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/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 254ab1152b..2dcedab29f 100644
--- a/docs/VUE-MIGRATION.md
+++ b/docs/VUE-MIGRATION.md
@@ -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
@@ -175,6 +192,22 @@ while a query is typed. The Filter button opens a disclosure and carries
a `UiIcon` with `:size="null"`, so `layer-finder.css` still sizes them
(`src/ui/kit/layerFinderControls.test.mjs` pins it); the search field's
magnifier is `UiSearchField`'s own span.
+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 +313,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 d5b0aea10f..7e53712e1d 100644
--- a/scripts/format-scope.json
+++ b/scripts/format-scope.json
@@ -1351,6 +1351,8 @@
"src/ui/kit/welcomeControls.test.mjs",
"src/ui/kit/omnibarControls.test.mjs",
"src/ui/kit/storiesControls.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",
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 8298dab6d8..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/credits/CreditsView.vue b/src/ui/credits/CreditsView.vue
index 4181af2995..95f7b8cc99 100644
--- a/src/ui/credits/CreditsView.vue
+++ b/src/ui/credits/CreditsView.vue
@@ -1,5 +1,6 @@
@@ -58,60 +63,62 @@ const meta = () =>
:data-report-id="item.id"
:style="{ '--news-color': item.color }"
>
- {{ t('NO PLACE LEFT BEHIND') }} {{
view.status
}}▶{{
+ item.picture.credit
+ }}
+ {{ item.title }}
+ {{
+ t('English headline by the model')
+ }}
+
+ {{ item.sides }}
+ {{ chip.label }}
+ {{
+ item.via
+ }}
+
-
▶{{
- item.picture.credit
- }}
- {{ item.title }}
- {{
- t('English headline by the model')
- }}
-
- {{ item.sides }}
- {{ chip.label }}
- {{ item.via }}
-
+
+
diff --git a/src/ui/views/panels/CockpitUtilityControls.vue b/src/ui/views/panels/CockpitUtilityControls.vue
index 956fb2f63c..0254cf3f04 100644
--- a/src/ui/views/panels/CockpitUtilityControls.vue
+++ b/src/ui/views/panels/CockpitUtilityControls.vue
@@ -8,6 +8,7 @@ import { useRadioStore } from '../../stores/radio.js';
import { useCockpitStore } from '../../stores/cockpit.js';
import { useDisplayStore } from '../../stores/display.js';
import UiButton from '../../kit/UiButton.vue';
+import UiIcon from '../../kit/UiIcon.vue';
// The Cockpit's Display and Radio launchers and their popovers, and the
// desktop look's rail, whose icons stay at the edge and open one panel at a
@@ -54,8 +55,8 @@ const radioLabel = computed(() =>
{{ item.value }}
-