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/docs/VUE-MIGRATION.md b/docs/VUE-MIGRATION.md index 7c8c75d8e5..2dcedab29f 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: @@ -166,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 +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 +(` diff --git a/src/ui/contextPanel.test.mjs b/src/ui/contextPanel.test.mjs index 9cb11da611..1ce7eceb6d 100644 --- a/src/ui/contextPanel.test.mjs +++ b/src/ui/contextPanel.test.mjs @@ -58,7 +58,10 @@ test('before ContextControls renders, the switch shows its initial markup', (t) ); assert.equal(panel.hasAttribute('data-context-mode'), false); const tab = $('global-context-flights-btn'); - assert.equal(tab.className, 'context-mode-button'); + assert.equal( + tab.className, + 'ui-button ui-focus ui-button--ghost ui-button--accent context-mode-button', + ); assert.equal(tab.getAttribute('aria-selected'), 'false'); assert.equal(tab.getAttribute('tabindex'), '0'); assert.equal(tab.hasAttribute('aria-busy'), false); 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 @@ 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.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) =>

{{ t('Globe view') }}