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

package/providers/maplibre/src/utils/symbolImages.js

@@ -36,10 +36,48 @@ export const anchorToMaplibre = ([ax, ay]) => {
   return (y + (x && y ? '-' : '') + x) || 'center'
 }
 
+// The discrete fraction (0, 0.5 or 1) icon-anchor actually renders a given axis at — the
+// same left/right/top/bottom/center snapping xAnchor/yAnchor above already do, expressed as
+// a number instead of a string so it can be compared against the true, unsnapped fraction.
+const discreteFraction = (a) => {
+  if (a <= ANCHOR_LOW) { return 0 }
+  if (a >= ANCHOR_HIGH) { return 1 }
+  return 0.5
+}
+
+/**
+ * MapLibre's icon-anchor only has 9 discrete positions — anchorToMaplibre above snaps a
+ * fractional anchor to the nearest one, which loses precision for anything off-grid (e.g.
+ * pin's [0.5, 0.9] renders as if it were 1.0/'bottom', shifting the whole icon ~10% of its
+ * height off from where a DOM marker using the same anchor value would place it —
+ * SymbolMarker.jsx positions markers with the exact fraction via CSS margins, with no such
+ * snapping). icon-offset corrects this: the pixel distance, in the icon's own display-space
+ * dimensions (derived from its viewBox), between the true anchor and the discrete one it
+ * snapped to — applied on top of icon-anchor, on both provider and dataset symbol layers.
+ *
+ * @param {number[]} anchor - [x, y] in 0–1 space (the true, unsnapped anchor)
+ * @param {string} viewBox - SVG viewBox string, e.g. '0 0 44 44'
+ * @returns {number[]} [offsetX, offsetY] in pixels, for the icon-offset layout property
+ */
+// Rounded to 2dp: sub-hundredth-of-a-pixel precision is meaningless for rendering, and
+// without it fractions like 0.8 produce float noise (8.799999999999997, not 8.8).
+const round2dp = (n) => Math.round(n * 100) / 100
+
+export const anchorToMaplibreOffset = ([ax, ay], viewBox) => {
+  const [,, width, height] = viewBox.split(' ').map(Number)
+  return [
+    round2dp((discreteFraction(ax) - ax) * width),
+    round2dp((discreteFraction(ay) - ay) * height)
+  ]
+}
+
 /**
  * Register normal, active (both rings) and selected (black ring) symbol images.
  * Skips images that are already registered (safe to call on style change).
- * Updates `map._activeSymbolImageMap` (normal→active) and `map._selectedSymbolImageMap` (normal→selected).
+ * Merges into `map._activeSymbolImageMap` (normal→active) and `map._selectedSymbolImageMap`
+ * (normal→selected) rather than replacing them — more than one caller (e.g. the datasets
+ * and draw plugins) can register symbols on the same map, and each call must add to that
+ * shared registry, not wipe out whatever another caller already registered there.
  *
  * @param {Object} map - MapLibre map instance
  * @param {Object[]} styleArray - an array of symbol configs
@@ -53,8 +91,8 @@ export const addSymbolsToMap = async (map, styleArray, mapStyle, symbolRegistry,
     return
   }
 
-  map._activeSymbolImageMap = {}
-  map._selectedSymbolImageMap = {}
+  map._activeSymbolImageMap ??= {}
+  map._selectedSymbolImageMap ??= {}
 
   await Promise.all(styleArray.flatMap(config => {
     const normalId = symbolRegistry.getSymbolImageId(config, mapStyle, false, pixelRatio)

package/providers/maplibre/src/utils/symbolImages.test.js

@@ -1,4 +1,4 @@
-import { anchorToMaplibre, addSymbolsToMap } from './symbolImages.js'
+import { anchorToMaplibre, anchorToMaplibreOffset, addSymbolsToMap } from './symbolImages.js'
 import { symbolRegistry } from '../../../../src/services/symbolRegistry.js'
 
 beforeAll(() => {
@@ -84,6 +84,36 @@ describe('anchorToMaplibre', () => {
   })
 })
 
+// ─── anchorToMaplibreOffset ───────────────────────────────────────────────────
+
+describe('anchorToMaplibreOffset', () => {
+  const VIEW_BOX = '0 0 44 44'
+
+  it('is zero for an anchor that already sits exactly on a discrete position', () => {
+    expect(anchorToMaplibreOffset([0.5, 0.5], VIEW_BOX)).toEqual([0, 0]) // center
+    expect(anchorToMaplibreOffset([0, 0], VIEW_BOX)).toEqual([0, 0]) // top-left
+    expect(anchorToMaplibreOffset([1, 1], VIEW_BOX)).toEqual([0, 0]) // bottom-right
+  })
+
+  it('corrects for pin-style [0.5, 0.9] snapping to bottom (1.0)', () => {
+    expect(anchorToMaplibreOffset([0.5, 0.9], VIEW_BOX)).toEqual([0, 4.4])
+  })
+
+  it('corrects both axes when both are off-grid', () => {
+    // 0.1 snaps to 'left'/'top' (0), 0.9 snaps to 'right'/'bottom' (1)
+    expect(anchorToMaplibreOffset([0.1, 0.1], VIEW_BOX)).toEqual([-4.4, -4.4])
+    expect(anchorToMaplibreOffset([0.9, 0.9], VIEW_BOX)).toEqual([4.4, 4.4])
+  })
+
+  it('still corrects a value inside the centre band that is not exactly 0.5 — the whole band snaps to 0.5, not just its edges', () => {
+    expect(anchorToMaplibreOffset([0.4, 0.6], VIEW_BOX)).toEqual([4.4, -4.4])
+  })
+
+  it('scales with the viewBox, not just the anchor fraction', () => {
+    expect(anchorToMaplibreOffset([0.5, 0.9], '0 0 100 100')).toEqual([0, 10])
+  })
+})
+
 // ─── addSymbolsToMap ──────────────────────────────────────────────────────────
 
 const makeMap = (existingIds = []) => ({
@@ -103,13 +133,17 @@ describe('addSymbolsToMap — registration', () => {
     expect(map.addImage).not.toHaveBeenCalled()
   })
 
-  it('resets _activeSymbolImageMap and _selectedSymbolImageMap before processing', async () => {
+  it('merges into existing _activeSymbolImageMap/_selectedSymbolImageMap rather than replacing them', async () => {
+    // More than one caller (datasets, draw, ...) can register symbols on the same map —
+    // a later call must add to the shared registry, not wipe an earlier caller's entries.
     const map = makeMap()
-    map._activeSymbolImageMap = { stale: 'entry' }
-    map._selectedSymbolImageMap = { stale: 'entry' }
+    map._activeSymbolImageMap = { 'other-normal-id': 'other-active-id' }
+    map._selectedSymbolImageMap = { 'other-normal-id': 'other-selected-id' }
     await addSymbolsToMap(map, [{ symbol: 'pin' }], mapStyle, symbolRegistry)
-    expect(map._activeSymbolImageMap).not.toHaveProperty('stale')
-    expect(map._selectedSymbolImageMap).not.toHaveProperty('stale')
+    expect(map._activeSymbolImageMap['other-normal-id']).toBe('other-active-id')
+    expect(map._selectedSymbolImageMap['other-normal-id']).toBe('other-selected-id')
+    const normalId = symbolRegistry.getSymbolImageId({ symbol: 'pin' }, mapStyle, false)
+    expect(map._activeSymbolImageMap).toHaveProperty(normalId)
   })
 
   it('calls addImage for normal, active and selected variants', async () => {

package/rollup.esm.mjs

@@ -182,7 +182,7 @@ const createESMConfig = (entryPath, outDir, isCore = false, manualChunks = null,
         open: false,
         gzipSize: true
       })]
-      : [])
+        : [])
     ],
 
     output: {
@@ -303,6 +303,16 @@ const ALL_BUILDS = [
     entryPath: './plugins/beta/frame/src/index.js',
     outDir: 'plugins/beta/frame/dist/esm',
     manualChunks: (id) => id.includes('/manifest') ? 'im-frame-plugin' : undefined
+  },
+  {
+    entryPath: './plugins/map-key/src/index.js',
+    outDir: 'plugins/map-key/dist/esm',
+    manualChunks: (id) => id.includes('/manifest') ? 'im-map-key-plugin' : undefined
+  },
+  {
+    entryPath: './plugins/menu/src/index.js',
+    outDir: 'plugins/menu/dist/esm',
+    manualChunks: (id) => id.includes('/manifest') ? 'im-menu-plugin' : undefined
   }
 ]
 

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

@@ -1,11 +1,16 @@
 import React from 'react'
 import { render, screen } from '@testing-library/react'
 import { Actions } from './Actions.jsx'
+import { mapButtons } from '../../renderer/mapButtons.js'
 import * as AppContext from '../../store/appContext' // import the module to mock
 
 // Simple child component to handle isHidden
 const TestChild = ({ isHidden, children, ...props }) => <div {...props}>{children}</div>
 
+jest.mock('../MapButton/MapButton.jsx', () => ({
+  MapButton: ({ isHidden }) => <button data-testid='map-button' hidden={isHidden} />
+}))
+
 const ACTIONS_SELECTOR = '.im-c-actions'
 const HIDDEN_CLASS = 'im-c-actions--hidden'
 
@@ -80,4 +85,46 @@ describe('Actions component', () => {
     const container = screen.getByTestId('child1').closest(ACTIONS_SELECTOR)
     expect(container).toHaveClass(HIDDEN_CLASS)
   })
+
+  // Integration with the real mapButtons() output, not just the TestChild stand-in above —
+  // guards the isHidden/variant contract at the actual seam between the two modules, since
+  // mapButtons.js's own unit tests can't catch a break here on their own.
+  describe('with real mapButtons() output', () => {
+    const evaluateProp = (prop) => (typeof prop === 'function' ? prop() : prop)
+    const appConfig = { id: 'test' }
+    const baseAppState = {
+      breakpoint: 'desktop',
+      mode: 'view',
+      isFullscreen: true,
+      openPanels: {},
+      dispatch: jest.fn(),
+      disabledButtons: new Set(),
+      hiddenButtons: new Set(),
+      pressedButtons: new Set(),
+      expandedButtons: new Set(),
+      panelConfig: {},
+      layoutRefs: { viewportRef: { current: { focus: jest.fn() } } }
+    }
+
+    const renderActionsWith = (appState) => {
+      const items = mapButtons({ slot: 'actions', appState, appConfig, evaluateProp })
+      return render(<Actions slot='actions'>{items.map(i => i.element)}</Actions>)
+    }
+
+    it('shows the actions bar when a real mapButtons() button is visible', () => {
+      const appState = { ...baseAppState, buttonConfig: { cancel: { label: 'Cancel', desktop: { slot: 'actions' } } } }
+      renderActionsWith(appState)
+      expect(screen.getByTestId('map-button').closest(ACTIONS_SELECTOR)).not.toHaveClass(HIDDEN_CLASS)
+    })
+
+    it('hides the actions bar when the only real mapButtons() button is hidden', () => {
+      const appState = {
+        ...baseAppState,
+        hiddenButtons: new Set(['cancel']),
+        buttonConfig: { cancel: { label: 'Cancel', desktop: { slot: 'actions' } } }
+      }
+      renderActionsWith(appState)
+      expect(screen.getByTestId('map-button').closest(ACTIONS_SELECTOR)).toHaveClass(HIDDEN_CLASS)
+    })
+  })
 })

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

@@ -52,6 +52,19 @@ describe('Hints — rendering', () => {
     expect(desc.innerHTML).toBe('Shift + ?')
   })
 
+  it('appends the move-controls hint text when enableMoveControls is true', () => {
+    const mainEl = setup()
+    useConfig.mockReturnValue({
+      id: 'test-map',
+      keyboardHintText: '<kbd>Shift</kbd> + <kbd>?</kbd>',
+      enableMoveControls: true,
+      moveControlsHintText: '<kbd>Arrow keys</kbd> to move'
+    })
+    render(<Hints />)
+    const desc = mainEl.querySelector('#test-map-keyboard-desc')
+    expect(desc.innerHTML).toBe('Shift + ? Arrow keys to move')
+  })
+
   it('renders no hint content when there is no active hint', () => {
     const mainEl = setup()
     render(<Hints />)

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

@@ -46,6 +46,7 @@
 .im-c-move-controls__directions .im-c-button-wrapper--nudge-step-toggle {
     grid-column: 2;
     grid-row: 2;
+    z-index: 1;
 }
 
 .im-c-move-controls__directions .im-c-map-button--pan-up svg {
@@ -66,24 +67,49 @@
 // express a plus-shaped grid where the centre button touches all four neighbours —
 // clip-path is set directly per button instead, clipping only the side(s) where it
 // touches another button and leaving the exposed side(s) showing the shadow as normal.
-.im-c-move-controls__directions .im-c-button-wrapper--pan-up .im-c-map-button::before {
-    clip-path: inset(-20px -20px 0 -20px); // touches nudge-step-toggle below
+.im-c-move-controls__directions .im-c-button-wrapper--pan-up .im-c-map-button {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+
+    &::before {
+        clip-path: inset(-20px -20px 0 -20px); // touches nudge-step-toggle below
+    }
 }
 
-.im-c-move-controls__directions .im-c-button-wrapper--pan-left .im-c-map-button::before {
-    clip-path: inset(-20px 0 -20px -20px); // touches nudge-step-toggle to the right
+.im-c-move-controls__directions .im-c-button-wrapper--pan-left .im-c-map-button {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+
+    &::before {
+        clip-path: inset(-20px 0 -20px -20px); // touches nudge-step-toggle to the right
+    }
 }
 
-.im-c-move-controls__directions .im-c-button-wrapper--pan-right .im-c-map-button::before {
-    clip-path: inset(-20px -20px -20px 0); // touches nudge-step-toggle to the left
+.im-c-move-controls__directions .im-c-button-wrapper--pan-right .im-c-map-button {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+
+    &::before {
+        clip-path: inset(-20px -20px -20px 0); // touches nudge-step-toggle to the left
+    }
 }
 
-.im-c-move-controls__directions .im-c-button-wrapper--pan-down .im-c-map-button::before {
-    clip-path: inset(0 -20px -20px -20px); // touches nudge-step-toggle above
+.im-c-move-controls__directions .im-c-button-wrapper--pan-down .im-c-map-button {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+
+    &::before {
+        clip-path: inset(0 -20px -20px -20px); // touches nudge-step-toggle above
+    }
 }
 
-.im-c-move-controls__directions .im-c-button-wrapper--nudge-step-toggle .im-c-map-button::before {
-    clip-path: inset(0); // touches all four neighbours
+.im-c-move-controls__directions .im-c-button-wrapper--nudge-step-toggle .im-c-map-button {
+    border-radius: 0;
+    outline: 1px solid var(--button-hover-color);
+
+    &::before {
+        clip-path: inset(0); // touches all four neighbours
+    }
 }
 
 // Same inverted "pressed" treatment already used for actions-slot toggle buttons
@@ -129,3 +155,8 @@
 .im-c-move-controls__zoom .im-c-button-wrapper--nudge-zoom-out .im-c-map-button {
     @include tools.border-focus-corner-override($corners: 'right');
 }
+
+// App dark modifiers
+.im-o-app--dark-app .im-c-move-controls__directions .im-c-button-wrapper--nudge-step-toggle .im-c-map-button {
+    outline-offset: -1px;
+}

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

@@ -56,9 +56,19 @@ const buildBodyProps = ({ bodyRef, panelBodyClass, isBodyScrollable, elementId }
   'aria-labelledby': isBodyScrollable ? `${elementId}-label` : undefined
 })
 
+// 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).
+const BodyContent = ({ items, WrappedChild, props, children }) => { // NOSONAR
+  if (items) {
+    return items.map(item => <React.Fragment key={item.id}>{item.element}</React.Fragment>)
+  }
+  return WrappedChild ? <WrappedChild {...props} /> : children
+}
+
 // eslint-disable-next-line camelcase, react/jsx-pascal-case
 // sonarjs/disable-next-line function-name
-export const Panel = ({ panelId, panelConfig, props, focusOnOpen, WrappedChild, label, html, children, isOpen = true, rootRef }) => {
+export const Panel = ({ panelId, panelConfig, props, focusOnOpen, WrappedChild, items, label, html, children, isOpen = true, rootRef }) => {
   const { id } = useConfig()
   const { dispatch, breakpoint, layoutRefs, interfaceType } = useApp()
 
@@ -103,6 +113,10 @@ export const Panel = ({ panelId, panelConfig, props, focusOnOpen, WrappedChild,
 
   const panelProps = buildPanelProps({ elementId, shouldFocus, isDialog, isDismissible, isModal, width: bpConfig.width, panelClass, slot: bpConfig.slot })
   const bodyProps = buildBodyProps({ bodyRef, panelBodyClass, isBodyScrollable, elementId })
+  // DOM anchor for controls DOM-projected via the JS/consumer-HTML API — see HtmlElementHost.jsx.
+  // Only present on the items-capable body below: dangerouslySetInnerHTML owns the static-html
+  // body's children, so it can't also host controls injected via the panel-slot convention.
+  const panelBodySlot = `${stringToKebab(panelId)}-panel`
 
   return (
     <div // nosonar
@@ -118,6 +132,7 @@ export const Panel = ({ panelId, panelConfig, props, focusOnOpen, WrappedChild,
 
       {isDismissible && (
         <button
+          type='button'
           aria-label={`Close ${label}`}
           className='im-c-panel__close'
           onClick={handleClose}
@@ -129,8 +144,8 @@ export const Panel = ({ panelId, panelConfig, props, focusOnOpen, WrappedChild,
       {innerHtmlProp
         ? <div {...bodyProps} dangerouslySetInnerHTML={innerHtmlProp} /> // nosonar
         : (
-          <div {...bodyProps}> {/* nosonar */}
-            {WrappedChild ? <WrappedChild {...props} /> : children}
+          <div {...bodyProps} data-panel-slot={panelBodySlot}> {/* nosonar */}
+            <BodyContent items={items} WrappedChild={WrappedChild} props={props}>{children}</BodyContent>
           </div>
           )}
     </div>

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

@@ -18,6 +18,7 @@
     min-height: 0;
     min-width: var(--min-panel-width);
     pointer-events: auto;
+    color: var(--foreground-color);
     background-color: var(--background-color);
 }
 
@@ -98,19 +99,28 @@
     );
 }
 
-// When banner heading is hidden we need to align with the close button
-.im-o-app--desktop .im-c-panel--banner.im-c-panel--no-heading {
-    .im-c-panel__close {
-        top: var(--banner-close-button-gap);
-        right: var(--banner-close-button-gap);
+// Banner gets small rounded corners instead of the default square panel look.
+.im-c-panel--banner {
+    &,
+    &::before {
+        border-radius: var(--banner-border-radius);
     }
 
-    .im-c-panel__body--offset {
-        padding-top: 10px;
-        padding-bottom: 10px;
+    &::after {
+        border-radius: calc(var(--banner-border-radius) - 2px);
     }
 }
 
+// No heading means no built-in top spacing, so add it back here.
+.im-c-panel--no-heading .im-c-panel__body {
+    padding-top: var(--panel-margin);
+}
+
+// Ensures the body is tall enough to contain the close button.
+.im-c-panel--no-heading .im-c-panel__body--offset {
+    min-height: calc((var(--panel-close-button-gap) * 2) + var(--button-size));
+}
+
 .im-c-panel__body--offset {
     padding-right: calc(var(--button-size) + var(--divider-gap));
 }

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

@@ -194,5 +194,39 @@ describe('Panel', () => {
       renderPanel({}, { html: '<p>HTML content</p>' })
       expect(screen.getByText('HTML content')).toBeInTheDocument()
     })
+
+    it('renders each items entry in list order', () => {
+      const items = [
+        { id: 'a', element: <p>First</p> },
+        { id: 'b', element: <p>Second</p> }
+      ]
+      renderPanel({}, { items })
+      expect(screen.getByText('First')).toBeInTheDocument()
+      expect(screen.getByText('Second')).toBeInTheDocument()
+    })
+
+    it('prefers items over WrappedChild/children when provided', () => {
+      const Wrapped = () => <p>Wrapped</p>
+      renderPanel({}, {
+        items: [{ id: 'a', element: <p>Item</p> }],
+        WrappedChild: Wrapped,
+        children: <p>Child content</p>
+      })
+      expect(screen.getByText('Item')).toBeInTheDocument()
+      expect(screen.queryByText('Wrapped')).not.toBeInTheDocument()
+      expect(screen.queryByText('Child content')).not.toBeInTheDocument()
+    })
+
+    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')
+      expect(body).toHaveAttribute('data-panel-slot', 'settings-panel')
+    })
+
+    it('does not stamp data-panel-slot on a static-html body', () => {
+      const { container } = renderPanel({}, { html: '<p>HTML content</p>' })
+      const body = container.querySelector('.im-c-panel__body')
+      expect(body).not.toHaveAttribute('data-panel-slot')
+    })
   })
 })

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

@@ -45,34 +45,32 @@ describe('Tooltip', () => {
 
   it('shows and hides tooltip on mouse interactions', () => {
     const { button, tooltip } = renderTooltip()
-    act(() => fireEvent.mouseEnter(button))
+    fireEvent.mouseEnter(button)
     advanceTimers()
     expect(tooltip).toHaveClass('im-c-tooltip--is-visible')
     expect(getTooltipPosition).toHaveBeenCalled()
-    act(() => fireEvent.mouseLeave(button))
+    fireEvent.mouseLeave(button)
     advanceTimers(0)
     expect(tooltip).not.toHaveClass('im-c-tooltip--is-visible')
   })
 
   it('cancels tooltip on mouse down or key down', () => {
     const { button, tooltip } = renderTooltip()
-    act(() => {
-      fireEvent.mouseEnter(button)
-      fireEvent.mouseDown(button)
-      fireEvent.mouseEnter(button)
-      fireEvent.keyDown(button)
-    })
+    fireEvent.mouseEnter(button)
+    fireEvent.mouseDown(button)
+    fireEvent.mouseEnter(button)
+    fireEvent.keyDown(button)
     advanceTimers()
     expect(tooltip).not.toHaveClass('im-c-tooltip--is-visible')
   })
 
   it('handles focus interactions for keyboard interface', () => {
     const { button, tooltip, wrapper } = renderTooltip({}, 'keyboard')
-    act(() => fireEvent.focus(button))
+    fireEvent.focus(button)
     advanceTimers()
     expect(wrapper).toHaveClass('im-c-tooltip-wrapper--has-focus')
     expect(tooltip).toHaveClass('im-c-tooltip--is-visible')
-    act(() => fireEvent.blur(button))
+    fireEvent.blur(button)
     advanceTimers(0)
     expect(wrapper).not.toHaveClass('im-c-tooltip-wrapper--has-focus')
     expect(tooltip).not.toHaveClass('im-c-tooltip--is-visible')
@@ -80,22 +78,22 @@ describe('Tooltip', () => {
 
   it('does not show tooltip on focus if interfaceType is mouse', () => {
     const { button, tooltip } = renderTooltip()
-    act(() => fireEvent.focus(button))
+    fireEvent.focus(button)
     advanceTimers()
     expect(tooltip).not.toHaveClass('im-c-tooltip--is-visible')
   })
 
   it('hides tooltip on Escape key', () => {
     const { button, tooltip } = renderTooltip()
-    act(() => fireEvent.mouseEnter(button))
+    fireEvent.mouseEnter(button)
     advanceTimers()
-    act(() => fireEvent.keyDown(window, { key: 'Escape' }))
+    fireEvent.keyDown(window, { key: 'Escape' })
     expect(tooltip).not.toHaveClass('im-c-tooltip--is-visible')
   })
 
   it('removes keydown listener on unmount', () => {
     const { button, unmount } = renderTooltip({}, 'keyboard')
-    act(() => fireEvent.mouseEnter(button))
+    fireEvent.mouseEnter(button)
     advanceTimers()
     const removeSpy = jest.spyOn(window, 'removeEventListener')
     unmount()

package/src/App/hooks/useFeatureItems.js

@@ -1,9 +1,12 @@
 import { useState, useEffect } from 'react'
 
+const SET_FEATURES = 'map:setfeatures'
+const SET_FEATURES_SUPPRESSED = 'map:setfeaturessuppressed'
+
 /**
- * Subscribes to map:setfeatures and exposes the current listbox item list and multiselectable flag.
- * The list is produced by useMapItemList in the interact plugin and pushed via the event bus
- * whenever the visible set of markers or features changes.
+ * Subscribes to map:setfeatures for the listbox item list, and map:setfeaturessuppressed
+ * (any plugin can emit this) to report items as empty while suppressed regardless of what's
+ * actually visible — which is what drives <Features>'s own tabIndex/aria-hidden.
  *
  * @param {object} eventBus
  * @returns {{ items: Array<{ id: string, label: string }>, multiselectable: boolean }}
@@ -11,20 +14,26 @@ import { useState, useEffect } from 'react'
 export function useFeatureItems (eventBus) {
   const [items, setItems] = useState([])
   const [multiselectable, setMultiselectable] = useState(false)
+  const [suppressed, setSuppressed] = useState(false)
 
   useEffect(() => {
     if (!eventBus) {
       return undefined
     }
-    const handle = ({ items: next = [], multiselectable: nextMultiselectable = false }) => {
+    const handleSetFeatures = ({ items: next = [], multiselectable: nextMultiselectable = false }) => {
       setItems(next)
       setMultiselectable(nextMultiselectable)
     }
-    eventBus.on('map:setfeatures', handle)
+    const handleSuppressed = ({ suppressed: next = false } = {}) => {
+      setSuppressed(next)
+    }
+    eventBus.on(SET_FEATURES, handleSetFeatures)
+    eventBus.on(SET_FEATURES_SUPPRESSED, handleSuppressed)
     return () => {
-      eventBus.off('map:setfeatures', handle)
+      eventBus.off(SET_FEATURES, handleSetFeatures)
+      eventBus.off(SET_FEATURES_SUPPRESSED, handleSuppressed)
     }
   }, [eventBus])
 
-  return { items, multiselectable }
+  return { items: suppressed ? [] : items, multiselectable }
 }

package/src/App/hooks/useFeatureItems.test.js

@@ -2,6 +2,7 @@ import { renderHook, act } from '@testing-library/react'
 import { useFeatureItems } from './useFeatureItems.js'
 
 const SET_FEATURES = 'map:setfeatures' // NOSONAR
+const SET_FEATURES_SUPPRESSED = 'map:setfeaturessuppressed' // NOSONAR
 
 const makeEventBus = () => {
   const listeners = {}
@@ -37,11 +38,18 @@ describe('useFeatureItems — event subscription', () => {
     expect(eb.on).toHaveBeenCalledWith(SET_FEATURES, expect.any(Function))
   })
 
+  it('subscribes to map:setfeaturessuppressed on mount', () => {
+    const eb = makeEventBus()
+    renderHook(() => useFeatureItems(eb))
+    expect(eb.on).toHaveBeenCalledWith(SET_FEATURES_SUPPRESSED, expect.any(Function))
+  })
+
   it('unsubscribes on unmount', () => {
     const eb = makeEventBus()
     const { unmount } = renderHook(() => useFeatureItems(eb))
     unmount()
     expect(eb.off).toHaveBeenCalledWith(SET_FEATURES, expect.any(Function))
+    expect(eb.off).toHaveBeenCalledWith(SET_FEATURES_SUPPRESSED, expect.any(Function))
   })
 
   it('does not subscribe when eventBus is undefined', () => {
@@ -96,3 +104,52 @@ describe('useFeatureItems — multiselectable updates', () => {
     expect(result.current.multiselectable).toBe(false)
   })
 })
+
+// ─── useFeatureItems — suppression ───────────────────────────────────────────
+
+describe('useFeatureItems — suppression', () => {
+  const items = [{ id: 'a', label: 'Feature A' }]
+
+  it('reports empty items while suppressed, regardless of what was last set', () => {
+    const eb = makeEventBus()
+    const { result } = renderHook(() => useFeatureItems(eb))
+    act(() => eb.emit(SET_FEATURES, { items }))
+    act(() => eb.emit(SET_FEATURES_SUPPRESSED, { suppressed: true }))
+    expect(result.current.items).toEqual([])
+  })
+
+  it('restores the last known items once suppression is lifted', () => {
+    const eb = makeEventBus()
+    const { result } = renderHook(() => useFeatureItems(eb))
+    act(() => eb.emit(SET_FEATURES, { items }))
+    act(() => eb.emit(SET_FEATURES_SUPPRESSED, { suppressed: true }))
+    act(() => eb.emit(SET_FEATURES_SUPPRESSED, { suppressed: false }))
+    expect(result.current.items).toEqual(items)
+  })
+
+  it('defaults suppressed to false when the payload omits it', () => {
+    const eb = makeEventBus()
+    const { result } = renderHook(() => useFeatureItems(eb))
+    act(() => eb.emit(SET_FEATURES, { items }))
+    act(() => eb.emit(SET_FEATURES_SUPPRESSED, {}))
+    expect(result.current.items).toEqual(items)
+  })
+
+  it('defaults suppressed to false when the event carries no payload at all', () => {
+    const eb = makeEventBus()
+    const { result } = renderHook(() => useFeatureItems(eb))
+    act(() => eb.emit(SET_FEATURES, { items }))
+    act(() => eb.emit(SET_FEATURES_SUPPRESSED))
+    expect(result.current.items).toEqual(items)
+  })
+
+  it('a features update received while suppressed is still applied once restored', () => {
+    const eb = makeEventBus()
+    const { result } = renderHook(() => useFeatureItems(eb))
+    act(() => eb.emit(SET_FEATURES_SUPPRESSED, { suppressed: true }))
+    act(() => eb.emit(SET_FEATURES, { items }))
+    expect(result.current.items).toEqual([]) // still suppressed
+    act(() => eb.emit(SET_FEATURES_SUPPRESSED, { suppressed: false }))
+    expect(result.current.items).toEqual(items)
+  })
+})