@defra/interactive-map 0.0.55-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 (394) hide show
  1. package/assets/templates/style-switcher.njk +2 -2
  2. package/dist/esm/im-core.js +1 -1
  3. package/dist/esm/im-shell.js +1 -1
  4. package/dist/umd/im-core.js +1 -1
  5. package/dist/umd/index.js +1 -1
  6. package/docs/api/context.md +2 -0
  7. package/docs/api.md +17 -1
  8. package/docs/architecture/interactive-map.likec4 +4 -4
  9. package/docs/plugins/datasets.md +11 -0
  10. package/docs/plugins/draw.md +8 -2
  11. package/docs/plugins/interact.md +24 -1
  12. package/docs/plugins/search.md +2 -2
  13. package/docusaurus.config.cjs +25 -3
  14. package/govuk-prototype-kit.config.json +6 -7
  15. package/package.json +20 -23
  16. package/plugins/datasets/dist/esm/im-datasets-esri-adapter.js +1 -1
  17. package/plugins/datasets/dist/esm/im-datasets-ml-adapter.js +1 -1
  18. package/plugins/datasets/dist/esm/im-datasets-ol-adapter.js +1 -1
  19. package/plugins/datasets/dist/esm/im-datasets-plugin.js +1 -1
  20. package/plugins/datasets/dist/esm/index.js +1 -1
  21. package/plugins/datasets/dist/esm/mapboxStyleLayerAdapter.js +1 -1
  22. package/plugins/datasets/dist/umd/im-datasets-ml-adapter.js +1 -1
  23. package/plugins/datasets/dist/umd/im-datasets-ol-adapter.js +1 -1
  24. package/plugins/datasets/dist/umd/im-datasets-plugin.js +1 -1
  25. package/plugins/datasets/dist/umd/index.js +1 -1
  26. package/plugins/datasets/src/adapters/esri/esriLayerAdapter.js +18 -16
  27. package/plugins/datasets/src/adapters/esri/esriLayerAdapter.test.js +2 -2
  28. package/plugins/datasets/src/adapters/esri/registry/esriDataset.js +2 -3
  29. package/plugins/datasets/src/adapters/esri/registry/esriDataset.test.js +1 -1
  30. package/plugins/datasets/src/adapters/loadLayerAdapter.js +2 -20
  31. package/plugins/datasets/src/adapters/loadLayerAdapter.test.js +9 -9
  32. package/plugins/datasets/src/adapters/mapboxStyleLayerAdapter.js +7 -7
  33. package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.js +19 -19
  34. package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.test.js +1 -1
  35. package/plugins/datasets/src/adapters/maplibre/registry/mapLibreDataset.test.js +1 -1
  36. package/plugins/datasets/src/adapters/openlayers/canvasPatternStyle.test.js +2 -2
  37. package/plugins/datasets/src/adapters/openlayers/layerBuilders.test.js +1 -1
  38. package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.js +21 -21
  39. package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.test.js +5 -5
  40. package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.js +2 -3
  41. package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.test.js +2 -2
  42. package/plugins/datasets/src/api/getOpacity.js +1 -2
  43. package/plugins/datasets/src/api/getOpacity.test.js +9 -12
  44. package/plugins/datasets/src/api/getStyle.js +1 -2
  45. package/plugins/datasets/src/api/getStyle.test.js +5 -8
  46. package/plugins/datasets/src/api/removeDataset.js +2 -4
  47. package/plugins/datasets/src/api/removeDataset.test.js +5 -10
  48. package/plugins/datasets/src/api/setData.js +2 -4
  49. package/plugins/datasets/src/api/setData.test.js +6 -14
  50. package/plugins/datasets/src/api/setFeatureVisibility.js +1 -2
  51. package/plugins/datasets/src/api/setFeatureVisibility.test.js +8 -11
  52. package/plugins/datasets/src/components/LayersMenu/LayersMenu.jsx +1 -0
  53. package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.jsx +1 -3
  54. package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.test.jsx +13 -18
  55. package/plugins/datasets/src/index.js +2 -2
  56. package/plugins/datasets/src/index.test.js +8 -1
  57. package/plugins/datasets/src/initialise/DatasetsInit.jsx +48 -26
  58. package/plugins/datasets/src/initialise/DatasetsInit.test.jsx +160 -89
  59. package/plugins/datasets/src/initialise/initialiseDatasets.js +2 -3
  60. package/plugins/datasets/src/initialise/initialiseDatasets.test.js +23 -10
  61. package/plugins/datasets/src/manifest.js +53 -44
  62. package/plugins/datasets/src/manifest.test.js +36 -4
  63. package/plugins/datasets/src/reducers/pluginState.js +5 -5
  64. package/plugins/datasets/src/reducers/pluginState.test.js +21 -20
  65. package/plugins/datasets/src/registry/__mocks__/datasetRegistry.js +7 -6
  66. package/plugins/datasets/src/registry/createDataset.js +2 -2
  67. package/plugins/datasets/src/registry/dataset.js +9 -10
  68. package/plugins/datasets/src/registry/dataset.test.js +63 -64
  69. package/plugins/datasets/src/registry/datasetRegistry.js +39 -10
  70. package/plugins/datasets/src/registry/datasetRegistry.test.js +83 -1
  71. package/plugins/datasets/src/registry/globalDataset.js +9 -17
  72. package/plugins/datasets/src/registry/isVisibleWhen.js +9 -17
  73. package/plugins/datasets/src/registry/isVisibleWhen.test.js +27 -20
  74. package/plugins/datasets/src/registry/mapboxStyleDataset.test.js +26 -27
  75. package/plugins/datasets/src/utils/hasLayersMenu.js +13 -0
  76. package/plugins/datasets/src/utils/hasLayersMenu.test.js +25 -0
  77. package/plugins/draw/dist/esm/im-draw-plugin.js +1 -1
  78. package/plugins/draw/dist/esm/index.js +1 -1
  79. package/plugins/draw/dist/umd/im-draw-plugin.js +1 -1
  80. package/plugins/draw/dist/umd/index.js +1 -1
  81. package/plugins/draw/src/DrawInit.jsx +47 -26
  82. package/plugins/draw/src/DrawInit.test.jsx +90 -2
  83. package/plugins/draw/src/adapters/openlayers/core/styles.test.js +1 -1
  84. package/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js +1 -1
  85. package/plugins/draw/src/manifest.js +3 -2
  86. package/plugins/draw/src/manifest.test.js +13 -1
  87. package/plugins/draw/src/utils/needsDrawTarget.js +22 -0
  88. package/plugins/draw/src/utils/needsDrawTarget.test.js +42 -0
  89. package/plugins/draw-es/dist/esm/index.js +1 -0
  90. package/plugins/{beta/draw-es → draw-es}/src/DrawInit.jsx +1 -1
  91. package/plugins/{beta/draw-es → draw-es}/src/events.test.js +1 -1
  92. package/plugins/{beta/draw-es → draw-es}/src/graphic.js +1 -1
  93. package/plugins/frame/dist/esm/index.js +1 -0
  94. package/plugins/{beta/frame → frame}/dist/umd/im-frame-plugin.js +1 -1
  95. package/plugins/{beta/frame → frame}/dist/umd/index.js +1 -1
  96. package/plugins/{beta/frame → frame}/package.json +2 -2
  97. package/plugins/interact/dist/esm/im-interact-plugin.js +1 -1
  98. package/plugins/interact/dist/esm/index.js +1 -1
  99. package/plugins/interact/dist/umd/im-interact-plugin.js +1 -1
  100. package/plugins/interact/dist/umd/index.js +1 -1
  101. package/plugins/interact/src/InteractInit.jsx +3 -3
  102. package/plugins/interact/src/api/enable.test.js +13 -0
  103. package/plugins/interact/src/defaults.js +1 -0
  104. package/plugins/interact/src/hooks/useCrossHairVisibility.js +27 -17
  105. package/plugins/interact/src/hooks/useCrossHairVisibility.test.js +72 -7
  106. package/plugins/interact/src/manifest.js +4 -4
  107. package/plugins/interact/src/manifest.test.js +29 -0
  108. package/plugins/interact/src/reducer.js +7 -2
  109. package/plugins/interact/src/reducer.test.js +12 -2
  110. package/plugins/interact/src/utils/needsTarget.js +20 -0
  111. package/plugins/interact/src/utils/needsTarget.test.js +36 -0
  112. package/plugins/map-key/dist/esm/im-map-key-plugin.js +1 -1
  113. package/plugins/map-key/dist/esm/index.js +1 -1
  114. package/plugins/map-key/dist/umd/im-map-key-plugin.js +1 -1
  115. package/plugins/map-key/dist/umd/index.js +1 -1
  116. package/plugins/map-key/src/components/Key/KeySvgSymbol.jsx +4 -0
  117. package/plugins/map-key/src/components/Key/MapKey.jsx +15 -15
  118. package/plugins/map-key/src/components/Key/MapKey.test.jsx +29 -15
  119. package/plugins/map-key/src/initialise/MapKeyInit.jsx +5 -8
  120. package/plugins/map-key/src/initialise/MapKeyInit.test.jsx +9 -7
  121. package/plugins/map-key/src/manifest.test.js +0 -1
  122. package/plugins/map-key/src/reducers/mergeKeyGroupItems.js +14 -33
  123. package/plugins/map-key/src/reducers/mergeKeyGroupItems.test.js +34 -50
  124. package/plugins/map-key/src/reducers/pluginState.js +6 -1
  125. package/plugins/map-key/src/reducers/pluginState.test.js +13 -4
  126. package/plugins/map-styles/dist/esm/index.js +1 -0
  127. package/plugins/{beta/map-styles → map-styles}/dist/umd/im-map-styles-plugin.js +1 -1
  128. package/plugins/{beta/map-styles → map-styles}/dist/umd/index.js +1 -1
  129. package/plugins/{beta/map-styles → map-styles}/src/MapStyles.jsx +2 -2
  130. package/plugins/{beta/map-styles → map-styles}/src/MapStylesInit.jsx +1 -1
  131. package/plugins/menu/dist/esm/index.js +1 -1
  132. package/plugins/scale-bar/dist/esm/index.js +1 -0
  133. package/plugins/{beta/scale-bar → scale-bar}/dist/umd/im-scale-bar-plugin.js +1 -1
  134. package/plugins/{beta/scale-bar → scale-bar}/dist/umd/index.js +1 -1
  135. package/plugins/{beta/scale-bar → scale-bar}/package.json +2 -2
  136. package/plugins/search/dist/esm/im-search-plugin.js +1 -1
  137. package/plugins/search/dist/esm/index.js +1 -1
  138. package/plugins/search/dist/umd/im-search-plugin.js +1 -1
  139. package/plugins/search/dist/umd/index.js +1 -1
  140. package/plugins/search/src/components/Suggestions/Suggestions.jsx +3 -1
  141. package/plugins/search/src/components/Suggestions/Suggestions.test.jsx +11 -0
  142. package/plugins/search/src/utils/markedToElements.jsx +25 -0
  143. package/plugins/search/src/utils/markedToElements.test.jsx +49 -0
  144. package/plugins/search/src/utils/parseOsNamesResults.js +6 -4
  145. package/plugins/search/src/utils/parseOsNamesResults.test.js +18 -0
  146. package/plugins/use-location/dist/esm/index.js +1 -0
  147. package/plugins/{beta/use-location → use-location}/dist/umd/im-use-location-plugin.js +1 -1
  148. package/plugins/{beta/use-location → use-location}/dist/umd/index.js +1 -1
  149. package/providers/esri/dist/esm/index.js +1 -0
  150. package/providers/{beta/esri → esri}/src/esriProvider.js +1 -1
  151. package/providers/{beta/esri → esri}/src/mapEvents.js +2 -2
  152. package/providers/maplibre/dist/esm/index.js +1 -1
  153. package/providers/open-names/dist/esm/index.js +1 -0
  154. package/providers/{beta/open-names → open-names}/dist/umd/im-reverse-geocode.js +1 -1
  155. package/providers/{beta/open-names → open-names}/dist/umd/index.js +1 -1
  156. package/providers/openlayers/dist/esm/index.js +1 -0
  157. package/providers/openlayers/dist/umd/im-openlayers-provider.js +2 -0
  158. package/providers/{beta/openlayers → openlayers}/dist/umd/index.js +1 -1
  159. package/providers/{beta/openlayers → openlayers}/src/index.js +4 -4
  160. package/providers/{beta/openlayers → openlayers}/src/mapEvents.js +2 -2
  161. package/providers/{beta/openlayers → openlayers}/src/mapEvents.test.js +2 -2
  162. package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.js +3 -3
  163. package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.js +1 -1
  164. package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.js +1 -1
  165. package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.js +1 -1
  166. package/rollup.esm.mjs +43 -47
  167. package/sonar-project.properties +1 -1
  168. package/src/App/App.jsx +4 -1
  169. package/src/App/App.test.jsx +6 -0
  170. package/src/App/renderer/PluginInits.jsx +8 -7
  171. package/src/App/renderer/PluginInits.test.jsx +20 -5
  172. package/src/App/renderer/SlotItemsProvider.jsx +33 -0
  173. package/src/App/renderer/SlotItemsProvider.test.jsx +59 -0
  174. package/src/App/renderer/SlotRenderer.jsx +3 -14
  175. package/src/App/renderer/SlotRenderer.test.jsx +11 -44
  176. package/src/App/renderer/mapButtons.js +22 -11
  177. package/src/App/renderer/mapButtons.test.js +23 -1
  178. package/src/App/renderer/mapControls.js +6 -8
  179. package/src/App/renderer/mapControls.test.js +10 -0
  180. package/src/App/renderer/mapPanels.js +16 -19
  181. package/src/App/renderer/mapPanels.test.js +37 -9
  182. package/src/App/renderer/pluginWrapper.js +10 -8
  183. package/src/App/renderer/pluginWrapper.test.js +23 -9
  184. package/src/App/renderer/slotAggregator.js +18 -5
  185. package/src/App/renderer/slotAggregator.test.js +68 -25
  186. package/src/App/renderer/slotHelpers.js +13 -0
  187. package/src/App/renderer/slotHelpers.test.js +16 -1
  188. package/src/App/store/AppProvider.jsx +19 -1
  189. package/src/App/store/AppProvider.test.jsx +41 -0
  190. package/src/App/store/appActionsMap.js +10 -1
  191. package/src/App/store/appActionsMap.test.js +21 -0
  192. package/src/App/store/appDispatchMiddleware.js +29 -17
  193. package/src/App/store/appDispatchMiddleware.test.js +31 -0
  194. package/src/InteractiveMap/parseDataProperties.js +4 -4
  195. package/src/InteractiveMap/parseDataProperties.test.js +62 -6
  196. package/src/config/events.js +4 -2
  197. package/src/scss/tools/_govuk-content.scss +4 -3
  198. package/webpack.dev.mjs +9 -3
  199. package/webpack.prod.mjs +11 -4
  200. package/webpack.umd.mjs +6 -7
  201. package/plugins/beta/draw-es/dist/esm/index.js +0 -1
  202. package/plugins/beta/draw-ml/dist/esm/im-draw-ml-plugin.js +0 -1
  203. package/plugins/beta/draw-ml/dist/esm/index.js +0 -1
  204. package/plugins/beta/draw-ml/dist/umd/im-draw-ml-plugin.js +0 -1
  205. package/plugins/beta/draw-ml/dist/umd/index.js +0 -2
  206. package/plugins/beta/draw-ml/src/DrawInit.jsx +0 -85
  207. package/plugins/beta/draw-ml/src/api/addFeature.js +0 -27
  208. package/plugins/beta/draw-ml/src/api/deleteFeature.js +0 -13
  209. package/plugins/beta/draw-ml/src/api/editFeature.js +0 -75
  210. package/plugins/beta/draw-ml/src/api/merge.js +0 -9
  211. package/plugins/beta/draw-ml/src/api/newLine.js +0 -68
  212. package/plugins/beta/draw-ml/src/api/newPolygon.js +0 -68
  213. package/plugins/beta/draw-ml/src/api/split.js +0 -81
  214. package/plugins/beta/draw-ml/src/defaults.js +0 -17
  215. package/plugins/beta/draw-ml/src/draw.scss +0 -26
  216. package/plugins/beta/draw-ml/src/events.js +0 -185
  217. package/plugins/beta/draw-ml/src/index.js +0 -13
  218. package/plugins/beta/draw-ml/src/manifest.js +0 -110
  219. package/plugins/beta/draw-ml/src/mapboxDraw.js +0 -143
  220. package/plugins/beta/draw-ml/src/mapboxSnap.js +0 -321
  221. package/plugins/beta/draw-ml/src/modes/createDrawMode.js +0 -552
  222. package/plugins/beta/draw-ml/src/modes/disabledMode.js +0 -23
  223. package/plugins/beta/draw-ml/src/modes/drawLineMode.js +0 -18
  224. package/plugins/beta/draw-ml/src/modes/drawPolygonMode.js +0 -16
  225. package/plugins/beta/draw-ml/src/modes/editVertex/geometryHelpers.js +0 -135
  226. package/plugins/beta/draw-ml/src/modes/editVertex/helpers.js +0 -2
  227. package/plugins/beta/draw-ml/src/modes/editVertex/touchHandlers.js +0 -142
  228. package/plugins/beta/draw-ml/src/modes/editVertex/undoHandlers.js +0 -133
  229. package/plugins/beta/draw-ml/src/modes/editVertex/vertexOperations.js +0 -142
  230. package/plugins/beta/draw-ml/src/modes/editVertex/vertexQueries.js +0 -121
  231. package/plugins/beta/draw-ml/src/modes/editVertexMode.js +0 -495
  232. package/plugins/beta/draw-ml/src/reducer.js +0 -90
  233. package/plugins/beta/draw-ml/src/styles.js +0 -190
  234. package/plugins/beta/draw-ml/src/undoStack.js +0 -50
  235. package/plugins/beta/draw-ml/src/utils/debounce.js +0 -16
  236. package/plugins/beta/draw-ml/src/utils/flattenStyleProperties.js +0 -49
  237. package/plugins/beta/draw-ml/src/utils/snapHelpers.js +0 -200
  238. package/plugins/beta/draw-ml/src/utils/spatial.js +0 -258
  239. package/plugins/beta/draw-ol/dist/css/index.css +0 -1
  240. package/plugins/beta/draw-ol/dist/esm/DrawMode.js +0 -1
  241. package/plugins/beta/draw-ol/dist/esm/EditMode.js +0 -1
  242. package/plugins/beta/draw-ol/dist/esm/geometryHelpers.js +0 -1
  243. package/plugins/beta/draw-ol/dist/esm/im-draw-ol-plugin.js +0 -1
  244. package/plugins/beta/draw-ol/dist/esm/index.js +0 -1
  245. package/plugins/beta/draw-ol/src/DrawInit.jsx +0 -65
  246. package/plugins/beta/draw-ol/src/api/addFeature.js +0 -29
  247. package/plugins/beta/draw-ol/src/api/deleteFeature.js +0 -11
  248. package/plugins/beta/draw-ol/src/api/editFeature.js +0 -50
  249. package/plugins/beta/draw-ol/src/api/newLine.js +0 -44
  250. package/plugins/beta/draw-ol/src/api/newPolygon.js +0 -44
  251. package/plugins/beta/draw-ol/src/core/OLDrawManager.js +0 -153
  252. package/plugins/beta/draw-ol/src/core/featureStore.js +0 -65
  253. package/plugins/beta/draw-ol/src/core/styles.js +0 -98
  254. package/plugins/beta/draw-ol/src/core/undoStack.js +0 -31
  255. package/plugins/beta/draw-ol/src/defaults.js +0 -16
  256. package/plugins/beta/draw-ol/src/draw/DrawMode.js +0 -121
  257. package/plugins/beta/draw-ol/src/draw/drawInput.js +0 -243
  258. package/plugins/beta/draw-ol/src/draw.scss +0 -17
  259. package/plugins/beta/draw-ol/src/edit/EditMode.js +0 -424
  260. package/plugins/beta/draw-ol/src/edit/keyboardHandler.js +0 -229
  261. package/plugins/beta/draw-ol/src/edit/midpointLayer.js +0 -57
  262. package/plugins/beta/draw-ol/src/edit/touchHandler.js +0 -171
  263. package/plugins/beta/draw-ol/src/edit/undoOps.js +0 -95
  264. package/plugins/beta/draw-ol/src/edit/vertexHitTest.js +0 -72
  265. package/plugins/beta/draw-ol/src/edit/vertexLayer.js +0 -49
  266. package/plugins/beta/draw-ol/src/edit/vertexOps.js +0 -99
  267. package/plugins/beta/draw-ol/src/events.js +0 -114
  268. package/plugins/beta/draw-ol/src/index.js +0 -12
  269. package/plugins/beta/draw-ol/src/manifest.js +0 -125
  270. package/plugins/beta/draw-ol/src/olDraw.js +0 -38
  271. package/plugins/beta/draw-ol/src/reducer.js +0 -41
  272. package/plugins/beta/draw-ol/src/snap/snapEngine.js +0 -153
  273. package/plugins/beta/draw-ol/src/snap/snapGeometry.js +0 -177
  274. package/plugins/beta/draw-ol/src/snap/snapIndicator.js +0 -81
  275. package/plugins/beta/draw-ol/src/snap/snapInteraction.js +0 -57
  276. package/plugins/beta/draw-ol/src/snap/snapManager.js +0 -99
  277. package/plugins/beta/draw-ol/src/utils/flattenStyleProperties.js +0 -47
  278. package/plugins/beta/draw-ol/src/utils/geometryHelpers.js +0 -103
  279. package/plugins/beta/draw-ol/src/utils/olCoords.js +0 -35
  280. package/plugins/beta/draw-ol/src/utils/resolveColors.js +0 -39
  281. package/plugins/beta/draw-ol/src/utils/spatial.js +0 -24
  282. package/plugins/beta/draw-ol/src/utils/touchTarget.js +0 -61
  283. package/plugins/beta/frame/dist/esm/index.js +0 -1
  284. package/plugins/beta/map-styles/dist/esm/index.js +0 -1
  285. package/plugins/beta/scale-bar/dist/esm/index.js +0 -1
  286. package/plugins/beta/use-location/dist/esm/index.js +0 -1
  287. package/plugins/map-key/src/registry/getDatasetRegistry.js +0 -6
  288. package/plugins/map-key/src/registry/getDatasetRegistry.test.js +0 -23
  289. package/plugins/map-key/src/registry/index.js +0 -1
  290. package/plugins/map-key/src/registry/index.test.js +0 -7
  291. package/providers/beta/esri/dist/esm/index.js +0 -1
  292. package/providers/beta/open-names/dist/esm/index.js +0 -1
  293. package/providers/beta/openlayers/dist/esm/index.js +0 -1
  294. package/providers/beta/openlayers/dist/umd/im-openlayers-provider.js +0 -2
  295. package/providers/beta/openlayers/dist/umd/index.js.LICENSE.txt +0 -1
  296. /package/plugins/{beta/draw-es → draw-es}/dist/esm/im-draw-es-plugin.js +0 -0
  297. /package/plugins/{beta/draw-es → draw-es}/src/api/addFeature.js +0 -0
  298. /package/plugins/{beta/draw-es → draw-es}/src/api/deleteFeature.js +0 -0
  299. /package/plugins/{beta/draw-es → draw-es}/src/api/editFeature.js +0 -0
  300. /package/plugins/{beta/draw-es → draw-es}/src/api/newPolygon.js +0 -0
  301. /package/plugins/{beta/draw-es → draw-es}/src/api/removeSafeZone.js +0 -0
  302. /package/plugins/{beta/draw-es → draw-es}/src/events.js +0 -0
  303. /package/plugins/{beta/draw-es → draw-es}/src/index.js +0 -0
  304. /package/plugins/{beta/draw-es → draw-es}/src/manifest.js +0 -0
  305. /package/plugins/{beta/draw-es → draw-es}/src/reducer.js +0 -0
  306. /package/plugins/{beta/draw-es → draw-es}/src/sketchViewModel.js +0 -0
  307. /package/plugins/{beta/frame → frame}/dist/css/index.css +0 -0
  308. /package/plugins/{beta/frame → frame}/dist/esm/im-frame-plugin.js +0 -0
  309. /package/plugins/{beta/draw-ml → frame}/dist/umd/index.js.LICENSE.txt +0 -0
  310. /package/plugins/{beta/frame → frame}/src/Frame.jsx +0 -0
  311. /package/plugins/{beta/frame → frame}/src/FrameInit.jsx +0 -0
  312. /package/plugins/{beta/frame → frame}/src/api/addFrame.js +0 -0
  313. /package/plugins/{beta/frame → frame}/src/api/editFeature.js +0 -0
  314. /package/plugins/{beta/frame → frame}/src/config.js +0 -0
  315. /package/plugins/{beta/frame → frame}/src/frame.scss +0 -0
  316. /package/plugins/{beta/frame → frame}/src/index.js +0 -0
  317. /package/plugins/{beta/frame → frame}/src/manifest.js +0 -0
  318. /package/plugins/{beta/frame → frame}/src/reducer.js +0 -0
  319. /package/plugins/{beta/frame → frame}/src/utils.js +0 -0
  320. /package/plugins/{beta/map-styles → map-styles}/dist/css/index.css +0 -0
  321. /package/plugins/{beta/map-styles → map-styles}/dist/esm/im-map-styles-plugin.js +0 -0
  322. /package/plugins/{beta/frame → map-styles}/dist/umd/index.js.LICENSE.txt +0 -0
  323. /package/plugins/{beta/map-styles → map-styles}/src/config.js +0 -0
  324. /package/plugins/{beta/map-styles → map-styles}/src/index.js +0 -0
  325. /package/plugins/{beta/map-styles → map-styles}/src/manifest.js +0 -0
  326. /package/plugins/{beta/map-styles → map-styles}/src/mapStyles.scss +0 -0
  327. /package/plugins/{beta/scale-bar → scale-bar}/dist/css/index.css +0 -0
  328. /package/plugins/{beta/scale-bar → scale-bar}/dist/esm/im-scale-bar-plugin.js +0 -0
  329. /package/plugins/{beta/map-styles → scale-bar}/dist/umd/index.js.LICENSE.txt +0 -0
  330. /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.jsx +0 -0
  331. /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.test.jsx +0 -0
  332. /package/plugins/{beta/scale-bar → scale-bar}/src/index.js +0 -0
  333. /package/plugins/{beta/scale-bar → scale-bar}/src/index.test.js +0 -0
  334. /package/plugins/{beta/scale-bar → scale-bar}/src/manifest.js +0 -0
  335. /package/plugins/{beta/scale-bar → scale-bar}/src/scaleBar.scss +0 -0
  336. /package/plugins/{beta/scale-bar → scale-bar}/src/utils.js +0 -0
  337. /package/plugins/{beta/scale-bar → scale-bar}/src/utils.test.js +0 -0
  338. /package/plugins/{beta/use-location → use-location}/dist/esm/im-use-location-plugin.js +0 -0
  339. /package/plugins/{beta/scale-bar → use-location}/dist/umd/index.js.LICENSE.txt +0 -0
  340. /package/plugins/{beta/use-location → use-location}/src/UseLocation.jsx +0 -0
  341. /package/plugins/{beta/use-location → use-location}/src/UseLocationInit.jsx +0 -0
  342. /package/plugins/{beta/use-location → use-location}/src/defaults.js +0 -0
  343. /package/plugins/{beta/use-location → use-location}/src/events.js +0 -0
  344. /package/plugins/{beta/use-location → use-location}/src/index.js +0 -0
  345. /package/plugins/{beta/use-location → use-location}/src/manifest.js +0 -0
  346. /package/plugins/{beta/use-location → use-location}/src/reducer.js +0 -0
  347. /package/providers/{beta/esri → esri}/dist/css/index.css +0 -0
  348. /package/providers/{beta/esri → esri}/dist/esm/im-esri-provider.js +0 -0
  349. /package/providers/{beta/esri → esri}/src/appEvents.js +0 -0
  350. /package/providers/{beta/esri → esri}/src/defaults.js +0 -0
  351. /package/providers/{beta/esri → esri}/src/esriProvider.scss +0 -0
  352. /package/providers/{beta/esri → esri}/src/index.js +0 -0
  353. /package/providers/{beta/esri → esri}/src/utils/coords.js +0 -0
  354. /package/providers/{beta/esri → esri}/src/utils/coords.test.js +0 -0
  355. /package/providers/{beta/esri → esri}/src/utils/detectWebGL.js +0 -0
  356. /package/providers/{beta/esri → esri}/src/utils/esriFixes.js +0 -0
  357. /package/providers/{beta/esri → esri}/src/utils/query.js +0 -0
  358. /package/providers/{beta/esri → esri}/src/utils/spatial.js +0 -0
  359. /package/providers/{beta/esri → esri}/src/utils/spatial.test.js +0 -0
  360. /package/providers/{beta/open-names → open-names}/dist/esm/im-reverse-geocode.js +0 -0
  361. /package/providers/{beta/open-names → open-names}/dist/umd/im-reverse-geocode.js.LICENSE.txt +0 -0
  362. /package/{plugins/beta/use-location → providers/open-names}/dist/umd/index.js.LICENSE.txt +0 -0
  363. /package/providers/{beta/open-names → open-names}/src/index.js +0 -0
  364. /package/providers/{beta/open-names → open-names}/src/reverseGeocode.js +0 -0
  365. /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.js +0 -0
  366. /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.test.js +0 -0
  367. /package/providers/{beta/openlayers → openlayers}/dist/esm/im-openlayers-provider.js +0 -0
  368. /package/providers/{beta/openlayers → openlayers}/dist/umd/im-openlayers-provider.js.LICENSE.txt +0 -0
  369. /package/providers/{beta/open-names → openlayers}/dist/umd/index.js.LICENSE.txt +0 -0
  370. /package/providers/{beta/openlayers → openlayers}/src/appEvents.js +0 -0
  371. /package/providers/{beta/openlayers → openlayers}/src/appEvents.test.js +0 -0
  372. /package/providers/{beta/openlayers → openlayers}/src/defaults.js +0 -0
  373. /package/providers/{beta/openlayers → openlayers}/src/index.test.js +0 -0
  374. /package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.test.js +0 -0
  375. /package/providers/{beta/openlayers → openlayers}/src/utils/bngProjection.js +0 -0
  376. /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.js +0 -0
  377. /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.test.js +0 -0
  378. /package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.test.js +0 -0
  379. /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.js +0 -0
  380. /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.test.js +0 -0
  381. /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.js +0 -0
  382. /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.test.js +0 -0
  383. /package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.test.js +0 -0
  384. /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.js +0 -0
  385. /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.test.js +0 -0
  386. /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.js +0 -0
  387. /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.test.js +0 -0
  388. /package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.test.js +0 -0
  389. /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.js +0 -0
  390. /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.test.js +0 -0
  391. /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.js +0 -0
  392. /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.test.js +0 -0
  393. /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.js +0 -0
  394. /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.test.js +0 -0
@@ -1,24 +1,12 @@
1
1
  import { render, act } from '@testing-library/react'
2
2
  import { DatasetsInit } from './DatasetsInit.jsx'
3
- import { datasetRegistry } from '../registry/datasetRegistry.js'
4
- import { attachGlobalState } from '../registry/globalDataset.js'
5
- import { loadLayerAdapter, layerAdapter } from '../adapters/loadLayerAdapter.js'
3
+ import { loadLayerAdapter } from '../adapters/loadLayerAdapter.js'
6
4
  import { initialiseDatasets } from './initialiseDatasets.js'
7
5
  import { EVENTS } from '../../../../src/config/events.js'
6
+ import { datasetsToMenu } from '../reducers/datasetsToMenu.js'
8
7
 
9
- jest.mock('../registry/datasetRegistry.js', () => ({
10
- datasetRegistry: {
11
- attach: jest.fn(),
12
- attachMapStyle: jest.fn(),
13
- attachCreateDataset: jest.fn()
14
- }
15
- }))
16
- jest.mock('../registry/globalDataset.js', () => ({
17
- attachGlobalState: jest.fn()
18
- }))
19
8
  jest.mock('../adapters/loadLayerAdapter.js', () => ({
20
- loadLayerAdapter: jest.fn(),
21
- layerAdapter: {}
9
+ loadLayerAdapter: jest.fn()
22
10
  }))
23
11
  jest.mock('./initialiseDatasets.js')
24
12
 
@@ -33,30 +21,47 @@ const makeAdapter = () => ({
33
21
  init: jest.fn().mockResolvedValue(undefined)
34
22
  })
35
23
 
24
+ const makeDatasetRegistry = () => ({
25
+ attach: jest.fn(),
26
+ attachMapStyle: jest.fn(),
27
+ attachGlobals: jest.fn()
28
+ })
29
+
30
+ // The registry the manifest put in this map's plugin state; clearAllMocks resets it between tests
31
+ const datasetRegistry = makeDatasetRegistry()
32
+
36
33
  const makePluginState = (overrides = {}) => ({
37
34
  dispatch: jest.fn(),
35
+ datasetRegistry,
38
36
  mappedDatasets: {},
39
37
  orderedDatasets: [],
38
+ menu: [],
39
+ menuInitialised: true,
40
40
  globals: { visible: true, opacity: 1 },
41
41
  actionsArray: [],
42
42
  ...overrides
43
43
  })
44
44
 
45
- const makeProps = (overrides = {}) => ({
46
- pluginConfig: {
45
+ const makeProps = (overrides = {}) => {
46
+ const pluginConfig = overrides.pluginConfig ?? {
47
47
  datasets: [{ id: 'roads', label: 'Roads', showInMenu: true }]
48
- },
49
- pluginState: makePluginState(),
50
- appState: {},
51
- mapState: { mapStyle: { id: 'outdoor' } },
52
- mapProvider: { isBaseMapReady: jest.fn().mockReturnValue(true) },
53
- services: {
54
- eventBus: makeEventBus(),
55
- symbolRegistry: {},
56
- patternRegistry: {}
57
- },
58
- ...overrides
59
- })
48
+ }
49
+ return {
50
+ appConfig: { id: 'test-map' },
51
+ appState: { openPanels: {} },
52
+ pluginConfig,
53
+ pluginState: makePluginState({ menu: datasetsToMenu(pluginConfig) }),
54
+ mapState: { mapStyle: { id: 'outdoor' } },
55
+ mapProvider: { isBaseMapReady: jest.fn().mockReturnValue(true) },
56
+ services: {
57
+ eventBus: makeEventBus(),
58
+ focusMap: jest.fn(),
59
+ symbolRegistry: {},
60
+ patternRegistry: {}
61
+ },
62
+ ...overrides
63
+ }
64
+ }
60
65
 
61
66
  describe('DatasetsInit', () => {
62
67
  let adapter
@@ -73,54 +78,79 @@ describe('DatasetsInit', () => {
73
78
  expect(container.firstChild).toBeNull()
74
79
  })
75
80
 
76
- // ─── hasMenu / panel removal ─────────────────────────────────────────────────
77
-
78
81
  describe('menu panel management', () => {
79
- it('removes the datasetsLayers panel when no datasets have showInMenu', async () => {
80
- const props = makeProps({
81
- pluginConfig: { datasets: [{ id: 'roads', label: 'Roads' }] }
82
- })
83
- await render(<DatasetsInit {...props} />)
84
- expect(props.services.eventBus.emitWhenReady).toHaveBeenCalledWith(
85
- EVENTS.APP_REMOVE_PANEL, 'datasetsLayers'
86
- )
87
- expect(props.services.eventBus.emitWhenReady).toHaveBeenCalledWith(
88
- EVENTS.APP_TOGGLE_BUTTON_STATE, { id: 'datasetsLayers', prop: 'hidden', value: true }
89
- )
82
+ const openPanelState = { openPanels: { datasetsLayers: {} } }
83
+ let panelEl
84
+
85
+ beforeEach(() => {
86
+ jest.useFakeTimers()
87
+ panelEl = document.createElement('div')
88
+ panelEl.id = 'test-map-panel-datasets-layers'
89
+ panelEl.tabIndex = -1
90
+ document.body.appendChild(panelEl)
90
91
  })
91
92
 
92
- it('does not remove the panel when at least one dataset has showInMenu', async () => {
93
- const props = makeProps()
94
- await render(<DatasetsInit {...props} />)
95
- expect(props.services.eventBus.emitWhenReady).not.toHaveBeenCalledWith(
96
- EVENTS.APP_REMOVE_PANEL, 'datasetsLayers'
97
- )
93
+ afterEach(() => {
94
+ panelEl.remove()
95
+ jest.useRealTimers()
98
96
  })
99
97
 
100
- it('removes the panel when hasMenu is explicitly false', async () => {
101
- const props = makeProps({
102
- pluginConfig: { hasMenu: false, datasets: [{ id: 'roads', label: 'Roads', showInMenu: true }] }
103
- })
104
- await render(<DatasetsInit {...props} />)
105
- expect(props.services.eventBus.emitWhenReady).toHaveBeenCalledWith(
106
- EVENTS.APP_REMOVE_PANEL, 'datasetsLayers'
107
- )
98
+ it('does not remove the panel or hide the button when there is no menu', () => {
99
+ const props = makeProps({ pluginConfig: { datasets: [] } })
100
+ render(<DatasetsInit {...props} />)
101
+ expect(props.services.eventBus.emitWhenReady).not.toHaveBeenCalled()
102
+ expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.APP_REMOVE_PANEL, expect.anything())
103
+ expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.APP_TOGGLE_BUTTON_STATE, expect.anything())
108
104
  })
109
105
 
110
- it('includes datasets with sublayer showInMenu when checking for menu items', async () => {
111
- const props = makeProps({
112
- pluginConfig: {
113
- datasets: [{
114
- id: 'parent',
115
- label: 'Parent',
116
- sublayers: [{ id: 'child', showInMenu: true }]
117
- }]
118
- }
119
- })
120
- await render(<DatasetsInit {...props} />)
121
- expect(props.services.eventBus.emitWhenReady).not.toHaveBeenCalledWith(
122
- EVENTS.APP_REMOVE_PANEL, 'datasetsLayers'
123
- )
106
+ it('closes the open panel and focuses the map when the menu empties with focus inside it', () => {
107
+ const props = makeProps({ appState: openPanelState })
108
+ const { eventBus, focusMap } = props.services
109
+ const { rerender } = render(<DatasetsInit {...props} />)
110
+ panelEl.focus()
111
+
112
+ rerender(<DatasetsInit {...props} pluginState={makePluginState()} />)
113
+ expect(eventBus.emit).toHaveBeenCalledWith(EVENTS.APP_HIDE_PANEL, 'datasetsLayers')
114
+ expect(focusMap).not.toHaveBeenCalled()
115
+ act(() => jest.runOnlyPendingTimers())
116
+ expect(focusMap).toHaveBeenCalledTimes(1)
117
+ })
118
+
119
+ it('closes the open panel without moving focus when focus is outside it', () => {
120
+ const props = makeProps({ appState: openPanelState })
121
+ const { eventBus, focusMap } = props.services
122
+ const { rerender } = render(<DatasetsInit {...props} />)
123
+
124
+ rerender(<DatasetsInit {...props} pluginState={makePluginState()} />)
125
+ act(() => jest.runOnlyPendingTimers())
126
+ expect(eventBus.emit).toHaveBeenCalledWith(EVENTS.APP_HIDE_PANEL, 'datasetsLayers')
127
+ expect(focusMap).not.toHaveBeenCalled()
128
+ })
129
+
130
+ it('closes a panel that is open on load when there is no menu', () => {
131
+ const props = makeProps({ pluginConfig: { datasets: [] }, appState: openPanelState })
132
+ render(<DatasetsInit {...props} />)
133
+ expect(props.services.eventBus.emit).toHaveBeenCalledWith(EVENTS.APP_HIDE_PANEL, 'datasetsLayers')
134
+ })
135
+
136
+ it.each([
137
+ ['the panel is closed', {}, makePluginState()],
138
+ ['menu datasets remain', openPanelState.openPanels, makePluginState({ menu: [{ id: 'roads' }] })],
139
+ ['the live menu is still loading', openPanelState.openPanels, makePluginState({ menuInitialised: false })]
140
+ ])('leaves the panel alone when %s', (_, openPanels, pluginState) => {
141
+ const props = makeProps({ appState: { openPanels } })
142
+ render(<DatasetsInit {...props} pluginState={pluginState} />)
143
+ expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.APP_HIDE_PANEL, 'datasetsLayers')
144
+ })
145
+
146
+ it('cancels a pending map focus on unmount', () => {
147
+ const props = makeProps({ appState: openPanelState })
148
+ const { rerender, unmount } = render(<DatasetsInit {...props} />)
149
+ panelEl.focus()
150
+ rerender(<DatasetsInit {...props} pluginState={makePluginState()} />)
151
+ unmount()
152
+ act(() => jest.runOnlyPendingTimers())
153
+ expect(props.services.focusMap).not.toHaveBeenCalled()
124
154
  })
125
155
  })
126
156
 
@@ -131,11 +161,38 @@ describe('DatasetsInit', () => {
131
161
  const props = makeProps()
132
162
  await render(<DatasetsInit {...props} />)
133
163
  expect(loadLayerAdapter).toHaveBeenCalledWith(
134
- props.mapProvider, props.services.symbolRegistry, props.services.patternRegistry
164
+ props.mapProvider, props.services.symbolRegistry, props.services.patternRegistry, datasetRegistry
135
165
  )
136
166
  expect(initialiseDatasets).toHaveBeenCalled()
137
167
  })
138
168
 
169
+ it('passes the registry from plugin state and its adapter to initialiseDatasets', async () => {
170
+ const props = makeProps()
171
+ render(<DatasetsInit {...props} />)
172
+ await act(async () => {})
173
+ expect(initialiseDatasets).toHaveBeenCalledWith(expect.objectContaining({ adapter, datasetRegistry }))
174
+ })
175
+
176
+ it('puts the adapter on its map provider once loaded', async () => {
177
+ const props = makeProps()
178
+ render(<DatasetsInit {...props} />)
179
+ expect(props.mapProvider.datasets).toBeUndefined()
180
+ await act(async () => {})
181
+ expect(props.mapProvider.datasets).toBe(adapter)
182
+ })
183
+
184
+ it('gives each map provider its own adapter', async () => {
185
+ const otherAdapter = makeAdapter()
186
+ loadLayerAdapter.mockResolvedValueOnce(adapter).mockResolvedValueOnce(otherAdapter)
187
+ const propsA = makeProps()
188
+ const propsB = makeProps()
189
+ render(<DatasetsInit {...propsA} />)
190
+ render(<DatasetsInit {...propsB} />)
191
+ await act(async () => {})
192
+ expect(propsA.mapProvider.datasets).toBe(adapter)
193
+ expect(propsB.mapProvider.datasets).toBe(otherAdapter)
194
+ })
195
+
139
196
  it('does not initialise when base map is not ready', async () => {
140
197
  const props = makeProps({
141
198
  mapProvider: { isBaseMapReady: jest.fn().mockReturnValue(false) }
@@ -176,6 +233,7 @@ describe('DatasetsInit', () => {
176
233
  await act(async () => {})
177
234
  unmount()
178
235
  expect(removeFn).toHaveBeenCalled()
236
+ expect(props.mapProvider.datasets).toBeNull()
179
237
  })
180
238
  })
181
239
 
@@ -198,13 +256,14 @@ describe('DatasetsInit', () => {
198
256
  expect(datasetRegistry.attachMapStyle).toHaveBeenCalledWith(props.mapState.mapStyle)
199
257
  })
200
258
 
201
- it('calls layerAdapter.onMapStyleChange when available', async () => {
202
- const onMapStyleChange = jest.fn()
203
- Object.assign(layerAdapter, { onMapStyleChange })
259
+ it('calls layerAdapter.onMapStyleChange when the map style changes after the adapter loads', async () => {
260
+ adapter.onMapStyleChange = jest.fn()
204
261
  const props = makeProps()
205
- await render(<DatasetsInit {...props} />)
206
- expect(onMapStyleChange).toHaveBeenCalled()
207
- delete layerAdapter.onMapStyleChange
262
+ const { rerender } = render(<DatasetsInit {...props} />)
263
+ await act(async () => {})
264
+ expect(adapter.onMapStyleChange).not.toHaveBeenCalled()
265
+ rerender(<DatasetsInit {...props} mapState={{ mapStyle: { id: 'dark' } }} />)
266
+ expect(adapter.onMapStyleChange).toHaveBeenCalled()
208
267
  })
209
268
 
210
269
  // MapLibre gets this re-apply for free (map.addImage()/setPaintProperty() naturally
@@ -214,46 +273,58 @@ describe('DatasetsInit', () => {
214
273
  // re-resolved symbols/patterns after a style change, instead of a stale highlight sticking.
215
274
  it('emits MAP_DATA_CHANGE once onMapStyleChange resolves, so highlights re-resolve for the new theme', async () => {
216
275
  let resolveOnMapStyleChange
217
- const onMapStyleChange = jest.fn(() => new Promise(resolve => { resolveOnMapStyleChange = resolve }))
218
- Object.assign(layerAdapter, { onMapStyleChange })
276
+ adapter.onMapStyleChange = jest.fn(() => new Promise(resolve => { resolveOnMapStyleChange = resolve }))
219
277
  const props = makeProps()
220
- await render(<DatasetsInit {...props} />)
278
+ const { rerender } = render(<DatasetsInit {...props} />)
279
+ await act(async () => {})
280
+ rerender(<DatasetsInit {...props} mapState={{ mapStyle: { id: 'dark' } }} />)
221
281
  expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.MAP_DATA_CHANGE)
222
282
  await act(async () => {
223
283
  resolveOnMapStyleChange()
224
284
  await Promise.resolve()
225
285
  })
226
286
  expect(props.services.eventBus.emit).toHaveBeenCalledWith(EVENTS.MAP_DATA_CHANGE)
227
- delete layerAdapter.onMapStyleChange
228
287
  })
229
288
  })
230
289
 
231
290
  // ─── globals effect ──────────────────────────────────────────────────────────
232
291
 
233
292
  describe('globals effect', () => {
234
- it('calls attachGlobalState with the current globals', async () => {
293
+ it('attaches the current globals to the registry', async () => {
235
294
  const globals = { visible: false, opacity: 0.5 }
236
295
  const props = makeProps({ pluginState: makePluginState({ globals }) })
237
296
  await render(<DatasetsInit {...props} />)
238
- expect(attachGlobalState).toHaveBeenCalledWith(globals)
297
+ expect(datasetRegistry.attachGlobals).toHaveBeenCalledWith(globals)
239
298
  })
240
299
  })
241
300
 
242
301
  // ─── actionsArray effect ─────────────────────────────────────────────────────
243
302
 
244
303
  describe('actionsArray effect', () => {
245
- it('calls each queued adapter method and dispatches REMOVE_ADAPTER_ACTIONS', async () => {
246
- const applyStyle = jest.fn()
247
- Object.assign(layerAdapter, { applyStyle })
304
+ it('runs actions queued before the adapter loads once it has loaded, and dispatches REMOVE_ADAPTER_ACTIONS', async () => {
305
+ adapter.applyStyle = jest.fn()
248
306
  const actions = [{ method: 'applyStyle', parameters: ['roads', {}] }]
249
307
  const dispatch = jest.fn()
250
308
  const props = makeProps({
251
309
  pluginState: makePluginState({ actionsArray: actions, dispatch })
252
310
  })
253
- await render(<DatasetsInit {...props} />)
254
- expect(applyStyle).toHaveBeenCalledWith('roads', {})
311
+ render(<DatasetsInit {...props} />)
312
+ expect(adapter.applyStyle).not.toHaveBeenCalled()
313
+ await act(async () => {})
314
+ expect(adapter.applyStyle).toHaveBeenCalledWith('roads', {})
315
+ expect(dispatch).toHaveBeenCalledWith({ type: 'REMOVE_ADAPTER_ACTIONS', payload: actions })
316
+ })
317
+
318
+ it('runs actions queued after the adapter has loaded straight away', async () => {
319
+ adapter.applyStyle = jest.fn()
320
+ const actions = [{ method: 'applyStyle', parameters: ['roads', {}] }]
321
+ const dispatch = jest.fn()
322
+ const props = makeProps({ pluginState: makePluginState({ dispatch }) })
323
+ const { rerender } = render(<DatasetsInit {...props} />)
324
+ await act(async () => {})
325
+ rerender(<DatasetsInit {...props} pluginState={makePluginState({ actionsArray: actions, dispatch })} />)
326
+ expect(adapter.applyStyle).toHaveBeenCalledWith('roads', {})
255
327
  expect(dispatch).toHaveBeenCalledWith({ type: 'REMOVE_ADAPTER_ACTIONS', payload: actions })
256
- delete layerAdapter.applyStyle
257
328
  })
258
329
 
259
330
  it('skips dispatching when actionsArray is empty', async () => {
@@ -1,11 +1,10 @@
1
1
  import { createDynamicSource } from '../fetch/createDynamicSource.js'
2
2
  import { mappedDatasetsReducer } from '../reducers/mappedDatasetsReducer.js'
3
- import { datasetRegistry } from '../registry/datasetRegistry.js'
4
- import { attachMenuStateRef } from '../registry/isVisibleWhen.js'
5
3
  import { datasetsToMenu } from '../reducers/datasetsToMenu.js'
6
4
 
7
5
  export const initialiseDatasets = ({
8
6
  adapter,
7
+ datasetRegistry,
9
8
  pluginConfig,
10
9
  mapStyle,
11
10
  mapProvider,
@@ -28,7 +27,7 @@ export const initialiseDatasets = ({
28
27
  datasetRegistry.attach(mappedDatasets, orderedDatasets, mapStyle)
29
28
  const menu = datasetsToMenu({ datasets })
30
29
 
31
- eventBus.requestOnce('menu:state', attachMenuStateRef) // Request the menu state from the menu plugin
30
+ eventBus.requestOnce('menu:state', menuStateRef => datasetRegistry.attachMenuStateRef(menuStateRef)) // Request the menu state from the menu plugin
32
31
 
33
32
  dispatch({ type: 'SET_MENU', payload: { menu } })
34
33
  dispatch({ type: 'SET_DATASETS', payload: { mappedDatasets, orderedDatasets } })
@@ -1,17 +1,15 @@
1
1
  import { initialiseDatasets } from './initialiseDatasets.js'
2
2
  import { createDynamicSource } from '../fetch/createDynamicSource.js'
3
- import { datasetRegistry } from '../registry/datasetRegistry.js'
4
3
 
5
4
  jest.mock('../fetch/createDynamicSource.js')
6
- jest.mock('../registry/datasetRegistry.js', () => ({
7
- datasetRegistry: {
8
- attach: jest.fn(),
9
- attachCreateDataset: jest.fn(),
10
- forEachDataset: jest.fn(),
11
- invalidateKeyItemsOnMenuStateChange: jest.fn(),
12
- _invalidateCache: jest.fn()
13
- }
14
- }))
5
+
6
+ const datasetRegistry = {
7
+ attach: jest.fn(),
8
+ attachCreateDataset: jest.fn(),
9
+ attachMenuStateRef: jest.fn(),
10
+ forEachDataset: jest.fn(),
11
+ invalidateKeyItemsOnMenuStateChange: jest.fn()
12
+ }
15
13
 
16
14
  // ─── helpers ─────────────────────────────────────────────────────────────────
17
15
 
@@ -43,6 +41,7 @@ const makeArgs = (overrides = {}) => {
43
41
  const eventBus = makeEventBus()
44
42
  return {
45
43
  adapter: makeAdapter(),
44
+ datasetRegistry,
46
45
  pluginConfig: { datasets: [{ id: 'roads', label: 'Roads' }] },
47
46
  pluginStateRef: {},
48
47
  mapStyle: { layers: [] },
@@ -281,6 +280,20 @@ describe('onUpdate callback', () => {
281
280
  })
282
281
  })
283
282
 
283
+ // ─── menu:state request ───────────────────────────────────────────────────────
284
+
285
+ describe('menu:state request', () => {
286
+ it('attaches the menu state ref to the registry', () => {
287
+ const args = makeArgs()
288
+ initialiseDatasets(args)
289
+
290
+ const menuStateRef = { current: { menuState: { timeframe: 'present' } } }
291
+ args.eventBus._handlers['menu:state'](menuStateRef)
292
+
293
+ expect(datasetRegistry.attachMenuStateRef).toHaveBeenCalledWith(menuStateRef)
294
+ })
295
+ })
296
+
284
297
  // ─── menu:changed handler ─────────────────────────────────────────────────────
285
298
 
286
299
  describe('menu:changed handler', () => {
@@ -12,57 +12,66 @@ import { setOpacity } from './api/setOpacity.js'
12
12
  import { getOpacity } from './api/getOpacity.js'
13
13
  import { setData } from './api/setData.js'
14
14
  import { setGlobals } from './api/setGlobals.js'
15
+ import { hasLayersMenu } from './utils/hasLayersMenu.js'
16
+ import { createDatasetRegistry } from './registry/datasetRegistry.js'
15
17
 
16
- export const manifest = {
18
+ const layersPanel = {
19
+ id: 'datasetsLayers',
20
+ label: 'Layers',
21
+ mobile: {
22
+ slot: 'drawer',
23
+ modal: true,
24
+ dismissible: true
25
+ },
26
+ tablet: {
27
+ slot: 'left-top',
28
+ dismissible: true,
29
+ exclusive: true,
30
+ width: '260px'
31
+ },
32
+ desktop: {
33
+ slot: 'left-top',
34
+ modal: false,
35
+ dismissible: true,
36
+ exclusive: true,
37
+ width: '280px'
38
+ },
39
+ render: LayersMenu
40
+ }
41
+
42
+ const layersButton = {
43
+ id: 'datasetsLayers',
44
+ label: 'Layers',
45
+ panelId: 'datasetsLayers',
46
+ excludeWhen: (context) => !hasLayersMenu(context),
47
+ iconId: 'layers',
48
+ mobile: {
49
+ slot: 'top-left',
50
+ showLabel: true
51
+ },
52
+ tablet: {
53
+ slot: 'top-left',
54
+ showLabel: true
55
+ },
56
+ desktop: {
57
+ slot: 'top-left',
58
+ showLabel: true
59
+ }
60
+ }
61
+
62
+ // With hasMenu: false the Layers button and panel are never registered
63
+ export const createManifest = ({ hasMenu } = {}) => ({
17
64
  InitComponent: DatasetsInit,
18
65
 
66
+ // load() calls createManifest once per map, so each map gets its own dataset registry
19
67
  reducer: {
20
- initialState,
68
+ initialState: { ...initialState, datasetRegistry: createDatasetRegistry() },
21
69
  actions
22
70
  },
23
71
 
24
- panels: [{
25
- id: 'datasetsLayers',
26
- label: 'Layers',
27
- mobile: {
28
- slot: 'drawer',
29
- modal: true,
30
- dismissible: true
31
- },
32
- tablet: {
33
- slot: 'left-top',
34
- dismissible: true,
35
- exclusive: true,
36
- width: '260px'
37
- },
38
- desktop: {
39
- slot: 'left-top',
40
- modal: false,
41
- dismissible: true,
42
- exclusive: true,
43
- width: '280px'
44
- },
45
- render: LayersMenu
46
- }],
72
+ panels: hasMenu === false ? [] : [layersPanel],
47
73
 
48
- buttons: [{
49
- id: 'datasetsLayers',
50
- label: 'Layers',
51
- panelId: 'datasetsLayers',
52
- iconId: 'layers',
53
- mobile: {
54
- slot: 'top-left',
55
- showLabel: true
56
- },
57
- tablet: {
58
- slot: 'top-left',
59
- showLabel: true
60
- },
61
- desktop: {
62
- slot: 'top-left',
63
- showLabel: true
64
- }
65
- }],
74
+ buttons: hasMenu === false ? [] : [layersButton],
66
75
 
67
76
  icons: [{
68
77
  id: 'layers',
@@ -84,4 +93,4 @@ export const manifest = {
84
93
  setData,
85
94
  setGlobals
86
95
  }
87
- }
96
+ })
@@ -1,6 +1,9 @@
1
- import { manifest } from './manifest.js'
1
+ import { createManifest } from './manifest.js'
2
+ import { hasLayersMenu } from './utils/hasLayersMenu.js'
2
3
 
3
- jest.mock('./reducers/pluginState.js', () => ({ initialState: {}, actions: {} }))
4
+ jest.mock('./reducers/pluginState.js', () => ({ initialState: { menu: [] }, actions: {} }))
5
+ jest.mock('./registry/datasetRegistry.js', () => ({ createDatasetRegistry: jest.fn(() => ({})) }))
6
+ jest.mock('./utils/hasLayersMenu.js', () => ({ hasLayersMenu: jest.fn() }))
4
7
  jest.mock('./initialise/DatasetsInit.jsx', () => ({ DatasetsInit: jest.fn() }))
5
8
  jest.mock('./components/LayersMenu/LayersMenu.jsx', () => ({ LayersMenu: jest.fn() }))
6
9
  jest.mock('./api/addDataset.js', () => ({ addDataset: jest.fn() }))
@@ -14,8 +17,10 @@ jest.mock('./api/getOpacity.js', () => ({ getOpacity: jest.fn() }))
14
17
  jest.mock('./api/setData.js', () => ({ setData: jest.fn() }))
15
18
  jest.mock('./api/setGlobals.js', () => ({ setGlobals: jest.fn() }))
16
19
 
17
- describe('manifest', () => {
18
- it('exports a manifest object', () => {
20
+ describe('createManifest', () => {
21
+ const manifest = createManifest()
22
+
23
+ it('returns a manifest object', () => {
19
24
  expect(manifest).toBeDefined()
20
25
  expect(typeof manifest).toBe('object')
21
26
  })
@@ -30,6 +35,15 @@ describe('manifest', () => {
30
35
  expect(manifest.reducer.actions).toBeDefined()
31
36
  })
32
37
 
38
+ it('adds a dataset registry to the initial state', () => {
39
+ expect(manifest.reducer.initialState).toEqual({ menu: [], datasetRegistry: expect.any(Object) })
40
+ })
41
+
42
+ it('creates a separate dataset registry for each manifest, so each map has its own', () => {
43
+ const otherManifest = createManifest()
44
+ expect(otherManifest.reducer.initialState.datasetRegistry).not.toBe(manifest.reducer.initialState.datasetRegistry)
45
+ })
46
+
33
47
  it('has panels with a datasetsLayers panel', () => {
34
48
  expect(Array.isArray(manifest.panels)).toBe(true)
35
49
  expect(manifest.panels.find(p => p.id === 'datasetsLayers')).toBeDefined()
@@ -39,6 +53,24 @@ describe('manifest', () => {
39
53
  expect(Array.isArray(manifest.buttons)).toBe(true)
40
54
  })
41
55
 
56
+ it('excludes the Layers button when there is no layers menu', () => {
57
+ const button = manifest.buttons.find(button => button.id === 'datasetsLayers')
58
+ const context = { pluginConfig: {}, pluginState: {} }
59
+
60
+ hasLayersMenu.mockReturnValue(false)
61
+ expect(button.excludeWhen(context)).toBe(true)
62
+ hasLayersMenu.mockReturnValue(true)
63
+ expect(button.excludeWhen(context)).toBe(false)
64
+ expect(hasLayersMenu).toHaveBeenCalledWith(context)
65
+ })
66
+
67
+ it('leaves out the Layers button and panel when hasMenu is false', () => {
68
+ const withoutMenu = createManifest({ hasMenu: false })
69
+ expect(withoutMenu.buttons).toEqual([])
70
+ expect(withoutMenu.panels).toEqual([])
71
+ expect(withoutMenu.api).toEqual(manifest.api)
72
+ })
73
+
42
74
  it('has an api with all expected methods', () => {
43
75
  expect(manifest.api.addDataset).toBeDefined()
44
76
  expect(manifest.api.removeDataset).toBeDefined()
@@ -18,7 +18,8 @@ const initialState = {
18
18
  mappedDatasets: {},
19
19
  orderedDatasets: [],
20
20
  actionsArray: [],
21
- menu: []
21
+ menu: [],
22
+ menuInitialised: false
22
23
  }
23
24
 
24
25
  const validateDatasetExists = (state, datasetId, prefix, suffix = 'not found') => {
@@ -29,10 +30,8 @@ const validateDatasetExists = (state, datasetId, prefix, suffix = 'not found') =
29
30
  return true
30
31
  }
31
32
 
32
- let actionId = 0
33
33
  const addAction = (method, parameters, state) => {
34
- actionId = state.actionsArray.length ? actionId + 1 : 0
35
- return { ...state, actionsArray: [...state.actionsArray, { method, parameters, actionId }] }
34
+ return { ...state, actionsArray: [...state.actionsArray, { method, parameters }] }
36
35
  }
37
36
 
38
37
  const setGlobalState = (state, payload) => {
@@ -48,7 +47,8 @@ const setMenu = (state, payload) => {
48
47
  const { menu } = payload
49
48
  return {
50
49
  ...state,
51
- menu
50
+ menu,
51
+ menuInitialised: true
52
52
  }
53
53
  }
54
54