Fix vertical keyboard window focus

Ariver

2026-06-19 cb67d8b2fa9b9c9d30cd81d72b8737ee2baa44b6

 C3.tools/round1-vertical-keyboard-app-focus-fixture-qa.sh

@@ -121,20 +121,24 @@
assert_report() {
  local report="$1"
  local expected_sequence="$2"
  local expected_app_index="$3"
  local expected_window_index="$4"
  local expected_boundary_count="$5"
  local expected_boundary_direction="$6"
  local expect_selection_changed="$7"
  local expected_focus_app_index="$3"
  local expected_selected_app_index="$4"
  local expected_window_index="$5"
  local expected_boundary_count="$6"
  local expected_boundary_direction="$7"
  local expect_selection_changed="$8"
  local expect_keyboard_window_focus="$9"

  /usr/bin/python3 - \
    "$report" \
    "$expected_sequence" \
    "$expected_app_index" \
    "$expected_focus_app_index" \
    "$expected_selected_app_index" \
    "$expected_window_index" \
    "$expected_boundary_count" \
    "$expected_boundary_direction" \
    "$expect_selection_changed" \
    "$expect_keyboard_window_focus" \
    "$FIXTURE_APP_COUNT" \
    "$FIXTURE_WINDOWS_PER_APP" <<'PY'
import json
@@ -142,13 +146,15 @@

path = sys.argv[1]
expected_sequence = [part for part in sys.argv[2].split(",") if part]
expected_app_index = int(sys.argv[3])
expected_window_index = int(sys.argv[4])
expected_boundary_count = int(sys.argv[5])
expected_boundary_direction = None if sys.argv[6] == "none" else sys.argv[6]
expect_selection_changed = sys.argv[7] == "true"
fixture_app_count = int(sys.argv[8])
fixture_windows_per_app = int(sys.argv[9])
expected_focus_app_index = int(sys.argv[3])
expected_selected_app_index = int(sys.argv[4])
expected_window_index = int(sys.argv[5])
expected_boundary_count = int(sys.argv[6])
expected_boundary_direction = None if sys.argv[7] == "none" else sys.argv[7]
expect_selection_changed = sys.argv[8] == "true"
expect_keyboard_window_focus = sys.argv[9] == "true"
fixture_app_count = int(sys.argv[10])
fixture_windows_per_app = int(sys.argv[11])

with open(path, "r", encoding="utf-8") as file:
    report = json.load(file)
@@ -162,8 +168,9 @@
root = report.get("rootView", {})
items = root.get("appShelfItems", [])
columns = root.get("waterfallColumns", [])
target_item = next((item for item in items if item.get("index") == expected_app_index), None)
target_column = next((column for column in columns if column.get("appGroupIndex") == expected_app_index), None)
focus_item = next((item for item in items if item.get("index") == expected_focus_app_index), None)
focus_column = next((column for column in columns if column.get("appGroupIndex") == expected_focus_app_index), None)
selected_column = next((column for column in columns if column.get("appGroupIndex") == expected_selected_app_index), None)

require(report.get("snapshotLoaded") is True, "snapshotLoaded must be true")
require(report.get("quickSwitchVisible") is True, "fixture must keep Quick Switch visible")
@@ -171,22 +178,43 @@
require(report.get("windowCount") == fixture_app_count * fixture_windows_per_app, "fixture windowCount must match")
require(root.get("waterfallViewMode") == "verticalColumns", "fixture must run in vertical Waterfall")
require(root.get("keyboardCommandsApplied") == expected_sequence, "keyboard commands must match normalized sequence")
require(root.get("keyboardFocusedAppGroupIndex") == expected_app_index, "keyboard focus must land on expected App")
require(root.get("hoveredAppGroupIndex") == expected_app_index, "keyboard focus must expose hovered App")
require(root.get("keyboardFocusedAppGroupIndex") == expected_focus_app_index, "keyboard focus must land on expected App")
require(root.get("hoveredAppGroupIndex") == expected_focus_app_index, "keyboard focus must expose hovered App")
require(root.get("hoverTargetKind") == "app", "keyboard focus must use App hover target")
require(root.get("hoverTargetSource") == "keyboard", "keyboard focus must report keyboard source")
require(root.get("lastCommittedWindowID") is None, "no-Enter keyboard focus runs must not commit")
require(root.get("lastCommitSource") is None, "no-Enter keyboard focus runs must not report commit source")
require(target_item is not None, "target App Shelf item must exist")
require(target_column is not None, "target Waterfall column must exist")
require(target_item.get("isHovered") is True, "target App Shelf item must expose hover")
require("hover" in target_item.get("visualStates", []), "target App Shelf item must expose hover visual")
require(target_column.get("isHovered") is True, "target Waterfall column must expose hover")
require("hover" in target_column.get("visualStates", []), "target Waterfall column must expose hover visual")
require(root.get("selectedAppGroupIndex") == expected_app_index, "selected App must match expected App after column entry")
require(focus_item is not None, "focused App Shelf item must exist")
require(focus_column is not None, "focused Waterfall column must exist")
require(selected_column is not None, "selected Waterfall column must exist")
selected_cards = [card for column in columns for card in column.get("cards", []) if card.get("isSelected") is True]
selected_card = selected_column.get("cards", [])[expected_window_index]
require(focus_item.get("isHovered") is True, "focused App Shelf item must expose hover")
require("hover" in focus_item.get("visualStates", []), "focused App Shelf item must expose hover visual")
require(focus_column.get("isHovered") is True, "focused Waterfall column must expose hover")
require("hover" in focus_column.get("visualStates", []), "focused Waterfall column must expose hover visual")
require(root.get("selectedAppGroupIndex") == expected_selected_app_index, "selected App must match expected selected App")
require(root.get("selectedWindowIndex") == expected_window_index, "selected window index must match expected column movement")
require(root.get("selectionChangedByLastCommand") is expect_selection_changed, "selectionChangedByLastCommand must match final command")
require(root.get("boundaryBounceCount") == expected_boundary_count, "boundary bounce count must match")
if expect_keyboard_window_focus:
    require(len(selected_cards) == 1, "keyboard window focus run must expose exactly one selected Waterfall card")
    require(selected_card.get("isSelected") is True, "expected selected card must expose selection")
    require(selected_card.get("isKeyboardFocused") is True, "expected selected card must expose keyboard focus")
    require(root.get("keyboardFocusedWindowID") == selected_card.get("windowID"), "keyboardFocusedWindowID must match selected card")
    require("selected" in selected_card.get("visualStates", []), "keyboard-focused selected card must expose selected visual")
    require("keyboardFocused" in selected_card.get("visualStates", []), "keyboard-focused selected card must expose keyboardFocused state")
    require(selected_card.get("shineVisible") is True, "keyboard-focused selected card must expose shine")
    header_frame = selected_column.get("headerFrame", {})
    clip_frame = selected_column.get("cardsClipFrame", {})
    column_frame = selected_column.get("visibleFrame", {})
    card_frame = selected_card.get("visibleFrame", {})
    require(selected_column.get("cardsClipMasksToBounds") is True, "vertical cards must be clipped below pinned header")
    require(clip_frame.get("height", 0) <= header_frame.get("y", 0) + 1, "cards clip must stop before pinned header")
    header_min_y = column_frame.get("y", 0) + header_frame.get("y", 0)
    require(card_frame.get("y", 0) + card_frame.get("height", 0) <= header_min_y + 1, "keyboard-focused card must not overlap pinned header")
else:
    require(root.get("keyboardFocusedWindowID") is None, "App-only keyboard focus must not expose keyboardFocusedWindowID")
if expected_boundary_direction is None:
    require(root.get("lastBoundaryBounceAxis") is None, "no-boundary run must not report boundary axis")
    require(root.get("lastBoundaryBounceDirection") is None, "no-boundary run must not report boundary direction")
@@ -197,7 +225,9 @@
print(json.dumps({
    "commands": root.get("keyboardCommandsApplied"),
    "keyboardFocusedAppGroupIndex": root.get("keyboardFocusedAppGroupIndex"),
    "selectedAppGroupIndex": root.get("selectedAppGroupIndex"),
    "selectedWindowIndex": root.get("selectedWindowIndex"),
    "keyboardFocusedWindowID": root.get("keyboardFocusedWindowID"),
    "boundaryBounceCount": root.get("boundaryBounceCount"),
    "lastBoundaryBounceDirection": root.get("lastBoundaryBounceDirection")
}, indent=2, ensure_ascii=False))
@@ -207,11 +237,13 @@
run_case() {
  local name="$1"
  local sequence="$2"
  local expected_app_index="$3"
  local expected_window_index="$4"
  local expected_boundary_count="$5"
  local expected_boundary_direction="$6"
  local expect_selection_changed="$7"
  local expected_focus_app_index="$3"
  local expected_selected_app_index="$4"
  local expected_window_index="$5"
  local expected_boundary_count="$6"
  local expected_boundary_direction="$7"
  local expect_selection_changed="$8"
  local expect_keyboard_window_focus="$9"
  local report="$REPORT_DIR/round01-vertical-keyboard-$name-report.json"
  local expected_sequence
  expected_sequence="$(normalize_keyboard_sequence "$sequence")"
@@ -235,11 +267,13 @@
  assert_report \
    "$report" \
    "$expected_sequence" \
    "$expected_app_index" \
    "$expected_focus_app_index" \
    "$expected_selected_app_index" \
    "$expected_window_index" \
    "$expected_boundary_count" \
    "$expected_boundary_direction" \
    "$expect_selection_changed"
    "$expect_selection_changed" \
    "$expect_keyboard_window_focus"

  kill "$APP_PID" 2>/dev/null || true
  wait "$APP_PID" 2>/dev/null || true
@@ -254,14 +288,23 @@
if [ "$FIXTURE_WINDOWS_PER_APP" -lt 8 ]; then
  fail "fixture windows per app must be at least 8"
fi
symbols="1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ"
if [ "$FIXTURE_APP_COUNT" -gt "${#symbols}" ]; then
  fail "fixture app count cannot exceed supported App Shelf index symbols"
fi

LAST_APP_INDEX=$((FIXTURE_APP_COUNT - 1))
LAST_APP_SYMBOL="${symbols:LAST_APP_INDEX:1}"

trap cleanup EXIT
stop_current_aligner
"$SCRIPT_DIR/package-app.sh" >&2

run_case "wrap" "1,left,right" 0 0 0 "none" "false"
run_case "bottom-boundary" "3,down,down,down,down,down,down,down,down,down" 2 7 1 "down" "false"
run_case "top-boundary" "4,down,up" 3 0 1 "up" "false"
run_case "index-hover-only" "A" 10 0 0 0 "none" "false" "false"
run_case "left-wrap-to-last" "1,left" "$LAST_APP_INDEX" 0 0 0 "none" "false" "false"
run_case "right-wrap-to-first" "$LAST_APP_SYMBOL,right" 0 0 0 0 "none" "false" "false"
run_case "bottom-boundary" "3,down,down,down,down,down,down,down,down,down" 2 2 7 1 "down" "false" "true"
run_case "top-boundary" "4,down,up" 3 3 0 1 "up" "false" "true"

trap - EXIT
cleanup