- }
-}
-
-#[component]
-pub fn ScoringPanel(
- event: ScoredEvent,
- turn_stage: SerTurnStage,
- #[prop(default = false)] is_opponent: bool,
-) -> impl IntoView {
- let i18n = use_i18n();
- let cmd_tx = use_context::>()
- .expect("UnboundedSender not found in context");
-
- let points_earned = event.points_earned;
- let holes_gained = event.holes_gained;
- let holes_total = event.holes_total;
- let bredouille = event.bredouille;
- let show_hold_go = !is_opponent && turn_stage == SerTurnStage::HoldOrGoChoice;
- let panel_class = if is_opponent {
- "scoring-panel scoring-panel-opp"
- } else {
- "scoring-panel"
- };
-
- // ── Lifecycle signals ──────────────────────────────────────────────────
- // peeked: added after 3.4 s (slide to peek strip)
- // revealed: added on first hover of the peek strip (stay open permanently)
- let peeked = RwSignal::new(false);
- let revealed = RwSignal::new(false);
-
- // ── Collect all moves from all jans for automatic arrow display ────────
- let all_moves: Vec<(CheckerMove, CheckerMove)> = event
- .jans
- .iter()
- .flat_map(|e| e.moves.iter().cloned())
- .collect();
- let all_moves_click = all_moves.clone();
- let all_moves_enter = all_moves.clone();
-
- let hovered_ctx = use_context::>>();
-
- // On mount: show all this event's moves as board arrows immediately,
- // then after 3.4 s slide to peek and clear the arrows.
- //
- // Two important constraints:
- // 1. The initial hm.set() must be deferred (spawn_local, not sync in body)
- // to avoid writing a reactive signal mid-render while Board reads it —
- // that triggers Leptos's cycle guard → `unreachable` WASM panic.
- // 2. The cancellation flag must be Rc>, NOT RwSignal.
- // RwSignal is a NodeId into Leptos's arena; the arena slot is freed
- // when ScoringPanel's owner drops (on every GameScreen remount). If the
- // 3.4 s future outlives the component and calls is_alive.get_untracked()
- // on a freed slot, that also panics with `unreachable`. Rc>
- // is reference-counted outside the arena and stays valid for as long as
- // the future holds onto it.
- #[cfg(target_arch = "wasm32")]
- if let Some(hm) = hovered_ctx {
- let is_alive = Arc::new(AtomicBool::new(true));
- let is_alive_cleanup = is_alive.clone();
- // on_cleanup requires Send + Sync; Arc satisfies both.
- on_cleanup(move || is_alive_cleanup.store(false, Ordering::Relaxed));
-
- spawn_local(async move {
- // Show arrows (runs in the next microtask, after render settles).
- hm.set(all_moves);
-
- TimeoutFuture::new(3_400).await;
- // Guard: component may have been destroyed while we were waiting.
- // is_alive was set to false by on_cleanup, which runs before Leptos
- // frees the signal arena slots — so peeked is still valid iff this
- // returns true.
- if !is_alive.load(Ordering::Relaxed) {
- return;
- }
- hm.set(vec![]);
- peeked.set(true);
- });
- }
-
- let jan_rows: Vec<_> = event.jans.into_iter().map(scoring_jan_row).collect();
-
- view! {
- // ── Outer wrapper: owns the slide / peek / reveal animation ───────
- // pointer-events are on by default (parent .side-panel sets none,
- // and .scoring-panel-wrapper overrides back to auto in CSS).
-
-
-
- {move || if is_opponent {
- t_string!(i18n, opp_scored_pts, n = points_earned)
- } else {
- t_string!(i18n, scored_pts, n = points_earned)
- }}
-
+ {my_can_bredouille.then(|| view! {
+
+ "B"
+
+ })}
+ // Flash sits in the free space to the right of the pegs.
+ // margin-left:auto keeps it right-aligned inside the flex row
+ // without adding a new row, so the board never shifts down.
+ {(my_holes_gained > 0).then(|| {
+ let label = if my_bredouille {
+ format!("Trou {} · ×2 bredouille", my_holes)
+ } else {
+ format!("Trou {}", my_holes)
+ };
+ view! {
+
}
diff --git a/clients/web/src/game/components/scoring.rs b/clients/web/src/game/components/scoring.rs
index d1966be..a3f939b 100644
--- a/clients/web/src/game/components/scoring.rs
+++ b/clients/web/src/game/components/scoring.rs
@@ -2,15 +2,18 @@ use futures::channel::mpsc::UnboundedSender;
#[cfg(target_arch = "wasm32")]
use gloo_timers::future::TimeoutFuture;
use leptos::prelude::*;
+#[cfg(target_arch = "wasm32")]
+use std::sync::{
+ atomic::{AtomicBool, Ordering},
+ Arc,
+};
use trictrac_store::CheckerMove;
#[cfg(target_arch = "wasm32")]
use wasm_bindgen_futures::spawn_local;
-#[cfg(target_arch = "wasm32")]
-use std::sync::{Arc, atomic::{AtomicBool, Ordering}};
use crate::app::NetCommand;
-use crate::i18n::*;
use crate::game::trictrac::types::{JanEntry, PlayerAction, ScoredEvent, SerTurnStage};
+use crate::i18n::*;
use super::score_panel::jan_label;
@@ -48,6 +51,14 @@ fn scoring_jan_row(entry: JanEntry) -> impl IntoView {
}
}
+/// Scoring detail panel, shown to the right of the hole counter in the merged
+/// score panel area.
+///
+/// Lifecycle:
+/// 1. Mounts expanded — shows all jan details and draws board arrows.
+/// 2. After 3.4 s the arrows clear and the panel auto-minimises to a small "+"
+/// button (unless Hold/Go buttons are still needed).
+/// 3. The "+" / "−" buttons let the player toggle between states at any time.
#[component]
pub fn ScoringPanel(
event: ScoredEvent,
@@ -69,22 +80,21 @@ pub fn ScoringPanel(
"scoring-panel"
};
- // ── Lifecycle signals ──────────────────────────────────────────────────
- // peeked: added after 3.4 s (slide to peek strip)
- // revealed: added on first hover of the peek strip (stay open permanently)
- let peeked = RwSignal::new(false);
- let revealed = RwSignal::new(false);
+ // minimized: starts false (expanded)
+ let minimized = RwSignal::new(false);
- // ── Collect all moves from all jans for automatic arrow display ────────
+ // Collect all moves from all jans for automatic arrow display.
let all_moves: Vec<(CheckerMove, CheckerMove)> = event
.jans
.iter()
.flat_map(|e| e.moves.iter().cloned())
.collect();
- let all_moves_click = all_moves.clone();
- let all_moves_enter = all_moves.clone();
+ let all_moves_auto = all_moves.clone();
+ let all_moves_expand = all_moves.clone();
+ let all_moves_enter = all_moves.clone();
let hovered_ctx = use_context::>>();
+ let jan_rows: Vec<_> = event.jans.into_iter().map(scoring_jan_row).collect();
// On mount: show all this event's moves as board arrows immediately,
// then after 3.4 s slide to peek and clear the arrows.
@@ -120,36 +130,14 @@ pub fn ScoringPanel(
return;
}
hm.set(vec![]);
- peeked.set(true);
});
}
- let jan_rows: Vec<_> = event.jans.into_iter().map(scoring_jan_row).collect();
-
view! {
- // ── Outer wrapper: owns the slide / peek / reveal animation ───────
- // pointer-events are on by default (parent .side-panel sets none,
- // and .scoring-panel-wrapper overrides back to auto in CSS).
+ // "+" expand button — shown only when minimised (CSS hides it otherwise).
+
+
+ // Full panel — hidden when minimised via CSS.
-
- {move || if is_opponent {
- t_string!(i18n, opp_scored_pts, n = points_earned)
- } else {
- t_string!(i18n, scored_pts, n = points_earned)
- }}
+
+
+ {move || if is_opponent {
+ t_string!(i18n, opp_scored_pts, n = points_earned)
+ } else {
+ t_string!(i18n, scored_pts, n = points_earned)
+ }}
+
// Hidden "join by code" fallback
@@ -175,8 +244,7 @@ fn IdleCard(
{t!(i18n, join_code_label)}
{move || {
- // Clone the sender on each reactive run to keep the outer closure FnMut
- let cmd = cmd_tx_join.clone();
+ let cmd = cmd_join.clone();
join_open.get().then(|| view! {