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

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/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'),