From e5fa31d01e6cb0aec1e780a80b5c656754a3eabb Mon Sep 17 00:00:00 2001
From: Sameh Khamis <sameh@halfpixel.ai>
Date: Sun, 1 Nov 2026 10:38:25 -0800
Subject: [PATCH] feat(controls): render every segmented group with UiSegmented

Street Level's fit and panorama filters and Recent Imagery's mode render
through the kit's UiSegmented, and their owners answer the choice
through the Street Level store (setPano, setRenderMode) and the
readout's onSetMode. The imperative segmentedControl.js adapter and its
test go. UiSegmented moves focus at once on a key, a radio group from
the option holding focus and an arrows group from the selection, and
asks for a change only when the key lands somewhere new.
---
 CHANGELOG.md                                  |   5 +-
 docs/CURRENT-STATE.md                         |  15 +-
 docs/VUE-MIGRATION.md                         |   6 +-
 scripts/format-scope.json                     |   1 -
 scripts/package-boundaries.json               |   4 +-
 src/ui/kit/UiSegmented.test.mjs               |  26 ++-
 src/ui/kit/UiSegmented.vue                    |  31 ++--
 src/ui/recentImagery.js                       |  13 +-
 src/ui/recentImagery/RecentImageryReadout.vue |  38 ++--
 src/ui/segmentedControl.js                    | 109 -----------
 src/ui/segmentedControl.test.mjs              | 174 ------------------
 src/ui/streetLevelControls.js                 |  36 +---
 src/ui/views/panels/StreetLevelPanel.vue      |  41 +++--
 13 files changed, 119 insertions(+), 380 deletions(-)
 delete mode 100644 src/ui/segmentedControl.js
 delete mode 100644 src/ui/segmentedControl.test.mjs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c0810d7f..1b06ef58d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,7 +55,10 @@
   `initGeoFileImport` takes `connect(actions)` the same way and no longer
   listens on the Import button, picker or list, nor restores focus itself:
   the `GeoImport` view does both, and its `publish` need not settle once the
-  list renders. `syncScopeControls` (`./ui/display`) and
+  list renders. Street Level's fit and panorama filters and Recent Imagery's
+  mode are `UiSegmented` too: the Street Level store's owner answers
+  `setPano` and `setRenderMode`, and `RecentImageryReadout` takes
+  `onSetMode`. `syncScopeControls` (`./ui/display`) and
   `shouldHideCollapsedRightPanels` (`./ui/layout`) are deprecated: the Display
   view and the rail now own what they did. `./ui/input` imports Vue
   (samehkhamis).
diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md
index c32945e05..f56875125 100644
--- a/docs/CURRENT-STATE.md
+++ b/docs/CURRENT-STATE.md
@@ -1495,14 +1495,15 @@ Browser acceptance: `QA_BASE_URL=http://127.0.0.1:4179 node scripts/qa-action-bu
 
 ## Segmented selectors
 
-Segmented selectors use the controlled DOM adapter in `ui/segmentedControl.js`
-and the shared `gev-segmented` / `gev-segment` surface. Model coverage, label
+Segmented selectors are the kit's `UiSegmented` (`ui/kit/UiSegmented.vue`) on
+the shared `gev-segmented` / `gev-segment` surface. Model coverage, label
 allocation, drawing shape, Street View fit/panorama filters and imagery mode keep
-their feature-owned values, actions and persistence. Painting a restored value
-does not emit a change or move focus. Existing keyboard policies remain explicit:
-Street View uses arrows/Home/End with one tab stop, imagery mode uses arrows from
-its controlled selection, and Display keeps its existing native button behavior.
-Pure value navigation is separate from DOM rendering for reuse by a future view.
+their feature-owned values, actions and persistence: the view renders the
+owner's value and sends a choice back through its store. Rendering a restored
+value does not emit a change or move focus. Each group names its keyboard
+policy: Street View uses `radio` (arrows/Home/End with one tab stop), imagery
+mode `arrows` from its controlled selection, and Display `none`, its native
+button behavior.
 Segments keep their word minimum width: compact inline groups such as FIT/FILL
 and ALL/360°/FLAT must not break short labels mid-word. Collapsed Weather follows
 the same exclusive-rail hiding rule as the other readouts.
diff --git a/docs/VUE-MIGRATION.md b/docs/VUE-MIGRATION.md
index 8523d8e85..91db14fa7 100644
--- a/docs/VUE-MIGRATION.md
+++ b/docs/VUE-MIGRATION.md
@@ -51,7 +51,11 @@ its own classes beside it. They contain no application state.
 owner hides the body by writing the root's `collapsed` class at once, and
 there is no `closable`, since Core's panels collapse rather than close.
 `UiSegmented` adds `keyboard` (`none`, `arrows` as in ui-vue, or `radio` with
-Home and End), since each of Core's groups keeps its own keyboard policy.
+Home and End), since each of Core's groups keeps its own keyboard policy, and
+`itemClass`/`activeClass` for Core's segment classes. A key moves focus at
+once and asks for a change only when it lands on another option. Every
+segmented group in Core is a `UiSegmented`; the old `segmentedControl.js`
+adapter is gone.
 
 Controls share one skin, so every panel reads the same. Every scrolling
 surface carries the kit's `.ui-scroll` (ui-vue's name), which draws the thin
diff --git a/scripts/format-scope.json b/scripts/format-scope.json
index e44dd9a1a..ed08a6430 100644
--- a/scripts/format-scope.json
+++ b/scripts/format-scope.json
@@ -199,7 +199,6 @@
   "scripts/qa-scope-hud.mjs",
   "scripts/qa-segmented-controls.mjs",
   "src/ui/displayControls.js",
-  "src/ui/segmentedControl.test.mjs",
   "src/ui/styles/segmented-control.css",
   "src/ui/cameraOrientationControls.js",
   "src/ui/cameraOrientationControls.test.mjs",
diff --git a/scripts/package-boundaries.json b/scripts/package-boundaries.json
index f1f0de351..d62687ac8 100644
--- a/scripts/package-boundaries.json
+++ b/scripts/package-boundaries.json
@@ -929,7 +929,6 @@
       "src/ui/contextSubscriptions.js",
       "src/ui/contextTransactions.js",
       "src/ui/displayControls.js",
-      "src/ui/segmentedControl.js",
       "src/ui/effects.js",
       "src/ui/frameRateMonitor.js",
       "src/ui/layerPanel.js",
@@ -2653,7 +2652,6 @@
       "src/ui/contextSubscriptions.js",
       "src/ui/contextTransactions.js",
       "src/ui/displayControls.js",
-      "src/ui/segmentedControl.js",
       "src/ui/effects.js",
       "src/ui/frameRateMonitor.js",
       "src/ui/layerPanel.js",
@@ -3017,6 +3015,7 @@
       "src/ui/kit/UiTooltip.vue",
       "src/ui/kit/rail.js",
       "src/ui/kit/UiRail.vue",
+      "src/ui/kit/UiSegmented.vue",
       "src/ui/PanelRailView.vue",
       "src/ui/panelNavigation.js",
       "src/ui/panelAccordion.js",
@@ -3820,7 +3819,6 @@
       "src/ui/visualSettings.js",
       "src/ui/stores/display.js",
       "src/ui/vueRuntime.js",
-      "src/ui/segmentedControl.js",
       "src/i18n/marker.js",
       "src/i18n/index.js",
       "src/i18n/locale.js",
diff --git a/src/ui/kit/UiSegmented.test.mjs b/src/ui/kit/UiSegmented.test.mjs
index 2dbb5bf26..f15e217c6 100644
--- a/src/ui/kit/UiSegmented.test.mjs
+++ b/src/ui/kit/UiSegmented.test.mjs
@@ -81,12 +81,22 @@ test('keyboard arrows: one roving stop, arrows skip disabled options and wrap',
 
 test('keyboard radio: Home and End reach the ends', async () => {
   const wrapper = mountGroup({ keyboard: 'radio', modelValue: 'c' });
-  await wrapper.get('#seg-a').trigger('keydown', { key: 'Home' });
-  await wrapper.get('#seg-a').trigger('keydown', { key: 'End' });
+  const [a, , c] = wrapper.findAll('button');
+  await c.trigger('keydown', { key: 'Home' });
+  await wrapper.setProps({ modelValue: 'a' });
+  await a.trigger('keydown', { key: 'End' });
   assert.deepEqual(wrapper.emitted('update:modelValue'), [['a'], ['c']]);
   wrapper.unmount();
 });
 
+test('a key that lands where it started moves focus without a change', async () => {
+  const wrapper = mountGroup({ keyboard: 'radio', modelValue: 'a' });
+  await wrapper.get('#seg-a').trigger('keydown', { key: 'Home' });
+  assert.equal(wrapper.emitted('update:modelValue'), undefined);
+  assert.ok(document.activeElement === wrapper.get('#seg-a').element);
+  wrapper.unmount();
+});
+
 test('a disabled group answers nothing and leaves the tab order', async () => {
   const wrapper = mountGroup({ disabled: true });
   assert.deepEqual(tabStops(wrapper), ['-1', '-1', '-1']);
@@ -95,3 +105,15 @@ test('a disabled group answers nothing and leaves the tab order', async () => {
   assert.equal(wrapper.emitted('update:modelValue'), undefined);
   wrapper.unmount();
 });
+
+test('a radio group moves from the focused option, an arrows group from the selection', async () => {
+  // The selection was restored to c while a keeps focus.
+  const radio = mountGroup({ keyboard: 'radio', modelValue: 'c' });
+  await radio.get('#seg-a').trigger('keydown', { key: 'ArrowLeft' });
+  assert.deepEqual(radio.emitted('update:modelValue'), [['c']]);
+  radio.unmount();
+  const arrows = mountGroup({ keyboard: 'arrows', modelValue: 'c' });
+  await arrows.get('#seg-a').trigger('keydown', { key: 'ArrowLeft' });
+  assert.deepEqual(arrows.emitted('update:modelValue'), [['a']]);
+  arrows.unmount();
+});
diff --git a/src/ui/kit/UiSegmented.vue b/src/ui/kit/UiSegmented.vue
index 13b690eeb..959faf3b2 100644
--- a/src/ui/kit/UiSegmented.vue
+++ b/src/ui/kit/UiSegmented.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, nextTick } from 'vue';
+import { computed } from 'vue';
 
 // Core's segmented control, with @halfpixel/ui-vue UiSegmented's
 // v-model, options, label, stacked and disabled so the two kits can merge.
@@ -50,8 +50,12 @@ function choose(index) {
   if (!option || optionOff(option)) return;
   emit('update:modelValue', option.value);
 }
-/** Select the option `delta` away, wrapping past disabled ones, or `to` an end. */
-function move({ delta = 0, to = null }) {
+/**
+ * Select the option `delta` away from `from`, wrapping past disabled ones, or
+ * `to` an end. A key that lands where it started (Home on the first) only
+ * moves focus.
+ */
+function move({ delta = 0, to = null, from }) {
   const count = props.options.length;
   if (!count || props.disabled) return;
   const enabled = props.options
@@ -62,23 +66,28 @@ function move({ delta = 0, to = null }) {
   if (to === 'first') target = enabled[0];
   else if (to === 'last') target = enabled.at(-1);
   else {
-    target =
-      selectedIndex.value < 0 ? (delta > 0 ? -1 : count) : selectedIndex.value;
+    target = from < 0 ? (delta > 0 ? -1 : count) : from;
     do target = (((target + delta) % count) + count) % count;
     while (props.options[target].disabled);
   }
-  choose(target);
-  // Focus follows the selection once the options re-render.
-  nextTick(() => items[target]?.focus());
+  if (target !== from) choose(target);
+  // Focus moves at once, as a radio group's does; the option is already there.
+  items[target]?.focus();
 }
 const STEPS = { ArrowRight: 1, ArrowDown: 1, ArrowLeft: -1, ArrowUp: -1 };
 function onKey(event) {
   if (props.keyboard === 'none') return;
-  if (STEPS[event.key]) move({ delta: STEPS[event.key] });
+  // A radio group moves from the option holding focus, `arrows` from the
+  // selection.
+  const from =
+    props.keyboard === 'radio'
+      ? items.indexOf(event.target)
+      : selectedIndex.value;
+  if (STEPS[event.key]) move({ delta: STEPS[event.key], from });
   else if (props.keyboard === 'radio' && event.key === 'Home')
-    move({ to: 'first' });
+    move({ to: 'first', from });
   else if (props.keyboard === 'radio' && event.key === 'End')
-    move({ to: 'last' });
+    move({ to: 'last', from });
   else return;
   event.preventDefault();
 }
diff --git a/src/ui/recentImagery.js b/src/ui/recentImagery.js
index 2447e874c..dbf7e45e2 100644
--- a/src/ui/recentImagery.js
+++ b/src/ui/recentImagery.js
@@ -11,7 +11,6 @@
 import { h, render as renderVue } from 'vue';
 import { formatNumber, msg, t, tn, translateKnown } from '../i18n/index.js';
 import { createImagerySplit } from './imagerySplit.js';
-import { createSegmentedControl } from './segmentedControl.js';
 import RecentImageryReadout from './recentImagery/RecentImageryReadout.vue';
 import {
   PRODUCTS,
@@ -236,6 +235,7 @@ export function createRecentImageryPanel({
         view: buildView(),
         modes: MODE_LABELS,
         onOpenDetails,
+        onSetMode: (mode) => layer.setMode(mode),
       }),
       container,
     );
@@ -245,16 +245,6 @@ export function createRecentImageryPanel({
   const zoomIn = root.querySelector('#ri-zoom-in');
   const swap = root.querySelector('#ri-swap');
   const opacity = root.querySelector('#ri-opacity');
-  const modeGroup = root.querySelector('#ri-mode');
-  const modeControl = createSegmentedControl({
-    buttons: modeGroup.querySelectorAll('.ri-mode-btn'),
-    valueOf: (button) => button.dataset.mode,
-    onChange: (mode) => layer.setMode(mode),
-    keyboard: 'arrows',
-    keyTarget: modeGroup,
-    readValue: () => snapshot.mode,
-    listen,
-  });
 
   /**
    * The body is the scroll container and no render may move it: a
@@ -758,7 +748,6 @@ export function createRecentImageryPanel({
     preserveScroll(() => {
       renderPanel();
       paint();
-      modeControl.update(snapshot.mode, { rovingFocus: true });
       renderSplit();
       reportVisibleRange();
     });
diff --git a/src/ui/recentImagery/RecentImageryReadout.vue b/src/ui/recentImagery/RecentImageryReadout.vue
index 568921ac3..0e7c29e35 100644
--- a/src/ui/recentImagery/RecentImageryReadout.vue
+++ b/src/ui/recentImagery/RecentImageryReadout.vue
@@ -1,18 +1,27 @@
 <script setup>
+import { computed } from 'vue';
 import { t } from '../../i18n/index.js';
+import UiSegmented from '../kit/UiSegmented.vue';
 import RailCardBlocks from '../rail/RailCardBlocks.vue';
 import RailCards from '../rail/RailCards.vue';
 import { vRangeValue } from '../rail/rangeValue.js';
 import RecentImageryCard from './RecentImageryCard.vue';
 
 // Every block exists from the start, in its final order. The owner computes
-// the view and listens on the root; the mode buttons are painted by its
-// segmented control.
-defineProps({
+// the view and listens on the root; a mode choice calls `onSetMode`.
+const props = defineProps({
   view: { type: Object, required: true },
   modes: { type: Array, required: true },
   onOpenDetails: { type: Function, default: () => {} },
+  onSetMode: { type: Function, default: () => {} },
 });
+const modeOptions = computed(() =>
+  props.modes.map(([mode, label]) => ({
+    value: mode,
+    label: t(label),
+    attrs: { 'data-mode': mode },
+  })),
+);
 </script>
 
 <template>
@@ -81,21 +90,16 @@ defineProps({
       class="ri-block ri-selection"
       :aria-label="t('On the map')"
       :data-mode="view.mode"
-      ><div
+      ><UiSegmented
         id="ri-mode"
-        class="gev-segmented ri-mode"
-        role="radiogroup"
-        :aria-label="t('Mode')"
-        ><button
-          v-for="[mode, label] in modes"
-          :key="mode"
-          class="gev-segment ri-mode-btn"
-          type="button"
-          :data-mode="mode"
-          role="radio"
-          >{{ t(label) }}</button
-        ></div
-      ><div
+        class="ri-mode"
+        item-class="ri-mode-btn"
+        keyboard="arrows"
+        :label="t('Mode')"
+        :options="modeOptions"
+        :model-value="view.mode"
+        @update:model-value="onSetMode"
+      /><div
         v-for="slot in view.slots"
         :id="`ri-slot-${slot.id}`"
         :key="slot.id"
diff --git a/src/ui/segmentedControl.js b/src/ui/segmentedControl.js
deleted file mode 100644
index 0ad785986..000000000
--- a/src/ui/segmentedControl.js
+++ /dev/null
@@ -1,109 +0,0 @@
-const STEPS = { ArrowRight: 1, ArrowDown: 1, ArrowLeft: -1, ArrowUp: -1 };
-
-/** Pure value navigation, also usable by a future template-based view. */
-export function nextSegmentValue(values, value, key, { homeEnd = true } = {}) {
-  if (!values.length) return undefined;
-  if (homeEnd && key === 'Home') return values[0];
-  if (homeEnd && key === 'End') return values.at(-1);
-  const step = STEPS[key];
-  if (!step) return undefined;
-  return values[(values.indexOf(value) + step + values.length) % values.length];
-}
-
-/** Paint controlled selection without emitting changes or moving focus. */
-export function syncSegmentedControl(
-  buttons,
-  value,
-  { valueOf, activeClass = 'active', rovingFocus = false } = {},
-) {
-  for (const button of buttons || []) {
-    if (!button) continue;
-    const selected = valueOf(button) === value;
-    if (button.classList.contains(activeClass) !== selected)
-      button.classList.toggle(activeClass, selected);
-    const set = (name, content) => {
-      if (button.getAttribute?.(name) !== content)
-        button.setAttribute(name, content);
-    };
-    set('aria-checked', String(selected));
-    if (rovingFocus) set('tabindex', selected ? '0' : '-1');
-  }
-}
-
-/**
- * Controlled segmented-selector DOM adapter. Feature owners supply values and
- * receive changes; rendering a restored value never triggers the callback.
- * `keyboard` retains each existing group's policy: none, arrows, or radio
- * (arrows plus Home/End). Pointer and native Enter/Space share the click path.
- * An injected listener owner keeps the feature's existing teardown boundary.
- * @param {object} options
- * @param {Iterable<HTMLButtonElement>} options.buttons
- * @param {Function} options.valueOf Maps a button to the feature's value.
- * @param {Function} options.onChange Receives value and originating button.
- * @param {'none'|'arrows'|'radio'} [options.keyboard]
- * @param {HTMLElement} [options.keyTarget] Delegated keyboard target, if any.
- * @param {Function} [options.readValue] Current controlled value for delegation.
- * @param {Function} [options.listen] Feature-owned event registration.
- * @returns {{ update: Function, destroy: Function }}
- */
-export function createSegmentedControl({
-  buttons,
-  valueOf,
-  onChange,
-  keyboard = 'none',
-  keyTarget,
-  readValue,
-  listen,
-}) {
-  const options = [...buttons].filter(Boolean);
-  const removers = [];
-  let destroyed = false;
-  const bind = (target, type, handler) => {
-    const owned = (event) => {
-      if (!destroyed) handler(event);
-    };
-    if (listen) listen(target, type, owned);
-    else {
-      target.addEventListener(type, owned);
-      removers.push(() => target.removeEventListener(type, owned));
-    }
-  };
-  for (const button of options)
-    bind(button, 'click', () => {
-      if (!button.disabled) onChange(valueOf(button), button);
-    });
-  const navigate = (event, from) => {
-    const enabled = options.filter((button) => !button.disabled);
-    const values = enabled.map(valueOf);
-    const next = nextSegmentValue(values, from, event.key, {
-      homeEnd: keyboard === 'radio',
-    });
-    if (next === undefined) return;
-    const button = enabled.find((option) => valueOf(option) === next);
-    event.preventDefault();
-    if (keyTarget) {
-      button.click();
-      button.focus();
-    } else {
-      button.focus();
-      if (next !== from) button.click();
-    }
-  };
-  if (keyboard !== 'none') {
-    if (keyTarget)
-      bind(keyTarget, 'keydown', (event) => navigate(event, readValue()));
-    else
-      for (const button of options)
-        bind(button, 'keydown', (event) => navigate(event, valueOf(button)));
-  }
-  return {
-    update(value, presentation) {
-      if (!destroyed)
-        syncSegmentedControl(options, value, { valueOf, ...presentation });
-    },
-    destroy() {
-      destroyed = true;
-      for (const remove of removers.splice(0)) remove();
-    },
-  };
-}
diff --git a/src/ui/segmentedControl.test.mjs b/src/ui/segmentedControl.test.mjs
deleted file mode 100644
index ad194ddd8..000000000
--- a/src/ui/segmentedControl.test.mjs
+++ /dev/null
@@ -1,174 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import { railFixture } from './railTestFixture.mjs';
-import {
-  createSegmentedControl,
-  nextSegmentValue,
-} from './segmentedControl.js';
-
-function fixture(options = {}) {
-  let writes = 0;
-  const f = railFixture(() => writes++);
-  const buttons = ['a', 'b', 'c'].map((value) => {
-    const button = f.document.createElement('button');
-    button.dataset.value = value;
-    f.container.appendChild(button);
-    return button;
-  });
-  const calls = [];
-  const control = createSegmentedControl({
-    buttons,
-    valueOf: (button) => button.dataset.value,
-    onChange: (value) => calls.push(value),
-    ...options,
-  });
-  const key = (target, value) => {
-    const event = new Event('keydown', { cancelable: true });
-    Object.defineProperty(event, 'key', { value });
-    target.dispatchEvent(event);
-    return event.defaultPrevented;
-  };
-  return { ...f, buttons, calls, control, key, writes: () => writes };
-}
-
-test('controlled restoration updates selection without emitting or stealing focus', () => {
-  const f = fixture();
-  f.buttons[0].focus();
-  f.control.update('b', { rovingFocus: true });
-  assert.deepEqual(f.calls, []);
-  assert.equal(f.document.activeElement, f.buttons[0]);
-  assert.deepEqual(
-    f.buttons.map((b) => b.getAttribute('aria-checked')),
-    ['false', 'true', 'false'],
-  );
-  assert.deepEqual(
-    f.buttons.map((b) => b.getAttribute('tabindex')),
-    ['-1', '0', '-1'],
-  );
-  const before = f.writes();
-  f.control.update('b', { rovingFocus: true });
-  assert.equal(
-    f.writes(),
-    before,
-    'unchanged renders must not retrigger rail observers',
-  );
-  f.control.destroy();
-});
-
-test('clicks emit current values once, including reselection; disabled controls do not emit', () => {
-  const f = fixture();
-  f.control.update('a');
-  f.buttons[0].click();
-  f.buttons[0].click();
-  f.buttons[1].dataset.value = 'renamed';
-  f.buttons[1].click();
-  f.buttons[2].disabled = true;
-  f.buttons[2].dispatchEvent(new Event('click'));
-  assert.deepEqual(f.calls, ['a', 'a', 'renamed']);
-  assert.equal(
-    f.buttons[0].getAttribute('aria-checked'),
-    'true',
-    'the owner controls selection',
-  );
-  f.control.destroy();
-});
-
-test('radio navigation wraps, skips disabled choices, and retains Home/End semantics', () => {
-  const f = fixture({ keyboard: 'radio' });
-  f.buttons[1].disabled = true;
-  assert.equal(f.key(f.buttons[0], 'ArrowRight'), true);
-  assert.equal(f.document.activeElement, f.buttons[2]);
-  assert.deepEqual(f.calls, ['c']);
-  f.key(f.buttons[2], 'ArrowDown');
-  assert.equal(f.document.activeElement, f.buttons[0]);
-  f.key(f.buttons[0], 'Home');
-  assert.deepEqual(
-    f.calls,
-    ['c', 'a'],
-    'Home on the first button does not reselect it',
-  );
-  f.key(f.buttons[0], 'End');
-  assert.equal(f.document.activeElement, f.buttons[2]);
-  assert.deepEqual(f.calls, ['c', 'a', 'c']);
-  f.control.destroy();
-});
-
-test('legacy click-only groups leave arrows and tab order to their existing owner', () => {
-  const f = fixture();
-  f.control.update('b');
-  assert.equal(f.key(f.buttons[0], 'ArrowRight'), false);
-  assert.equal(f.key(f.buttons[0], 'Home'), false);
-  assert.deepEqual(f.calls, []);
-  assert.ok(
-    f.buttons.every((button) => button.getAttribute('tabindex') === null),
-  );
-  f.control.destroy();
-});
-
-test('delegated imagery keys navigate from the controlled value, not stale focus', () => {
-  const f = railFixture();
-  const buttons = ['a', 'b', 'c'].map((value) => {
-    const button = f.document.createElement('button');
-    button.dataset.value = value;
-    f.container.appendChild(button);
-    return button;
-  });
-  let selected = 'c';
-  const calls = [];
-  const control = createSegmentedControl({
-    buttons,
-    valueOf: (b) => b.dataset.value,
-    onChange: (value) => {
-      calls.push(value);
-      selected = value;
-    },
-    keyboard: 'arrows',
-    keyTarget: f.container,
-    readValue: () => selected,
-  });
-  const event = new Event('keydown', { cancelable: true });
-  Object.defineProperty(event, 'key', { value: 'ArrowRight' });
-  f.container.dispatchEvent(event);
-  assert.deepEqual(calls, ['a']);
-  assert.equal(f.document.activeElement, buttons[0]);
-  const home = new Event('keydown', { cancelable: true });
-  Object.defineProperty(home, 'key', { value: 'Home' });
-  f.container.dispatchEvent(home);
-  assert.equal(home.defaultPrevented, false);
-  assert.deepEqual(calls, ['a']);
-  control.destroy();
-});
-
-test('disposal revokes detached controls and replacement subscriptions fire once', () => {
-  const f = fixture({ keyboard: 'radio' });
-  f.control.destroy();
-  const next = [];
-  const replacement = createSegmentedControl({
-    buttons: f.buttons,
-    valueOf: (b) => b.dataset.value,
-    onChange: (value) => next.push(value),
-    keyboard: 'radio',
-  });
-  f.buttons[0].click();
-  f.key(f.buttons[0], 'End');
-  assert.deepEqual(f.calls, []);
-  assert.deepEqual(next, ['a', 'c']);
-  replacement.destroy();
-  replacement.destroy();
-  f.buttons[1].click();
-  f.key(f.buttons[0], 'End');
-  assert.deepEqual(next, ['a', 'c']);
-});
-
-test('pure value navigation can be reused without a DOM', () => {
-  assert.equal(nextSegmentValue(['fit', 'fill'], 'fill', 'ArrowRight'), 'fit');
-  assert.equal(nextSegmentValue(['fit', 'fill'], 'fit', 'ArrowUp'), 'fill');
-  assert.equal(nextSegmentValue(['fit', 'fill'], 'fill', 'Home'), 'fit');
-  assert.equal(nextSegmentValue(['fit', 'fill'], 'fit', 'End'), 'fill');
-  assert.equal(
-    nextSegmentValue(['fit', 'fill'], 'fit', 'Home', { homeEnd: false }),
-    undefined,
-  );
-  assert.equal(nextSegmentValue([], 'fit', 'ArrowRight'), undefined);
-  assert.equal(nextSegmentValue(['fit'], 'fit', 'Escape'), undefined);
-});
diff --git a/src/ui/streetLevelControls.js b/src/ui/streetLevelControls.js
index 365b543ff..4c0efeb5d 100644
--- a/src/ui/streetLevelControls.js
+++ b/src/ui/streetLevelControls.js
@@ -1,5 +1,4 @@
 import { isExplicitLayerStateOrigin } from '../data/layerState.js';
-import { createSegmentedControl } from './segmentedControl.js';
 import {
   presentStreetLevelPanel,
   SINCE_STOPS,
@@ -33,6 +32,15 @@ export class StreetLevelControls {
       setSinceStop: (stop) =>
         this._setParams({ sinceDays: SINCE_STOPS[stop]?.days ?? 0 }),
       describeSinceStop: (stop) => t(SINCE_STOPS[stop]?.label ?? ''),
+      setPano: (pano) => this._setParams({ pano }),
+      setRenderMode: (mode) => {
+        this.layer.setViewerRenderMode?.(mode);
+        try {
+          localStorage.setItem(RENDER_MODE_KEY, mode);
+        } catch {
+          /* storage unavailable */
+        }
+      },
     });
     this.destroyed = false;
     this.listeners = new AbortController();
@@ -51,9 +59,6 @@ export class StreetLevelControls {
 
   _collect() {
     const byId = (id) => this.root?.querySelector(`#${id}`) || null;
-    const all = (selector) => [
-      ...(this.root?.querySelectorAll(selector) || []),
-    ];
     return {
       status: byId('sl-status'),
       providerChips: byId('sl-provider-chips'),
@@ -62,8 +67,6 @@ export class StreetLevelControls {
       viewerExpand: byId('sl-viewer-expand'),
       viewerClose: byId('sl-viewer-close'),
       viewer: byId('sl-viewer'),
-      panoButtons: all('[data-sl-pano]'),
-      renderButtons: all('[data-sl-render]'),
     };
   }
 
@@ -93,13 +96,6 @@ export class StreetLevelControls {
       }
       this._toggleProvider(button.dataset.chipId);
     });
-    createSegmentedControl({
-      buttons: el.panoButtons,
-      valueOf: (button) => button.dataset.slPano,
-      onChange: (pano) => this._setParams({ pano }),
-      keyboard: 'radio',
-      listen: (target, type, handler) => this.listen(target, type, handler),
-    });
     this.listen(el.nearestBtn, 'click', () => {
       const nearest = this._view?.nearest;
       if (!nearest?.visible || nearest.disabled) return;
@@ -137,20 +133,6 @@ export class StreetLevelControls {
       });
     }
     this.store.setExpandAvailable(Boolean(this._expandMode));
-    createSegmentedControl({
-      buttons: el.renderButtons,
-      valueOf: (button) => button.dataset.slRender,
-      keyboard: 'radio',
-      listen: (target, type, handler) => this.listen(target, type, handler),
-      onChange: (mode) => {
-        this.layer.setViewerRenderMode?.(mode);
-        try {
-          localStorage.setItem(RENDER_MODE_KEY, mode);
-        } catch {
-          /* storage unavailable */
-        }
-      },
-    });
     try {
       const stored = localStorage.getItem(RENDER_MODE_KEY);
       if (stored === 'fill' || stored === 'letterbox')
diff --git a/src/ui/views/panels/StreetLevelPanel.vue b/src/ui/views/panels/StreetLevelPanel.vue
index c3a9bd554..5259d3815 100644
--- a/src/ui/views/panels/StreetLevelPanel.vue
+++ b/src/ui/views/panels/StreetLevelPanel.vue
@@ -3,6 +3,7 @@ import { storeToRefs } from 'pinia';
 import { computed, shallowRef, watch } from 'vue';
 import { t } from '../../../i18n/index.js';
 import UiButton from '../../kit/UiButton.vue';
+import UiSegmented from '../../kit/UiSegmented.vue';
 import RailPanel from '../../rail/RailPanel.vue';
 import RailChips from '../../rail/RailChips.vue';
 import { useStreetLevelStore } from '../../stores/streetLevel.js';
@@ -36,12 +37,29 @@ const shows = computed(
 );
 const pano = computed(() => view.value?.filter.pano ?? 'all');
 
-/** A radio segment; the chosen one is the group's tab stop once rendered. */
-const segment = (value, option) => ({
-  class: `gev-segment sl-seg-btn${value === option ? ' is-active' : ''}`,
-  'aria-checked': String(value === option),
-  tabindex: value === option ? (view.value ? '0' : undefined) : '-1',
-});
+const renderModeOptions = [
+  {
+    value: 'letterbox',
+    label: t('FIT'),
+    attrs: {
+      'data-sl-render': 'letterbox',
+      title: t('Fit: show the whole photo, with dark bars where its shape differs from the frame'),
+    },
+  },
+  {
+    value: 'fill',
+    label: t('FILL'),
+    attrs: {
+      'data-sl-render': 'fill',
+      title: t('Fill: fill the frame edge to edge, cropping the photo'),
+    },
+  },
+];
+const panoOptions = [
+  { value: 'all', label: t('ALL'), attrs: { 'data-sl-pano': 'all' } },
+  { value: 'pano', label: '360°', attrs: { 'data-sl-pano': 'pano' } },
+  { value: 'flat', label: t('FLAT'), attrs: { 'data-sl-pano': 'flat' } },
+];
 
 // The image line and OPEN keep what they last showed while hidden.
 const image = shallowRef({
@@ -109,10 +127,7 @@ const vThumb = { mounted: placeThumb, updated: placeThumb };
         <div class="sl-viewer-bar">
           <div class="sl-viewer-tools">
             <button id="sl-viewer-expand" class="scene-btn" type="button" :hidden="!expandAvailable" :aria-pressed="String(Boolean(expanded))" :aria-label="expanded === null ? undefined : expanded ? t('Shrink') : t('Expand')" title="Show the street-level view full screen (Esc shrinks it)" data-i18n-title><span class="sl-btn-icon" aria-hidden="true">{{ expanded ? '⤡' : '⤢' }}</span><span class="sl-btn-text">{{ expanded ? t('SHRINK') : t('EXPAND') }}</span></button>
-            <div class="gev-segmented sl-seg" role="radiogroup" aria-label="Image fit" data-i18n-aria-label :hidden="!viewer.renderModes">
-              <button type="button" v-bind="segment(viewer.renderMode, 'letterbox')" data-sl-render="letterbox" role="radio" title="Fit: show the whole photo, with dark bars where its shape differs from the frame" data-i18n-title data-i18n>FIT</button>
-              <button type="button" v-bind="segment(viewer.renderMode, 'fill')" data-sl-render="fill" role="radio" title="Fill: fill the frame edge to edge, cropping the photo" data-i18n-title data-i18n>FILL</button>
-            </div>
+            <UiSegmented class="sl-seg" item-class="sl-seg-btn" active-class="is-active" keyboard="radio" :hidden="!viewer.renderModes" :label="t('Image fit')" :options="renderModeOptions" :model-value="viewer.renderMode" @update:model-value="store.act('setRenderMode', $event)" />
           </div>
           <div class="sl-viewer-tools sl-viewer-tools-right">
             <button id="sl-viewer-close" class="sl-viewer-x" type="button" title="Close the image and deselect it on the map" aria-label="Close the street-level image" data-i18n-title data-i18n-aria-label>×</button>
@@ -140,11 +155,7 @@ const vThumb = { mounted: placeThumb, updated: placeThumb };
       <fieldset id="sl-controls" class="sl-controls" :disabled="Boolean(view?.controlsDisabled)" :hidden="!shows.pano && !shows.since">
         <div id="sl-pano-row" class="sl-filters" :hidden="!shows.pano" role="group" aria-label="Imagery filters" data-i18n-aria-label>
           <span class="cctv-summary-label" data-i18n>IMAGERY</span>
-          <div class="gev-segmented sl-seg" role="radiogroup" aria-label="Panorama filter" data-i18n-aria-label>
-            <button type="button" v-bind="segment(pano, 'all')" data-sl-pano="all" role="radio" data-i18n>ALL</button>
-            <button type="button" v-bind="segment(pano, 'pano')" data-sl-pano="pano" role="radio">360°</button>
-            <button type="button" v-bind="segment(pano, 'flat')" data-sl-pano="flat" role="radio" data-i18n>FLAT</button>
-          </div>
+          <UiSegmented class="sl-seg" item-class="sl-seg-btn" active-class="is-active" keyboard="radio" :disabled="Boolean(view?.controlsDisabled)" :label="t('Panorama filter')" :options="panoOptions" :model-value="pano" @update:model-value="store.act('setPano', $event)" />
         </div>
         <div id="sl-since-row" class="sl-since" :hidden="!shows.since">
           <label class="cctv-summary-label" for="sl-since" data-i18n>SINCE</label>