diff --git a/changelog.d/1803-shots-click-to-go-reorder.md b/changelog.d/1803-shots-click-to-go-reorder.md
index 427a9a5f4d..3158a3fcd4 100644
--- a/changelog.d/1803-shots-click-to-go-reorder.md
+++ b/changelog.d/1803-shots-click-to-go-reorder.md
@@ -1,4 +1,4 @@
- Clicking a shot row anywhere (its number, title or summary), or pressing
Enter or Space on its title, now goes to the shot, as LOAD did; the LOAD
button is gone. In its place, up and down arrows swap the shot with its
- neighbour, saved with the project (Sameh Khamis, @samehkhamis, #XXXX).
+ neighbour, saved with the project (Sameh Khamis, @samehkhamis, #1803).
diff --git a/changelog.d/1820-fleet-entry.md b/changelog.d/1820-fleet-entry.md
index 78d09ddf22..eab448489f 100644
--- a/changelog.d/1820-fleet-entry.md
+++ b/changelog.d/1820-fleet-entry.md
@@ -3,4 +3,4 @@
posing, and the vessel hull sprites are part of the package's public entry
points as `gods-eye-view/fleet`, with declarations, so contacts can be drawn
exactly as the Flights and Vessels layers draw them (Sameh Khamis,
- @samehkhamis, #XXXX).
+ @samehkhamis, #1820).
diff --git a/changelog.d/1855-kit-sweep-command-dock.md b/changelog.d/1855-kit-sweep-command-dock.md
new file mode 100644
index 0000000000..da8c33a820
--- /dev/null
+++ b/changelog.d/1855-kit-sweep-command-dock.md
@@ -0,0 +1,3 @@
+- The command dock's and Context's buttons and glyphs are now kit controls,
+ and the style buttons say whether they are pressed (manjunath22466,
+ samehkhamis, #1855).
diff --git a/changelog.d/1856-kit-sweep-small-surfaces.md b/changelog.d/1856-kit-sweep-small-surfaces.md
new file mode 100644
index 0000000000..a3d6130ee1
--- /dev/null
+++ b/changelog.d/1856-kit-sweep-small-surfaces.md
@@ -0,0 +1,3 @@
+- The small views' buttons and glyphs (locale picker, phone tabs, globe
+ actions and compass, News and rail cards, credits, the Omnibar guide's
+ rings and others) are now kit controls (manjunath22466, samehkhamis, #1856).
diff --git a/changelog.d/1858-kit-sweep-cockpit.md b/changelog.d/1858-kit-sweep-cockpit.md
new file mode 100644
index 0000000000..47f07f3b48
--- /dev/null
+++ b/changelog.d/1858-kit-sweep-cockpit.md
@@ -0,0 +1,2 @@
+- The Cockpit HUD's buttons and glyphs are now kit controls, and its rim
+ pointers are hidden from screen readers (manjunath22466, samehkhamis, #1858).
diff --git a/docs/VUE-MIGRATION.md b/docs/VUE-MIGRATION.md
index 9a54cd9452..15d8223889 100644
--- a/docs/VUE-MIGRATION.md
+++ b/docs/VUE-MIGRATION.md
@@ -97,8 +97,8 @@ header's search and expand, the imported files' row actions and the rail
chips' icons), the glyphs are `UiIcon`s with `:size="null"`, so the site
rules still size them. Core's pressable chips and pills (the rail cards'
chips and action chips, Recent Imagery's day chips, SWAP and ZOOM IN, map
-sources, cities and places) are `UiButton`s too; the view context's place
-and layer chips and the key setup chip are still plain buttons. `UiChip`
+sources, cities and places, and the view context's place and layer chips)
+are `UiButton`s too; the key setup chip is still a plain button. `UiChip`
is a non-interactive label chip, used by the voice card.
The welcome card's buttons (SKIP, the three start tiles, BROWSE STORIES,
BACK and the main NEXT / ENTER GOD MODE action) are ghost `UiButton`s:
@@ -122,6 +122,23 @@ magnifier would replace their SVG one, and Explore's two clear buttons,
which draw an SVG cross, are ghost `UiButton`s rather than
`UiCloseButton`s (`src/ui/kit/storiesControls.test.mjs` pins it).
Explore's sort is a `UiSelect`.
+Every button in the Cockpit HUD (`CockpitView` and its panels: the vision
+selector, Look ahead, the view switcher's Reset and Exit, the utility
+strip's launchers, collapse buttons, Radio transport and desktop rail, the
+briefing card's paging, Auto, collapse and page tabs, the Contact card's
+navigation, collapse and Weather, a signal row's target, the orbital
+view's TLE, Nadir, zoom and Sensor, and the bridge radar's range) is a
+ghost `UiButton` that keeps its id and classes, so the Cockpit
+controller's listeners and the cockpit stylesheets still find it. Radio's
+Enable (with `active`), Auto and Weather are pressed toggles; the
+disclosures keep `aria-expanded` and the page tabs `aria-current`. Its
+glyphs (the rim pointers, the reticle, the heading caret, the chevrons and
+panel glyphs, the contact and route arrows) are `UiIcon`s with
+`:size="null"`; the heading caret's rule reads
+`.cockpit-compass .cockpit-heading-caret`, so it still outranks the kit's
+`.ui-icon`, which loads after cockpit.css
+(`src/ui/kit/cockpitControls.test.mjs` pins it). The −, ◀ ▶ and + glyphs
+are text characters and stay text, and the Radio volume is a `UiSlider`.
The Omnibar's mic (a pressed toggle with `active`) and its suggestion
strip's chips (options, so `aria-current` rather than `pressed`) are
ghost `UiButton`s, and its search, row and chip glyphs are `UiIcon`s with
@@ -149,6 +166,23 @@ context view shows too). Their glyphs are `UiIcon`s with `:size="null"`,
so entity-card.css and spot-conditions.css still size them
(`src/ui/kit/entityCardControls.test.mjs` pins it). Ask GEV's chat bubble
stays inline SVG, since no Material symbol the page loads draws it.
+The command dock's buttons (the six style buttons, the two tray toggles,
+Location's collapse and the search toggle, beside the pins and pills that
+already were) are ghost `UiButton`s. The style buttons are pressed toggles
+with `active` as their pressed class, so they now carry `aria-pressed`;
+Normal is the pressed one until a style is published. Their glyphs, the
+search 🔎 and the collapse + are text characters, not Material symbols, and
+stay plain text. The Context panel's buttons (its two tabs, Contacts, the
+cockpit entry and SEARCH NEARBY SITES, beside the header's search and
+expand and the TR-3B chip) are ghost `UiButton`s; the tabs and Contacts
+are `role="tab"` controls, chosen through `aria-selected` with their own
+`active` class rather than `pressed`. The view context it shows while
+nothing is picked (a worldwide tile that turns a layer on, an item's row,
+the place and layer chips and Ask GEV) is on the kit too, and the glyphs of
+all three are `UiIcon`s with `:size="null"`, so their site rules still size
+them; an item's motion glyph keeps `role="img"` and its name, with the
+kit's `aria-hidden` taken off (`src/ui/kit/commandDockControls.test.mjs`
+pins it). Ask GEV's chat bubble stays inline SVG.
The Layer Finder's buttons (Search, Filter, the filter menu's Status and
Category options and the bar's two clear chips) are ghost `UiButton`s.
Search and the options are pressed toggles; the options' pressed class is
@@ -175,6 +209,22 @@ globe, attach, send and stop, expand and Back glyphs stay inline SVG,
since no Material symbol the page loads draws them the same, and the
message box, file picker and inactivity minutes stay native fields, which
the kit has none of. The voice modules build no controls in script.
+The small surfaces' buttons are ghost `UiButton`s: the locale picker's
+button, the phone tab bar's tabs, the globe actions' Clear, Share, Reset
+and north-up compass, the imagery divider's handle, the scene sharing
+dialog's buttons, the layer group index's ticks, the title logo, Exit
+clean view, the HUD's cockpit entry, a News card's face, a rail card's
+header, a layer row's toggle, the credits line's Data attribution and the
+camera calibration chips. None is a pressed toggle; the disclosures keep
+`aria-expanded`. Their Material glyphs (the tabs', the globe actions', the
+compass needle, the cockpit entry's and the celestial ring's sun and moon)
+are `UiIcon`s with `:size="null"`, so the site rules still size them. The
+locale picker's globe, caret and check and a News card's category icon stay
+inline SVG. The Omnibar guide draws the extra rings of a step with several
+targets in its template, as many as `view.subRings` says, rather than
+building them in script; the Omnibar's one other `material-symbols-outlined`
+is a stylesheet selector, and the layer disclosure only names a button in a
+comment (`src/ui/kit/smallSurfacesControls.test.mjs` pins it).
`UiSelect` renders the bare native select (Core's labels sit outside it or
come as an `aria-label`) with `v-model`, `options` and `disabled`;
options that carry their own attributes come through the slot, a caller's
@@ -280,11 +330,17 @@ page declares no dark `color-scheme`. Selects and number fields are
and keeps native spinners dark; ranges are `.gev-quantitative-slider`, with
a feature supplying only its accent.
-`t()` is not reactive. Words a view passes to a kit component as a prop
-(`UiCloseButton`'s `label`) follow a locale change on the view's next
-render, but words in a kit component's slot do not: the compiled slot does
-not render the child again. A view whose words must follow the locale at
-once passes the locale itself as a prop or key, as the credits line does.
+`t()` is reactive only while the locale is bound to a ref (the app binds
+it to vue-i18n's). Words a view passes to a kit component as a prop
+(`UiCloseButton`'s `label`) follow the view's render at once. Words and
+props read in a kit component's slot follow a tick later, in the child's
+own update, and never when the locale is unbound; a slot that reads a
+`v-for` variable is already redrawn with its view. A view whose owner
+patches synchronously and reads the result at once (a News card, a rail
+card, the credits line, the Omnibar guide's buttons) gives such a slot
+under a named condition that is always true
+(``): Vue redraws a conditional
+slot whenever its view is drawn.
## Phases
diff --git a/scripts/format-scope.json b/scripts/format-scope.json
index 4f918bae17..6606eee17a 100644
--- a/scripts/format-scope.json
+++ b/scripts/format-scope.json
@@ -1351,6 +1351,9 @@
"src/ui/kit/omnibarControls.test.mjs",
"src/ui/kit/storiesControls.test.mjs",
"src/ui/kit/chatVoiceControls.test.mjs",
+ "src/ui/kit/cockpitControls.test.mjs",
+ "src/ui/kit/smallSurfacesControls.test.mjs",
+ "src/ui/kit/commandDockControls.test.mjs",
"src/ui/styles/chip.css",
"src/ui/styles/empty-state.css",
"src/ui/rail/RailChips.vue",
diff --git a/src/celestialRingView.test.mjs b/src/celestialRingView.test.mjs
index 841f42d746..4b0493d679 100644
--- a/src/celestialRingView.test.mjs
+++ b/src/celestialRingView.test.mjs
@@ -90,8 +90,14 @@ test('the ring renders its overlay in the viewer container', async (t) => {
['DIV', 'celestial-ring-outline'],
['CANVAS', 'celestial-ring-canvas celestial-sun-canvas'],
['CANVAS', 'celestial-ring-canvas celestial-moon-canvas'],
- ['SPAN', 'celestial-marker celestial-sun material-symbols-outlined'],
- ['SPAN', 'celestial-marker celestial-moon material-symbols-outlined'],
+ [
+ 'SPAN',
+ 'ui-icon material-symbols-outlined celestial-marker celestial-sun',
+ ],
+ [
+ 'SPAN',
+ 'ui-icon material-symbols-outlined celestial-marker celestial-moon',
+ ],
],
);
assert.equal(root.children[0].style.display, 'none');
diff --git a/src/cockpitMarkup.test.mjs b/src/cockpitMarkup.test.mjs
index 3a084af32f..f8232a2f47 100644
--- a/src/cockpitMarkup.test.mjs
+++ b/src/cockpitMarkup.test.mjs
@@ -74,10 +74,14 @@ const voiceActions = fs.readFileSync(
test('Cockpit has one reset action beside its bottom exit path', () => {
assert.doesNotMatch(html, /id="cockpit-quick-entry"/);
assert.doesNotMatch(html, /id="cockpit-exit"/);
- assert.match(
- html,
- /id="map-view-switch"[^>]*aria-label="Exit cockpit view"[^>]*aria-keyshortcuts="Escape"[\s\S]*?close_fullscreen[\s\S]*?EXIT COCKPIT/,
+ // The exit button's attributes, in whatever order the button renders them.
+ const exit = html.match(
+ /
diff --git a/src/ui/views/panels/PhoneTabBar.vue b/src/ui/views/panels/PhoneTabBar.vue
index ed6ac0f3c1..9e71984761 100644
--- a/src/ui/views/panels/PhoneTabBar.vue
+++ b/src/ui/views/panels/PhoneTabBar.vue
@@ -4,6 +4,8 @@ import { computed } from 'vue';
import { t } from '../../../i18n/index.js';
import { useDisplayStore } from '../../stores/display.js';
import { useSpaceMissionsStore } from '../../stores/spaceMissions.js';
+import UiButton from '../../kit/UiButton.vue';
+import UiIcon from '../../kit/UiIcon.vue';
// The phone shell's tab bar and sheet backdrop. They join the end of the
// page when the shell first publishes, after the scene's credits, and leave
@@ -19,7 +21,7 @@ const tabs = computed(() =>
diff --git a/src/ui/views/panels/SceneDialog.vue b/src/ui/views/panels/SceneDialog.vue
index 39b0fad100..2fd033af67 100644
--- a/src/ui/views/panels/SceneDialog.vue
+++ b/src/ui/views/panels/SceneDialog.vue
@@ -2,6 +2,7 @@
import { storeToRefs } from 'pinia';
import { computed, shallowRef } from 'vue';
import { t, tn } from '../../../i18n/index.js';
+import UiButton from '../../kit/UiButton.vue';
import UiDialog from '../../kit/UiDialog.vue';
import { vStatusText } from '../../rail/statusText.js';
import { useSceneSharingStore } from '../../stores/sceneSharing.js';
@@ -47,14 +48,14 @@ const chooserStyle = (focused) => ({ padding: '3px 9px', border: '1px solid #397
{{ item.value }}
- {{ item.label }}
+ {{ item.label }}
- {{ item.label }}
+ {{ item.label }}
diff --git a/src/ui/views/panels/ViewContext.vue b/src/ui/views/panels/ViewContext.vue
index 15295c757c..326fee561d 100644
--- a/src/ui/views/panels/ViewContext.vue
+++ b/src/ui/views/panels/ViewContext.vue
@@ -10,7 +10,9 @@ import { shownLayerName } from '../../layerNames.js';
import { entityKind } from '../../../data/entityContext.js';
import SpotConditions from './SpotConditions.vue';
import SunDial from './SunDial.vue';
+import UiButton from '../../kit/UiButton.vue';
import UiCloseButton from '../../kit/UiCloseButton.vue';
+import UiIcon from '../../kit/UiIcon.vue';
import AltitudeGraph from './AltitudeGraph.vue';
// What the Context panel shows while nothing is picked: where the camera is
@@ -284,7 +286,7 @@ const distance = (km) =>