From 6f901fd9ce07c7cfd9024a73a82d8fd8d3ef814c Mon Sep 17 00:00:00 2001
From: Disco DeDisco <adamcraighamilton@gmail.com>
Date: Wed, 20 May 2026 00:27:50 -0400
Subject: [PATCH] =?UTF-8?q?My=20Sea=20iter=204b=20polish=20v2:=20drop=20FY?=
 =?UTF-8?q?I=20from=20locked-draw=20Brief;=20dynamic=20aria-selected=20per?=
 =?UTF-8?q?=20default=5Fspread;=20defensive=20cross=20data-spread=20sync?=
 =?UTF-8?q?=20on=20init=20(guards=20bf-cache=20drift=20causing=20all=206?=
 =?UTF-8?q?=20slots=20to=20render=20post-DEL+reload)=20=E2=80=94=20TDD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(1) FYI removal — the locked-draw Brief is purely informational (status + next-free-draw timestamp). No navigation target made sense for the FYI; drop it after Brief.showBanner renders. The NVM dismiss + dedicated `<time>` slot carry all the affordance the user needs.

(2) Dynamic aria-selected on the SPREAD combobox — previously the SAO option was hardcoded `aria-selected="true"`. When active_draw is non-SAO (e.g. Celtic Cross), server-rendered state was internally inconsistent: hidden value = waite-smith, aria-selected = SAO. JS init's force-sync (which reads aria-selected to override autofill on hidden) then overwrote the correct hidden value w. SAO — corrupting the picker's state silently. Made aria-selected + `.sea-select-current` visible label both branch on `default_spread`.

(3) Defensive cross.data-spread sync on init — after the autofill force-sync settles `hidden.value` from the aria-selected source-of-truth, mirror it onto `.my-sea-cross[data-spread]` + re-run syncLabels. Idempotent when server-rendered state is internally consistent; corrective when a prior page state (Firefox bfcache restoring a Celtic-Cross DOM, mid-draw session restored) left a stale `data-spread` that SCSS-hides the wrong subset of cells. User-reported 2026-05-20: after locking a Celtic Cross + DEL + reload, all 6 slots remained visible on the picker w. SAO labels — exactly the symptom of cross.data-spread="waite-smith" surviving an otherwise-fresh server render.

Tests: 116 gameboard ITs + 5 iter-4b FTs green. The dynamic aria-selected behavior is implicitly covered by the existing default-spread IT (no regression on the SAO=true baseline); the bf-cache scenario is hard to express as a deterministic FT/IT — the defensive sync is a safety net, not a behavioral spec.

Code architected by Disco DeDisco <discodedisco@outlook.com>
Git commit message Co-Authored-By:
Claude Opus 4.7 <noreply@anthropic.com>
---
 src/templates/apps/gameboard/my_sea.html | 32 ++++++++++++++++++------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/templates/apps/gameboard/my_sea.html b/src/templates/apps/gameboard/my_sea.html
index db89f14..0a94db0 100644
--- a/src/templates/apps/gameboard/my_sea.html
+++ b/src/templates/apps/gameboard/my_sea.html
@@ -157,17 +157,17 @@
                                  aria-haspopup="listbox"
                                  aria-labelledby="id_sea_spread_label"
                                  tabindex="0">
-                                <span class="sea-select-current">Situation, Action, Outcome</span>
+                                <span class="sea-select-current">{% if default_spread == 'past-present-future' %}Past, Present, Future{% elif default_spread == 'mind-body-spirit' %}Mind, Body, Spirit{% elif default_spread == 'desire-obstacle-solution' %}Desire, Obstacle, Solution{% elif default_spread == 'waite-smith' %}Celtic Cross, Waite-Smith{% elif default_spread == 'escape-velocity' %}Celtic Cross, Escape Velocity{% else %}Situation, Action, Outcome{% endif %}</span>
                                 <span class="sea-select-arrow" aria-hidden="true">▾</span>
                                 <ul class="sea-select-list" role="listbox">
                                     <li role="presentation" class="sea-select-divider">3-card spreads</li>
-                                    <li role="option" data-value="past-present-future"      aria-selected="false">Past, Present, Future</li>
-                                    <li role="option" data-value="situation-action-outcome" aria-selected="true">Situation, Action, Outcome</li>
-                                    <li role="option" data-value="mind-body-spirit"         aria-selected="false">Mind, Body, Spirit</li>
-                                    <li role="option" data-value="desire-obstacle-solution" aria-selected="false">Desire, Obstacle, Solution</li>
+                                    <li role="option" data-value="past-present-future"      aria-selected="{% if default_spread == 'past-present-future' %}true{% else %}false{% endif %}">Past, Present, Future</li>
+                                    <li role="option" data-value="situation-action-outcome" aria-selected="{% if default_spread == 'situation-action-outcome' %}true{% else %}false{% endif %}">Situation, Action, Outcome</li>
+                                    <li role="option" data-value="mind-body-spirit"         aria-selected="{% if default_spread == 'mind-body-spirit' %}true{% else %}false{% endif %}">Mind, Body, Spirit</li>
+                                    <li role="option" data-value="desire-obstacle-solution" aria-selected="{% if default_spread == 'desire-obstacle-solution' %}true{% else %}false{% endif %}">Desire, Obstacle, Solution</li>
                                     <li role="presentation" class="sea-select-divider">6-card spreads</li>
-                                    <li role="option" data-value="waite-smith"     aria-selected="false">Celtic Cross, Waite-Smith</li>
-                                    <li role="option" data-value="escape-velocity" aria-selected="false">Celtic Cross, Escape Velocity</li>
+                                    <li role="option" data-value="waite-smith"     aria-selected="{% if default_spread == 'waite-smith' %}true{% else %}false{% endif %}">Celtic Cross, Waite-Smith</li>
+                                    <li role="option" data-value="escape-velocity" aria-selected="{% if default_spread == 'escape-velocity' %}true{% else %}false{% endif %}">Celtic Cross, Escape Velocity</li>
                                 </ul>
                             </div>
                         </div>
@@ -578,6 +578,12 @@
                         // attribute intact for accessibility tooling).
                         var ts = banner.querySelector('.note-banner__timestamp');
                         if (ts && iso) ts.textContent = _formatTimestamp(iso);
+                        // No FYI on this Brief — it's an informational nudge
+                        // (locked draw status), not a navigation target. The
+                        // NVM button + timestamp slot carry all the affordance
+                        // the user needs.
+                        var fyi = banner.querySelector('.note-banner__fyi');
+                        if (fyi) fyi.remove();
                     }
                 };
                 function _postLock(hand) {
@@ -646,6 +652,18 @@
                 if (_initialOpt && hidden.value !== _initialOpt.dataset.value) {
                     hidden.value = _initialOpt.dataset.value;
                 }
+                // Mirror the hidden value onto the cross's `data-spread` +
+                // re-run syncLabels. Idempotent when server-rendered state
+                // is internally consistent; corrective if a prior page
+                // state (Firefox bfcache restoring a Celtic-Cross DOM,
+                // session left mid-draw etc.) left a stale `data-spread`
+                // that SCSS-hides the wrong subset of cells. Without this,
+                // a post-DEL reload could land on the picker w. data-
+                // spread="waite-smith" but SAO labels + SAO hidden value
+                // → all 6 cells visible, sometimes unlabeled (the user-
+                // observed bug, 2026-05-20).
+                cross.setAttribute('data-spread', hidden.value);
+                syncLabels(hidden.value);
 
                 // Exposed for iter 4b / future surfaces.
                 window._mySeaDrawOrder = DRAW_ORDER;