@defra/interactive-map 0.0.26-alpha → 0.0.28-alpha

package/src/InteractiveMap/deviceChecker.js

@@ -1,5 +1,6 @@
 import { renderError } from './renderError.js'
 import { removeLoadingState } from './domStateManager.js'
+import { logger } from '../services/logger.js'
 
 /**
  * Checks if the current device is supported by the map provider.
@@ -18,14 +19,14 @@ export function checkDeviceSupport (rootEl, config) {
   const device = mapProvider?.checkDeviceCapabilities()
 
   if (!mapProvider) {
-    console.log('No map provider')
+    logger.warn('No map provider')
     return false
   }
 
   if (!device?.isSupported) {
     renderError(rootEl, deviceNotSupportedText)
     removeLoadingState()
-    console.log(device?.error)
+    logger.warn(device?.error)
     return false
   }
   return true

package/src/InteractiveMap/deviceChecker.test.js

@@ -1,23 +1,20 @@
 import { checkDeviceSupport } from './deviceChecker.js'
 import { renderError } from './renderError.js'
 import { removeLoadingState } from './domStateManager.js'
+import { logger } from '../services/logger.js'
 
 jest.mock('./renderError.js')
 jest.mock('./domStateManager.js')
+jest.mock('../services/logger.js', () => ({ logger: { warn: jest.fn() } }))
 
 describe('checkDeviceSupport', () => {
-  let rootEl, config, consoleLogSpy
+  let rootEl, config
 
   beforeEach(() => {
     rootEl = document.createElement('div')
-    consoleLogSpy = jest.spyOn(console, 'log').mockImplementation()
     jest.clearAllMocks()
   })
 
-  afterEach(() => {
-    consoleLogSpy.mockRestore()
-  })
-
   it('returns true when device is supported', () => {
     config = {
       mapProvider: {
@@ -29,7 +26,7 @@ describe('checkDeviceSupport', () => {
     expect(checkDeviceSupport(rootEl, config)).toBe(true)
     expect(renderError).not.toHaveBeenCalled()
     expect(removeLoadingState).not.toHaveBeenCalled()
-    expect(console.log).not.toHaveBeenCalled()
+    expect(logger.warn).not.toHaveBeenCalled()
   })
 
   it('returns false and shows error when device is not supported', () => {
@@ -46,7 +43,7 @@ describe('checkDeviceSupport', () => {
     expect(checkDeviceSupport(rootEl, config)).toBe(false)
     expect(renderError).toHaveBeenCalledWith(rootEl, 'Device not supported')
     expect(removeLoadingState).toHaveBeenCalled()
-    expect(console.log).toHaveBeenCalledWith('WebGL not available')
+    expect(logger.warn).toHaveBeenCalledWith('WebGL not available')
   })
 
   it('logs "No map provider" and returns false if mapProvider is missing', () => {
@@ -56,7 +53,7 @@ describe('checkDeviceSupport', () => {
     }
 
     expect(checkDeviceSupport(rootEl, config)).toBe(false)
-    expect(console.log).toHaveBeenCalledWith('No map provider')
+    expect(logger.warn).toHaveBeenCalledWith('No map provider')
     expect(renderError).not.toHaveBeenCalled()
     expect(removeLoadingState).not.toHaveBeenCalled()
   })
@@ -72,6 +69,6 @@ describe('checkDeviceSupport', () => {
     expect(checkDeviceSupport(rootEl, config)).toBe(false)
     expect(renderError).toHaveBeenCalledWith(rootEl, 'Device not supported')
     expect(removeLoadingState).toHaveBeenCalled()
-    expect(console.log).toHaveBeenCalledWith(undefined)
+    expect(logger.warn).toHaveBeenCalledWith(undefined)
   })
 })

package/src/InteractiveMap/historyManager.js

@@ -51,6 +51,8 @@ function syncMapInstance (mapInstance, viewId) {
     return
   }
 
+  mapInstance._isClosingViaBack = false
+
   const shouldBeOpen = mapInstance.id === viewId
   const isHybridVisible = mapInstance.config.behaviour === 'hybrid' && !isHybridFullscreen(mapInstance.config)
   const isOpen = mapInstance.rootEl?.children.length
@@ -134,6 +136,11 @@ function register (component) {
  */
 function unregister (component) {
   components.delete(component.id)
+
+  if (components.size === 0) {
+    globalThis.removeEventListener('popstate', handlePopstate)
+    initialized = false
+  }
 }
 
 // -----------------------------------------------------------------------------

package/src/InteractiveMap/historyManager.test.js

@@ -168,4 +168,15 @@ describe('historyManager', () => {
 
     expect(component1.loadApp).not.toHaveBeenCalled()
   })
+
+  it('removes popstate listener and resets initialized when last component is unregistered', () => {
+    const removeListenerSpy = jest.spyOn(window, 'removeEventListener')
+    jest.isolateModules(() => {
+      const freshManager = require('./historyManager.js').default
+      freshManager.register(component1)
+      freshManager.unregister(component1)
+      expect(removeListenerSpy).toHaveBeenCalledWith('popstate', expect.any(Function))
+    })
+    removeListenerSpy.mockRestore()
+  })
 })

package/src/config/defaults.js

@@ -20,7 +20,7 @@ const defaults = {
   genericErrorText: 'There was a problem loading the map. Please try again later.',
   hasExitButton: false,
   hybridWidth: null, // Defaults to maxMobileWidth if not set
-  keyboardHintText: '<span class="im-u-visually-hidden">Press </span><kbd>Alt</kbd> + <kbd>K</kbd> <span class="im-u-visually-hidden">to view </span>keyboard shortcuts',
+  keyboardHintText: '<span class="im-u-visually-hidden">Press </span><kbd>Shift</kbd> + <kbd>?</kbd> <span class="im-u-visually-hidden">to view </span>keyboard shortcuts',
   mapLabel: 'Interactive map application',
   mapProvider: null,
   mapSize: 'small',

package/src/utils/htmlToPlainText.js

@@ -0,0 +1,11 @@
+/**
+ * Strips HTML tags from a string and returns plain text.
+ * Collapses runs of two or more whitespace characters into a single space,
+ * while preserving intentional single spaces between words.
+ * @param {string} htmlString - A string containing HTML markup.
+ * @returns {string} The extracted text content with normalised whitespace.
+ */
+export const htmlToPlainText = (htmlString) => {
+  const doc = new DOMParser().parseFromString(htmlString, 'text/html')
+  return doc.body.textContent.replace(/\s{2,}/g, ' ').trim()
+}

package/src/utils/htmlToPlainText.test.js

@@ -0,0 +1,5 @@
+import { htmlToPlainText } from './htmlToPlainText'
+
+it('strips HTML and normalises whitespace', () => {
+  expect(htmlToPlainText('<p>  Hello  <strong>world</strong>  </p>')).toBe('Hello world')
+})

package/webpack.dev.mjs

@@ -19,10 +19,12 @@ export default {
   entry: {
     index: path.join(__dirname, 'demo/js/index.js'),
     draw: path.join(__dirname, 'demo/js/draw.js'),
+    'draw-ol': path.join(__dirname, 'demo/js/draw-ol.js'),
     farming: path.join(__dirname, 'demo/js/farming.js'),
     planning: path.join(__dirname, 'demo/js/planning.js'),
     'planning-ol': path.join(__dirname, 'demo/js/planning-ol.js'),
-    gep: path.join(__dirname, 'demo/js/gep.js')
+    gep: path.join(__dirname, 'demo/js/gep.js'),
+    multimap: path.join(__dirname, 'demo/js/multimap.js')
   },
   output: {
     path: path.resolve(__dirname, 'public'),