@defra/interactive-map 0.0.15-alpha → 0.0.17-alpha

package/src/App/renderer/slots.js

@@ -10,8 +10,9 @@ export const layoutSlots = Object.freeze({
   MIDDLE: 'middle',
   RIGHT_TOP: 'right-top',
   RIGHT_BOTTOM: 'right-bottom',
-  FOOTER_RIGHT: 'footer-right',
-  BOTTOM: 'bottom',
+  BOTTOM_LEFT: 'bottom-left',
+  BOTTOM_RIGHT: 'bottom-right',
+  DRAWER: 'drawer',
   ACTIONS: 'actions',
   MODAL: 'modal' // internal only
 })
@@ -22,8 +23,9 @@ export const allowedSlots = Object.freeze({
     layoutSlots.TOP_LEFT,
     layoutSlots.TOP_RIGHT,
     layoutSlots.MIDDLE,
-    layoutSlots.FOOTER_RIGHT,
-    layoutSlots.BOTTOM,
+    layoutSlots.RIGHT_BOTTOM,
+    layoutSlots.BOTTOM_RIGHT,
+    layoutSlots.DRAWER,
     layoutSlots.ACTIONS
   ],
   panel: [
@@ -34,7 +36,7 @@ export const allowedSlots = Object.freeze({
     layoutSlots.MIDDLE,
     layoutSlots.RIGHT_TOP,
     layoutSlots.RIGHT_BOTTOM,
-    layoutSlots.BOTTOM, // Typicaly on mobile
+    layoutSlots.DRAWER, // Typically on mobile
     layoutSlots.MODAL // Internal only
   ],
   button: [
@@ -45,6 +47,8 @@ export const allowedSlots = Object.freeze({
     layoutSlots.LEFT_BOTTOM,
     layoutSlots.RIGHT_TOP,
     layoutSlots.RIGHT_BOTTOM,
+    layoutSlots.BOTTOM_LEFT,
+    layoutSlots.BOTTOM_RIGHT,
     layoutSlots.ACTIONS
   ]
 })

package/src/App/store/AppProvider.jsx

@@ -26,8 +26,10 @@ export const AppProvider = ({ options, children }) => {
     rightRef: useRef(null),
     rightTopRef: useRef(null),
     rightBottomRef: useRef(null),
+    drawerRef: useRef(null),
     bottomRef: useRef(null),
-    footerRef: useRef(null),
+    bottomRightRef: useRef(null),
+    attributionsRef: useRef(null),
     actionsRef: useRef(null),
     bannerRef: useRef(null),
     modalRef: useRef(null),

package/src/App/store/AppProvider.test.jsx

@@ -110,7 +110,7 @@ describe('AppProvider', () => {
     expect(contextValue).toHaveProperty('mode')
     expect(contextValue).toHaveProperty('openPanels')
     expect(contextValue.layoutRefs).toHaveProperty('mainRef')
-    expect(contextValue.layoutRefs).toHaveProperty('footerRef')
+    expect(contextValue.layoutRefs).toHaveProperty('bottomRef')
   })
 
   test('dispatch fallback uses options.panelRegistry.getPanelConfig() when state.panelConfig missing', () => {

package/src/App/store/ServiceProvider.jsx

@@ -5,6 +5,7 @@ import { createAnnouncer } from '../../services/announcer.js'
 import { reverseGeocode } from '../../services/reverseGeocode.js'
 import { useConfig } from '../store/configContext.js'
 import { closeApp } from '../../services/closeApp.js'
+import { logger } from '../../services/logger.js'
 
 export const ServiceContext = createContext(null)
 
@@ -19,7 +20,8 @@ export const ServiceProvider = ({ eventBus, children }) => {
     events: EVENTS,
     eventBus,
     mapStatusRef,
-    closeApp: () => closeApp(id, handleExitClick, eventBus)
+    closeApp: () => closeApp(id, handleExitClick, eventBus),
+    logger
   }), [announce])
 
   return (

package/src/App/store/appActionsMap.js

@@ -152,6 +152,12 @@ const toggleHasExclusiveControl = (state, payload) => {
   }
 }
 
+const setPluginsEvaluated = (state) =>
+  state.arePluginsEvaluated ? state : { ...state, arePluginsEvaluated: true }
+
+const clearPluginsEvaluated = (state) =>
+  state.arePluginsEvaluated ? { ...state, arePluginsEvaluated: false } : state
+
 const setSafeZoneInset = (state, { safeZoneInset, syncMapPadding = true }) => {
   return shallowEqual(state.safeZoneInset, safeZoneInset)
     ? state
@@ -163,6 +169,13 @@ const setSafeZoneInset = (state, { safeZoneInset, syncMapPadding = true }) => {
       }
 }
 
+const toggleAppVisible = (state, payload) => {
+  return {
+    ...state,
+    appVisible: payload
+  }
+}
+
 const toggleButtonDisabled = (state, payload) => {
   const { id, isDisabled } = payload
   const updated = new Set(state.disabledButtons)
@@ -358,12 +371,15 @@ export const actionsMap = {
   SET_HYBRID_FULLSCREEN: setHybridFullscreen,
   SET_INTERFACE_TYPE: setInterfaceType,
   SET_MODE: setMode,
+  PLUGINS_EVALUATED: setPluginsEvaluated,
+  CLEAR_PLUGINS_EVALUATED: clearPluginsEvaluated,
   SET_SAFE_ZONE_INSET: setSafeZoneInset,
   REVERT_MODE: revertMode,
   OPEN_PANEL: openPanel,
   CLOSE_PANEL: closePanel,
   CLOSE_ALL_PANELS: closeAllPanels,
   RESTORE_PREVIOUS_PANELS: restorePreviousPanels,
+  TOGGLE_APP_VISIBLE: toggleAppVisible,
   TOGGLE_HAS_EXCLUSIVE_CONTROL: toggleHasExclusiveControl,
   TOGGLE_BUTTON_DISABLED: toggleButtonDisabled,
   TOGGLE_BUTTON_HIDDEN: toggleButtonHidden,

package/src/App/store/appActionsMap.test.js

@@ -128,6 +128,26 @@ describe('actionsMap full coverage', () => {
     expect(result.hasExclusiveControl).toBe(true)
   })
 
+  test('PLUGINS_EVALUATED is no-op when arePluginsEvaluated already true', () => {
+    const s = { ...state, arePluginsEvaluated: true }
+    expect(actionsMap.PLUGINS_EVALUATED(s)).toBe(s)
+  })
+
+  test('PLUGINS_EVALUATED sets arePluginsEvaluated when false', () => {
+    const s = { ...state, arePluginsEvaluated: false }
+    expect(actionsMap.PLUGINS_EVALUATED(s).arePluginsEvaluated).toBe(true)
+  })
+
+  test('CLEAR_PLUGINS_EVALUATED clears arePluginsEvaluated when true', () => {
+    const s = { ...state, arePluginsEvaluated: true }
+    expect(actionsMap.CLEAR_PLUGINS_EVALUATED(s).arePluginsEvaluated).toBe(false)
+  })
+
+  test('CLEAR_PLUGINS_EVALUATED is no-op when arePluginsEvaluated already false', () => {
+    const s = { ...state, arePluginsEvaluated: false }
+    expect(actionsMap.CLEAR_PLUGINS_EVALUATED(s)).toBe(s)
+  })
+
   test('SET_SAFE_ZONE_INSET branch true/false', () => {
     shallowEqualModule.shallowEqual.mockReturnValueOnce(false)
     const res1 = actionsMap.SET_SAFE_ZONE_INSET(state, { safeZoneInset: { top: 10, bottom: 10 } })
@@ -152,6 +172,13 @@ describe('actionsMap full coverage', () => {
     expect(r2.hiddenButtons.has('btn3')).toBe(false)
   })
 
+  test('TOGGLE_APP_VISIBLE sets appVisible to payload', () => {
+    const r1 = actionsMap.TOGGLE_APP_VISIBLE(state, true)
+    expect(r1.appVisible).toBe(true)
+    const r2 = actionsMap.TOGGLE_APP_VISIBLE(state, false)
+    expect(r2.appVisible).toBe(false)
+  })
+
   test('TOGGLE_BUTTON_PRESSED adds/removes button', () => {
     const r1 = actionsMap.TOGGLE_BUTTON_PRESSED(state, { id: 'btn6', isPressed: true })
     expect(r1.pressedButtons.has('btn6')).toBe(true)

package/src/App/store/appDispatchMiddleware.js

@@ -1,7 +1,11 @@
 // src/App/store/dispatchMiddleware.js
 import { EVENTS as events } from '../../config/events.js'
-import { defaultPanelConfig } from '../../config/appConfig.js'
+import { defaultPanelConfig, defaultButtonConfig, defaultControlConfig } from '../../config/appConfig.js'
 import { deepMerge } from '../../utils/deepMerge.js'
+import { allowedSlots } from '../renderer/slots.js'
+import { logger } from '../../services/logger.js'
+
+const BREAKPOINTS = ['mobile', 'tablet', 'desktop']
 
 /**
  * Determines which panels were implicitly closed when opening a new panel
@@ -81,9 +85,37 @@ export function handleActionSideEffects (action, previousState, panelConfig, eve
     })
   }
 
+  if (type === 'ADD_BUTTON') {
+    const { id, config } = payload
+    const mergedConfig = deepMerge(defaultButtonConfig, config)
+    BREAKPOINTS.forEach(bp => {
+      const slot = mergedConfig[bp]?.slot
+      if (slot && !allowedSlots.button.includes(slot)) {
+        logger.warn(`button "${id}" has invalid slot "${slot}" at breakpoint "${bp}". Allowed slots: ${allowedSlots.button.join(', ')}.`)
+      }
+    })
+  }
+
+  if (type === 'ADD_CONTROL') {
+    const { id, config } = payload
+    const mergedConfig = deepMerge(defaultControlConfig, config)
+    BREAKPOINTS.forEach(bp => {
+      const slot = mergedConfig[bp]?.slot
+      if (slot && !allowedSlots.control.includes(slot)) {
+        logger.warn(`control "${id}" has invalid slot "${slot}" at breakpoint "${bp}". Allowed slots: ${allowedSlots.control.join(', ')}.`)
+      }
+    })
+  }
+
   if (type === 'ADD_PANEL') {
     const { id, config } = payload
     const mergedConfig = deepMerge(defaultPanelConfig, config)
+    BREAKPOINTS.forEach(bp => {
+      const slot = mergedConfig[bp]?.slot
+      if (slot && !allowedSlots.panel.includes(slot) && !slot.endsWith('-button')) {
+        logger.warn(`panel "${id}" has invalid slot "${slot}" at breakpoint "${bp}". Allowed slots: ${allowedSlots.panel.join(', ')}.`)
+      }
+    })
     const bpConfig = mergedConfig[previousState.breakpoint]
     if (bpConfig?.open) {
       queueMicrotask(() => {