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

package/src/config/mergeConfig.test.js

@@ -40,4 +40,24 @@ describe('mergeConfig', () => {
     expect(warnSpy).not.toHaveBeenCalled()
     warnSpy.mockRestore()
   })
+
+  it('sanitises hasExitButton to false for mapOnly behaviour', () => {
+    const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {})
+    const result = mergeConfig({ behaviour: 'mapOnly', hasExitButton: true })
+    expect(result.hasExitButton).toBe(false)
+    expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining("hasExitButton has no effect when behaviour is 'mapOnly'"))
+    warnSpy.mockRestore()
+  })
+
+  it('leaves hasExitButton alone for non-mapOnly behaviours', () => {
+    const result = mergeConfig({ behaviour: 'buttonFirst', hasExitButton: true })
+    expect(result.hasExitButton).toBe(true)
+  })
+
+  it('does not warn when hasExitButton is already false for mapOnly', () => {
+    const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {})
+    mergeConfig({ behaviour: 'mapOnly', hasExitButton: false })
+    expect(warnSpy).not.toHaveBeenCalled()
+    warnSpy.mockRestore()
+  })
 })

package/src/scss/main.scss

@@ -31,7 +31,7 @@
 @use '../App/components/Markers/Markers.module';
 @use '../App/components/Viewport/Features.module';
 @use '../App/components/Actions/Actions.module';
-@use '../App/components/MoveControl/MoveControl.module';
+@use '../App/components/MoveControls/MoveControls.module';
 
 // Components that dont have a corresponding React Component
 @use 'components';

package/src/test-utils.js

@@ -32,6 +32,11 @@ export const createMockRegistries = (overrides = {}) => {
       registeredPlugins: [],
       registerPlugin: jest.fn(),
       clear: jest.fn()
+    },
+    keyboardShortcutRegistry: {
+      registerKeyboardShortcut: jest.fn(),
+      setProviderSupportedShortcuts: jest.fn(),
+      getKeyboardShortcuts: jest.fn(() => [])
     }
   }
 }

package/src/types.js

@@ -697,8 +697,8 @@
  * @property {boolean} [enableFullscreen=false]
  * Whether a toggle fullscreen button is displayed.
  *
- * @property {boolean} [enableMoveControl=true]
- * Whether the move control is displayed — a button that reveals directional pan,
+ * @property {boolean} [enableMoveControls=true]
+ * Whether the move controls are displayed — a button that reveals directional pan,
  * zoom, and step-size buttons, providing a non-dragging alternative to panning
  * and zooming the map (WCAG 2.5.7). Unlike enableZoomControls, it remains visible
  * when the interface type is 'touch'. When enabled, enableZoomControls' buttons
@@ -706,7 +706,7 @@
  *
  * @property {boolean} [enableZoomControls=true]
  * Whether zoom control buttons are displayed. Not displayed when the interface
- * type is 'touch', or when enableMoveControl is enabled.
+ * type is 'touch', or when enableMoveControls is enabled.
  *
  * @property {[number, number, number, number]} [extent]
  * Initial extent [minX, minY, maxX, maxY]. Equivalent to bounds; use whichever matches your map provider's terminology.
@@ -722,16 +722,24 @@
  * In `mapOnly` behaviour the Back button is hidden when there is no browser history to go back to.
  *
  * @property {boolean} [hasExitButton=false]
- * Whether an exit map button is displayed when the app is fullscreen.
+ * Whether an exit map button is displayed. Only shown when the behaviour is `buttonFirst`
+ * or `hybrid` and the map is fullscreen - `mapOnly` has no launcher button or history entry
+ * to exit back to, so the exit button is never shown there.
  *
  * @property {number | null} [hybridWidth]
  * Optional breakpoint (in pixels) for hybrid behaviour. Defaults to 'maxMobileWidth' when not set.
  *
  * @property {string} [keyboardHintText]
- * HTML string providing keyboard shortcut instructions for accessibility users.
+ * HTML string providing keyboard shortcut instructions for accessibility users, announced via aria-describedby whenever the map viewport gains focus.
+ *
+ * @property {string} [mapHintText]
+ * Visually hidden text, rendered immediately before the map for screen reader users, explaining that it must be focused before keyboard commands work. Prefixed with mapLabel, so multiple maps on one page can be told apart.
  *
  * @property {string} [mapLabel='Interactive map']
- * Accessible label for the map, announced by screen readers.
+ * Accessible label for the map, announced by screen readers. Also prefixed onto mapHintText, so give each map on a page a distinct label.
+ *
+ * @property {string} [moveControlsHintText]
+ * Visually hidden text describing the move controls button, appended to keyboardHintText when enableMoveControls is true.
  *
  * @property {MapProviderDescriptor} [mapProvider]
  * A factory function that returns a map provider instance (e.g. maplibreProvider()).