@defra/interactive-map 0.0.41-alpha → 0.0.42-alpha

package/src/App/components/KeyboardHelp/KeyboardHelp.test.jsx

@@ -116,11 +116,11 @@ describe('KeyboardHelp — tabs', () => {
     expect(screen.getByRole('tab', { name: 'Group A' })).toHaveAttribute('aria-selected', 'true')
   })
 
-  it('shows only the active tab panel content', () => {
+  it('shows only the active tab panel content — the inactive one stays in the DOM (so its aria-controls target exists) but hidden', () => {
     getKeyboardShortcuts.mockReturnValue(allShortcuts)
     render(<KeyboardHelp context='viewport' />)
-    expect(screen.getByText('Move')).toBeInTheDocument()
-    expect(screen.queryByText('Select')).not.toBeInTheDocument()
+    expect(screen.getByText('Move')).toBeVisible()
+    expect(screen.getByText('Select')).not.toBeVisible()
   })
 
   it('switches tab and content on click', () => {
@@ -128,8 +128,8 @@ describe('KeyboardHelp — tabs', () => {
     render(<KeyboardHelp context='viewport' />)
     fireEvent.click(screen.getByRole('tab', { name: SELECT_FEATURES_GROUP }))
     expect(screen.getByRole('tab', { name: SELECT_FEATURES_GROUP })).toHaveAttribute('aria-selected', 'true')
-    expect(screen.getByText('Select')).toBeInTheDocument()
-    expect(screen.queryByText('Move')).not.toBeInTheDocument()
+    expect(screen.getByText('Select')).toBeVisible()
+    expect(screen.getByText('Move')).not.toBeVisible()
   })
 
   it('ungrouped shortcuts default to Navigate group', () => {
@@ -141,6 +141,23 @@ describe('KeyboardHelp — tabs', () => {
     fireEvent.click(screen.getByRole('tab', { name: DEFAULT_GROUP }))
     expect(screen.getByText('No group')).toBeInTheDocument()
   })
+
+  it('merges group names that differ only by case/whitespace into one tab (groupIntoTabs)', () => {
+    getKeyboardShortcuts.mockReturnValue([
+      { id: 'a', group: 'Select Features', context: 'listbox', title: 'Shortcut A', command: '<kbd>Ctrl+A</kbd>' },
+      { id: 'b', group: 'select features', context: 'listbox', title: 'Shortcut B', command: '<kbd>Ctrl+B</kbd>' },
+      ...VIEWPORT_SHORTCUTS
+    ])
+    render(<KeyboardHelp context='listbox' />)
+    // Two groups present (Select Features, Navigate) — not one, so tabs render at all
+    expect(screen.getAllByRole('tab')).toHaveLength(2)
+    // First-encountered member's raw group string wins as the tab's displayed name
+    const tab = screen.getByRole('tab', { name: 'Select Features' })
+    expect(tab).toBeInTheDocument()
+    fireEvent.click(tab)
+    expect(screen.getByText('Shortcut A')).toBeVisible()
+    expect(screen.getByText('Shortcut B')).toBeVisible()
+  })
 })
 
 // ─── listboxIsActive filtering ────────────────────────────────────────────────

package/src/App/components/Panel/Panel.jsx

@@ -5,6 +5,7 @@ import { stringToKebab } from '../../../utils/stringToKebab.js'
 import { useModalPanelBehaviour } from '../../hooks/useModalPanelBehaviour.js'
 import { useIsScrollable } from '../../hooks/useIsScrollable.js'
 import { Icon } from '../Icon/Icon'
+import { Tabs } from '../Tabs/Tabs.jsx'
 
 const computePanelState = (bpConfig, triggeringElement, focus, focusOnOpen) => {
   const isAside = bpConfig.slot === 'side' && bpConfig.open && !bpConfig.modal
@@ -59,6 +60,8 @@ const buildBodyProps = ({ bodyRef, panelBodyClass, isBodyScrollable, elementId }
 // Renders the panel body's content: an ordered list of items (own content plus any
 // controls injected via the `<panelId>-panel` slot convention), or the legacy single
 // WrappedChild/children shape for callers that don't build an items list (e.g. HtmlElementHost).
+// Tabbed content is handled separately by Panel itself — see the tabs handling below — since
+// the tablist needs to render outside this component's scrollable body, not inside it.
 const BodyContent = ({ items, WrappedChild, props, children }) => { // NOSONAR
   if (items) {
     return items.map(item => <React.Fragment key={item.id}>{item.element}</React.Fragment>)
@@ -66,9 +69,44 @@ const BodyContent = ({ items, WrappedChild, props, children }) => { // NOSONAR
   return WrappedChild ? <WrappedChild {...props} /> : children
 }
 
+// Chooses between the three body shapes: static html, tabbed, or the flat BodyContent above.
+// .im-c-panel__body (bodyProps) always wraps everything, completely unchanged — same padding/
+// overflow/box role it's always had, which is also what the tablist and tabpanel need to pick
+// up their own inset from by simply being nested inside it. Only the scrollable-region
+// behaviour (ref/tabIndex/role/aria-labelledby) moves down onto <Tabs>' own tabpanel div via
+// panelProps when tabbed, since that's the part that should actually scroll/receive focus —
+// the tablist (rendered by <Tabs> itself, ahead of the tabpanel) stays outside that inner
+// scroll boundary so it can't scroll away with long tab content. The tabpanel's own focus ring
+// clearance (so it isn't flush against its content) is a CSS-only concern — see
+// Panel.module.scss's .im-c-tabs__panel override.
+const PanelBody = ({ innerHtmlProp, tabs, items, WrappedChild, props, children, bodyProps, panelBodySlot }) => { // NOSONAR
+  if (innerHtmlProp) {
+    return <div {...bodyProps} dangerouslySetInnerHTML={innerHtmlProp} /> // nosonar
+  }
+  const { className, ...scrollableProps } = bodyProps
+  if (tabs) {
+    return (
+      <div className={className} data-panel-slot={panelBodySlot}>
+        <Tabs
+          tabs={tabs.map(tab => ({
+            name: tab.name,
+            content: tab.items.map(item => <React.Fragment key={item.id}>{item.element}</React.Fragment>)
+          }))}
+          panelProps={scrollableProps}
+        />
+      </div>
+    )
+  }
+  return (
+    <div {...bodyProps} data-panel-slot={panelBodySlot}> {/* nosonar */}
+      <BodyContent items={items} WrappedChild={WrappedChild} props={props}>{children}</BodyContent>
+    </div>
+  )
+}
+
 // eslint-disable-next-line camelcase, react/jsx-pascal-case
 // sonarjs/disable-next-line function-name
-export const Panel = ({ panelId, panelConfig, props, focusOnOpen, WrappedChild, items, label, html, children, isOpen = true, rootRef }) => {
+export const Panel = ({ panelId, panelConfig, props, focusOnOpen, WrappedChild, items, tabs, label, html, children, isOpen = true, rootRef }) => {
   const { id } = useConfig()
   const { dispatch, breakpoint, layoutRefs, interfaceType } = useApp()
 
@@ -141,13 +179,17 @@ export const Panel = ({ panelId, panelConfig, props, focusOnOpen, WrappedChild,
         </button>
       )}
 
-      {innerHtmlProp
-        ? <div {...bodyProps} dangerouslySetInnerHTML={innerHtmlProp} /> // nosonar
-        : (
-          <div {...bodyProps} data-panel-slot={panelBodySlot}> {/* nosonar */}
-            <BodyContent items={items} WrappedChild={WrappedChild} props={props}>{children}</BodyContent>
-          </div>
-          )}
+      <PanelBody
+        innerHtmlProp={innerHtmlProp}
+        tabs={tabs}
+        items={items}
+        WrappedChild={WrappedChild}
+        props={props}
+        bodyProps={bodyProps}
+        panelBodySlot={panelBodySlot}
+      >
+        {children}
+      </PanelBody>
     </div>
   )
 }

package/src/App/components/Panel/Panel.module.scss

@@ -59,15 +59,39 @@
 .im-c-panel__body {
     padding: 0 var(--panel-margin) var(--panel-margin);
     overflow: auto;
+    // display: flex so a tabbed .im-c-tabs child (see Tabs.module.scss) has a flex context to
+    // size itself within — its tablist keeps its natural height, only its tabpanel grows and
+    // scrolls internally, rather than this whole element (tablist included) scrolling as one.
+    // A single non-tabbed child is unaffected — one flex item in a column sizes the same as a
+    // plain block child would.
+    display: flex;
+    flex-direction: column;
+}
 
-    &[data-focus-visible="true"] {
-        outline: var(--scrollable-outline);
-        outline-offset: var(--scrollable-outline-offset);
-        box-shadow: var(--scrollable-box-shadow);
+// The tabpanel (see Tabs.module.scss) is its own scroll/focus region nested inside this
+// already-padded wrapper — its content already sits correctly inset just by being nested, but
+// its own border box (where the focus ring is drawn, and where its own overflow: auto clips)
+// would otherwise sit tight against that content, with no room of its own. Reaching out with a
+// negative margin — matching this wrapper's own padding — and re-padding by the same amount
+// gives it that room without moving the content: the negative margin and the padding cancel
+// out visually, but the border box itself is now larger. This is a panel-specific override —
+// <Tabs> used anywhere else would need the same treatment if this clearance matters there too.
+.im-c-panel__body .im-c-tabs__panel {
+    margin: 0 calc(-1 * var(--panel-margin)) calc(-1 * var(--panel-margin));
+    padding: 0 var(--panel-margin) var(--panel-margin);
+}
+
+// The scrollable-region focus ring — normally on .im-c-panel__body itself, but when tabbed,
+// the tabpanel (see Tabs.module.scss's .im-c-tabs__panel) is the element that's actually
+// focusable/scrollable instead (see Panel.jsx's PanelBody), so it needs the same treatment.
+.im-c-panel__body[data-focus-visible="true"],
+.im-c-tabs__panel[data-focus-visible="true"] {
+    outline: var(--scrollable-outline);
+    outline-offset: var(--scrollable-outline-offset);
+    box-shadow: var(--scrollable-box-shadow);
 
-        @media (-ms-high-contrast:active), screen and (forced-colors: active) {
-            outline-width: 4px;
-        }
+    @media (-ms-high-contrast:active), screen and (forced-colors: active) {
+        outline-width: 4px;
     }
 }
 

package/src/App/components/Panel/Panel.test.jsx

@@ -69,7 +69,7 @@ describe('Panel', () => {
       const { container } = renderPanel()
 
       // 2. Target by class to avoid role collision with the parent panel
-      const body = container.querySelector('.im-c-panel__body')
+      const body = container.querySelector('[data-panel-slot]')
 
       expect(body).toHaveAttribute('tabIndex', '0')
       expect(body).toHaveAttribute('role', 'region')
@@ -219,7 +219,7 @@ describe('Panel', () => {
 
     it('stamps data-panel-slot on the items-capable body, for controls DOM-projected via the JS API', () => {
       const { container } = renderPanel({}, { items: [{ id: 'a', element: <p>Item</p> }] })
-      const body = container.querySelector('.im-c-panel__body')
+      const body = container.querySelector('[data-panel-slot]')
       expect(body).toHaveAttribute('data-panel-slot', 'settings-panel')
     })
 
@@ -228,5 +228,84 @@ describe('Panel', () => {
       const body = container.querySelector('.im-c-panel__body')
       expect(body).not.toHaveAttribute('data-panel-slot')
     })
+
+    describe('tabs', () => {
+      const tabs = [
+        { name: 'First', items: [{ id: 'a', element: <p>First content</p> }] },
+        { name: 'Second', items: [{ id: 'b', element: <p>Second content</p> }] }
+      ]
+
+      it('renders items grouped into tabs when the tabs prop is provided', () => {
+        renderPanel({}, { tabs })
+        expect(screen.getByRole('tablist')).toBeInTheDocument()
+        expect(screen.getByRole('tab', { name: 'First' })).toBeInTheDocument()
+        expect(screen.getByRole('tab', { name: 'Second' })).toBeInTheDocument()
+        expect(screen.getByText('First content')).toBeInTheDocument()
+      })
+
+      it('switches tab content when a different tab is activated', () => {
+        renderPanel({}, { tabs })
+        fireEvent.click(screen.getByRole('tab', { name: 'Second' }))
+        expect(screen.getByText('Second content')).toBeVisible()
+        expect(screen.getByText('First content')).not.toBeVisible()
+      })
+
+      it('prefers tabs over items/WrappedChild/children when provided', () => {
+        renderPanel({}, {
+          tabs,
+          items: [{ id: 'x', element: <p>Flat item</p> }],
+          WrappedChild: () => <p>Wrapped</p>,
+          children: <p>Child content</p>
+        })
+        expect(screen.getByText('First content')).toBeInTheDocument()
+        expect(screen.queryByText('Flat item')).not.toBeInTheDocument()
+        expect(screen.queryByText('Wrapped')).not.toBeInTheDocument()
+        expect(screen.queryByText('Child content')).not.toBeInTheDocument()
+      })
+
+      it('keeps the panel body wrapper (padding, data-panel-slot) around the whole tabs block', () => {
+        const { container } = renderPanel({}, { tabs })
+        const body = container.querySelector('[data-panel-slot]')
+        expect(body).toHaveAttribute('data-panel-slot', 'settings-panel')
+        expect(body.querySelector('[role="tablist"]')).not.toBeNull()
+        expect(body.querySelector('[role="tabpanel"]')).not.toBeNull()
+      })
+
+      it('keeps the outer wrapper as the normal, unconditional im-c-panel__body — the tablist and tabpanel pick up their inset by being nested inside it, same as any other panel content', () => {
+        const { container } = renderPanel({}, { tabs })
+        const body = container.querySelector('[data-panel-slot]')
+        expect(body).toHaveClass('im-c-panel__body')
+      })
+
+      it('keeps the tablist outside the scrollable tabpanel, so it does not scroll away with long tab content', () => {
+        const { container } = renderPanel({}, { tabs })
+        const tabpanel = container.querySelector('[role="tabpanel"]')
+        expect(tabpanel.querySelector('[role="tablist"]')).toBeNull()
+      })
+
+      it('places the tablist before the tabpanel in DOM order, so keyboard focus reaches it first', () => {
+        const { container } = renderPanel({}, { tabs })
+        const tablist = container.querySelector('[role="tablist"]')
+        const tabpanel = container.querySelector('[role="tabpanel"]')
+        // DOCUMENT_POSITION_FOLLOWING (4) means `tabpanel` comes after `tablist`
+        // eslint-disable-next-line no-bitwise
+        expect(tablist.compareDocumentPosition(tabpanel) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
+      })
+
+      it('moves the scrollable-region treatment onto the tabpanel itself, not the outer wrapper', () => {
+        useIsScrollable.mockReturnValue(true)
+
+        const { container } = renderPanel({}, { tabs })
+        const body = container.querySelector('[data-panel-slot]')
+        const tabpanel = screen.getByRole('tabpanel')
+
+        expect(tabpanel).toHaveAttribute('tabIndex', '0')
+        expect(body).not.toHaveAttribute('tabIndex')
+        expect(body).not.toHaveAttribute('role', 'region')
+        expect(tabpanel).not.toHaveAttribute('data-panel-slot')
+
+        useIsScrollable.mockReturnValue(false)
+      })
+    })
   })
 })

package/src/App/components/Tabs/Tabs.jsx

@@ -1,18 +1,31 @@
 import React, { useState, useCallback } from 'react'
+import { useConfig } from '../../store/configContext'
 
-const toTabId = (name) => `im-c-tabs-tab-${name.toLowerCase().replaceAll(/\s+/g, '-')}`
-const toPanelId = (name) => `im-c-tabs-panel-${name.toLowerCase().replaceAll(/\s+/g, '-')}`
+// Prefixed with the app's own id (not the im-c- BEM prefix, which is for CSS classes, not DOM
+// ids — see Panel.jsx's/MapButton.jsx's own ${id}-... ids for the same convention) so these
+// stay unique when more than one map instance is on the same page.
+const toTabId = (idPrefix, name) => `${idPrefix}-tabs-tab-${name.toLowerCase().replaceAll(/\s+/g, '-')}`
+const toPanelId = (idPrefix, name) => `${idPrefix}-tabs-panel-${name.toLowerCase().replaceAll(/\s+/g, '-')}`
 
+/**
+ * @param {object} [panelProps] Extra props merged onto the tabpanel div (not the tablist) —
+ * e.g. a scrollable container's ref/className/tabIndex, for a caller (Panel.jsx) that needs
+ * that behaviour scoped to just the active tab's content, not the tablist above it. `id`,
+ * `role` and `aria-labelledby` are structural to the tabs pattern and always win over any
+ * same-named key in `panelProps`; `tabIndex` defers to `panelProps.tabIndex` when provided,
+ * since a scrollable tabpanel legitimately wants tabIndex 0 rather than the -1 default.
+ */
 // eslint-disable-next-line camelcase, react/jsx-pascal-case
 // sonarjs/disable-next-line function-name
-export const Tabs = ({ tabs, defaultTab }) => { // NOSONAR: project does not use PropTypes
+export const Tabs = ({ tabs, defaultTab, panelProps }) => { // NOSONAR: project does not use PropTypes
+  const { id: idPrefix } = useConfig()
   const names = tabs.map(t => t.name)
   const [activeTab, setActiveTab] = useState(defaultTab ?? names[0])
 
   const activateTab = useCallback((name) => {
     setActiveTab(name)
-    document.getElementById(toTabId(name))?.focus()
-  }, [])
+    document.getElementById(toTabId(idPrefix, name))?.focus()
+  }, [idPrefix])
 
   const handleKeyDown = useCallback((e) => {
     const idx = names.indexOf(activeTab)
@@ -33,7 +46,7 @@ export const Tabs = ({ tabs, defaultTab }) => { // NOSONAR: project does not use
     }
   }, [names, activeTab, activateTab])
 
-  const activeContent = tabs.find(t => t.name === activeTab)?.content
+  const panelClassName = ['im-c-tabs__panel', panelProps?.className].filter(Boolean).join(' ')
 
   return (
     <div className='im-c-tabs'>
@@ -42,10 +55,10 @@ export const Tabs = ({ tabs, defaultTab }) => { // NOSONAR: project does not use
           <button
             type='button'
             key={name}
-            id={toTabId(name)}
+            id={toTabId(idPrefix, name)}
             role='tab'
             aria-selected={activeTab === name}
-            aria-controls={toPanelId(name)}
+            aria-controls={toPanelId(idPrefix, name)}
             tabIndex={activeTab === name ? 0 : -1}
             className='im-c-tabs__tab'
             onClick={() => activateTab(name)}
@@ -55,15 +68,28 @@ export const Tabs = ({ tabs, defaultTab }) => { // NOSONAR: project does not use
           </button>
         ))}
       </div>
-      <div
-        id={toPanelId(activeTab)}
-        role='tabpanel'
-        aria-labelledby={toTabId(activeTab)}
-        tabIndex={-1} // nosonar — panel has no focusable children; -1 per ARIA tabs pattern (AT reads via role/aria-labelledby)
-        className='im-c-tabs__panel'
-      >
-        {activeContent}
-      </div>
+      {/* All tabpanels render, hidden unless active — not swapped in/out — so every tab's
+          aria-controls always resolves to a real element, rather than only the active one's.
+          panelProps (ref/tabIndex — a scrollable container's, from a caller like Panel.jsx)
+          can only meaningfully target one DOM node, so it's applied to the active panel only;
+          className is shared by all of them so there's nothing to restyle on switch. */}
+      {tabs.map(({ name, content }) => {
+        const isActive = activeTab === name
+        return (
+          <div
+            key={name}
+            ref={isActive ? panelProps?.ref : undefined}
+            id={toPanelId(idPrefix, name)}
+            role='tabpanel'
+            aria-labelledby={toTabId(idPrefix, name)}
+            tabIndex={isActive ? (panelProps?.tabIndex ?? -1) : -1} // nosonar — panel has no focusable children by default (-1); a scrollable active one wants 0, via panelProps
+            hidden={!isActive}
+            className={panelClassName}
+          >
+            {content}
+          </div>
+        )
+      })}
     </div>
   )
 }

package/src/App/components/Tabs/Tabs.module.scss

@@ -4,9 +4,18 @@
 // Component: Tabs
 // ===================================================
 
+// Lets a caller (e.g. Panel.jsx) give Tabs a bounded height — only .im-c-tabs__panel scrolls.
+.im-c-tabs {
+    display: flex;
+    flex-direction: column;
+    min-height: 0;
+    flex: 1 1 auto;
+}
+
 .im-c-tabs__list {
     position: relative;
     display: flex;
+    flex: 0 0 auto;
     flex-wrap: wrap;
     padding: 0;
     margin: 0;
@@ -14,8 +23,14 @@
     z-index: 1;
 }
 
+.im-c-tabs__panel {
+    flex: 1 1 auto;
+    overflow: auto;
+}
+
 .im-c-tabs__tab {
     position: relative;
+    z-index: 0; // scopes the active tab's ::before (below) to this button's own stacking context
     appearance: none;
     background: var(--button-hover-color);
     border: 1px solid transparent;
@@ -42,12 +57,24 @@
         }
     }
 
+    // The selected tab looks taller via an absolutely-positioned ::before rather than changing
+    // the button's own box, so the label never moves and the tablist's height never shifts.
     &[aria-selected='true'] {
-        background: var(--background-color);
-        border-color: var(--app-border-color);
-        border-bottom-color: var(--background-color);
-        margin-top: 0;
-        margin-bottom: -1px;
+        z-index: 1; // sit above unselected siblings
+        background: transparent;
+
+        &::before {
+            content: '';
+            position: absolute;
+            z-index: -1;
+            top: -5px;
+            right: -1px;
+            bottom: -6px;
+            left: -1px;
+            background: var(--background-color);
+            border: 1px solid var(--app-border-color);
+            border-bottom-color: var(--background-color);
+        }
     }
 
     &:focus .im-c-tabs__label {

package/src/App/components/Tabs/Tabs.test.jsx

@@ -1,11 +1,18 @@
 import React from 'react'
 import { render, screen, fireEvent } from '@testing-library/react'
 import { Tabs } from './Tabs'
+import { useConfig } from '../../store/configContext'
+
+jest.mock('../../store/configContext', () => ({ useConfig: jest.fn() }))
 
 const TAB_A = { name: 'Alpha', content: <p>Alpha content</p> }
 const TAB_B = { name: 'Beta', content: <p>Beta content</p> }
 const TAB_C = { name: 'Gamma', content: <p>Gamma content</p> }
 
+beforeEach(() => {
+  useConfig.mockReturnValue({ id: 'test-app' })
+})
+
 // ─── rendering ───────────────────────────────────────────────────────────────
 
 describe('Tabs — rendering', () => {
@@ -15,17 +22,17 @@ describe('Tabs — rendering', () => {
     expect(screen.getByRole('tab', { name: 'Beta' })).toBeInTheDocument()
   })
 
-  it('shows content for the active tab only', () => {
+  it('shows content for the active tab only — the inactive one stays in the DOM (so its aria-controls target exists) but hidden', () => {
     render(<Tabs tabs={[TAB_A, TAB_B]} />)
-    expect(screen.getByText('Alpha content')).toBeInTheDocument()
-    expect(screen.queryByText('Beta content')).not.toBeInTheDocument()
+    expect(screen.getByText('Alpha content')).toBeVisible()
+    expect(screen.getByText('Beta content')).not.toBeVisible()
   })
 
   it('uses defaultTab to set the initial active tab', () => {
     render(<Tabs tabs={[TAB_A, TAB_B]} defaultTab='Beta' />)
     expect(screen.getByRole('tab', { name: 'Beta' })).toHaveAttribute('aria-selected', 'true')
-    expect(screen.getByText('Beta content')).toBeInTheDocument()
-    expect(screen.queryByText('Alpha content')).not.toBeInTheDocument()
+    expect(screen.getByText('Beta content')).toBeVisible()
+    expect(screen.getByText('Alpha content')).not.toBeVisible()
   })
 
   it('falls back to first tab when defaultTab is not provided', () => {
@@ -41,8 +48,8 @@ describe('Tabs — click behaviour', () => {
     render(<Tabs tabs={[TAB_A, TAB_B]} />)
     fireEvent.click(screen.getByRole('tab', { name: 'Beta' }))
     expect(screen.getByRole('tab', { name: 'Beta' })).toHaveAttribute('aria-selected', 'true')
-    expect(screen.getByText('Beta content')).toBeInTheDocument()
-    expect(screen.queryByText('Alpha content')).not.toBeInTheDocument()
+    expect(screen.getByText('Beta content')).toBeVisible()
+    expect(screen.getByText('Alpha content')).not.toBeVisible()
   })
 })
 
@@ -55,10 +62,33 @@ describe('Tabs — WCAG attributes', () => {
     expect(screen.getByRole('tab', { name: 'Beta' })).toHaveAttribute('tabindex', '-1')
   })
 
-  it('each tab has aria-controls pointing to an element in the DOM', () => {
+  it('every tab has aria-controls pointing to a real element — including inactive tabs, since their panel stays in the DOM (hidden) rather than being unmounted', () => {
+    render(<Tabs tabs={[TAB_A, TAB_B]} />)
+    const activeTab = screen.getByRole('tab', { name: 'Alpha' })
+    const inactiveTab = screen.getByRole('tab', { name: 'Beta' })
+    expect(document.getElementById(activeTab.getAttribute('aria-controls'))).toBeInTheDocument()
+    expect(document.getElementById(inactiveTab.getAttribute('aria-controls'))).toBeInTheDocument()
+  })
+
+  it('gives every tabpanel its own stable id, distinct per tab, not just the active one', () => {
+    render(<Tabs tabs={[TAB_A, TAB_B]} />)
+    const activeTab = screen.getByRole('tab', { name: 'Alpha' })
+    const inactiveTab = screen.getByRole('tab', { name: 'Beta' })
+    expect(activeTab.getAttribute('aria-controls')).not.toBe(inactiveTab.getAttribute('aria-controls'))
+  })
+
+  it('hides the inactive tabpanel via the hidden attribute rather than unmounting it', () => {
+    render(<Tabs tabs={[TAB_A, TAB_B]} />)
+    const inactiveTab = screen.getByRole('tab', { name: 'Beta' })
+    const inactivePanel = document.getElementById(inactiveTab.getAttribute('aria-controls'))
+    expect(inactivePanel).toHaveAttribute('hidden')
+  })
+
+  it("labels every tabpanel with its own tab, not just the active one's", () => {
     render(<Tabs tabs={[TAB_A, TAB_B]} />)
-    const tab = screen.getByRole('tab', { name: 'Alpha' })
-    expect(document.getElementById(tab.getAttribute('aria-controls'))).toBeInTheDocument()
+    const inactiveTab = screen.getByRole('tab', { name: 'Beta' })
+    const inactivePanel = document.getElementById(inactiveTab.getAttribute('aria-controls'))
+    expect(inactivePanel.getAttribute('aria-labelledby')).toBe(inactiveTab.id)
   })
 
   it('panel has aria-labelledby pointing to the active tab', () => {

package/src/App/renderer/groupByKey.js

@@ -0,0 +1,28 @@
+import { stringToKebab } from '../../utils/stringToKebab.js'
+
+/**
+ * Partitions a list of items into buckets, keyed by `keyFn(item)` kebab-cased — two items
+ * share a bucket by producing the same key (so 'Map Size' and 'map size' merge). Items for
+ * which `keyFn` returns a falsy value all share one `null`-keyed bucket. Bucket iteration
+ * order follows first-encountered order, same as `Map`.
+ *
+ * Shared by `groupIntoTabs` (panel/control tabs) and `mapButtons` (button groups) — the two
+ * callers differ only in what happens *after* bucketing (how a bucket's own order/label is
+ * derived), not in how items get partitioned.
+ *
+ * @returns {Map<string|null, object[]>}
+ */
+export function groupByKey ({ items, keyFn }) {
+  const buckets = new Map()
+
+  for (const item of items) {
+    const raw = keyFn(item)
+    const key = raw ? stringToKebab(raw) : null
+    if (!buckets.has(key)) {
+      buckets.set(key, [])
+    }
+    buckets.get(key).push(item)
+  }
+
+  return buckets
+}

package/src/App/renderer/groupByKey.test.js

@@ -0,0 +1,39 @@
+import { groupByKey } from './groupByKey.js'
+
+describe('groupByKey', () => {
+  it('returns one bucket per distinct key', () => {
+    const items = [{ id: 'a', k: 'Styles' }, { id: 'b', k: 'Sizes' }]
+    const buckets = groupByKey({ items, keyFn: item => item.k })
+    expect([...buckets.keys()].sort()).toEqual(['sizes', 'styles'])
+  })
+
+  it('lowercases the key, hyphenating only camelCase-style boundaries (stringToKebab)', () => {
+    const items = [{ id: 'a', k: 'mapSize' }]
+    const buckets = groupByKey({ items, keyFn: item => item.k })
+    expect([...buckets.keys()]).toEqual(['map-size'])
+  })
+
+  it('merges items whose key differs only by case/whitespace into one bucket', () => {
+    const items = [{ id: 'a', k: 'Map Size' }, { id: 'b', k: 'map size' }]
+    const buckets = groupByKey({ items, keyFn: item => item.k })
+    expect(buckets.size).toBe(1)
+    expect([...buckets.values()][0]).toHaveLength(2)
+  })
+
+  it('puts items with no key into one null-keyed bucket', () => {
+    const items = [{ id: 'a' }, { id: 'b' }]
+    const buckets = groupByKey({ items, keyFn: () => null })
+    expect(buckets.size).toBe(1)
+    expect(buckets.get(null)).toHaveLength(2)
+  })
+
+  it('keeps items within a bucket in their original relative order', () => {
+    const items = [{ id: 'a', k: 'g' }, { id: 'b', k: 'g' }, { id: 'c', k: 'g' }]
+    const buckets = groupByKey({ items, keyFn: item => item.k })
+    expect(buckets.get('g').map(i => i.id)).toEqual(['a', 'b', 'c'])
+  })
+
+  it('returns an empty map for an empty list', () => {
+    expect(groupByKey({ items: [], keyFn: () => 'x' }).size).toBe(0)
+  })
+})

package/src/App/renderer/groupIntoTabs.js

@@ -0,0 +1,42 @@
+import { orderItems } from './orderItems.js'
+import { groupByKey } from './groupByKey.js'
+
+/**
+ * Groups a flat list of `{ id, order, tab, element }` items into tabs, when warranted.
+ *
+ * Items are partitioned by `tab` via `groupByKey` — two items share a tab by producing the
+ * same kebab-cased key. Items with no `tab` share one fallback bucket. Returns `null` when
+ * there's one bucket or fewer, so the caller can fall back to flat rendering unchanged.
+ *
+ * Each bucket's members are ordered via `orderItems`; the resulting tab's own `order` and
+ * displayed `name` both come from whichever member ends up first in that ordering — the same
+ * item that "wins" the position also wins the label, so there's nothing separate to reconcile
+ * when members disagree. The tabs themselves are then ordered the same way, via `orderItems`
+ * again — no new ordering concept, just the existing one applied twice.
+ *
+ * This derived-order approach is safe here because tabs are mutually exclusive — only the
+ * active tab's content is ever visible, so a "losing" member's own order never has to compete
+ * against anything outside its own tab at the same time. `mapButtons`'s button groups don't
+ * have that property (every group renders simultaneously), so they don't derive a group's
+ * order from its members the same way — see `mapButtons.js`.
+ */
+export function groupIntoTabs ({ items, fallbackLabel }) {
+  const buckets = groupByKey({ items, keyFn: item => item.tab })
+
+  if (buckets.size <= 1) {
+    return null
+  }
+
+  const tabs = Array.from(buckets.entries()).map(([key, members]) => {
+    const orderedMembers = orderItems(members)
+    const first = orderedMembers[0]
+    return {
+      id: key ?? 'default',
+      order: first.order,
+      name: key ? first.tab : fallbackLabel,
+      items: orderedMembers
+    }
+  })
+
+  return orderItems(tabs)
+}