@defra/interactive-map 0.0.55-alpha → 0.0.57-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 (502) 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/button-definition.md +11 -0
  7. package/docs/api/context.md +4 -0
  8. package/docs/api.md +20 -2
  9. package/docs/architecture/interactive-map.likec4 +4 -4
  10. package/docs/plugins/datasets.md +11 -0
  11. package/docs/plugins/draw.md +197 -35
  12. package/docs/plugins/interact.md +24 -1
  13. package/docs/plugins/search.md +2 -2
  14. package/docusaurus.config.cjs +25 -3
  15. package/govuk-prototype-kit.config.json +6 -7
  16. package/package.json +20 -23
  17. package/plugins/datasets/dist/esm/im-datasets-esri-adapter.js +1 -1
  18. package/plugins/datasets/dist/esm/im-datasets-ml-adapter.js +1 -1
  19. package/plugins/datasets/dist/esm/im-datasets-ol-adapter.js +1 -1
  20. package/plugins/datasets/dist/esm/im-datasets-plugin.js +1 -1
  21. package/plugins/datasets/dist/esm/index.js +1 -1
  22. package/plugins/datasets/dist/esm/mapboxStyleLayerAdapter.js +1 -1
  23. package/plugins/datasets/dist/umd/im-datasets-ml-adapter.js +1 -1
  24. package/plugins/datasets/dist/umd/im-datasets-ol-adapter.js +1 -1
  25. package/plugins/datasets/dist/umd/im-datasets-plugin.js +1 -1
  26. package/plugins/datasets/dist/umd/index.js +1 -1
  27. package/plugins/datasets/src/adapters/esri/esriLayerAdapter.js +18 -16
  28. package/plugins/datasets/src/adapters/esri/esriLayerAdapter.test.js +2 -2
  29. package/plugins/datasets/src/adapters/esri/registry/esriDataset.js +2 -3
  30. package/plugins/datasets/src/adapters/esri/registry/esriDataset.test.js +1 -1
  31. package/plugins/datasets/src/adapters/loadLayerAdapter.js +2 -20
  32. package/plugins/datasets/src/adapters/loadLayerAdapter.test.js +9 -9
  33. package/plugins/datasets/src/adapters/mapboxStyleLayerAdapter.js +7 -7
  34. package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.js +19 -19
  35. package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.test.js +1 -1
  36. package/plugins/datasets/src/adapters/maplibre/registry/mapLibreDataset.test.js +1 -1
  37. package/plugins/datasets/src/adapters/openlayers/canvasPatternStyle.test.js +2 -2
  38. package/plugins/datasets/src/adapters/openlayers/layerBuilders.test.js +1 -1
  39. package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.js +21 -21
  40. package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.test.js +5 -5
  41. package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.js +2 -3
  42. package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.test.js +2 -2
  43. package/plugins/datasets/src/api/getOpacity.js +1 -2
  44. package/plugins/datasets/src/api/getOpacity.test.js +9 -12
  45. package/plugins/datasets/src/api/getStyle.js +1 -2
  46. package/plugins/datasets/src/api/getStyle.test.js +5 -8
  47. package/plugins/datasets/src/api/removeDataset.js +2 -4
  48. package/plugins/datasets/src/api/removeDataset.test.js +5 -10
  49. package/plugins/datasets/src/api/setData.js +2 -4
  50. package/plugins/datasets/src/api/setData.test.js +6 -14
  51. package/plugins/datasets/src/api/setFeatureVisibility.js +1 -2
  52. package/plugins/datasets/src/api/setFeatureVisibility.test.js +8 -11
  53. package/plugins/datasets/src/components/LayersMenu/LayersMenu.jsx +1 -0
  54. package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.jsx +1 -3
  55. package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.test.jsx +13 -18
  56. package/plugins/datasets/src/index.js +2 -2
  57. package/plugins/datasets/src/index.test.js +8 -1
  58. package/plugins/datasets/src/initialise/DatasetsInit.jsx +37 -26
  59. package/plugins/datasets/src/initialise/DatasetsInit.test.jsx +120 -89
  60. package/plugins/datasets/src/initialise/initialiseDatasets.js +2 -3
  61. package/plugins/datasets/src/initialise/initialiseDatasets.test.js +23 -10
  62. package/plugins/datasets/src/manifest.js +53 -44
  63. package/plugins/datasets/src/manifest.test.js +36 -4
  64. package/plugins/datasets/src/reducers/pluginState.js +5 -5
  65. package/plugins/datasets/src/reducers/pluginState.test.js +21 -20
  66. package/plugins/datasets/src/registry/__mocks__/datasetRegistry.js +7 -6
  67. package/plugins/datasets/src/registry/createDataset.js +2 -2
  68. package/plugins/datasets/src/registry/dataset.js +9 -10
  69. package/plugins/datasets/src/registry/dataset.test.js +63 -64
  70. package/plugins/datasets/src/registry/datasetRegistry.js +39 -10
  71. package/plugins/datasets/src/registry/datasetRegistry.test.js +83 -1
  72. package/plugins/datasets/src/registry/globalDataset.js +9 -17
  73. package/plugins/datasets/src/registry/isVisibleWhen.js +9 -17
  74. package/plugins/datasets/src/registry/isVisibleWhen.test.js +27 -20
  75. package/plugins/datasets/src/registry/mapboxStyleDataset.test.js +26 -27
  76. package/plugins/datasets/src/utils/hasLayersMenu.js +13 -0
  77. package/plugins/datasets/src/utils/hasLayersMenu.test.js +25 -0
  78. package/plugins/draw/dist/esm/im-draw-ml-adapter.js +1 -1
  79. package/plugins/draw/dist/esm/im-draw-ol-adapter.js +1 -1
  80. package/plugins/draw/dist/esm/im-draw-plugin.js +1 -1
  81. package/plugins/draw/dist/esm/index.js +1 -1
  82. package/plugins/draw/dist/esm/liveDrawChecks.js +1 -1
  83. package/plugins/draw/dist/umd/im-draw-ml-adapter.js +1 -1
  84. package/plugins/draw/dist/umd/im-draw-ol-adapter.js +1 -1
  85. package/plugins/draw/dist/umd/im-draw-plugin.js +1 -1
  86. package/plugins/draw/dist/umd/index.js +1 -1
  87. package/plugins/draw/src/DrawInit.jsx +53 -29
  88. package/plugins/draw/src/DrawInit.test.jsx +105 -2
  89. package/plugins/draw/src/adapterEvents.js +78 -44
  90. package/plugins/draw/src/adapters/adapterContract.test.js +3 -3
  91. package/plugins/draw/src/adapters/maplibre/MaplibreDrawAdapter.js +18 -10
  92. package/plugins/draw/src/adapters/maplibre/MaplibreDrawAdapter.test.js +31 -22
  93. package/plugins/draw/src/adapters/maplibre/drawEvents.js +2 -1
  94. package/plugins/draw/src/adapters/maplibre/modes/drawMode/clickHandlers.js +13 -12
  95. package/plugins/draw/src/adapters/maplibre/modes/drawMode/clickHandlers.test.js +5 -5
  96. package/plugins/draw/src/adapters/maplibre/modes/drawMode/undoHandlers.js +1 -1
  97. package/plugins/draw/src/adapters/maplibre/modes/drawMode/undoHandlers.test.js +2 -2
  98. package/plugins/draw/src/adapters/maplibre/modes/drawPointMode.js +6 -9
  99. package/plugins/draw/src/adapters/maplibre/modes/drawPointMode.test.js +4 -4
  100. package/plugins/draw/src/adapters/maplibre/modes/editPointMode/pointerHandlers.js +6 -9
  101. package/plugins/draw/src/adapters/maplibre/modes/editPointMode/pointerHandlers.test.js +1 -1
  102. package/plugins/draw/src/adapters/maplibre/modes/editPointMode/undoHandlers.js +8 -14
  103. package/plugins/draw/src/adapters/maplibre/modes/editPointMode/undoHandlers.test.js +37 -8
  104. package/plugins/draw/src/adapters/maplibre/modes/editPointMode.js +11 -1
  105. package/plugins/draw/src/adapters/maplibre/modes/editVertexMode/undoHandlers.js +14 -19
  106. package/plugins/draw/src/adapters/maplibre/modes/editVertexMode/undoHandlers.test.js +41 -4
  107. package/plugins/draw/src/adapters/maplibre/modes/editVertexMode.js +12 -1
  108. package/plugins/draw/src/adapters/maplibre/utils/editModeEvents.js +3 -1
  109. package/plugins/draw/src/adapters/maplibre/utils/geometryValidation.js +9 -10
  110. package/plugins/draw/src/adapters/maplibre/utils/geometryValidation.test.js +5 -24
  111. package/plugins/draw/src/adapters/openlayers/OLDrawAdapter.js +10 -7
  112. package/plugins/draw/src/adapters/openlayers/OLDrawAdapter.test.js +12 -7
  113. package/plugins/draw/src/adapters/openlayers/core/OLDrawManager.js +5 -0
  114. package/plugins/draw/src/adapters/openlayers/core/OLDrawManager.test.js +7 -3
  115. package/plugins/draw/src/adapters/openlayers/core/styles.test.js +1 -1
  116. package/plugins/draw/src/adapters/openlayers/draw/DrawMode.js +11 -11
  117. package/plugins/draw/src/adapters/openlayers/draw/DrawMode.test.js +15 -15
  118. package/plugins/draw/src/adapters/openlayers/edit/EditMode.js +21 -28
  119. package/plugins/draw/src/adapters/openlayers/edit/EditMode.test.js +26 -5
  120. package/plugins/draw/src/adapters/openlayers/edit/selectionState.js +5 -6
  121. package/plugins/draw/src/adapters/openlayers/edit/selectionState.test.js +2 -12
  122. package/plugins/draw/src/adapters/openlayers/edit/undoOps.js +9 -0
  123. package/plugins/draw/src/adapters/openlayers/edit/undoOps.test.js +7 -0
  124. package/plugins/draw/src/adapters/openlayers/point/drawPointMode.js +6 -9
  125. package/plugins/draw/src/adapters/openlayers/point/drawPointMode.test.js +3 -3
  126. package/plugins/draw/src/adapters/openlayers/point/editPointMode.js +18 -9
  127. package/plugins/draw/src/adapters/openlayers/point/editPointMode.test.js +29 -4
  128. package/plugins/draw/src/adapters/openlayers/point/pointOps.js +3 -2
  129. package/plugins/draw/src/adapters/openlayers/point/pointOps.test.js +6 -0
  130. package/plugins/draw/src/adapters/openlayers/point/pointSelectionState.js +3 -4
  131. package/plugins/draw/src/adapters/openlayers/point/pointSelectionState.test.js +2 -12
  132. package/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js +1 -1
  133. package/plugins/draw/src/api/createNewShape.js +4 -4
  134. package/plugins/draw/src/api/createNewShape.test.js +1 -1
  135. package/plugins/draw/src/api/editFeature.js +8 -11
  136. package/plugins/draw/src/api/editFeature.test.js +33 -22
  137. package/plugins/draw/src/api/newLine.test.js +3 -3
  138. package/plugins/draw/src/api/newPoint.js +4 -5
  139. package/plugins/draw/src/api/newPoint.test.js +3 -3
  140. package/plugins/draw/src/api/newPolygon.test.js +3 -3
  141. package/plugins/draw/src/api/recheckGeometry.js +32 -0
  142. package/plugins/draw/src/api/recheckGeometry.test.js +55 -0
  143. package/plugins/draw/src/api/setGeometry.js +33 -0
  144. package/plugins/draw/src/api/setGeometry.test.js +48 -0
  145. package/plugins/draw/src/api/split.js +23 -22
  146. package/plugins/draw/src/api/split.test.js +33 -18
  147. package/plugins/draw/src/events.js +265 -77
  148. package/plugins/draw/src/events.test.js +708 -34
  149. package/plugins/draw/src/hooks/useSpatialList.js +10 -11
  150. package/plugins/draw/src/hooks/useSpatialList.test.js +3 -3
  151. package/plugins/draw/src/manifest.js +33 -17
  152. package/plugins/draw/src/manifest.test.js +104 -10
  153. package/plugins/draw/src/reducer.js +31 -9
  154. package/plugins/draw/src/reducer.test.js +35 -3
  155. package/plugins/draw/src/utils/drawModes.js +27 -0
  156. package/plugins/draw/src/utils/drawModes.test.js +27 -0
  157. package/plugins/draw/src/utils/needsDrawTarget.js +18 -0
  158. package/plugins/draw/src/utils/needsDrawTarget.test.js +32 -0
  159. package/plugins/draw/src/utils/touchTarget.js +34 -26
  160. package/plugins/draw/src/utils/touchTarget.test.js +32 -20
  161. package/plugins/draw/src/validation/commitChecks.js +185 -0
  162. package/plugins/draw/src/validation/commitChecks.test.js +205 -0
  163. package/plugins/draw/src/validation/liveDrawChecks.js +11 -11
  164. package/plugins/draw/src/validation/liveDrawChecks.test.js +37 -37
  165. package/plugins/draw/src/validation/liveStroke.js +6 -6
  166. package/plugins/draw/src/validation/liveStroke.test.js +27 -27
  167. package/plugins/draw/src/validation/rules.js +16 -14
  168. package/plugins/draw/src/validation/rules.test.js +5 -5
  169. package/plugins/draw/src/validation/validateGeometry.js +58 -31
  170. package/plugins/draw/src/validation/validateGeometry.test.js +68 -44
  171. package/plugins/draw-es/dist/esm/index.js +1 -0
  172. package/plugins/{beta/draw-es → draw-es}/src/DrawInit.jsx +1 -1
  173. package/plugins/{beta/draw-es → draw-es}/src/events.test.js +1 -1
  174. package/plugins/{beta/draw-es → draw-es}/src/graphic.js +1 -1
  175. package/plugins/frame/dist/esm/index.js +1 -0
  176. package/plugins/{beta/frame → frame}/dist/umd/im-frame-plugin.js +1 -1
  177. package/plugins/{beta/frame → frame}/dist/umd/index.js +1 -1
  178. package/plugins/{beta/frame → frame}/package.json +2 -2
  179. package/plugins/interact/dist/esm/im-interact-plugin.js +1 -1
  180. package/plugins/interact/dist/esm/index.js +1 -1
  181. package/plugins/interact/dist/umd/im-interact-plugin.js +1 -1
  182. package/plugins/interact/dist/umd/index.js +1 -1
  183. package/plugins/interact/src/InteractInit.jsx +3 -3
  184. package/plugins/interact/src/api/enable.test.js +13 -0
  185. package/plugins/interact/src/defaults.js +1 -0
  186. package/plugins/interact/src/hooks/useCrossHairVisibility.js +27 -17
  187. package/plugins/interact/src/hooks/useCrossHairVisibility.test.js +72 -7
  188. package/plugins/interact/src/hooks/useInteractionHandlers.js +3 -5
  189. package/plugins/interact/src/hooks/useInteractionHandlers.test.js +4 -3
  190. package/plugins/interact/src/hooks/useSpatialList.js +16 -17
  191. package/plugins/interact/src/hooks/useSpatialList.test.js +9 -9
  192. package/plugins/interact/src/manifest.js +4 -4
  193. package/plugins/interact/src/manifest.test.js +29 -0
  194. package/plugins/interact/src/reducer.js +7 -2
  195. package/plugins/interact/src/reducer.test.js +12 -2
  196. package/plugins/interact/src/utils/needsTarget.js +20 -0
  197. package/plugins/interact/src/utils/needsTarget.test.js +36 -0
  198. package/plugins/map-key/dist/esm/im-map-key-plugin.js +1 -1
  199. package/plugins/map-key/dist/esm/index.js +1 -1
  200. package/plugins/map-key/dist/umd/im-map-key-plugin.js +1 -1
  201. package/plugins/map-key/dist/umd/index.js +1 -1
  202. package/plugins/map-key/src/components/Key/KeySvgSymbol.jsx +4 -0
  203. package/plugins/map-key/src/components/Key/MapKey.jsx +15 -15
  204. package/plugins/map-key/src/components/Key/MapKey.test.jsx +29 -15
  205. package/plugins/map-key/src/initialise/MapKeyInit.jsx +5 -8
  206. package/plugins/map-key/src/initialise/MapKeyInit.test.jsx +9 -7
  207. package/plugins/map-key/src/manifest.test.js +0 -1
  208. package/plugins/map-key/src/reducers/mergeKeyGroupItems.js +14 -33
  209. package/plugins/map-key/src/reducers/mergeKeyGroupItems.test.js +34 -50
  210. package/plugins/map-key/src/reducers/pluginState.js +6 -1
  211. package/plugins/map-key/src/reducers/pluginState.test.js +13 -4
  212. package/plugins/map-styles/dist/esm/im-map-styles-plugin.js +1 -0
  213. package/plugins/map-styles/dist/esm/index.js +1 -0
  214. package/plugins/map-styles/dist/umd/im-map-styles-plugin.js +1 -0
  215. package/plugins/{beta/map-styles → map-styles}/dist/umd/index.js +1 -1
  216. package/plugins/{beta/map-styles → map-styles}/src/MapStyles.jsx +3 -3
  217. package/plugins/{beta/map-styles → map-styles}/src/MapStylesInit.jsx +1 -1
  218. package/plugins/menu/dist/esm/index.js +1 -1
  219. package/plugins/scale-bar/dist/esm/index.js +1 -0
  220. package/plugins/{beta/scale-bar → scale-bar}/dist/umd/im-scale-bar-plugin.js +1 -1
  221. package/plugins/{beta/scale-bar → scale-bar}/dist/umd/index.js +1 -1
  222. package/plugins/{beta/scale-bar → scale-bar}/package.json +2 -2
  223. package/plugins/search/dist/esm/im-search-plugin.js +1 -1
  224. package/plugins/search/dist/esm/index.js +1 -1
  225. package/plugins/search/dist/umd/im-search-plugin.js +1 -1
  226. package/plugins/search/dist/umd/index.js +1 -1
  227. package/plugins/search/src/components/Suggestions/Suggestions.jsx +3 -1
  228. package/plugins/search/src/components/Suggestions/Suggestions.test.jsx +11 -0
  229. package/plugins/search/src/utils/markedToElements.jsx +25 -0
  230. package/plugins/search/src/utils/markedToElements.test.jsx +49 -0
  231. package/plugins/search/src/utils/parseOsNamesResults.js +6 -4
  232. package/plugins/search/src/utils/parseOsNamesResults.test.js +18 -0
  233. package/plugins/use-location/dist/esm/index.js +1 -0
  234. package/plugins/{beta/use-location → use-location}/dist/umd/im-use-location-plugin.js +1 -1
  235. package/plugins/{beta/use-location → use-location}/dist/umd/index.js +1 -1
  236. package/providers/esri/dist/esm/index.js +1 -0
  237. package/providers/{beta/esri → esri}/src/esriProvider.js +1 -1
  238. package/providers/{beta/esri → esri}/src/mapEvents.js +2 -2
  239. package/providers/maplibre/dist/esm/index.js +1 -1
  240. package/providers/maplibre/dist/umd/index.js +1 -1
  241. package/providers/maplibre/src/index.js +11 -2
  242. package/providers/maplibre/src/index.test.js +23 -1
  243. package/providers/maplibre/src/utils/detectModuleWorker.js +8 -19
  244. package/providers/maplibre/src/utils/detectModuleWorker.test.js +19 -23
  245. package/providers/maplibre/src/utils/workerUrl.js +12 -0
  246. package/providers/maplibre/src/utils/workerUrl.test.js +14 -1
  247. package/providers/open-names/dist/esm/index.js +1 -0
  248. package/providers/{beta/open-names → open-names}/dist/umd/im-reverse-geocode.js +1 -1
  249. package/providers/{beta/open-names → open-names}/dist/umd/index.js +1 -1
  250. package/providers/openlayers/dist/esm/index.js +1 -0
  251. package/providers/openlayers/dist/umd/im-openlayers-provider.js +2 -0
  252. package/providers/{beta/openlayers → openlayers}/dist/umd/index.js +1 -1
  253. package/providers/{beta/openlayers → openlayers}/src/index.js +4 -4
  254. package/providers/{beta/openlayers → openlayers}/src/mapEvents.js +2 -2
  255. package/providers/{beta/openlayers → openlayers}/src/mapEvents.test.js +2 -2
  256. package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.js +3 -3
  257. package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.js +1 -1
  258. package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.js +1 -1
  259. package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.js +1 -1
  260. package/rollup.esm.mjs +43 -47
  261. package/sonar-project.properties +1 -1
  262. package/src/App/App.jsx +4 -1
  263. package/src/App/App.test.jsx +6 -0
  264. package/src/App/components/MapButton/MapButton.jsx +6 -0
  265. package/src/App/components/MapButton/MapButton.test.jsx +10 -0
  266. package/src/App/components/Markers/Markers.jsx +3 -5
  267. package/src/App/components/Markers/Markers.test.jsx +9 -11
  268. package/src/App/components/Panel/Panel.jsx +2 -9
  269. package/src/App/hooks/useInterfaceAPI.js +16 -4
  270. package/src/App/hooks/useInterfaceAPI.test.js +66 -1
  271. package/src/App/renderer/PluginInits.jsx +8 -7
  272. package/src/App/renderer/PluginInits.test.jsx +20 -5
  273. package/src/App/renderer/SlotItemsProvider.jsx +33 -0
  274. package/src/App/renderer/SlotItemsProvider.test.jsx +59 -0
  275. package/src/App/renderer/SlotRenderer.jsx +3 -14
  276. package/src/App/renderer/SlotRenderer.test.jsx +11 -44
  277. package/src/App/renderer/mapButtons.js +24 -12
  278. package/src/App/renderer/mapButtons.test.js +32 -1
  279. package/src/App/renderer/mapControls.js +6 -8
  280. package/src/App/renderer/mapControls.test.js +10 -0
  281. package/src/App/renderer/mapPanels.js +16 -19
  282. package/src/App/renderer/mapPanels.test.js +37 -9
  283. package/src/App/renderer/pluginWrapper.js +10 -8
  284. package/src/App/renderer/pluginWrapper.test.js +23 -9
  285. package/src/App/renderer/slotAggregator.js +18 -5
  286. package/src/App/renderer/slotAggregator.test.js +68 -25
  287. package/src/App/renderer/slotHelpers.js +13 -0
  288. package/src/App/renderer/slotHelpers.test.js +16 -1
  289. package/src/App/store/AppProvider.jsx +19 -1
  290. package/src/App/store/AppProvider.test.jsx +41 -0
  291. package/src/App/store/MapProvider.jsx +3 -0
  292. package/src/App/store/MapProvider.test.jsx +24 -0
  293. package/src/App/store/appActionsMap.js +10 -1
  294. package/src/App/store/appActionsMap.test.js +21 -0
  295. package/src/App/store/appDispatchMiddleware.js +29 -17
  296. package/src/App/store/appDispatchMiddleware.test.js +31 -0
  297. package/src/InteractiveMap/parseDataProperties.js +4 -4
  298. package/src/InteractiveMap/parseDataProperties.test.js +62 -6
  299. package/src/config/events.js +4 -2
  300. package/src/config/mapSizeScales.js +3 -0
  301. package/src/scss/tools/_govuk-content.scss +4 -3
  302. package/src/types.js +4 -0
  303. package/src/utils/focusAfterPanelClose.js +9 -0
  304. package/src/utils/focusAfterPanelClose.test.js +40 -0
  305. package/webpack.dev.mjs +9 -3
  306. package/webpack.prod.mjs +11 -4
  307. package/webpack.umd.mjs +6 -7
  308. package/plugins/beta/draw-es/dist/esm/index.js +0 -1
  309. package/plugins/beta/draw-ml/dist/esm/im-draw-ml-plugin.js +0 -1
  310. package/plugins/beta/draw-ml/dist/esm/index.js +0 -1
  311. package/plugins/beta/draw-ml/dist/umd/im-draw-ml-plugin.js +0 -1
  312. package/plugins/beta/draw-ml/dist/umd/index.js +0 -2
  313. package/plugins/beta/draw-ml/src/DrawInit.jsx +0 -85
  314. package/plugins/beta/draw-ml/src/api/addFeature.js +0 -27
  315. package/plugins/beta/draw-ml/src/api/deleteFeature.js +0 -13
  316. package/plugins/beta/draw-ml/src/api/editFeature.js +0 -75
  317. package/plugins/beta/draw-ml/src/api/merge.js +0 -9
  318. package/plugins/beta/draw-ml/src/api/newLine.js +0 -68
  319. package/plugins/beta/draw-ml/src/api/newPolygon.js +0 -68
  320. package/plugins/beta/draw-ml/src/api/split.js +0 -81
  321. package/plugins/beta/draw-ml/src/defaults.js +0 -17
  322. package/plugins/beta/draw-ml/src/draw.scss +0 -26
  323. package/plugins/beta/draw-ml/src/events.js +0 -185
  324. package/plugins/beta/draw-ml/src/index.js +0 -13
  325. package/plugins/beta/draw-ml/src/manifest.js +0 -110
  326. package/plugins/beta/draw-ml/src/mapboxDraw.js +0 -143
  327. package/plugins/beta/draw-ml/src/mapboxSnap.js +0 -321
  328. package/plugins/beta/draw-ml/src/modes/createDrawMode.js +0 -552
  329. package/plugins/beta/draw-ml/src/modes/disabledMode.js +0 -23
  330. package/plugins/beta/draw-ml/src/modes/drawLineMode.js +0 -18
  331. package/plugins/beta/draw-ml/src/modes/drawPolygonMode.js +0 -16
  332. package/plugins/beta/draw-ml/src/modes/editVertex/geometryHelpers.js +0 -135
  333. package/plugins/beta/draw-ml/src/modes/editVertex/helpers.js +0 -2
  334. package/plugins/beta/draw-ml/src/modes/editVertex/touchHandlers.js +0 -142
  335. package/plugins/beta/draw-ml/src/modes/editVertex/undoHandlers.js +0 -133
  336. package/plugins/beta/draw-ml/src/modes/editVertex/vertexOperations.js +0 -142
  337. package/plugins/beta/draw-ml/src/modes/editVertex/vertexQueries.js +0 -121
  338. package/plugins/beta/draw-ml/src/modes/editVertexMode.js +0 -495
  339. package/plugins/beta/draw-ml/src/reducer.js +0 -90
  340. package/plugins/beta/draw-ml/src/styles.js +0 -190
  341. package/plugins/beta/draw-ml/src/undoStack.js +0 -50
  342. package/plugins/beta/draw-ml/src/utils/debounce.js +0 -16
  343. package/plugins/beta/draw-ml/src/utils/flattenStyleProperties.js +0 -49
  344. package/plugins/beta/draw-ml/src/utils/snapHelpers.js +0 -200
  345. package/plugins/beta/draw-ml/src/utils/spatial.js +0 -258
  346. package/plugins/beta/draw-ol/dist/css/index.css +0 -1
  347. package/plugins/beta/draw-ol/dist/esm/DrawMode.js +0 -1
  348. package/plugins/beta/draw-ol/dist/esm/EditMode.js +0 -1
  349. package/plugins/beta/draw-ol/dist/esm/geometryHelpers.js +0 -1
  350. package/plugins/beta/draw-ol/dist/esm/im-draw-ol-plugin.js +0 -1
  351. package/plugins/beta/draw-ol/dist/esm/index.js +0 -1
  352. package/plugins/beta/draw-ol/src/DrawInit.jsx +0 -65
  353. package/plugins/beta/draw-ol/src/api/addFeature.js +0 -29
  354. package/plugins/beta/draw-ol/src/api/deleteFeature.js +0 -11
  355. package/plugins/beta/draw-ol/src/api/editFeature.js +0 -50
  356. package/plugins/beta/draw-ol/src/api/newLine.js +0 -44
  357. package/plugins/beta/draw-ol/src/api/newPolygon.js +0 -44
  358. package/plugins/beta/draw-ol/src/core/OLDrawManager.js +0 -153
  359. package/plugins/beta/draw-ol/src/core/featureStore.js +0 -65
  360. package/plugins/beta/draw-ol/src/core/styles.js +0 -98
  361. package/plugins/beta/draw-ol/src/core/undoStack.js +0 -31
  362. package/plugins/beta/draw-ol/src/defaults.js +0 -16
  363. package/plugins/beta/draw-ol/src/draw/DrawMode.js +0 -121
  364. package/plugins/beta/draw-ol/src/draw/drawInput.js +0 -243
  365. package/plugins/beta/draw-ol/src/draw.scss +0 -17
  366. package/plugins/beta/draw-ol/src/edit/EditMode.js +0 -424
  367. package/plugins/beta/draw-ol/src/edit/keyboardHandler.js +0 -229
  368. package/plugins/beta/draw-ol/src/edit/midpointLayer.js +0 -57
  369. package/plugins/beta/draw-ol/src/edit/touchHandler.js +0 -171
  370. package/plugins/beta/draw-ol/src/edit/undoOps.js +0 -95
  371. package/plugins/beta/draw-ol/src/edit/vertexHitTest.js +0 -72
  372. package/plugins/beta/draw-ol/src/edit/vertexLayer.js +0 -49
  373. package/plugins/beta/draw-ol/src/edit/vertexOps.js +0 -99
  374. package/plugins/beta/draw-ol/src/events.js +0 -114
  375. package/plugins/beta/draw-ol/src/index.js +0 -12
  376. package/plugins/beta/draw-ol/src/manifest.js +0 -125
  377. package/plugins/beta/draw-ol/src/olDraw.js +0 -38
  378. package/plugins/beta/draw-ol/src/reducer.js +0 -41
  379. package/plugins/beta/draw-ol/src/snap/snapEngine.js +0 -153
  380. package/plugins/beta/draw-ol/src/snap/snapGeometry.js +0 -177
  381. package/plugins/beta/draw-ol/src/snap/snapIndicator.js +0 -81
  382. package/plugins/beta/draw-ol/src/snap/snapInteraction.js +0 -57
  383. package/plugins/beta/draw-ol/src/snap/snapManager.js +0 -99
  384. package/plugins/beta/draw-ol/src/utils/flattenStyleProperties.js +0 -47
  385. package/plugins/beta/draw-ol/src/utils/geometryHelpers.js +0 -103
  386. package/plugins/beta/draw-ol/src/utils/olCoords.js +0 -35
  387. package/plugins/beta/draw-ol/src/utils/resolveColors.js +0 -39
  388. package/plugins/beta/draw-ol/src/utils/spatial.js +0 -24
  389. package/plugins/beta/draw-ol/src/utils/touchTarget.js +0 -61
  390. package/plugins/beta/frame/dist/esm/index.js +0 -1
  391. package/plugins/beta/map-styles/dist/esm/im-map-styles-plugin.js +0 -1
  392. package/plugins/beta/map-styles/dist/esm/index.js +0 -1
  393. package/plugins/beta/map-styles/dist/umd/im-map-styles-plugin.js +0 -1
  394. package/plugins/beta/scale-bar/dist/esm/index.js +0 -1
  395. package/plugins/beta/use-location/dist/esm/index.js +0 -1
  396. package/plugins/map-key/src/registry/getDatasetRegistry.js +0 -6
  397. package/plugins/map-key/src/registry/getDatasetRegistry.test.js +0 -23
  398. package/plugins/map-key/src/registry/index.js +0 -1
  399. package/plugins/map-key/src/registry/index.test.js +0 -7
  400. package/providers/beta/esri/dist/esm/index.js +0 -1
  401. package/providers/beta/open-names/dist/esm/index.js +0 -1
  402. package/providers/beta/openlayers/dist/esm/index.js +0 -1
  403. package/providers/beta/openlayers/dist/umd/im-openlayers-provider.js +0 -2
  404. package/providers/beta/openlayers/dist/umd/index.js.LICENSE.txt +0 -1
  405. /package/plugins/{beta/draw-es → draw-es}/dist/esm/im-draw-es-plugin.js +0 -0
  406. /package/plugins/{beta/draw-es → draw-es}/src/api/addFeature.js +0 -0
  407. /package/plugins/{beta/draw-es → draw-es}/src/api/deleteFeature.js +0 -0
  408. /package/plugins/{beta/draw-es → draw-es}/src/api/editFeature.js +0 -0
  409. /package/plugins/{beta/draw-es → draw-es}/src/api/newPolygon.js +0 -0
  410. /package/plugins/{beta/draw-es → draw-es}/src/api/removeSafeZone.js +0 -0
  411. /package/plugins/{beta/draw-es → draw-es}/src/events.js +0 -0
  412. /package/plugins/{beta/draw-es → draw-es}/src/index.js +0 -0
  413. /package/plugins/{beta/draw-es → draw-es}/src/manifest.js +0 -0
  414. /package/plugins/{beta/draw-es → draw-es}/src/reducer.js +0 -0
  415. /package/plugins/{beta/draw-es → draw-es}/src/sketchViewModel.js +0 -0
  416. /package/plugins/{beta/frame → frame}/dist/css/index.css +0 -0
  417. /package/plugins/{beta/frame → frame}/dist/esm/im-frame-plugin.js +0 -0
  418. /package/plugins/{beta/draw-ml → frame}/dist/umd/index.js.LICENSE.txt +0 -0
  419. /package/plugins/{beta/frame → frame}/src/Frame.jsx +0 -0
  420. /package/plugins/{beta/frame → frame}/src/FrameInit.jsx +0 -0
  421. /package/plugins/{beta/frame → frame}/src/api/addFrame.js +0 -0
  422. /package/plugins/{beta/frame → frame}/src/api/editFeature.js +0 -0
  423. /package/plugins/{beta/frame → frame}/src/config.js +0 -0
  424. /package/plugins/{beta/frame → frame}/src/frame.scss +0 -0
  425. /package/plugins/{beta/frame → frame}/src/index.js +0 -0
  426. /package/plugins/{beta/frame → frame}/src/manifest.js +0 -0
  427. /package/plugins/{beta/frame → frame}/src/reducer.js +0 -0
  428. /package/plugins/{beta/frame → frame}/src/utils.js +0 -0
  429. /package/plugins/{beta/map-styles → map-styles}/dist/css/index.css +0 -0
  430. /package/plugins/{beta/frame → map-styles}/dist/umd/index.js.LICENSE.txt +0 -0
  431. /package/plugins/{beta/map-styles → map-styles}/src/config.js +0 -0
  432. /package/plugins/{beta/map-styles → map-styles}/src/index.js +0 -0
  433. /package/plugins/{beta/map-styles → map-styles}/src/manifest.js +0 -0
  434. /package/plugins/{beta/map-styles → map-styles}/src/mapStyles.scss +0 -0
  435. /package/plugins/{beta/scale-bar → scale-bar}/dist/css/index.css +0 -0
  436. /package/plugins/{beta/scale-bar → scale-bar}/dist/esm/im-scale-bar-plugin.js +0 -0
  437. /package/plugins/{beta/map-styles → scale-bar}/dist/umd/index.js.LICENSE.txt +0 -0
  438. /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.jsx +0 -0
  439. /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.test.jsx +0 -0
  440. /package/plugins/{beta/scale-bar → scale-bar}/src/index.js +0 -0
  441. /package/plugins/{beta/scale-bar → scale-bar}/src/index.test.js +0 -0
  442. /package/plugins/{beta/scale-bar → scale-bar}/src/manifest.js +0 -0
  443. /package/plugins/{beta/scale-bar → scale-bar}/src/scaleBar.scss +0 -0
  444. /package/plugins/{beta/scale-bar → scale-bar}/src/utils.js +0 -0
  445. /package/plugins/{beta/scale-bar → scale-bar}/src/utils.test.js +0 -0
  446. /package/plugins/{beta/use-location → use-location}/dist/esm/im-use-location-plugin.js +0 -0
  447. /package/plugins/{beta/scale-bar → use-location}/dist/umd/index.js.LICENSE.txt +0 -0
  448. /package/plugins/{beta/use-location → use-location}/src/UseLocation.jsx +0 -0
  449. /package/plugins/{beta/use-location → use-location}/src/UseLocationInit.jsx +0 -0
  450. /package/plugins/{beta/use-location → use-location}/src/defaults.js +0 -0
  451. /package/plugins/{beta/use-location → use-location}/src/events.js +0 -0
  452. /package/plugins/{beta/use-location → use-location}/src/index.js +0 -0
  453. /package/plugins/{beta/use-location → use-location}/src/manifest.js +0 -0
  454. /package/plugins/{beta/use-location → use-location}/src/reducer.js +0 -0
  455. /package/providers/{beta/esri → esri}/dist/css/index.css +0 -0
  456. /package/providers/{beta/esri → esri}/dist/esm/im-esri-provider.js +0 -0
  457. /package/providers/{beta/esri → esri}/src/appEvents.js +0 -0
  458. /package/providers/{beta/esri → esri}/src/defaults.js +0 -0
  459. /package/providers/{beta/esri → esri}/src/esriProvider.scss +0 -0
  460. /package/providers/{beta/esri → esri}/src/index.js +0 -0
  461. /package/providers/{beta/esri → esri}/src/utils/coords.js +0 -0
  462. /package/providers/{beta/esri → esri}/src/utils/coords.test.js +0 -0
  463. /package/providers/{beta/esri → esri}/src/utils/detectWebGL.js +0 -0
  464. /package/providers/{beta/esri → esri}/src/utils/esriFixes.js +0 -0
  465. /package/providers/{beta/esri → esri}/src/utils/query.js +0 -0
  466. /package/providers/{beta/esri → esri}/src/utils/spatial.js +0 -0
  467. /package/providers/{beta/esri → esri}/src/utils/spatial.test.js +0 -0
  468. /package/providers/{beta/open-names → open-names}/dist/esm/im-reverse-geocode.js +0 -0
  469. /package/providers/{beta/open-names → open-names}/dist/umd/im-reverse-geocode.js.LICENSE.txt +0 -0
  470. /package/{plugins/beta/use-location → providers/open-names}/dist/umd/index.js.LICENSE.txt +0 -0
  471. /package/providers/{beta/open-names → open-names}/src/index.js +0 -0
  472. /package/providers/{beta/open-names → open-names}/src/reverseGeocode.js +0 -0
  473. /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.js +0 -0
  474. /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.test.js +0 -0
  475. /package/providers/{beta/openlayers → openlayers}/dist/esm/im-openlayers-provider.js +0 -0
  476. /package/providers/{beta/openlayers → openlayers}/dist/umd/im-openlayers-provider.js.LICENSE.txt +0 -0
  477. /package/providers/{beta/open-names → openlayers}/dist/umd/index.js.LICENSE.txt +0 -0
  478. /package/providers/{beta/openlayers → openlayers}/src/appEvents.js +0 -0
  479. /package/providers/{beta/openlayers → openlayers}/src/appEvents.test.js +0 -0
  480. /package/providers/{beta/openlayers → openlayers}/src/defaults.js +0 -0
  481. /package/providers/{beta/openlayers → openlayers}/src/index.test.js +0 -0
  482. /package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.test.js +0 -0
  483. /package/providers/{beta/openlayers → openlayers}/src/utils/bngProjection.js +0 -0
  484. /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.js +0 -0
  485. /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.test.js +0 -0
  486. /package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.test.js +0 -0
  487. /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.js +0 -0
  488. /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.test.js +0 -0
  489. /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.js +0 -0
  490. /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.test.js +0 -0
  491. /package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.test.js +0 -0
  492. /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.js +0 -0
  493. /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.test.js +0 -0
  494. /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.js +0 -0
  495. /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.test.js +0 -0
  496. /package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.test.js +0 -0
  497. /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.js +0 -0
  498. /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.test.js +0 -0
  499. /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.js +0 -0
  500. /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.test.js +0 -0
  501. /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.js +0 -0
  502. /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.test.js +0 -0
@@ -2,9 +2,11 @@ import { renderHook, act } from '@testing-library/react'
2
2
  import { useInterfaceAPI } from './useInterfaceAPI.js'
3
3
  import { useApp } from '../store/appContext.js'
4
4
  import { useService } from '../store/serviceContext.js'
5
+ import { useConfig } from '../store/configContext.js'
5
6
 
6
7
  jest.mock('../store/appContext.js')
7
8
  jest.mock('../store/serviceContext.js')
9
+ jest.mock('../store/configContext.js')
8
10
 
9
11
  const makeEventBus = () => {
10
12
  const handlers = {}
@@ -26,11 +28,15 @@ describe('useInterfaceAPI', () => {
26
28
  hiddenButtons: new Set(),
27
29
  disabledButtons: new Set(),
28
30
  pressedButtons: new Set(),
29
- expandedButtons: new Set()
31
+ expandedButtons: new Set(),
32
+ openPanels: {},
33
+ layoutRefs: { viewportRef: { current: { focus: jest.fn() } } },
34
+ interfaceType: 'keyboard'
30
35
  }
31
36
 
32
37
  useApp.mockReturnValue({ dispatch: mockDispatch, ...mockState })
33
38
  useService.mockReturnValue({ eventBus: mockEventBus })
39
+ useConfig.mockReturnValue({ id: 'map' })
34
40
  })
35
41
 
36
42
  it('sets a mode on app:setapplicationmode', () => {
@@ -122,6 +128,65 @@ describe('useInterfaceAPI', () => {
122
128
  expect(mockDispatch).toHaveBeenCalledWith({ type: 'CLOSE_PANEL', payload: 'panel1' })
123
129
  })
124
130
 
131
+ describe('focus on app:hidepanel', () => {
132
+ let panelEl, panelButton, triggeringElement, outsideButton
133
+
134
+ beforeEach(() => {
135
+ jest.spyOn(window, 'requestAnimationFrame').mockImplementation((cb) => cb())
136
+ panelEl = document.createElement('div')
137
+ panelEl.id = 'map-panel-panel1'
138
+ panelButton = panelEl.appendChild(document.createElement('button'))
139
+ triggeringElement = document.createElement('button')
140
+ outsideButton = document.createElement('button')
141
+ document.body.append(panelEl, triggeringElement, outsideButton)
142
+ jest.spyOn(triggeringElement, 'focus')
143
+ })
144
+
145
+ afterEach(() => {
146
+ window.requestAnimationFrame.mockRestore()
147
+ document.body.innerHTML = ''
148
+ })
149
+
150
+ const renderWithOpenPanel = (props) => {
151
+ useApp.mockReturnValue({ dispatch: mockDispatch, ...mockState, openPanels: { panel1: { props } } })
152
+ renderHook(() => useInterfaceAPI())
153
+ }
154
+
155
+ it('focuses the triggering element when focus is inside the panel', () => {
156
+ renderWithOpenPanel({ triggeringElement })
157
+ panelButton.focus()
158
+ act(() => mockEventBus.emit('app:hidepanel', 'panel1'))
159
+ expect(triggeringElement.focus).toHaveBeenCalledWith({ preventScroll: false })
160
+ expect(mockDispatch).toHaveBeenCalledWith({ type: 'CLOSE_PANEL', payload: 'panel1' })
161
+ })
162
+
163
+ it('focuses the map when focus is inside the panel and the triggering element has gone', () => {
164
+ triggeringElement.remove()
165
+ renderWithOpenPanel({ triggeringElement })
166
+ panelButton.focus()
167
+ act(() => mockEventBus.emit('app:hidepanel', 'panel1'))
168
+ expect(triggeringElement.focus).not.toHaveBeenCalled()
169
+ expect(mockState.layoutRefs.viewportRef.current.focus).toHaveBeenCalled()
170
+ })
171
+
172
+ it('focuses the map when focus is inside a panel opened without a triggering element', () => {
173
+ renderWithOpenPanel({})
174
+ panelButton.focus()
175
+ act(() => mockEventBus.emit('app:hidepanel', 'panel1'))
176
+ expect(mockState.layoutRefs.viewportRef.current.focus).toHaveBeenCalled()
177
+ })
178
+
179
+ it('leaves focus where it is when focus is outside the panel', () => {
180
+ renderWithOpenPanel({ triggeringElement })
181
+ outsideButton.focus()
182
+ act(() => mockEventBus.emit('app:hidepanel', 'panel1'))
183
+ expect(triggeringElement.focus).not.toHaveBeenCalled()
184
+ expect(mockState.layoutRefs.viewportRef.current.focus).not.toHaveBeenCalled()
185
+ expect(document.activeElement).toBe(outsideButton)
186
+ expect(mockDispatch).toHaveBeenCalledWith({ type: 'CLOSE_PANEL', payload: 'panel1' })
187
+ })
188
+ })
189
+
125
190
  it('dispatches ADD_CONTROL on app:addcontrol', () => {
126
191
  renderHook(() => useInterfaceAPI())
127
192
  act(() => mockEventBus.emit('app:addcontrol', { id: 'ctrl1', config: { position: 'top-left' } }))
@@ -1,5 +1,5 @@
1
1
  // src/core/PluginInits.jsx
2
- import React, { useEffect } from 'react'
2
+ import React, { useEffect, useMemo } from 'react'
3
3
  import { withPluginContexts } from './pluginWrapper.js'
4
4
  import { withPluginApiContexts, usePluginApiState } from './pluginApiWrapper.js'
5
5
  import { useInterfaceAPI } from '../hooks/useInterfaceAPI.js'
@@ -27,18 +27,19 @@ const PluginInit = ({ plugin }) => {
27
27
  }, [plugin, stateRef])
28
28
 
29
29
  const { InitComponent } = plugin
30
- const { api, ...pluginConfig } = plugin?.config || {}
30
+ // The same object on every render, so plugins can depend on it in effects
31
+ const pluginConfig = useMemo(() => {
32
+ const { api, ...config } = plugin?.config || {}
33
+ return config
34
+ }, [plugin])
31
35
 
32
36
  if (!InitComponent) {
33
37
  return null
34
38
  }
35
39
 
36
- const WrappedInit = withPluginContexts(InitComponent, {
37
- pluginId: plugin.id,
38
- pluginConfig
39
- })
40
+ const WrappedInit = withPluginContexts(InitComponent)
40
41
 
41
- return <WrappedInit />
42
+ return <WrappedInit pluginId={plugin.id} pluginConfig={pluginConfig} />
42
43
  }
43
44
 
44
45
  export const PluginInits = () => {
@@ -77,7 +77,7 @@ describe('PluginInits', () => {
77
77
  })
78
78
 
79
79
  it('renders wrapped InitComponent for plugin with InitComponent and valid mode', () => {
80
- const InitComp = () => <div data-testid='init' />
80
+ const InitComp = jest.fn(() => <div data-testid='init' />)
81
81
  const plugin = {
82
82
  id: 'plugin1',
83
83
  _originalPlugin: {},
@@ -88,10 +88,25 @@ describe('PluginInits', () => {
88
88
 
89
89
  const { getByTestId } = render(<PluginInits />)
90
90
  expect(getByTestId('init')).toBeTruthy()
91
- expect(withPluginContexts).toHaveBeenCalledWith(
92
- InitComp,
93
- expect.objectContaining({ pluginId: 'plugin1' })
94
- )
91
+ expect(withPluginContexts).toHaveBeenCalledWith(InitComp)
92
+ // The plugin's id and config, without its api, are passed when rendering
93
+ expect(InitComp.mock.calls[0][0]).toEqual({ pluginId: 'plugin1', pluginConfig: { foo: 'bar' } })
94
+ })
95
+
96
+ it('passes the same pluginConfig object on every render', () => {
97
+ const InitComp = jest.fn(() => <div data-testid='init' />)
98
+ pluginRegistryMock.registeredPlugins.push({
99
+ id: 'plugin1',
100
+ _originalPlugin: {},
101
+ config: { foo: 'bar', api: {} },
102
+ InitComponent: InitComp
103
+ })
104
+
105
+ const { rerender } = render(<PluginInits />)
106
+ rerender(<PluginInits />)
107
+
108
+ const [firstProps, secondProps] = InitComp.mock.calls.map(([props]) => props)
109
+ expect(secondProps.pluginConfig).toBe(firstProps.pluginConfig)
95
110
  })
96
111
 
97
112
  it('skips plugin without InitComponent', () => {
@@ -0,0 +1,33 @@
1
+ // src/core/renderers/SlotItemsProvider.jsx
2
+ import React, { createContext, useContext } from 'react'
3
+ import { useConfig } from '../store/configContext.js'
4
+ import { useApp } from '../store/appContext.js'
5
+ import { getItemsBySlot } from './slotAggregator.js'
6
+ import { useEvaluateProp } from '../hooks/useEvaluateProp.js'
7
+ import { useApplicationModeFilter } from '../hooks/useApplicationModeFilter.js'
8
+
9
+ const SlotItemsContext = createContext(new Map())
10
+
11
+ /**
12
+ * Builds every slot's items once per render and shares them with each SlotRenderer below it.
13
+ * Kept separate from Layout so that a plugin state change re-renders only this provider and the
14
+ * slots, not the rest of the layout.
15
+ */
16
+ export const SlotItemsProvider = ({ children }) => {
17
+ const appConfig = useConfig()
18
+ const appState = useApp()
19
+ const evaluateProp = useEvaluateProp()
20
+ const isHiddenByApplicationMode = useApplicationModeFilter()
21
+
22
+ const itemsBySlot = getItemsBySlot({ appConfig, appState, evaluateProp, isHiddenByApplicationMode })
23
+
24
+ return (
25
+ <SlotItemsContext.Provider value={itemsBySlot}>
26
+ {children}
27
+ </SlotItemsContext.Provider>
28
+ )
29
+ }
30
+
31
+ const noItems = []
32
+
33
+ export const useSlotItems = (slot) => useContext(SlotItemsContext).get(slot) ?? noItems
@@ -0,0 +1,59 @@
1
+ import React from 'react'
2
+ import { render } from '@testing-library/react'
3
+ import { SlotItemsProvider, useSlotItems } from './SlotItemsProvider.jsx'
4
+ import { getItemsBySlot } from './slotAggregator.js'
5
+ import { useApp } from '../store/appContext.js'
6
+ import { useConfig } from '../store/configContext.js'
7
+ import { useEvaluateProp } from '../hooks/useEvaluateProp.js'
8
+ import { useApplicationModeFilter } from '../hooks/useApplicationModeFilter.js'
9
+
10
+ jest.mock('./slotAggregator.js', () => ({ getItemsBySlot: jest.fn() }))
11
+ jest.mock('../store/appContext.js', () => ({ useApp: jest.fn() }))
12
+ jest.mock('../store/configContext.js', () => ({ useConfig: jest.fn() }))
13
+ jest.mock('../hooks/useEvaluateProp.js', () => ({ useEvaluateProp: jest.fn() }))
14
+ jest.mock('../hooks/useApplicationModeFilter.js', () => ({ useApplicationModeFilter: jest.fn() }))
15
+
16
+ const SlotIds = ({ slot }) => <div data-testid={slot}>{useSlotItems(slot).map(item => item.id).join(',')}</div>
17
+
18
+ describe('SlotItemsProvider', () => {
19
+ const appConfig = { id: 'test' }
20
+ const appState = { breakpoint: 'desktop' }
21
+ const evaluateProp = jest.fn()
22
+ const isHiddenByApplicationMode = jest.fn()
23
+
24
+ beforeEach(() => {
25
+ jest.clearAllMocks()
26
+ useConfig.mockReturnValue(appConfig)
27
+ useApp.mockReturnValue(appState)
28
+ useEvaluateProp.mockReturnValue(evaluateProp)
29
+ useApplicationModeFilter.mockReturnValue(isHiddenByApplicationMode)
30
+ getItemsBySlot.mockReturnValue(new Map([['header', [{ id: 'a' }, { id: 'b' }]]]))
31
+ })
32
+
33
+ it('builds every slot\'s items once per render, however many slots read them', () => {
34
+ render(
35
+ <SlotItemsProvider>
36
+ <SlotIds slot='header' />
37
+ <SlotIds slot='banner' />
38
+ </SlotItemsProvider>
39
+ )
40
+ expect(getItemsBySlot).toHaveBeenCalledTimes(1)
41
+ expect(getItemsBySlot).toHaveBeenCalledWith({ appConfig, appState, evaluateProp, isHiddenByApplicationMode })
42
+ })
43
+
44
+ it('gives each slot its own items, and none to a slot with no items', () => {
45
+ const { getByTestId } = render(
46
+ <SlotItemsProvider>
47
+ <SlotIds slot='header' />
48
+ <SlotIds slot='banner' />
49
+ </SlotItemsProvider>
50
+ )
51
+ expect(getByTestId('header')).toHaveTextContent('a,b')
52
+ expect(getByTestId('banner')).toBeEmptyDOMElement()
53
+ })
54
+
55
+ it('gives no items outside a provider', () => {
56
+ const { getByTestId } = render(<SlotIds slot='header' />)
57
+ expect(getByTestId('header')).toBeEmptyDOMElement()
58
+ })
59
+ })
@@ -1,22 +1,11 @@
1
1
  // src/core/renderers/SlotRenderer.jsx
2
2
  import React from 'react'
3
- import { useConfig } from '../store/configContext.js'
4
- import { useApp } from '../store/appContext.js'
5
- import { getSlotItems } from './slotAggregator.js'
3
+ import { useSlotItems } from './SlotItemsProvider.jsx'
6
4
  import { Actions } from '../components/Actions/Actions.jsx'
7
- import { useEvaluateProp } from '../hooks/useEvaluateProp.js'
8
- import { useApplicationModeFilter } from '../hooks/useApplicationModeFilter.js'
9
5
 
10
6
  export const SlotRenderer = ({ slot }) => {
11
- const appConfig = useConfig()
12
- const appState = useApp()
13
-
14
- // Shared evaluateProp hook for this render cycle
15
- const evaluateProp = useEvaluateProp()
16
- const isHiddenByApplicationMode = useApplicationModeFilter()
17
-
18
- // Get all slot items (controls, panels, buttons)
19
- const slotItems = getSlotItems({ slot, appConfig, appState, evaluateProp, isHiddenByApplicationMode })
7
+ // Built for every slot at once by SlotItemsProvider
8
+ const slotItems = useSlotItems(slot)
20
9
 
21
10
  if (!slotItems.length) {
22
11
  return null
@@ -1,57 +1,30 @@
1
1
  import React from 'react'
2
2
  import { render } from '@testing-library/react'
3
3
  import { SlotRenderer } from './SlotRenderer.jsx'
4
- import { getSlotItems } from './slotAggregator'
5
- import { useApp } from '../store/appContext'
6
- import { useConfig } from '../store/configContext'
7
- import { useEvaluateProp } from '../hooks/useEvaluateProp'
8
- import { useApplicationModeFilter } from '../hooks/useApplicationModeFilter.js'
4
+ import { useSlotItems } from './SlotItemsProvider.jsx'
9
5
 
10
- jest.mock('./slotAggregator', () => ({
11
- getSlotItems: jest.fn()
6
+ jest.mock('./SlotItemsProvider.jsx', () => ({
7
+ useSlotItems: jest.fn()
12
8
  }))
9
+ // Actions reads the open panels from app state
13
10
  jest.mock('../store/appContext', () => ({
14
- useApp: jest.fn()
15
- }))
16
- jest.mock('../store/configContext', () => ({
17
- useConfig: jest.fn()
18
- }))
19
- jest.mock('../hooks/useEvaluateProp', () => ({
20
- useEvaluateProp: jest.fn()
21
- }))
22
- jest.mock('../hooks/useApplicationModeFilter.js', () => ({
23
- useApplicationModeFilter: jest.fn()
11
+ useApp: () => ({ breakpoint: 'desktop', openPanels: {}, panelConfig: {} })
24
12
  }))
25
13
 
26
14
  describe('SlotRenderer', () => {
27
- const mockAppConfig = { id: 'testId' }
28
- const mockAppState = {
29
- breakpoint: 'desktop',
30
- mode: 'view',
31
- openPanels: {},
32
- dispatch: jest.fn(),
33
- disabledButtons: new Set()
34
- }
35
- const mockEvaluateProp = jest.fn(x => x)
36
- const mockIsHiddenByApplicationMode = jest.fn(() => false)
37
-
38
15
  beforeEach(() => {
39
16
  jest.clearAllMocks()
40
- useConfig.mockReturnValue(mockAppConfig)
41
- useApp.mockReturnValue(mockAppState)
42
- useEvaluateProp.mockReturnValue(mockEvaluateProp)
43
- useApplicationModeFilter.mockReturnValue(mockIsHiddenByApplicationMode)
44
17
  })
45
18
 
46
19
  it('renders nothing if no slot items', () => {
47
- getSlotItems.mockReturnValue([])
20
+ useSlotItems.mockReturnValue([])
48
21
  const { container } = render(<SlotRenderer slot='header' />)
49
22
  expect(container.firstChild).toBeNull()
50
23
  })
51
24
 
52
25
  it('wraps slot items in <Actions> for actions slot', () => {
53
26
  const items = [{ element: <div key='1'>Item1</div> }]
54
- getSlotItems.mockReturnValue(items)
27
+ useSlotItems.mockReturnValue(items)
55
28
 
56
29
  const { getByText } = render(<SlotRenderer slot='actions' />)
57
30
  expect(getByText('Item1')).toBeInTheDocument()
@@ -62,22 +35,16 @@ describe('SlotRenderer', () => {
62
35
  { element: <div key='1'>Item1</div> },
63
36
  { element: <span key='2'>Item2</span> }
64
37
  ]
65
- getSlotItems.mockReturnValue(items)
38
+ useSlotItems.mockReturnValue(items)
66
39
 
67
40
  const { getByText } = render(<SlotRenderer slot='header' />)
68
41
  expect(getByText('Item1')).toBeInTheDocument()
69
42
  expect(getByText('Item2')).toBeInTheDocument()
70
43
  })
71
44
 
72
- it('calls getSlotItems with correct arguments including evaluateProp and the application mode filter', () => {
73
- getSlotItems.mockReturnValue([])
45
+ it('looks up the items for its own slot', () => {
46
+ useSlotItems.mockReturnValue([])
74
47
  render(<SlotRenderer slot='sidebar' />)
75
- expect(getSlotItems).toHaveBeenCalledWith({
76
- slot: 'sidebar',
77
- appState: mockAppState,
78
- appConfig: mockAppConfig,
79
- evaluateProp: mockEvaluateProp,
80
- isHiddenByApplicationMode: mockIsHiddenByApplicationMode
81
- })
48
+ expect(useSlotItems).toHaveBeenCalledWith('sidebar')
82
49
  })
83
50
  })
@@ -6,7 +6,9 @@ import { orderItems } from './orderItems.js'
6
6
  import { classifyPanel, getPanelRole } from '../../utils/getPanelRole.js'
7
7
  import { logger } from '../../services/logger.js'
8
8
  import { hidesNothing } from './applicationModes.js'
9
+ import { groupBySlot } from './slotHelpers.js'
9
10
 
11
+ // With no slot, matches buttons for every slot
10
12
  function getMatchingButtons ({ appState, buttonConfig, slot, evaluateProp }) {
11
13
  const { breakpoint } = appState
12
14
  if (!buttonConfig) {
@@ -39,7 +41,7 @@ function getMatchingButtons ({ appState, buttonConfig, slot, evaluateProp }) {
39
41
  }
40
42
  }
41
43
 
42
- if (bpConfig?.slot !== slot || !allowedSlots.button.includes(bpConfig.slot)) {
44
+ if ((slot !== undefined && bpConfig?.slot !== slot) || !allowedSlots.button.includes(bpConfig?.slot)) {
43
45
  return false
44
46
  }
45
47
 
@@ -114,7 +116,7 @@ const slotButtonProps = ({ buttonId, config, isHidden, appState, appConfig, eval
114
116
  * Renders a single button's MapButton element for its slot, computing its click handler
115
117
  * and derived state (panel-open, showLabel fallback, etc.) from its config and appState.
116
118
  */
117
- function SlotButton ({ buttonId, config, isHidden = false, appState, appConfig, evaluateProp }) {
119
+ function SlotButton ({ buttonId, config, isHidden = false, appState, appConfig, evaluateProp }) { // NOSONAR, the inline props read more clearly than a helper would
118
120
  const bpConfig = config[appState.breakpoint] ?? {}
119
121
  const handleClick = createButtonClickHandler(config, appState, evaluateProp)
120
122
  const isPanelOpen = !!(config.panelId && appState.openPanels[config.panelId])
@@ -134,6 +136,7 @@ function SlotButton ({ buttonId, config, isHidden = false, appState, appConfig,
134
136
  isHidden={isHidden}
135
137
  isPressed={(config.isPressed !== undefined || config.pressedWhen) ? appState.pressedButtons.has(buttonId) : undefined}
136
138
  isExpanded={(config.isExpanded !== undefined || config.expandedWhen) ? appState.expandedButtons.has(buttonId) : undefined}
139
+ isBusy={config.busyWhen ? !!evaluateProp(config.busyWhen, config.pluginId) : undefined}
137
140
  isPanelOpen={isPanelOpen}
138
141
  panelRole={panelRole}
139
142
  onClick={handleClick}
@@ -153,6 +156,7 @@ function buildUngroupedItems (members, ctx) {
153
156
  return members.map(([buttonId, config]) => ({
154
157
  id: buttonId,
155
158
  type: 'button',
159
+ slot: config[ctx.breakpoint].slot,
156
160
  order: config[ctx.breakpoint]?.order ?? 0,
157
161
  element: <SlotButton key={buttonId} {...slotButtonProps({ buttonId, config, isHidden: isButtonHidden(buttonId, config, ctx), ...ctx })} />
158
162
  }))
@@ -183,6 +187,7 @@ function buildGroupItem (key, members, ctx) {
183
187
  return {
184
188
  id: buttonId,
185
189
  type: 'button',
190
+ slot: config[ctx.breakpoint].slot,
186
191
  order,
187
192
  element: <SlotButton key={buttonId} {...slotButtonProps({ buttonId, config, isHidden: isButtonHidden(buttonId, config, ctx), ...ctx })} />
188
193
  }
@@ -200,6 +205,7 @@ function buildGroupItem (key, members, ctx) {
200
205
  return {
201
206
  id: `group-${key}`,
202
207
  type: 'group',
208
+ slot: firstConfig[ctx.breakpoint].slot,
203
209
  order,
204
210
  element: (
205
211
  <div // NOSONAR - div with role="group" is correct for a button group
@@ -216,19 +222,12 @@ function buildGroupItem (key, members, ctx) {
216
222
  }
217
223
  }
218
224
 
219
- function mapButtons ({ slot, appState, appConfig, evaluateProp, isHiddenByApplicationMode = hidesNothing }) {
220
- const { buttonConfig, breakpoint } = appState
221
-
222
- const raw = getMatchingButtons({ appState, appConfig, buttonConfig, slot, evaluateProp })
223
- const matching = applySlotExclusivity(raw, appState)
224
-
225
- if (!matching.length) {
226
- return []
227
- }
225
+ // Builds one slot's items from the buttons matched for it
226
+ function buildSlotItems (raw, ctx) {
227
+ const matching = applySlotExclusivity(raw, ctx.appState)
228
228
 
229
229
  // Partition into named groups (keyed by kebab-cased group.label) plus one ungrouped bucket
230
230
  const buckets = groupByKey({ items: matching, keyFn: ([, config]) => config.group?.label })
231
- const ctx = { breakpoint, appState, appConfig, evaluateProp, isHiddenByApplicationMode }
232
231
 
233
232
  const result = []
234
233
  for (const [key, members] of buckets) {
@@ -242,6 +241,19 @@ function mapButtons ({ slot, appState, appConfig, evaluateProp, isHiddenByApplic
242
241
  return result
243
242
  }
244
243
 
244
+ // Maps buttons for the given slot or, with no slot, for every slot. Exclusivity and groups apply
245
+ // within a slot, so matching buttons are split by slot first.
246
+ function mapButtons ({ slot, appState, appConfig, evaluateProp, isHiddenByApplicationMode = hidesNothing }) {
247
+ const { buttonConfig, breakpoint } = appState
248
+
249
+ const raw = getMatchingButtons({ appState, appConfig, buttonConfig, slot, evaluateProp })
250
+ const ctx = { breakpoint, appState, appConfig, evaluateProp, isHiddenByApplicationMode }
251
+
252
+ const bySlot = groupBySlot(raw, ([, config]) => config[breakpoint].slot)
253
+
254
+ return [...bySlot.values()].flatMap(entries => buildSlotItems(entries, ctx))
255
+ }
256
+
245
257
  export {
246
258
  mapButtons,
247
259
  getMatchingButtons,
@@ -165,6 +165,15 @@ describe('mapButtons module', () => {
165
165
  expect(result.props).toMatchObject({ isDisabled: true, isHidden: true, isPressed: true, isExpanded: true })
166
166
  })
167
167
 
168
+ it('evaluates busyWhen on render, and leaves isBusy undefined without it', () => {
169
+ const busyEvaluate = jest.fn((prop) => (typeof prop === 'function' ? prop() : prop))
170
+ const busy = SlotButton({ buttonId: 'id', config: { ...baseBtn, busyWhen: () => true }, appState, appConfig, evaluateProp: busyEvaluate })
171
+ expect(busy.props.isBusy).toBe(true)
172
+ const idle = SlotButton({ buttonId: 'id', config: { ...baseBtn, busyWhen: () => false }, appState, appConfig, evaluateProp: busyEvaluate })
173
+ expect(idle.props.isBusy).toBe(false)
174
+ expect(render(baseBtn).props.isBusy).toBeUndefined()
175
+ })
176
+
168
177
  it.each([
169
178
  [{ slot: 'right-top', open: false }, 'dialog'],
170
179
  [{ slot: 'right-top', open: false, dismissible: false }, 'region'],
@@ -257,7 +266,29 @@ describe('mapButtons module', () => {
257
266
  it('returns a flat list of buttons with type and order', () => {
258
267
  appState.buttonConfig = ({ b1: baseBtn })
259
268
  const result = map()
260
- expect(result[0]).toMatchObject({ id: 'b1', type: 'button', order: 1 })
269
+ expect(result[0]).toMatchObject({ id: 'b1', type: 'button', slot: 'header', order: 1 })
270
+ })
271
+
272
+ it('maps buttons for every slot, each tagged with its slot, when no slot is given', () => {
273
+ appState.buttonConfig = ({ b1: baseBtn, b2: { ...baseBtn, desktop: { slot: 'sidebar' } } })
274
+ const result = mapButtons({ appState, appConfig, evaluateProp })
275
+ expect(result.map(({ id, slot }) => ({ id, slot }))).toEqual([{ id: 'b1', slot: 'header' }, { id: 'b2', slot: 'sidebar' }])
276
+ })
277
+
278
+ it('applies slot exclusivity within each slot when mapping every slot', () => {
279
+ appState.buttonConfig = {
280
+ drawCancel: { ...baseBtn, pluginId: 'draw', exclusiveSlot: true },
281
+ journeyBack: { ...baseBtn },
282
+ sidebarBtn: { ...baseBtn, desktop: { slot: 'sidebar' } }
283
+ }
284
+ const result = mapButtons({ appState, appConfig, evaluateProp })
285
+ expect(result.map(r => r.id)).toEqual(['drawCancel', 'sidebarBtn'])
286
+ })
287
+
288
+ it('tags a button group with its members\' slot', () => {
289
+ const group = { label: 'G1' }
290
+ appState.buttonConfig = ({ b1: { ...baseBtn, group }, b2: { ...baseBtn, group } })
291
+ expect(map()[0]).toMatchObject({ id: 'group-g1', type: 'group', slot: 'header' })
261
292
  })
262
293
 
263
294
  it('renders grouped buttons as a single group item with role=group, keyed by kebab-cased label', () => {
@@ -7,8 +7,8 @@ import { hidesNothing } from './applicationModes.js'
7
7
  import { stringToKebab } from '../../utils/stringToKebab.js'
8
8
 
9
9
  /**
10
- * Map controls for a given slot and app state.
11
- * Returns an array of control descriptors.
10
+ * Map controls for a given slot and app state — or, with no slot, for every slot.
11
+ * Returns an array of control descriptors, each with the slot it renders in.
12
12
  */
13
13
  export function mapControls ({ slot, appState, evaluateProp, isHiddenByApplicationMode = hidesNothing }) {
14
14
  const { breakpoint, pluginRegistry, controlConfig } = appState
@@ -40,7 +40,7 @@ export function mapControls ({ slot, appState, evaluateProp, isHiddenByApplicati
40
40
  }
41
41
 
42
42
  // Only include controls allowed in this slot
43
- return bpConfig.slot === slot && slotAllowed
43
+ return (slot === undefined || bpConfig.slot === slot) && slotAllowed
44
44
  })
45
45
  .map(control => {
46
46
  // Detect plugin owning this control
@@ -65,10 +65,7 @@ export function mapControls ({ slot, appState, evaluateProp, isHiddenByApplicati
65
65
  )
66
66
  } else {
67
67
  // Plugin control: wrap render with plugin context
68
- const Wrapped = withPluginContexts(control.render, {
69
- pluginId,
70
- pluginConfig: plugin?.config
71
- })
68
+ const Wrapped = withPluginContexts(control.render)
72
69
  // Core's own element around the plugin's control, as MapButton's wrapper is for buttons and
73
70
  // Panel's root for panels — so hiding it (application mode) never remounts it: display:
74
71
  // contents leaves layout untouched while shown, hidden hides it with its state intact.
@@ -79,7 +76,7 @@ export function mapControls ({ slot, appState, evaluateProp, isHiddenByApplicati
79
76
  className={`im-c-control-wrapper im-c-control-wrapper--${stringToKebab(control.id)}`}
80
77
  hidden={isHidden}
81
78
  >
82
- <Wrapped />
79
+ <Wrapped pluginId={pluginId} pluginConfig={plugin?.config} />
83
80
  </div>
84
81
  )
85
82
  }
@@ -87,6 +84,7 @@ export function mapControls ({ slot, appState, evaluateProp, isHiddenByApplicati
87
84
  return {
88
85
  id: control.id,
89
86
  type: 'control',
87
+ slot: control[breakpoint].slot,
90
88
  order: control[breakpoint]?.order ?? 0,
91
89
  tab: control[breakpoint]?.tab,
92
90
  element
@@ -202,6 +202,16 @@ describe('mapControls', () => {
202
202
  expect(result).toEqual([])
203
203
  })
204
204
 
205
+ it('maps controls for every slot, each tagged with its slot, when no slot is given', () => {
206
+ defaultAppState.controlConfig = ({
207
+ ctrl1: { id: 'ctrl1', desktop: { slot: 'header' } },
208
+ ctrl2: { id: 'ctrl2', desktop: { slot: 'map-styles-panel' } },
209
+ ctrl3: { id: 'ctrl3', desktop: { slot: 'not-a-slot' } }
210
+ })
211
+ const result = mapControls({ appState: defaultAppState, evaluateProp: (p) => p })
212
+ expect(result.map(({ id, slot }) => ({ id, slot }))).toEqual([{ id: 'ctrl1', slot: 'header' }, { id: 'ctrl2', slot: 'map-styles-panel' }])
213
+ })
214
+
205
215
  it('passes through the tab field from the breakpoint config', () => {
206
216
  defaultAppState.controlConfig = ({
207
217
  ctrl1: { id: 'ctrl1', desktop: { slot: 'map-styles-panel', tab: 'Styles' } }