From b1368b6a51379714958af82cb1e3dc24183b0583 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Fri, 19 Jun 2026 19:21:31 +0800
Subject: [PATCH] Add horizontal waterfall arrow focus

---
 C3.tools/round1-horizontal-waterfall-fixture-qa.sh |  126 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 121 insertions(+), 5 deletions(-)

diff --git a/C3.tools/round1-horizontal-waterfall-fixture-qa.sh b/C3.tools/round1-horizontal-waterfall-fixture-qa.sh
index 5463421..05361bb 100755
--- a/C3.tools/round1-horizontal-waterfall-fixture-qa.sh
+++ b/C3.tools/round1-horizontal-waterfall-fixture-qa.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 # Round01.1 horizontal Waterfall fixture QA. It verifies the P1 masonry view:
 # no horizontal scroll, centered equal-width fixed-height cards, 150pt vertical
-# placement steps, App Shelf anchoring, and horizontal-mode Tab navigation.
+# placement steps, App Shelf anchoring, horizontal-mode Tab navigation, and
+# horizontal arrow focus across App Shelf icons plus window cards.
 
 set -euo pipefail
 
@@ -12,11 +13,16 @@
 APP="$BUILD_CURRENT_APP"
 LAYOUT_REPORT="$BUILD_REPORT_ROOT/round01-horizontal-waterfall-layout-report.json"
 KEYBOARD_REPORT="$BUILD_REPORT_ROOT/round01-horizontal-waterfall-keyboard-report.json"
+APP_ENTER_REPORT="$BUILD_REPORT_ROOT/round01-horizontal-waterfall-app-enter-report.json"
+ARROW_WRAP_REPORT="$BUILD_REPORT_ROOT/round01-horizontal-waterfall-arrow-wrap-report.json"
 FILTER_REPORT="$BUILD_REPORT_ROOT/round01-horizontal-waterfall-filter-report.json"
 FIXTURE_APP_COUNT="${ALIGNER_ROUND1_HORIZONTAL_WATERFALL_FIXTURE_APP_COUNT:-8}"
 FIXTURE_WINDOWS_PER_APP="${ALIGNER_ROUND1_HORIZONTAL_WATERFALL_FIXTURE_WINDOWS_PER_APP:-6}"
 HOVER_APP_INDEX="${ALIGNER_ROUND1_HORIZONTAL_WATERFALL_HOVER_APP_INDEX:-7}"
 KEY_SEQUENCE="${ALIGNER_ROUND1_HORIZONTAL_WATERFALL_KEY_SEQUENCE:-tab}"
+APP_ENTER_KEY_SEQUENCE="${ALIGNER_ROUND1_HORIZONTAL_WATERFALL_APP_ENTER_KEY_SEQUENCE:-app:3,enter}"
+APP_ENTER_TARGET_APP_INDEX="${ALIGNER_ROUND1_HORIZONTAL_WATERFALL_APP_ENTER_TARGET_APP_INDEX:-2}"
+ARROW_WRAP_KEY_SEQUENCE="${ALIGNER_ROUND1_HORIZONTAL_WATERFALL_ARROW_WRAP_KEY_SEQUENCE:-app:1,down,up,left,down,enter}"
 REPORT_WAIT="${ALIGNER_ROUND1_HORIZONTAL_WATERFALL_REPORT_WAIT:-6.0}"
 
 fail() {
@@ -125,9 +131,9 @@
 require(root.get("hoveredAppGroupIndex") == hover_app_index, "horizontal masonry must keep the hovered App group available to Waterfall visuals")
 
 require(cards, "horizontal masonry fixture must expose cards")
-widths = [round(card.get("frame", {}).get("width", 0), 1) for card in cards]
+widths = [round(card.get("bounds", {}).get("width", 0), 1) for card in cards]
 require(len(set(widths)) == 1, "horizontal masonry cards must be equal width")
-heights = [round(card.get("frame", {}).get("height", 0), 1) for card in cards]
+heights = [round(card.get("bounds", {}).get("height", 0), 1) for card in cards]
 expected_card_height = 138.0
 expected_thumbnail_height = 106.0
 expected_card_step = 150.0
@@ -181,6 +187,13 @@
 require(blue_reference is not None, "fixture must expose a Space Lane blue reference color")
 require(all("appLinked" in card.get("visualStates", []) for card in hover_cards), "all cards for the hovered App must expose appLinked visual state")
 require(all("appLinked" not in card.get("visualStates", []) for card in non_hover_cards), "non-hovered App cards must not expose appLinked visual state")
+require(root.get("selectedAppGroupIndex") == hover_app_index, "hovered App must select its first window as the default submit target")
+require(root.get("selectedWindowIndex") == 0, "hovered App default submit target must be its first window")
+require(root.get("horizontalAppDefaultWindowID") == hover_first_card.get("windowID"), "hovered App default window ID must match the first card")
+require(hover_first_card.get("isSelected") is True, "hovered App first card must become the effective selection")
+require(hover_first_card.get("isHorizontalAppDefault") is True, "hovered App first card must expose app default state")
+require("appDefault" in hover_first_card.get("visualStates", []), "hovered App first card must report appDefault visual state")
+require("selected" in hover_first_card.get("visualStates", []), "hovered App first card must get selected visual state")
 require(all(card.get("shadowOpacity", 0) >= 0.15 for card in hover_cards), "hovered App cards must float with visible shadow opacity")
 require(all(card.get("shadowRadius", 0) >= 18 for card in hover_cards), "hovered App cards must float with visible shadow radius")
 require(all(card.get("shadowOpacity", 1) <= 0.01 for card in non_hover_cards if "spaceFocused" not in card.get("visualStates", []) and "hover" not in card.get("visualStates", []) and "selected" not in card.get("visualStates", [])), "normal non-hovered cards must not inherit App hover shadow")
@@ -248,6 +261,95 @@
 PY
 }
 
+assert_app_enter_report() {
+  /usr/bin/python3 - "$APP_ENTER_REPORT" "$APP_ENTER_KEY_SEQUENCE" "$APP_ENTER_TARGET_APP_INDEX" <<'PY'
+import json
+import sys
+
+path = sys.argv[1]
+key_sequence = [part for part in sys.argv[2].split(",") if part]
+target_app_index = int(sys.argv[3])
+
+with open(path, "r", encoding="utf-8") as file:
+    report = json.load(file)
+
+def require(condition, message):
+    if not condition:
+        print(message, file=sys.stderr)
+        print(json.dumps(report, indent=2, ensure_ascii=False), file=sys.stderr)
+        sys.exit(1)
+
+root = report.get("rootView", {})
+columns = root.get("waterfallColumns", [])
+require(report.get("snapshotLoaded") is True, "snapshotLoaded must be true")
+require(root.get("waterfallViewMode") == "horizontalMasonry", "App Enter run must use horizontalMasonry")
+require(root.get("keyboardCommandsApplied") == key_sequence, "App Enter keyboard commands must be applied")
+require(target_app_index < len(columns), "target App index must exist")
+target_card = columns[target_app_index].get("cards", [])[0]
+require(root.get("hoverTargetKind") == "app", "App index focus must leave hover target on the App icon")
+require(root.get("keyboardFocusedAppGroupIndex") == target_app_index, "keyboard App focus must target requested App")
+require(root.get("keyboardFocusedWindowID") is None, "App icon focus must not keep stale window keyboard focus")
+require(root.get("selectedAppGroupIndex") == target_app_index, "App icon focus must select the target App")
+require(root.get("selectedWindowIndex") == 0, "App icon focus must select the first window")
+require(root.get("horizontalAppDefaultWindowID") == target_card.get("windowID"), "App default window ID must match the first window")
+require(root.get("lastCommittedAppGroupIndex") == target_app_index, "Enter on App icon must commit the target App")
+require(root.get("lastCommittedWindowIndex") == 0, "Enter on App icon must commit the first window")
+require(root.get("lastCommittedWindowID") == target_card.get("windowID"), "Enter on App icon must commit the first window ID")
+require(root.get("lastCommitSource") == "keyboard", "App Enter commit must be keyboard sourced")
+require(target_card.get("isHorizontalAppDefault") is True, "target first card must report app default state")
+require("appDefault" in target_card.get("visualStates", []), "target first card must expose appDefault visual state")
+require("selected" in target_card.get("visualStates", []), "target first card must expose selected visual state")
+
+print(json.dumps({
+    "commands": root.get("keyboardCommandsApplied"),
+    "hoverTargetKind": root.get("hoverTargetKind"),
+    "targetAppGroupIndex": target_app_index,
+    "lastCommittedWindowID": root.get("lastCommittedWindowID")
+}, indent=2, ensure_ascii=False))
+PY
+}
+
+assert_arrow_wrap_report() {
+  /usr/bin/python3 - "$ARROW_WRAP_REPORT" "$ARROW_WRAP_KEY_SEQUENCE" "$FIXTURE_APP_COUNT" <<'PY'
+import json
+import sys
+
+path = sys.argv[1]
+key_sequence = [part for part in sys.argv[2].split(",") if part]
+fixture_app_count = int(sys.argv[3])
+
+with open(path, "r", encoding="utf-8") as file:
+    report = json.load(file)
+
+def require(condition, message):
+    if not condition:
+        print(message, file=sys.stderr)
+        print(json.dumps(report, indent=2, ensure_ascii=False), file=sys.stderr)
+        sys.exit(1)
+
+root = report.get("rootView", {})
+columns = root.get("waterfallColumns", [])
+target_app_index = fixture_app_count - 1
+require(report.get("snapshotLoaded") is True, "snapshotLoaded must be true")
+require(root.get("waterfallViewMode") == "horizontalMasonry", "arrow wrap run must use horizontalMasonry")
+require(root.get("keyboardCommandsApplied") == key_sequence, "arrow wrap keyboard commands must be applied")
+require(len(columns) == fixture_app_count, "fixture App count must match")
+target_card = columns[target_app_index].get("cards", [])[0]
+require(root.get("lastCommittedAppGroupIndex") == target_app_index, "left arrow from first App icon must wrap to the last App")
+require(root.get("lastCommittedWindowIndex") == 0, "down arrow from App icon must land on the first window")
+require(root.get("lastCommittedWindowID") == target_card.get("windowID"), "Enter after arrow focus must commit the focused first window")
+require(root.get("selectedAppGroupIndex") == target_app_index, "selected App must match wrapped App")
+require(root.get("selectedWindowIndex") == 0, "selected window must be the wrapped App first window")
+require(root.get("lastCommitSource") == "keyboard", "arrow focus Enter commit must be keyboard sourced")
+
+print(json.dumps({
+    "commands": root.get("keyboardCommandsApplied"),
+    "wrappedAppGroupIndex": target_app_index,
+    "lastCommittedWindowID": root.get("lastCommittedWindowID")
+}, indent=2, ensure_ascii=False))
+PY
+}
+
 assert_filter_report() {
   /usr/bin/python3 - "$FILTER_REPORT" <<'PY'
 import json
@@ -281,9 +383,9 @@
 require(root.get("projectionTransitionFadeOutLayerCount", 0) > 0, "horizontal Space filter must animate removed cards/apps")
 require(root.get("projectionTransitionDurationMilliseconds", 0) >= 120, "horizontal Space filter must report projection duration")
 
-widths = [round(card.get("frame", {}).get("width", 0), 1) for card in cards]
+widths = [round(card.get("bounds", {}).get("width", 0), 1) for card in cards]
 require(len(set(widths)) == 1, "filtered horizontal cards must remain equal width")
-heights = [round(card.get("frame", {}).get("height", 0), 1) for card in cards]
+heights = [round(card.get("bounds", {}).get("height", 0), 1) for card in cards]
 require(len(set(heights)) == 1 and abs(heights[0] - 138.0) <= 1.0, "filtered horizontal cards must keep the fixed 138pt height")
 visible_width = root.get("waterfallVisibleWidth", 0)
 require(all(card.get("frame", {}).get("x", -1) >= -1 for card in cards), "filtered cards must not overflow left")
@@ -368,6 +470,20 @@
 wait "$APP_PID" 2>/dev/null || true
 stop_current_aligner
 
+run_fixture "$APP_ENTER_REPORT" --round01-debug-key-sequence="$APP_ENTER_KEY_SEQUENCE"
+wait_for_loaded_report "$APP_ENTER_REPORT"
+assert_app_enter_report
+kill "$APP_PID" 2>/dev/null || true
+wait "$APP_PID" 2>/dev/null || true
+stop_current_aligner
+
+run_fixture "$ARROW_WRAP_REPORT" --round01-debug-key-sequence="$ARROW_WRAP_KEY_SEQUENCE"
+wait_for_loaded_report "$ARROW_WRAP_REPORT"
+assert_arrow_wrap_report
+kill "$APP_PID" 2>/dev/null || true
+wait "$APP_PID" 2>/dev/null || true
+stop_current_aligner
+
 run_space_filter_fixture "$FILTER_REPORT"
 wait_for_loaded_report "$FILTER_REPORT"
 assert_filter_report

--
Gitblit v1.9.3