@defra/interactive-map 0.0.54-alpha → 0.0.56-alpha

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (472) hide show
  1. package/assets/templates/add-polygons.njk +1 -1
  2. package/assets/templates/add-symbols.njk +4 -4
  3. package/assets/templates/draw-tools.njk +7 -7
  4. package/assets/templates/marker-panel.njk +5 -5
  5. package/assets/templates/place-marker.njk +8 -8
  6. package/assets/templates/search-control.njk +1 -1
  7. package/assets/templates/select-feature.njk +7 -7
  8. package/assets/templates/style-switcher.njk +6 -6
  9. package/assets/templates/toggle-marker-label.njk +3 -3
  10. package/dist/esm/im-core.js +1 -1
  11. package/dist/esm/im-shell.js +1 -1
  12. package/dist/esm/index.js +1 -1
  13. package/dist/umd/im-core.js +1 -1
  14. package/dist/umd/im-core.js.LICENSE.txt +0 -30
  15. package/dist/umd/index.js +1 -1
  16. package/dist/umd/index.js.LICENSE.txt +0 -20
  17. package/docs/api/context.md +2 -0
  18. package/docs/api.md +20 -14
  19. package/docs/architecture/interactive-map.likec4 +4 -4
  20. package/docs/building-a-plugin.md +2 -2
  21. package/docs/examples/add-marker-with-panel.mdx +46 -44
  22. package/docs/examples/add-polygons.mdx +100 -98
  23. package/docs/examples/add-symbols.mdx +75 -73
  24. package/docs/examples/basic-map.mdx +16 -14
  25. package/docs/examples/button-map.mdx +16 -14
  26. package/docs/examples/draw-tools.mdx +119 -117
  27. package/docs/examples/place-marker.mdx +51 -49
  28. package/docs/examples/search-control.mdx +22 -20
  29. package/docs/examples/select-feature.mdx +107 -105
  30. package/docs/examples/style-switcher.mdx +47 -45
  31. package/docs/examples/toggle-marker-label.mdx +30 -28
  32. package/docs/getting-started.md +26 -24
  33. package/docs/plugins/datasets.md +11 -0
  34. package/docs/plugins/draw.md +18 -12
  35. package/docs/plugins/interact.md +33 -10
  36. package/docs/plugins/plugin-descriptor.md +1 -1
  37. package/docs/plugins/search.md +5 -5
  38. package/docusaurus.config.cjs +48 -3
  39. package/govuk-prototype-kit.config.json +6 -7
  40. package/package.json +22 -29
  41. package/plugins/datasets/dist/esm/im-datasets-esri-adapter.js +1 -1
  42. package/plugins/datasets/dist/esm/im-datasets-ml-adapter.js +1 -1
  43. package/plugins/datasets/dist/esm/im-datasets-ol-adapter.js +1 -1
  44. package/plugins/datasets/dist/esm/im-datasets-plugin.js +1 -1
  45. package/plugins/datasets/dist/esm/index.js +1 -1
  46. package/plugins/datasets/dist/esm/layerAdapter.js +1 -1
  47. package/plugins/datasets/dist/esm/mapboxStyleLayerAdapter.js +1 -1
  48. package/plugins/datasets/dist/umd/im-datasets-ml-adapter.js +1 -1
  49. package/plugins/datasets/dist/umd/im-datasets-ol-adapter.js +1 -1
  50. package/plugins/datasets/dist/umd/im-datasets-plugin.js +1 -1
  51. package/plugins/datasets/dist/umd/index.js +1 -1
  52. package/plugins/datasets/src/adapters/esri/esriLayerAdapter.js +18 -16
  53. package/plugins/datasets/src/adapters/esri/esriLayerAdapter.test.js +2 -2
  54. package/plugins/datasets/src/adapters/esri/registry/esriDataset.js +2 -3
  55. package/plugins/datasets/src/adapters/esri/registry/esriDataset.test.js +1 -1
  56. package/plugins/datasets/src/adapters/loadLayerAdapter.js +2 -20
  57. package/plugins/datasets/src/adapters/loadLayerAdapter.test.js +9 -9
  58. package/plugins/datasets/src/adapters/mapboxStyleLayerAdapter.js +7 -7
  59. package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.js +19 -19
  60. package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.test.js +1 -1
  61. package/plugins/datasets/src/adapters/maplibre/registry/mapLibreDataset.test.js +1 -1
  62. package/plugins/datasets/src/adapters/openlayers/canvasPatternStyle.test.js +2 -2
  63. package/plugins/datasets/src/adapters/openlayers/layerBuilders.test.js +1 -1
  64. package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.js +21 -21
  65. package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.test.js +5 -5
  66. package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.js +2 -3
  67. package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.test.js +2 -2
  68. package/plugins/datasets/src/api/getOpacity.js +1 -2
  69. package/plugins/datasets/src/api/getOpacity.test.js +9 -12
  70. package/plugins/datasets/src/api/getStyle.js +1 -2
  71. package/plugins/datasets/src/api/getStyle.test.js +5 -8
  72. package/plugins/datasets/src/api/removeDataset.js +2 -4
  73. package/plugins/datasets/src/api/removeDataset.test.js +5 -10
  74. package/plugins/datasets/src/api/setData.js +2 -4
  75. package/plugins/datasets/src/api/setData.test.js +6 -14
  76. package/plugins/datasets/src/api/setFeatureVisibility.js +1 -2
  77. package/plugins/datasets/src/api/setFeatureVisibility.test.js +8 -11
  78. package/plugins/datasets/src/components/LayersMenu/LayersMenu.jsx +1 -0
  79. package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.jsx +1 -3
  80. package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.test.jsx +13 -18
  81. package/plugins/datasets/src/index.js +2 -2
  82. package/plugins/datasets/src/index.test.js +8 -1
  83. package/plugins/datasets/src/initialise/DatasetsInit.jsx +48 -26
  84. package/plugins/datasets/src/initialise/DatasetsInit.test.jsx +160 -89
  85. package/plugins/datasets/src/initialise/initialiseDatasets.js +2 -3
  86. package/plugins/datasets/src/initialise/initialiseDatasets.test.js +23 -10
  87. package/plugins/datasets/src/manifest.js +53 -44
  88. package/plugins/datasets/src/manifest.test.js +36 -4
  89. package/plugins/datasets/src/reducers/pluginState.js +5 -5
  90. package/plugins/datasets/src/reducers/pluginState.test.js +21 -20
  91. package/plugins/datasets/src/registry/__mocks__/datasetRegistry.js +7 -6
  92. package/plugins/datasets/src/registry/createDataset.js +2 -2
  93. package/plugins/datasets/src/registry/dataset.js +9 -10
  94. package/plugins/datasets/src/registry/dataset.test.js +63 -64
  95. package/plugins/datasets/src/registry/datasetRegistry.js +39 -10
  96. package/plugins/datasets/src/registry/datasetRegistry.test.js +83 -1
  97. package/plugins/datasets/src/registry/globalDataset.js +9 -17
  98. package/plugins/datasets/src/registry/isVisibleWhen.js +9 -17
  99. package/plugins/datasets/src/registry/isVisibleWhen.test.js +27 -20
  100. package/plugins/datasets/src/registry/mapboxStyleDataset.test.js +26 -27
  101. package/plugins/datasets/src/utils/hasLayersMenu.js +13 -0
  102. package/plugins/datasets/src/utils/hasLayersMenu.test.js +25 -0
  103. package/plugins/draw/dist/esm/im-draw-ml-adapter.js +1 -1
  104. package/plugins/draw/dist/esm/im-draw-ol-adapter.js +1 -1
  105. package/plugins/draw/dist/esm/im-draw-plugin.js +1 -1
  106. package/plugins/draw/dist/esm/index.js +1 -1
  107. package/plugins/draw/dist/esm/liveDrawChecks.js +1 -1
  108. package/plugins/draw/dist/umd/im-draw-ml-adapter.js +1 -1
  109. package/plugins/draw/dist/umd/im-draw-ol-adapter.js +1 -1
  110. package/plugins/draw/dist/umd/im-draw-plugin.js +1 -1
  111. package/plugins/draw/dist/umd/index.js +1 -1
  112. package/plugins/draw/src/DrawInit.jsx +47 -26
  113. package/plugins/draw/src/DrawInit.test.jsx +90 -2
  114. package/plugins/draw/src/adapters/maplibre/styles.js +3 -2
  115. package/plugins/draw/src/adapters/maplibre/styles.test.js +3 -3
  116. package/plugins/draw/src/adapters/openlayers/core/styles.test.js +1 -1
  117. package/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js +1 -1
  118. package/plugins/draw/src/manifest.js +3 -2
  119. package/plugins/draw/src/manifest.test.js +13 -1
  120. package/plugins/draw/src/utils/needsDrawTarget.js +22 -0
  121. package/plugins/draw/src/utils/needsDrawTarget.test.js +42 -0
  122. package/plugins/draw-es/dist/esm/im-draw-es-plugin.js +1 -0
  123. package/plugins/draw-es/dist/esm/index.js +1 -0
  124. package/plugins/{beta/draw-es → draw-es}/src/DrawInit.jsx +1 -1
  125. package/plugins/{beta/draw-es → draw-es}/src/events.test.js +1 -1
  126. package/plugins/{beta/draw-es → draw-es}/src/graphic.js +1 -1
  127. package/plugins/frame/dist/esm/im-frame-plugin.js +1 -0
  128. package/plugins/frame/dist/esm/index.js +1 -0
  129. package/plugins/frame/dist/umd/im-frame-plugin.js +1 -0
  130. package/plugins/frame/dist/umd/index.js +2 -0
  131. package/plugins/{beta/frame → frame}/package.json +2 -2
  132. package/plugins/interact/dist/esm/im-interact-plugin.js +1 -1
  133. package/plugins/interact/dist/esm/index.js +1 -1
  134. package/plugins/interact/dist/umd/im-interact-plugin.js +1 -1
  135. package/plugins/interact/dist/umd/index.js +1 -1
  136. package/plugins/interact/src/InteractInit.jsx +3 -3
  137. package/plugins/interact/src/api/enable.test.js +13 -0
  138. package/plugins/interact/src/defaults.js +1 -0
  139. package/plugins/interact/src/hooks/useCrossHairVisibility.js +27 -17
  140. package/plugins/interact/src/hooks/useCrossHairVisibility.test.js +72 -7
  141. package/plugins/interact/src/manifest.js +4 -4
  142. package/plugins/interact/src/manifest.test.js +29 -0
  143. package/plugins/interact/src/reducer.js +7 -2
  144. package/plugins/interact/src/reducer.test.js +12 -2
  145. package/plugins/interact/src/utils/needsTarget.js +20 -0
  146. package/plugins/interact/src/utils/needsTarget.test.js +36 -0
  147. package/plugins/map-key/dist/esm/im-map-key-plugin.js +1 -1
  148. package/plugins/map-key/dist/esm/index.js +1 -1
  149. package/plugins/map-key/dist/umd/im-map-key-plugin.js +1 -1
  150. package/plugins/map-key/dist/umd/index.js +1 -1
  151. package/plugins/map-key/src/components/Key/KeySvgSymbol.jsx +4 -0
  152. package/plugins/map-key/src/components/Key/MapKey.jsx +15 -15
  153. package/plugins/map-key/src/components/Key/MapKey.test.jsx +29 -15
  154. package/plugins/map-key/src/initialise/MapKeyInit.jsx +5 -8
  155. package/plugins/map-key/src/initialise/MapKeyInit.test.jsx +9 -7
  156. package/plugins/map-key/src/manifest.test.js +0 -1
  157. package/plugins/map-key/src/reducers/mergeKeyGroupItems.js +14 -33
  158. package/plugins/map-key/src/reducers/mergeKeyGroupItems.test.js +34 -50
  159. package/plugins/map-key/src/reducers/pluginState.js +6 -1
  160. package/plugins/map-key/src/reducers/pluginState.test.js +13 -4
  161. package/plugins/map-styles/dist/esm/im-map-styles-plugin.js +1 -0
  162. package/plugins/map-styles/dist/esm/index.js +1 -0
  163. package/plugins/map-styles/dist/umd/im-map-styles-plugin.js +1 -0
  164. package/plugins/map-styles/dist/umd/index.js +2 -0
  165. package/plugins/{beta/map-styles → map-styles}/src/MapStyles.jsx +2 -2
  166. package/plugins/{beta/map-styles → map-styles}/src/MapStylesInit.jsx +1 -1
  167. package/plugins/menu/dist/esm/im-menu-plugin.js +1 -1
  168. package/plugins/menu/dist/esm/index.js +1 -1
  169. package/plugins/menu/dist/umd/im-menu-plugin.js +1 -1
  170. package/plugins/menu/dist/umd/index.js +1 -1
  171. package/plugins/scale-bar/dist/esm/im-scale-bar-plugin.js +1 -0
  172. package/plugins/scale-bar/dist/esm/index.js +1 -0
  173. package/plugins/scale-bar/dist/umd/im-scale-bar-plugin.js +1 -0
  174. package/plugins/scale-bar/dist/umd/index.js +2 -0
  175. package/plugins/{beta/scale-bar → scale-bar}/package.json +2 -2
  176. package/plugins/search/dist/esm/im-search-plugin.js +1 -1
  177. package/plugins/search/dist/esm/index.js +1 -1
  178. package/plugins/search/dist/umd/im-search-plugin.js +1 -1
  179. package/plugins/search/dist/umd/index.js +1 -1
  180. package/plugins/search/src/components/Suggestions/Suggestions.jsx +3 -1
  181. package/plugins/search/src/components/Suggestions/Suggestions.test.jsx +11 -0
  182. package/plugins/search/src/utils/markedToElements.jsx +25 -0
  183. package/plugins/search/src/utils/markedToElements.test.jsx +49 -0
  184. package/plugins/search/src/utils/parseOsNamesResults.js +6 -4
  185. package/plugins/search/src/utils/parseOsNamesResults.test.js +18 -0
  186. package/plugins/use-location/dist/esm/im-use-location-plugin.js +1 -0
  187. package/plugins/use-location/dist/esm/index.js +1 -0
  188. package/plugins/use-location/dist/umd/im-use-location-plugin.js +1 -0
  189. package/plugins/use-location/dist/umd/index.js +2 -0
  190. package/providers/esri/dist/esm/im-esri-provider.js +1 -0
  191. package/providers/esri/dist/esm/index.js +1 -0
  192. package/providers/{beta/esri → esri}/src/esriProvider.js +1 -1
  193. package/providers/{beta/esri → esri}/src/mapEvents.js +2 -2
  194. package/providers/maplibre/dist/esm/im-maplibre-provider.js +1 -1
  195. package/providers/maplibre/dist/esm/index.js +1 -1
  196. package/providers/maplibre/dist/umd/im-maplibre-framework.js +1 -1
  197. package/providers/maplibre/dist/umd/im-maplibre-framework.js.LICENSE.txt +3 -3
  198. package/providers/maplibre/dist/umd/im-maplibre-provider.js +1 -1
  199. package/providers/maplibre/dist/umd/im-maplibre-worker.js +2 -0
  200. package/providers/maplibre/dist/umd/im-maplibre-worker.js.LICENSE.txt +4 -0
  201. package/providers/maplibre/dist/umd/index.js +1 -1
  202. package/providers/maplibre/src/index.js +41 -12
  203. package/providers/maplibre/src/index.test.js +43 -12
  204. package/providers/maplibre/src/utils/detectModuleWorker.js +25 -0
  205. package/providers/maplibre/src/utils/detectModuleWorker.test.js +40 -0
  206. package/providers/maplibre/src/utils/spatial.js +22 -12
  207. package/providers/maplibre/src/utils/spatial.test.js +6 -6
  208. package/providers/maplibre/src/utils/workerUrl.js +15 -0
  209. package/providers/maplibre/src/utils/workerUrl.test.js +14 -0
  210. package/providers/open-names/dist/esm/im-reverse-geocode.js +1 -0
  211. package/providers/open-names/dist/esm/index.js +1 -0
  212. package/providers/open-names/dist/umd/im-reverse-geocode.js +2 -0
  213. package/providers/open-names/dist/umd/index.js +2 -0
  214. package/providers/openlayers/dist/esm/im-openlayers-provider.js +1 -0
  215. package/providers/openlayers/dist/esm/index.js +1 -0
  216. package/providers/openlayers/dist/umd/im-openlayers-provider.js +2 -0
  217. package/providers/openlayers/dist/umd/index.js +2 -0
  218. package/providers/openlayers/src/index.js +60 -0
  219. package/providers/openlayers/src/index.test.js +47 -0
  220. package/providers/{beta/openlayers → openlayers}/src/mapEvents.js +2 -2
  221. package/providers/{beta/openlayers → openlayers}/src/mapEvents.test.js +2 -2
  222. package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.js +3 -3
  223. package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.js +1 -1
  224. package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.js +1 -1
  225. package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.js +1 -1
  226. package/rollup.esm.mjs +79 -46
  227. package/sonar-project.properties +1 -1
  228. package/src/App/App.jsx +4 -1
  229. package/src/App/App.test.jsx +6 -0
  230. package/src/App/renderer/PluginInits.jsx +8 -7
  231. package/src/App/renderer/PluginInits.test.jsx +20 -5
  232. package/src/App/renderer/SlotItemsProvider.jsx +33 -0
  233. package/src/App/renderer/SlotItemsProvider.test.jsx +59 -0
  234. package/src/App/renderer/SlotRenderer.jsx +3 -14
  235. package/src/App/renderer/SlotRenderer.test.jsx +11 -44
  236. package/src/App/renderer/mapButtons.js +22 -11
  237. package/src/App/renderer/mapButtons.test.js +23 -1
  238. package/src/App/renderer/mapControls.js +6 -8
  239. package/src/App/renderer/mapControls.test.js +10 -0
  240. package/src/App/renderer/mapPanels.js +16 -19
  241. package/src/App/renderer/mapPanels.test.js +37 -9
  242. package/src/App/renderer/pluginWrapper.js +10 -8
  243. package/src/App/renderer/pluginWrapper.test.js +23 -9
  244. package/src/App/renderer/slotAggregator.js +18 -5
  245. package/src/App/renderer/slotAggregator.test.js +68 -25
  246. package/src/App/renderer/slotHelpers.js +13 -0
  247. package/src/App/renderer/slotHelpers.test.js +16 -1
  248. package/src/App/store/AppProvider.jsx +19 -1
  249. package/src/App/store/AppProvider.test.jsx +41 -0
  250. package/src/App/store/appActionsMap.js +10 -1
  251. package/src/App/store/appActionsMap.test.js +21 -0
  252. package/src/App/store/appDispatchMiddleware.js +29 -17
  253. package/src/App/store/appDispatchMiddleware.test.js +31 -0
  254. package/src/InteractiveMap/InteractiveMap.js +2 -1
  255. package/src/InteractiveMap/InteractiveMap.test.js +9 -2
  256. package/src/InteractiveMap/domStateManager.js +21 -1
  257. package/src/InteractiveMap/domStateManager.test.js +48 -1
  258. package/src/InteractiveMap/parseDataProperties.js +4 -4
  259. package/src/InteractiveMap/parseDataProperties.test.js +62 -6
  260. package/src/InteractiveMap/polyfills.js +4 -3
  261. package/src/InteractiveMap/polyfills.test.js +12 -0
  262. package/src/config/events.js +4 -2
  263. package/src/scss/tools/_govuk-content.scss +4 -3
  264. package/src/types.js +3 -5
  265. package/webpack.dev.mjs +11 -3
  266. package/webpack.prod.mjs +11 -4
  267. package/webpack.umd.mjs +34 -14
  268. package/plugins/beta/draw-es/dist/esm/im-draw-es-plugin.js +0 -1
  269. package/plugins/beta/draw-es/dist/esm/index.js +0 -1
  270. package/plugins/beta/draw-ml/dist/esm/im-draw-ml-plugin.js +0 -1
  271. package/plugins/beta/draw-ml/dist/esm/index.js +0 -1
  272. package/plugins/beta/draw-ml/dist/umd/im-draw-ml-plugin.js +0 -1
  273. package/plugins/beta/draw-ml/dist/umd/index.js +0 -2
  274. package/plugins/beta/draw-ml/src/DrawInit.jsx +0 -85
  275. package/plugins/beta/draw-ml/src/api/addFeature.js +0 -27
  276. package/plugins/beta/draw-ml/src/api/deleteFeature.js +0 -13
  277. package/plugins/beta/draw-ml/src/api/editFeature.js +0 -75
  278. package/plugins/beta/draw-ml/src/api/merge.js +0 -9
  279. package/plugins/beta/draw-ml/src/api/newLine.js +0 -68
  280. package/plugins/beta/draw-ml/src/api/newPolygon.js +0 -68
  281. package/plugins/beta/draw-ml/src/api/split.js +0 -81
  282. package/plugins/beta/draw-ml/src/defaults.js +0 -17
  283. package/plugins/beta/draw-ml/src/draw.scss +0 -26
  284. package/plugins/beta/draw-ml/src/events.js +0 -185
  285. package/plugins/beta/draw-ml/src/index.js +0 -13
  286. package/plugins/beta/draw-ml/src/manifest.js +0 -110
  287. package/plugins/beta/draw-ml/src/mapboxDraw.js +0 -143
  288. package/plugins/beta/draw-ml/src/mapboxSnap.js +0 -321
  289. package/plugins/beta/draw-ml/src/modes/createDrawMode.js +0 -552
  290. package/plugins/beta/draw-ml/src/modes/disabledMode.js +0 -23
  291. package/plugins/beta/draw-ml/src/modes/drawLineMode.js +0 -18
  292. package/plugins/beta/draw-ml/src/modes/drawPolygonMode.js +0 -16
  293. package/plugins/beta/draw-ml/src/modes/editVertex/geometryHelpers.js +0 -135
  294. package/plugins/beta/draw-ml/src/modes/editVertex/helpers.js +0 -2
  295. package/plugins/beta/draw-ml/src/modes/editVertex/touchHandlers.js +0 -142
  296. package/plugins/beta/draw-ml/src/modes/editVertex/undoHandlers.js +0 -133
  297. package/plugins/beta/draw-ml/src/modes/editVertex/vertexOperations.js +0 -142
  298. package/plugins/beta/draw-ml/src/modes/editVertex/vertexQueries.js +0 -121
  299. package/plugins/beta/draw-ml/src/modes/editVertexMode.js +0 -495
  300. package/plugins/beta/draw-ml/src/reducer.js +0 -90
  301. package/plugins/beta/draw-ml/src/styles.js +0 -190
  302. package/plugins/beta/draw-ml/src/undoStack.js +0 -50
  303. package/plugins/beta/draw-ml/src/utils/debounce.js +0 -16
  304. package/plugins/beta/draw-ml/src/utils/flattenStyleProperties.js +0 -49
  305. package/plugins/beta/draw-ml/src/utils/snapHelpers.js +0 -200
  306. package/plugins/beta/draw-ml/src/utils/spatial.js +0 -258
  307. package/plugins/beta/draw-ol/dist/css/index.css +0 -1
  308. package/plugins/beta/draw-ol/dist/esm/DrawMode.js +0 -1
  309. package/plugins/beta/draw-ol/dist/esm/EditMode.js +0 -1
  310. package/plugins/beta/draw-ol/dist/esm/geometryHelpers.js +0 -1
  311. package/plugins/beta/draw-ol/dist/esm/im-draw-ol-plugin.js +0 -1
  312. package/plugins/beta/draw-ol/dist/esm/index.js +0 -1
  313. package/plugins/beta/draw-ol/src/DrawInit.jsx +0 -65
  314. package/plugins/beta/draw-ol/src/api/addFeature.js +0 -29
  315. package/plugins/beta/draw-ol/src/api/deleteFeature.js +0 -11
  316. package/plugins/beta/draw-ol/src/api/editFeature.js +0 -50
  317. package/plugins/beta/draw-ol/src/api/newLine.js +0 -44
  318. package/plugins/beta/draw-ol/src/api/newPolygon.js +0 -44
  319. package/plugins/beta/draw-ol/src/core/OLDrawManager.js +0 -153
  320. package/plugins/beta/draw-ol/src/core/featureStore.js +0 -65
  321. package/plugins/beta/draw-ol/src/core/styles.js +0 -98
  322. package/plugins/beta/draw-ol/src/core/undoStack.js +0 -31
  323. package/plugins/beta/draw-ol/src/defaults.js +0 -16
  324. package/plugins/beta/draw-ol/src/draw/DrawMode.js +0 -121
  325. package/plugins/beta/draw-ol/src/draw/drawInput.js +0 -243
  326. package/plugins/beta/draw-ol/src/draw.scss +0 -17
  327. package/plugins/beta/draw-ol/src/edit/EditMode.js +0 -424
  328. package/plugins/beta/draw-ol/src/edit/keyboardHandler.js +0 -229
  329. package/plugins/beta/draw-ol/src/edit/midpointLayer.js +0 -57
  330. package/plugins/beta/draw-ol/src/edit/touchHandler.js +0 -171
  331. package/plugins/beta/draw-ol/src/edit/undoOps.js +0 -95
  332. package/plugins/beta/draw-ol/src/edit/vertexHitTest.js +0 -72
  333. package/plugins/beta/draw-ol/src/edit/vertexLayer.js +0 -49
  334. package/plugins/beta/draw-ol/src/edit/vertexOps.js +0 -99
  335. package/plugins/beta/draw-ol/src/events.js +0 -114
  336. package/plugins/beta/draw-ol/src/index.js +0 -12
  337. package/plugins/beta/draw-ol/src/manifest.js +0 -125
  338. package/plugins/beta/draw-ol/src/olDraw.js +0 -38
  339. package/plugins/beta/draw-ol/src/reducer.js +0 -41
  340. package/plugins/beta/draw-ol/src/snap/snapEngine.js +0 -153
  341. package/plugins/beta/draw-ol/src/snap/snapGeometry.js +0 -177
  342. package/plugins/beta/draw-ol/src/snap/snapIndicator.js +0 -81
  343. package/plugins/beta/draw-ol/src/snap/snapInteraction.js +0 -57
  344. package/plugins/beta/draw-ol/src/snap/snapManager.js +0 -99
  345. package/plugins/beta/draw-ol/src/utils/flattenStyleProperties.js +0 -47
  346. package/plugins/beta/draw-ol/src/utils/geometryHelpers.js +0 -103
  347. package/plugins/beta/draw-ol/src/utils/olCoords.js +0 -35
  348. package/plugins/beta/draw-ol/src/utils/resolveColors.js +0 -39
  349. package/plugins/beta/draw-ol/src/utils/spatial.js +0 -24
  350. package/plugins/beta/draw-ol/src/utils/touchTarget.js +0 -61
  351. package/plugins/beta/frame/dist/esm/im-frame-plugin.js +0 -1
  352. package/plugins/beta/frame/dist/esm/index.js +0 -1
  353. package/plugins/beta/frame/dist/umd/im-frame-plugin.js +0 -1
  354. package/plugins/beta/frame/dist/umd/index.js +0 -2
  355. package/plugins/beta/map-styles/dist/esm/im-map-styles-plugin.js +0 -1
  356. package/plugins/beta/map-styles/dist/esm/index.js +0 -1
  357. package/plugins/beta/map-styles/dist/umd/im-map-styles-plugin.js +0 -1
  358. package/plugins/beta/map-styles/dist/umd/index.js +0 -2
  359. package/plugins/beta/scale-bar/dist/esm/im-scale-bar-plugin.js +0 -1
  360. package/plugins/beta/scale-bar/dist/esm/index.js +0 -1
  361. package/plugins/beta/scale-bar/dist/umd/im-scale-bar-plugin.js +0 -1
  362. package/plugins/beta/scale-bar/dist/umd/index.js +0 -2
  363. package/plugins/beta/use-location/dist/esm/im-use-location-plugin.js +0 -1
  364. package/plugins/beta/use-location/dist/esm/index.js +0 -1
  365. package/plugins/beta/use-location/dist/umd/im-use-location-plugin.js +0 -1
  366. package/plugins/beta/use-location/dist/umd/index.js +0 -2
  367. package/plugins/map-key/src/registry/getDatasetRegistry.js +0 -6
  368. package/plugins/map-key/src/registry/getDatasetRegistry.test.js +0 -23
  369. package/plugins/map-key/src/registry/index.js +0 -1
  370. package/plugins/map-key/src/registry/index.test.js +0 -7
  371. package/providers/beta/esri/dist/esm/im-esri-provider.js +0 -1
  372. package/providers/beta/esri/dist/esm/index.js +0 -1
  373. package/providers/beta/open-names/dist/esm/im-reverse-geocode.js +0 -1
  374. package/providers/beta/open-names/dist/esm/index.js +0 -1
  375. package/providers/beta/open-names/dist/umd/im-reverse-geocode.js +0 -2
  376. package/providers/beta/open-names/dist/umd/index.js +0 -2
  377. package/providers/beta/openlayers/dist/esm/im-openlayers-provider.js +0 -1
  378. package/providers/beta/openlayers/dist/esm/index.js +0 -1
  379. package/providers/beta/openlayers/dist/umd/im-openlayers-provider.js +0 -2
  380. package/providers/beta/openlayers/dist/umd/index.js +0 -2
  381. package/providers/beta/openlayers/dist/umd/index.js.LICENSE.txt +0 -1
  382. package/providers/beta/openlayers/src/index.js +0 -37
  383. /package/plugins/{beta/draw-es → draw-es}/src/api/addFeature.js +0 -0
  384. /package/plugins/{beta/draw-es → draw-es}/src/api/deleteFeature.js +0 -0
  385. /package/plugins/{beta/draw-es → draw-es}/src/api/editFeature.js +0 -0
  386. /package/plugins/{beta/draw-es → draw-es}/src/api/newPolygon.js +0 -0
  387. /package/plugins/{beta/draw-es → draw-es}/src/api/removeSafeZone.js +0 -0
  388. /package/plugins/{beta/draw-es → draw-es}/src/events.js +0 -0
  389. /package/plugins/{beta/draw-es → draw-es}/src/index.js +0 -0
  390. /package/plugins/{beta/draw-es → draw-es}/src/manifest.js +0 -0
  391. /package/plugins/{beta/draw-es → draw-es}/src/reducer.js +0 -0
  392. /package/plugins/{beta/draw-es → draw-es}/src/sketchViewModel.js +0 -0
  393. /package/plugins/{beta/frame → frame}/dist/css/index.css +0 -0
  394. /package/plugins/{beta/draw-ml → frame}/dist/umd/index.js.LICENSE.txt +0 -0
  395. /package/plugins/{beta/frame → frame}/src/Frame.jsx +0 -0
  396. /package/plugins/{beta/frame → frame}/src/FrameInit.jsx +0 -0
  397. /package/plugins/{beta/frame → frame}/src/api/addFrame.js +0 -0
  398. /package/plugins/{beta/frame → frame}/src/api/editFeature.js +0 -0
  399. /package/plugins/{beta/frame → frame}/src/config.js +0 -0
  400. /package/plugins/{beta/frame → frame}/src/frame.scss +0 -0
  401. /package/plugins/{beta/frame → frame}/src/index.js +0 -0
  402. /package/plugins/{beta/frame → frame}/src/manifest.js +0 -0
  403. /package/plugins/{beta/frame → frame}/src/reducer.js +0 -0
  404. /package/plugins/{beta/frame → frame}/src/utils.js +0 -0
  405. /package/plugins/{beta/map-styles → map-styles}/dist/css/index.css +0 -0
  406. /package/plugins/{beta/frame → map-styles}/dist/umd/index.js.LICENSE.txt +0 -0
  407. /package/plugins/{beta/map-styles → map-styles}/src/config.js +0 -0
  408. /package/plugins/{beta/map-styles → map-styles}/src/index.js +0 -0
  409. /package/plugins/{beta/map-styles → map-styles}/src/manifest.js +0 -0
  410. /package/plugins/{beta/map-styles → map-styles}/src/mapStyles.scss +0 -0
  411. /package/plugins/{beta/scale-bar → scale-bar}/dist/css/index.css +0 -0
  412. /package/plugins/{beta/map-styles → scale-bar}/dist/umd/index.js.LICENSE.txt +0 -0
  413. /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.jsx +0 -0
  414. /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.test.jsx +0 -0
  415. /package/plugins/{beta/scale-bar → scale-bar}/src/index.js +0 -0
  416. /package/plugins/{beta/scale-bar → scale-bar}/src/index.test.js +0 -0
  417. /package/plugins/{beta/scale-bar → scale-bar}/src/manifest.js +0 -0
  418. /package/plugins/{beta/scale-bar → scale-bar}/src/scaleBar.scss +0 -0
  419. /package/plugins/{beta/scale-bar → scale-bar}/src/utils.js +0 -0
  420. /package/plugins/{beta/scale-bar → scale-bar}/src/utils.test.js +0 -0
  421. /package/plugins/{beta/scale-bar → use-location}/dist/umd/index.js.LICENSE.txt +0 -0
  422. /package/plugins/{beta/use-location → use-location}/src/UseLocation.jsx +0 -0
  423. /package/plugins/{beta/use-location → use-location}/src/UseLocationInit.jsx +0 -0
  424. /package/plugins/{beta/use-location → use-location}/src/defaults.js +0 -0
  425. /package/plugins/{beta/use-location → use-location}/src/events.js +0 -0
  426. /package/plugins/{beta/use-location → use-location}/src/index.js +0 -0
  427. /package/plugins/{beta/use-location → use-location}/src/manifest.js +0 -0
  428. /package/plugins/{beta/use-location → use-location}/src/reducer.js +0 -0
  429. /package/providers/{beta/esri → esri}/dist/css/index.css +0 -0
  430. /package/providers/{beta/esri → esri}/src/appEvents.js +0 -0
  431. /package/providers/{beta/esri → esri}/src/defaults.js +0 -0
  432. /package/providers/{beta/esri → esri}/src/esriProvider.scss +0 -0
  433. /package/providers/{beta/esri → esri}/src/index.js +0 -0
  434. /package/providers/{beta/esri → esri}/src/utils/coords.js +0 -0
  435. /package/providers/{beta/esri → esri}/src/utils/coords.test.js +0 -0
  436. /package/providers/{beta/esri → esri}/src/utils/detectWebGL.js +0 -0
  437. /package/providers/{beta/esri → esri}/src/utils/esriFixes.js +0 -0
  438. /package/providers/{beta/esri → esri}/src/utils/query.js +0 -0
  439. /package/providers/{beta/esri → esri}/src/utils/spatial.js +0 -0
  440. /package/providers/{beta/esri → esri}/src/utils/spatial.test.js +0 -0
  441. /package/providers/{beta/open-names → open-names}/dist/umd/im-reverse-geocode.js.LICENSE.txt +0 -0
  442. /package/{plugins/beta/use-location → providers/open-names}/dist/umd/index.js.LICENSE.txt +0 -0
  443. /package/providers/{beta/open-names → open-names}/src/index.js +0 -0
  444. /package/providers/{beta/open-names → open-names}/src/reverseGeocode.js +0 -0
  445. /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.js +0 -0
  446. /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.test.js +0 -0
  447. /package/providers/{beta/openlayers → openlayers}/dist/umd/im-openlayers-provider.js.LICENSE.txt +0 -0
  448. /package/providers/{beta/open-names → openlayers}/dist/umd/index.js.LICENSE.txt +0 -0
  449. /package/providers/{beta/openlayers → openlayers}/src/appEvents.js +0 -0
  450. /package/providers/{beta/openlayers → openlayers}/src/appEvents.test.js +0 -0
  451. /package/providers/{beta/openlayers → openlayers}/src/defaults.js +0 -0
  452. /package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.test.js +0 -0
  453. /package/providers/{beta/openlayers → openlayers}/src/utils/bngProjection.js +0 -0
  454. /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.js +0 -0
  455. /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.test.js +0 -0
  456. /package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.test.js +0 -0
  457. /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.js +0 -0
  458. /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.test.js +0 -0
  459. /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.js +0 -0
  460. /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.test.js +0 -0
  461. /package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.test.js +0 -0
  462. /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.js +0 -0
  463. /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.test.js +0 -0
  464. /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.js +0 -0
  465. /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.test.js +0 -0
  466. /package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.test.js +0 -0
  467. /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.js +0 -0
  468. /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.test.js +0 -0
  469. /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.js +0 -0
  470. /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.test.js +0 -0
  471. /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.js +0 -0
  472. /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.test.js +0 -0
@@ -1,31 +1,74 @@
1
- import { getSlotItems } from './slotAggregator.js'
2
- import * as mapControlsModule from './mapControls.js'
3
- import * as mapPanelsModule from './mapPanels.js'
4
- import * as mapButtonsModule from './mapButtons.js'
1
+ import { getItemsBySlot } from './slotAggregator.js'
2
+ jest.mock('../components/MapButton/MapButton.jsx', () => ({ MapButton: () => null }))
3
+ jest.mock('../components/Panel/Panel.jsx', () => ({ Panel: () => null }))
4
+ jest.mock('./pluginWrapper.js', () => ({ withPluginContexts: jest.fn((Comp) => Comp || (() => null)) }))
5
+
6
+ describe('getItemsBySlot', () => {
7
+ let appState
8
+ let excludeWhen
9
+
10
+ const evaluateProp = jest.fn((prop) => typeof prop === 'function' ? prop({}) : prop)
11
+ const build = () => getItemsBySlot({ appState, appConfig: { id: 'test' }, evaluateProp })
12
+ const ids = (items) => items.map(item => item.id)
5
13
 
6
- describe('getSlotItems', () => {
7
14
  beforeEach(() => {
8
- jest.resetAllMocks()
15
+ jest.clearAllMocks()
16
+ excludeWhen = {
17
+ kept: jest.fn(() => false),
18
+ excluded: jest.fn(() => true),
19
+ search: jest.fn(() => false),
20
+ resultsControl: jest.fn(() => false),
21
+ topControl: jest.fn(() => false)
22
+ }
23
+ appState = {
24
+ breakpoint: 'desktop',
25
+ isFullscreen: true,
26
+ openPanels: { results: { props: {} } },
27
+ disabledButtons: new Set(),
28
+ hiddenButtons: new Set(),
29
+ pressedButtons: new Set(),
30
+ expandedButtons: new Set(),
31
+ pluginRegistry: { registeredPlugins: [] },
32
+ buttonConfig: {
33
+ kept: { label: 'Kept', excludeWhen: excludeWhen.kept, desktop: { slot: 'top-left' } },
34
+ excluded: { label: 'Excluded', excludeWhen: excludeWhen.excluded, desktop: { slot: 'top-left' } },
35
+ search: { label: 'Search', panelId: 'results', excludeWhen: excludeWhen.search, desktop: { slot: 'top-right' } },
36
+ menuItem: { label: 'Menu item', isMenuItem: true, desktop: { slot: 'top-left' } }
37
+ },
38
+ panelConfig: {
39
+ results: { label: 'Results', desktop: { slot: 'search-button' } }
40
+ },
41
+ controlConfig: {
42
+ resultsControl: { id: 'resultsControl', excludeWhen: excludeWhen.resultsControl, desktop: { slot: 'results-panel' } },
43
+ topControl: { id: 'topControl', excludeWhen: excludeWhen.topControl, desktop: { slot: 'top-right', order: 1 } }
44
+ }
45
+ }
46
+ })
47
+
48
+ it('groups items by slot, including a button\'s nested <buttonId>-button slot', () => {
49
+ const bySlot = build()
50
+ expect(ids(bySlot.get('top-left'))).toEqual(['kept'])
51
+ expect(ids(bySlot.get('search-button'))).toEqual(['results'])
52
+ expect(bySlot.has('header')).toBe(false)
53
+ })
54
+
55
+ it('orders each slot\'s controls, panels and buttons together', () => {
56
+ // topControl's order 1 splices it ahead of the unordered search button
57
+ expect(ids(build().get('top-right'))).toEqual(['topControl', 'search'])
58
+ })
59
+
60
+ it('renders a control in a <panelId>-panel slot in that panel\'s body', () => {
61
+ const [panel] = build().get('search-button')
62
+ expect(ids(panel.element.props.items)).toEqual(['resultsControl'])
63
+ })
64
+
65
+ it('runs each excludeWhen once, however many slots there are', () => {
66
+ build()
67
+ Object.values(excludeWhen).forEach(fn => expect(fn).toHaveBeenCalledTimes(1))
9
68
  })
10
69
 
11
- it('returns combined and sorted slot items from controls, panels, and buttons', () => {
12
- jest.spyOn(mapControlsModule, 'mapControls').mockReturnValue([
13
- { id: 'control1', order: 3, type: 'control' }
14
- ])
15
- jest.spyOn(mapPanelsModule, 'mapPanels').mockReturnValue([
16
- { id: 'panel1', order: 1, type: 'panel' }
17
- ])
18
- jest.spyOn(mapButtonsModule, 'mapButtons').mockReturnValue([
19
- { id: 'button1', order: 2, type: 'button' }
20
- ])
21
-
22
- const args = { slot: 'header', breakpoint: 'desktop', mode: 'view', openPanels: {} }
23
- const result = getSlotItems(args)
24
-
25
- expect(result).toEqual([
26
- { id: 'panel1', order: 1, type: 'panel' },
27
- { id: 'button1', order: 2, type: 'button' },
28
- { id: 'control1', order: 3, type: 'control' }
29
- ])
70
+ it('returns an empty map when nothing is configured', () => {
71
+ appState = { ...appState, buttonConfig: {}, panelConfig: {}, controlConfig: {} }
72
+ expect(build().size).toBe(0)
30
73
  })
31
74
  })
@@ -73,3 +73,16 @@ export const getAllowedModalPanelId = (openPanels, panelConfig, breakpoint) => {
73
73
  export const hasOpenModalPanel = (openPanels, panelConfig, breakpoint) => {
74
74
  return getAllowedModalPanelId(openPanels, panelConfig, breakpoint) !== null
75
75
  }
76
+
77
+ // Splits items into a Map of slot -> items, keeping each slot's items in their original order.
78
+ export const groupBySlot = (items, getSlot = item => item.slot) => {
79
+ const bySlot = new Map()
80
+ for (const item of items) {
81
+ const slot = getSlot(item)
82
+ if (!bySlot.has(slot)) {
83
+ bySlot.set(slot, [])
84
+ }
85
+ bySlot.get(slot).push(item)
86
+ }
87
+ return bySlot
88
+ }
@@ -1,4 +1,4 @@
1
- import { resolveTargetSlot, isControlVisible, isConsumerHtml, isPanelSlotEligible, getAllowedModalPanelId, hasOpenModalPanel } from './slotHelpers.js'
1
+ import { resolveTargetSlot, isControlVisible, isConsumerHtml, isPanelSlotEligible, getAllowedModalPanelId, hasOpenModalPanel, groupBySlot } from './slotHelpers.js'
2
2
 
3
3
  jest.mock('./slots.js', () => ({ allowedSlots: { control: ['inset', 'banner', 'actions'], panel: ['header', 'modal', 'left-top'] } }))
4
4
 
@@ -136,3 +136,18 @@ describe('hasOpenModalPanel', () => {
136
136
  expect(hasOpenModalPanel({ p1: { props: {} } }, panelConfig, 'desktop')).toBe(true)
137
137
  })
138
138
  })
139
+
140
+ describe('groupBySlot', () => {
141
+ it('groups items by their slot, keeping each slot\'s items in order', () => {
142
+ const items = [{ id: 'a', slot: 'header' }, { id: 'b', slot: 'banner' }, { id: 'c', slot: 'header' }]
143
+ expect([...groupBySlot(items)]).toEqual([
144
+ ['header', [items[0], items[2]]],
145
+ ['banner', [items[1]]]
146
+ ])
147
+ })
148
+
149
+ it('reads the slot with getSlot when given', () => {
150
+ const entries = [['b1', { slot: 'header' }]]
151
+ expect([...groupBySlot(entries, ([, config]) => config.slot)]).toEqual([['header', entries]])
152
+ })
153
+ })
@@ -5,9 +5,21 @@ import { handleActionSideEffects } from './appDispatchMiddleware.js'
5
5
  import { ConfigContext } from './configContext.js'
6
6
  import { subscribeToInterfaceChanges } from '../../utils/detectInterfaceType.js'
7
7
  import { useMediaQueryDispatch } from '../hooks/useMediaQueryDispatch.js'
8
+ import { addPanel, removePanel } from '../registry/panelRegistry.js'
8
9
 
9
10
  export const AppContext = createContext(null)
10
11
 
12
+ // Mirrors the reducer's panelConfig changes for added and removed panels
13
+ const getNextPanelConfig = (panelConfig, { type, payload }) => {
14
+ if (type === 'ADD_PANEL') {
15
+ return addPanel(panelConfig, payload.id, payload.config)
16
+ }
17
+ if (type === 'REMOVE_PANEL') {
18
+ return removePanel(panelConfig, payload)
19
+ }
20
+ return panelConfig
21
+ }
22
+
11
23
  export const AppProvider = ({ options, children }) => {
12
24
  const { pluginRegistry, buttonRegistry, panelRegistry, controlRegistry, keyboardShortcutRegistry, spatialListRegistry, eventBus, breakpointDetector } = options
13
25
 
@@ -40,11 +52,17 @@ export const AppProvider = ({ options, children }) => {
40
52
 
41
53
  const [state, rawDispatch] = useReducer(reducer, initialState(options))
42
54
 
55
+ // Panel config including panels added or removed since the last render, so side effects for
56
+ // e.g. addPanel() then showPanel() in the same tick see the new panel
57
+ const panelConfigRef = useRef(state.panelConfig)
58
+ panelConfigRef.current = state.panelConfig
59
+
43
60
  // Wrap dispatch to handle side effects
44
61
  const dispatch = useCallback((action) => {
45
- const panelConfig = state.panelConfig || options.panelRegistry.getPanelConfig()
62
+ const panelConfig = panelConfigRef.current || options.panelRegistry.getPanelConfig()
46
63
  const previousState = state
47
64
  rawDispatch(action)
65
+ panelConfigRef.current = getNextPanelConfig(panelConfig, action)
48
66
  handleActionSideEffects(action, previousState, panelConfig, eventBus)
49
67
  }, [state, options, eventBus])
50
68
 
@@ -98,6 +98,47 @@ describe('AppProvider', () => {
98
98
  expect(contextValue.layoutRefs).toHaveProperty('bottomRef')
99
99
  })
100
100
 
101
+ test('emits panel opened when a panel is added and opened before the next render', async () => {
102
+ mockOptions.initialBreakpoint = 'desktop'
103
+ mockOptions.eventBus.emit = jest.fn()
104
+ let dispatch
105
+ render(
106
+ <AppProvider options={mockOptions}>
107
+ <AppContext.Consumer>
108
+ {value => { dispatch = value.dispatch; return null }}
109
+ </AppContext.Consumer>
110
+ </AppProvider>
111
+ )
112
+
113
+ await act(async () => {
114
+ dispatch({ type: 'ADD_PANEL', payload: { id: 'newPanel', config: { desktop: { slot: 'left-top', open: false } } } })
115
+ dispatch({ type: 'OPEN_PANEL', payload: { panelId: 'newPanel', props: {} } })
116
+ })
117
+
118
+ expect(mockOptions.eventBus.emit).toHaveBeenCalledWith('app:panelopened', { panelId: 'newPanel', props: {} })
119
+ })
120
+
121
+ test('does not emit panel opened when a panel is removed and opened before the next render', async () => {
122
+ mockOptions.initialBreakpoint = 'desktop'
123
+ mockOptions.eventBus.emit = jest.fn()
124
+ let dispatch
125
+ render(
126
+ <AppProvider options={mockOptions}>
127
+ <AppContext.Consumer>
128
+ {value => { dispatch = value.dispatch; return null }}
129
+ </AppContext.Consumer>
130
+ </AppProvider>
131
+ )
132
+
133
+ await act(async () => {
134
+ dispatch({ type: 'ADD_PANEL', payload: { id: 'oldPanel', config: { desktop: { slot: 'left-top', open: false } } } })
135
+ dispatch({ type: 'REMOVE_PANEL', payload: 'oldPanel' })
136
+ dispatch({ type: 'OPEN_PANEL', payload: { panelId: 'oldPanel', props: {} } })
137
+ })
138
+
139
+ expect(mockOptions.eventBus.emit).not.toHaveBeenCalled()
140
+ })
141
+
101
142
  test('dispatch fallback uses options.panelRegistry.getPanelConfig() when state.panelConfig missing', () => {
102
143
  const getPanelConfigMock = jest.fn(() => ({ panel1: {} }))
103
144
 
@@ -9,6 +9,11 @@ import { registerControl as registerControlFn, addControl as addControlFn } from
9
9
  function buildOpenPanels (state, panelId, breakpoint, props, focusOnOpen) {
10
10
  const panelConfig = state.panelConfig || state.panelRegistry.getPanelConfig()
11
11
  const bpConfig = panelConfig[panelId]?.[breakpoint]
12
+ // Missing panel, or no config at this breakpoint: leave the open panels unchanged.
13
+ if (!bpConfig) {
14
+ return state.openPanels
15
+ }
16
+
12
17
  const isExclusiveNonModal = !!bpConfig.exclusive && !bpConfig.modal
13
18
  const isModal = !!bpConfig.modal
14
19
 
@@ -87,11 +92,15 @@ const setInterfaceType = (state, payload) => {
87
92
 
88
93
  const openPanel = (state, payload) => {
89
94
  const { panelId, props = {}, focusOnOpen } = payload
95
+ const openPanels = buildOpenPanels(state, panelId, state.breakpoint, props, focusOnOpen)
96
+ if (openPanels === state.openPanels) {
97
+ return state
98
+ }
90
99
 
91
100
  return {
92
101
  ...state,
93
102
  previousOpenPanels: state.openPanels,
94
- openPanels: buildOpenPanels(state, panelId, state.breakpoint, props, focusOnOpen)
103
+ openPanels
95
104
  }
96
105
  }
97
106
 
@@ -441,6 +441,27 @@ describe('actionsMap full coverage', () => {
441
441
  expect(res.openPanels).toHaveProperty('p2')
442
442
  expect(res.openPanels).toHaveProperty('p1')
443
443
  })
444
+
445
+ test('missing panel is a no-op and does not throw', () => {
446
+ const tmp = {
447
+ ...state,
448
+ panelConfig: { keyboardHelp: { desktop: { exclusive: true, modal: false } } },
449
+ openPanels: { keyboardHelp: { props: {} } }
450
+ }
451
+ const res = actionsMap.OPEN_PANEL(tmp, { panelId: 'datasetsLayers' })
452
+ expect(res).toBe(tmp)
453
+ })
454
+
455
+ test('panel with no config for the current breakpoint is a no-op', () => {
456
+ const tmp = {
457
+ ...state,
458
+ panelConfig: { p1: { mobile: { exclusive: true, modal: false } } },
459
+ openPanels: { p2: { props: {} } },
460
+ breakpoint: 'desktop'
461
+ }
462
+ const res = actionsMap.OPEN_PANEL(tmp, { panelId: 'p1', props: {} })
463
+ expect(res).toBe(tmp)
464
+ })
444
465
  })
445
466
 
446
467
  describe('SET_LISTBOX_ACTIVE', () => {
@@ -44,6 +44,34 @@ function getClosedPanelIds (panelId, previousOpenPanels, breakpoint, panelConfig
44
44
  return closedPanelIds
45
45
  }
46
46
 
47
+ /**
48
+ * Emits close events for implicitly closed panels, then the open event
49
+ */
50
+ function emitOpenPanelEvents ({ panelId, props }, previousState, panelConfig, eventBus) {
51
+ // The reducer leaves this panel unopened. Skip the opened event, and don't
52
+ // close exclusive panels that would have closed for a real open.
53
+ if (!panelConfig?.[panelId]?.[previousState.breakpoint]) {
54
+ return
55
+ }
56
+
57
+ const closedPanelIds = getClosedPanelIds(
58
+ panelId,
59
+ previousState.openPanels,
60
+ previousState.breakpoint,
61
+ panelConfig
62
+ )
63
+
64
+ queueMicrotask(() => {
65
+ // Emit close events for implicitly closed panels
66
+ closedPanelIds.forEach(closedPanelId => {
67
+ eventBus.emit(events.APP_PANEL_CLOSED, { panelId: closedPanelId })
68
+ })
69
+
70
+ // Emit open event for the new panel
71
+ eventBus.emit(events.APP_PANEL_OPENED, { panelId, props })
72
+ })
73
+ }
74
+
47
75
  /**
48
76
  * Handles side effects for actions
49
77
  */
@@ -66,23 +94,7 @@ export function handleActionSideEffects (action, previousState, panelConfig, eve
66
94
  }
67
95
 
68
96
  if (type === 'OPEN_PANEL') {
69
- const { panelId, props } = payload
70
- const closedPanelIds = getClosedPanelIds(
71
- panelId,
72
- previousState.openPanels,
73
- previousState.breakpoint,
74
- panelConfig
75
- )
76
-
77
- queueMicrotask(() => {
78
- // Emit close events for implicitly closed panels
79
- closedPanelIds.forEach(closedPanelId => {
80
- eventBus.emit(events.APP_PANEL_CLOSED, { panelId: closedPanelId })
81
- })
82
-
83
- // Emit open event for the new panel
84
- eventBus.emit(events.APP_PANEL_OPENED, { panelId, props })
85
- })
97
+ emitOpenPanelEvents(payload, previousState, panelConfig, eventBus)
86
98
  }
87
99
 
88
100
  if (type === 'ADD_BUTTON') {
@@ -117,6 +117,37 @@ describe('OPEN_PANEL — opening regular closes exclusive non-modal', () => {
117
117
  })
118
118
  })
119
119
 
120
+ describe('OPEN_PANEL — missing panel', () => {
121
+ it('does not emit opened or closed events', async () => {
122
+ run(
123
+ { type: 'OPEN_PANEL', payload: { panelId: 'missing', props: {} } },
124
+ { openPanels: { exclusivePanel: {} }, breakpoint: 'desktop' },
125
+ { exclusivePanel: { desktop: { exclusive: true, modal: false } } }
126
+ )
127
+
128
+ await flushMicrotasks()
129
+
130
+ expect(eventBus.emit).not.toHaveBeenCalled()
131
+ })
132
+ })
133
+
134
+ describe('OPEN_PANEL — no config for the current breakpoint', () => {
135
+ it('does not emit opened or closed events', async () => {
136
+ run(
137
+ { type: 'OPEN_PANEL', payload: { panelId: 'panel', props: {} } },
138
+ { openPanels: { exclusivePanel: {} }, breakpoint: 'desktop' },
139
+ {
140
+ panel: { mobile: { exclusive: false, modal: false } },
141
+ exclusivePanel: { desktop: { exclusive: true, modal: false } }
142
+ }
143
+ )
144
+
145
+ await flushMicrotasks()
146
+
147
+ expect(eventBus.emit).not.toHaveBeenCalled()
148
+ })
149
+ })
150
+
120
151
  describe('OPEN_PANEL — modal panel', () => {
121
152
  it('does not close any panels when opening modal', async () => {
122
153
  run(
@@ -15,7 +15,7 @@ import { parseDataProperties } from './parseDataProperties.js'
15
15
  import { checkDeviceSupport } from './deviceChecker.js'
16
16
  import { createButton } from './buttonManager.js'
17
17
  import { setupBehavior, shouldLoadComponent } from './behaviourController.js'
18
- import { updateDOMState, removeLoadingState } from './domStateManager.js'
18
+ import { updateDOMState, removeLoadingState, showPageIfMapInline } from './domStateManager.js'
19
19
  import { renderError } from './renderError.js'
20
20
  import { mergeConfig } from '../config/mergeConfig.js'
21
21
  import { createBreakpointDetector } from '../utils/detectBreakpoint.js'
@@ -99,6 +99,7 @@ export default class InteractiveMap {
99
99
  this._hybridBehaviourCleanup = setupBehavior(this)
100
100
 
101
101
  if (shouldLoadComponent(this.config)) {
102
+ showPageIfMapInline(this)
102
103
  this.loadApp() // NOSONAR: Not changing for now as used in production
103
104
  } else {
104
105
  removeLoadingState()
@@ -7,7 +7,7 @@ import historyManager from './historyManager.js'
7
7
  import { parseDataProperties } from './parseDataProperties.js'
8
8
  import { checkDeviceSupport } from './deviceChecker.js'
9
9
  import { setupBehavior, shouldLoadComponent } from './behaviourController.js'
10
- import { updateDOMState, removeLoadingState } from './domStateManager.js'
10
+ import { updateDOMState, removeLoadingState, showPageIfMapInline } from './domStateManager.js'
11
11
  import { renderError } from './renderError.js'
12
12
  import { createBreakpointDetector } from '../utils/detectBreakpoint.js'
13
13
  import { createInterfaceDetector } from '../utils/detectInterfaceType.js'
@@ -23,7 +23,7 @@ jest.mock('./behaviourController.js', () => ({
23
23
  setupBehavior: jest.fn(),
24
24
  shouldLoadComponent: jest.fn(() => true)
25
25
  }))
26
- jest.mock('./domStateManager.js', () => ({ updateDOMState: jest.fn().mockReturnValue({ isFullscreen: false }), removeLoadingState: jest.fn() }))
26
+ jest.mock('./domStateManager.js', () => ({ updateDOMState: jest.fn().mockReturnValue({ isFullscreen: false }), removeLoadingState: jest.fn(), showPageIfMapInline: jest.fn() }))
27
27
  jest.mock('./renderError.js', () => ({ renderError: jest.fn() }))
28
28
  jest.mock('../config/mergeConfig.js', () => ({ mergeConfig: jest.fn(cfg => cfg) }))
29
29
  const mockBreakpointDetector = {
@@ -146,6 +146,13 @@ describe('InteractiveMap — loadApp', () => {
146
146
  expect(map).toBeDefined()
147
147
  })
148
148
 
149
+ it('shows the page before loading the app when shouldLoadComponent returns true', () => {
150
+ shouldLoadComponent.mockReturnValue(true)
151
+ const map = new InteractiveMap('map', { behaviour: 'inline', mapProvider: mapProviderMock })
152
+ expect(showPageIfMapInline).toHaveBeenCalledWith(map)
153
+ expect(removeLoadingState).not.toHaveBeenCalled()
154
+ })
155
+
149
156
  it('calls removeLoadingState if shouldLoadComponent returns false', () => {
150
157
  shouldLoadComponent.mockReturnValue(false)
151
158
  const map = new InteractiveMap('map', { behaviour: 'buttonFirst', mapProvider: mapProviderMock })
@@ -85,11 +85,31 @@ function removeLoadingState () {
85
85
  document.body.classList.remove('im-is-loading')
86
86
  }
87
87
 
88
+ /**
89
+ * Show the page straight away when the map will render inline.
90
+ *
91
+ * Reserves the map container's height and removes the loading state, so the
92
+ * page's own content can render while the map app loads. When the map will
93
+ * open fullscreen, the loading state stays until the app has rendered, so the
94
+ * page doesn't show through before the map covers it.
95
+ *
96
+ * @param {Object} mapInstance - Map instance containing config and root element.
97
+ * @returns {void}
98
+ */
99
+ function showPageIfMapInline (mapInstance) {
100
+ if (getIsFullscreen(mapInstance.config)) {
101
+ return
102
+ }
103
+ updateDOMState(mapInstance, { isFullscreen: false })
104
+ removeLoadingState()
105
+ }
106
+
88
107
  // -----------------------------------------------------------------------------
89
108
  // Exports
90
109
  // -----------------------------------------------------------------------------
91
110
 
92
111
  export {
93
112
  updateDOMState,
94
- removeLoadingState
113
+ removeLoadingState,
114
+ showPageIfMapInline
95
115
  }
@@ -2,7 +2,7 @@
2
2
  * @jest-environment jsdom
3
3
  */
4
4
 
5
- import { updateDOMState, removeLoadingState } from './domStateManager.js'
5
+ import { updateDOMState, removeLoadingState, showPageIfMapInline } from './domStateManager.js'
6
6
  import * as queryString from '../utils/queryString.js'
7
7
  import * as toggleInertElements from '../utils/toggleInertElements.js'
8
8
 
@@ -145,3 +145,50 @@ describe('removeLoadingState', () => {
145
145
  expect(document.body.classList.contains('im-is-loading')).toBe(false)
146
146
  })
147
147
  })
148
+
149
+ describe('showPageIfMapInline', () => {
150
+ let rootEl
151
+
152
+ const createMapInstance = (config) => ({
153
+ config: { id: 'map', pageTitle: 'Map View', containerHeight: '500px', hybridWidth: null, maxMobileWidth: 640, ...config },
154
+ rootEl
155
+ })
156
+
157
+ beforeEach(() => {
158
+ rootEl = document.createElement('div')
159
+ document.body.appendChild(rootEl)
160
+ document.body.classList.add('im-is-loading')
161
+ queryString.getQueryParam.mockReturnValue(null)
162
+ window.matchMedia = jest.fn().mockImplementation(() => ({ matches: false }))
163
+ })
164
+
165
+ afterEach(() => {
166
+ document.body.innerHTML = ''
167
+ document.body.classList.remove('im-is-loading')
168
+ })
169
+
170
+ it.each([
171
+ ['inline', {}],
172
+ ['hybrid above hybridWidth', { behaviour: 'hybrid' }]
173
+ ])('shows the page and reserves the container height for %s', (_label, config) => {
174
+ showPageIfMapInline(createMapInstance({ behaviour: 'inline', ...config }))
175
+
176
+ expect(document.body.classList.contains('im-is-loading')).toBe(false)
177
+ expect(rootEl.style.height).toBe('500px')
178
+ expect(document.documentElement.classList.contains('im-is-fullscreen')).toBe(false)
179
+ })
180
+
181
+ it.each([
182
+ ['mapOnly', { behaviour: 'mapOnly' }, null, false],
183
+ ['buttonFirst opened from the URL', { behaviour: 'buttonFirst' }, 'map', false],
184
+ ['hybrid below hybridWidth opened from the URL', { behaviour: 'hybrid' }, 'map', true]
185
+ ])('keeps the page hidden when the map opens fullscreen: %s', (_label, config, viewParam, isNarrow) => {
186
+ queryString.getQueryParam.mockReturnValue(viewParam)
187
+ window.matchMedia = jest.fn().mockImplementation(() => ({ matches: isNarrow }))
188
+
189
+ showPageIfMapInline(createMapInstance(config))
190
+
191
+ expect(document.body.classList.contains('im-is-loading')).toBe(true)
192
+ expect(rootEl.style.height).toBe('')
193
+ })
194
+ })
@@ -5,9 +5,8 @@
5
5
  function parseAttribute (attr) {
6
6
  try {
7
7
  return JSON.parse(attr)
8
- } catch (err) {
9
- console.log(err)
10
- return null
8
+ } catch {
9
+ return attr
11
10
  }
12
11
  }
13
12
 
@@ -17,7 +16,8 @@ function parseAttribute (attr) {
17
16
 
18
17
  /**
19
18
  * Parses all `data-*` attributes from a DOM element into an object,
20
- * converting JSON strings to JavaScript values where possible.
19
+ * converting JSON strings to JavaScript values where possible. Values that
20
+ * aren't valid JSON are returned as the original string.
21
21
  *
22
22
  * @param {HTMLElement} el - The element whose dataset will be parsed.
23
23
  * @returns {Object} An object containing the parsed data attributes.
@@ -2,12 +2,21 @@ import { parseDataProperties } from './parseDataProperties.js'
2
2
 
3
3
  describe('parseDataProperties', () => {
4
4
  let el
5
+ let logSpy
6
+ let errorSpy
5
7
 
6
8
  beforeEach(() => {
7
9
  el = document.createElement('div')
10
+ logSpy = jest.spyOn(console, 'log').mockImplementation(() => {})
11
+ errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {})
8
12
  })
9
13
 
10
- it('parses JSON string attributes', () => {
14
+ afterEach(() => {
15
+ logSpy.mockRestore()
16
+ errorSpy.mockRestore()
17
+ })
18
+
19
+ it('parses JSON object and array attributes', () => {
11
20
  el.dataset.config = '{"foo":"bar"}'
12
21
  el.dataset.numbers = '[1,2,3]'
13
22
 
@@ -17,14 +26,50 @@ describe('parseDataProperties', () => {
17
26
  expect(result.numbers).toEqual([1, 2, 3])
18
27
  })
19
28
 
20
- it('returns null for non-JSON attributes', () => {
29
+ it('parses JSON numbers, booleans, null and quoted strings', () => {
30
+ el.dataset.zoom = '7'
31
+ el.dataset.enabled = 'false'
32
+ el.dataset.empty = 'null'
33
+ el.dataset.behaviour = '"hybrid"'
34
+
35
+ const result = parseDataProperties(el)
36
+
37
+ expect(result.zoom).toBe(7)
38
+ expect(result.enabled).toBe(false)
39
+ expect(result.empty).toBeNull()
40
+ expect(result.behaviour).toBe('hybrid')
41
+ })
42
+
43
+ it('returns plain strings unchanged when they are not valid JSON', () => {
44
+ el.dataset.behaviour = 'hybrid'
21
45
  el.dataset.title = 'Hello World'
22
- el.dataset.id = 'test-123'
23
46
 
24
47
  const result = parseDataProperties(el)
25
48
 
26
- expect(result.title).toBeNull() // <-- changed from "Hello World"
27
- expect(result.id).toBeNull() // <-- changed from "test-123"
49
+ expect(result.behaviour).toBe('hybrid')
50
+ expect(result.title).toBe('Hello World')
51
+ })
52
+
53
+ it('keeps app-specific attributes such as paths, URLs and tokens as strings', () => {
54
+ el.dataset.backLinkPath = '/quote/boundary-type'
55
+ el.dataset.saveAndContinueUrl = 'https://example.com/quote/draw-boundary/save?x=1'
56
+ el.dataset.csrfToken = 'NV3T3p+abc/def=='
57
+
58
+ const result = parseDataProperties(el)
59
+
60
+ expect(result.backLinkPath).toBe('/quote/boundary-type')
61
+ expect(result.saveAndContinueUrl).toBe('https://example.com/quote/draw-boundary/save?x=1')
62
+ expect(result.csrfToken).toBe('NV3T3p+abc/def==')
63
+ })
64
+
65
+ it('returns malformed JSON and empty values as the raw string', () => {
66
+ el.dataset.broken = '{"foo":'
67
+ el.dataset.blank = ''
68
+
69
+ const result = parseDataProperties(el)
70
+
71
+ expect(result.broken).toBe('{"foo":')
72
+ expect(result.blank).toBe('')
28
73
  })
29
74
 
30
75
  it('handles mixed JSON and plain string attributes', () => {
@@ -34,7 +79,18 @@ describe('parseDataProperties', () => {
34
79
  const result = parseDataProperties(el)
35
80
 
36
81
  expect(result.config).toEqual({ enabled: true })
37
- expect(result.name).toBeNull() // <-- changed from "Component"
82
+ expect(result.name).toBe('Component')
83
+ })
84
+
85
+ it('does not log to the console when attributes are not valid JSON', () => {
86
+ el.dataset.backLinkPath = '/quote/boundary-type'
87
+ el.dataset.example = 'hello'
88
+ el.dataset.broken = '{"foo":'
89
+
90
+ parseDataProperties(el)
91
+
92
+ expect(logSpy).not.toHaveBeenCalled()
93
+ expect(errorSpy).not.toHaveBeenCalled()
38
94
  })
39
95
 
40
96
  it('returns empty object for element with no data attributes', () => {