@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.
- package/assets/templates/style-switcher.njk +2 -2
- package/dist/esm/im-core.js +1 -1
- package/dist/esm/im-shell.js +1 -1
- package/dist/umd/im-core.js +1 -1
- package/dist/umd/index.js +1 -1
- package/docs/api/button-definition.md +11 -0
- package/docs/api/context.md +4 -0
- package/docs/api.md +20 -2
- package/docs/architecture/interactive-map.likec4 +4 -4
- package/docs/plugins/datasets.md +11 -0
- package/docs/plugins/draw.md +197 -35
- package/docs/plugins/interact.md +24 -1
- package/docs/plugins/search.md +2 -2
- package/docusaurus.config.cjs +25 -3
- package/govuk-prototype-kit.config.json +6 -7
- package/package.json +20 -23
- package/plugins/datasets/dist/esm/im-datasets-esri-adapter.js +1 -1
- package/plugins/datasets/dist/esm/im-datasets-ml-adapter.js +1 -1
- package/plugins/datasets/dist/esm/im-datasets-ol-adapter.js +1 -1
- package/plugins/datasets/dist/esm/im-datasets-plugin.js +1 -1
- package/plugins/datasets/dist/esm/index.js +1 -1
- package/plugins/datasets/dist/esm/mapboxStyleLayerAdapter.js +1 -1
- package/plugins/datasets/dist/umd/im-datasets-ml-adapter.js +1 -1
- package/plugins/datasets/dist/umd/im-datasets-ol-adapter.js +1 -1
- package/plugins/datasets/dist/umd/im-datasets-plugin.js +1 -1
- package/plugins/datasets/dist/umd/index.js +1 -1
- package/plugins/datasets/src/adapters/esri/esriLayerAdapter.js +18 -16
- package/plugins/datasets/src/adapters/esri/esriLayerAdapter.test.js +2 -2
- package/plugins/datasets/src/adapters/esri/registry/esriDataset.js +2 -3
- package/plugins/datasets/src/adapters/esri/registry/esriDataset.test.js +1 -1
- package/plugins/datasets/src/adapters/loadLayerAdapter.js +2 -20
- package/plugins/datasets/src/adapters/loadLayerAdapter.test.js +9 -9
- package/plugins/datasets/src/adapters/mapboxStyleLayerAdapter.js +7 -7
- package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.js +19 -19
- package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.test.js +1 -1
- package/plugins/datasets/src/adapters/maplibre/registry/mapLibreDataset.test.js +1 -1
- package/plugins/datasets/src/adapters/openlayers/canvasPatternStyle.test.js +2 -2
- package/plugins/datasets/src/adapters/openlayers/layerBuilders.test.js +1 -1
- package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.js +21 -21
- package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.test.js +5 -5
- package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.js +2 -3
- package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.test.js +2 -2
- package/plugins/datasets/src/api/getOpacity.js +1 -2
- package/plugins/datasets/src/api/getOpacity.test.js +9 -12
- package/plugins/datasets/src/api/getStyle.js +1 -2
- package/plugins/datasets/src/api/getStyle.test.js +5 -8
- package/plugins/datasets/src/api/removeDataset.js +2 -4
- package/plugins/datasets/src/api/removeDataset.test.js +5 -10
- package/plugins/datasets/src/api/setData.js +2 -4
- package/plugins/datasets/src/api/setData.test.js +6 -14
- package/plugins/datasets/src/api/setFeatureVisibility.js +1 -2
- package/plugins/datasets/src/api/setFeatureVisibility.test.js +8 -11
- package/plugins/datasets/src/components/LayersMenu/LayersMenu.jsx +1 -0
- package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.jsx +1 -3
- package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.test.jsx +13 -18
- package/plugins/datasets/src/index.js +2 -2
- package/plugins/datasets/src/index.test.js +8 -1
- package/plugins/datasets/src/initialise/DatasetsInit.jsx +37 -26
- package/plugins/datasets/src/initialise/DatasetsInit.test.jsx +120 -89
- package/plugins/datasets/src/initialise/initialiseDatasets.js +2 -3
- package/plugins/datasets/src/initialise/initialiseDatasets.test.js +23 -10
- package/plugins/datasets/src/manifest.js +53 -44
- package/plugins/datasets/src/manifest.test.js +36 -4
- package/plugins/datasets/src/reducers/pluginState.js +5 -5
- package/plugins/datasets/src/reducers/pluginState.test.js +21 -20
- package/plugins/datasets/src/registry/__mocks__/datasetRegistry.js +7 -6
- package/plugins/datasets/src/registry/createDataset.js +2 -2
- package/plugins/datasets/src/registry/dataset.js +9 -10
- package/plugins/datasets/src/registry/dataset.test.js +63 -64
- package/plugins/datasets/src/registry/datasetRegistry.js +39 -10
- package/plugins/datasets/src/registry/datasetRegistry.test.js +83 -1
- package/plugins/datasets/src/registry/globalDataset.js +9 -17
- package/plugins/datasets/src/registry/isVisibleWhen.js +9 -17
- package/plugins/datasets/src/registry/isVisibleWhen.test.js +27 -20
- package/plugins/datasets/src/registry/mapboxStyleDataset.test.js +26 -27
- package/plugins/datasets/src/utils/hasLayersMenu.js +13 -0
- package/plugins/datasets/src/utils/hasLayersMenu.test.js +25 -0
- package/plugins/draw/dist/esm/im-draw-ml-adapter.js +1 -1
- package/plugins/draw/dist/esm/im-draw-ol-adapter.js +1 -1
- package/plugins/draw/dist/esm/im-draw-plugin.js +1 -1
- package/plugins/draw/dist/esm/index.js +1 -1
- package/plugins/draw/dist/esm/liveDrawChecks.js +1 -1
- package/plugins/draw/dist/umd/im-draw-ml-adapter.js +1 -1
- package/plugins/draw/dist/umd/im-draw-ol-adapter.js +1 -1
- package/plugins/draw/dist/umd/im-draw-plugin.js +1 -1
- package/plugins/draw/dist/umd/index.js +1 -1
- package/plugins/draw/src/DrawInit.jsx +53 -29
- package/plugins/draw/src/DrawInit.test.jsx +105 -2
- package/plugins/draw/src/adapterEvents.js +78 -44
- package/plugins/draw/src/adapters/adapterContract.test.js +3 -3
- package/plugins/draw/src/adapters/maplibre/MaplibreDrawAdapter.js +18 -10
- package/plugins/draw/src/adapters/maplibre/MaplibreDrawAdapter.test.js +31 -22
- package/plugins/draw/src/adapters/maplibre/drawEvents.js +2 -1
- package/plugins/draw/src/adapters/maplibre/modes/drawMode/clickHandlers.js +13 -12
- package/plugins/draw/src/adapters/maplibre/modes/drawMode/clickHandlers.test.js +5 -5
- package/plugins/draw/src/adapters/maplibre/modes/drawMode/undoHandlers.js +1 -1
- package/plugins/draw/src/adapters/maplibre/modes/drawMode/undoHandlers.test.js +2 -2
- package/plugins/draw/src/adapters/maplibre/modes/drawPointMode.js +6 -9
- package/plugins/draw/src/adapters/maplibre/modes/drawPointMode.test.js +4 -4
- package/plugins/draw/src/adapters/maplibre/modes/editPointMode/pointerHandlers.js +6 -9
- package/plugins/draw/src/adapters/maplibre/modes/editPointMode/pointerHandlers.test.js +1 -1
- package/plugins/draw/src/adapters/maplibre/modes/editPointMode/undoHandlers.js +8 -14
- package/plugins/draw/src/adapters/maplibre/modes/editPointMode/undoHandlers.test.js +37 -8
- package/plugins/draw/src/adapters/maplibre/modes/editPointMode.js +11 -1
- package/plugins/draw/src/adapters/maplibre/modes/editVertexMode/undoHandlers.js +14 -19
- package/plugins/draw/src/adapters/maplibre/modes/editVertexMode/undoHandlers.test.js +41 -4
- package/plugins/draw/src/adapters/maplibre/modes/editVertexMode.js +12 -1
- package/plugins/draw/src/adapters/maplibre/utils/editModeEvents.js +3 -1
- package/plugins/draw/src/adapters/maplibre/utils/geometryValidation.js +9 -10
- package/plugins/draw/src/adapters/maplibre/utils/geometryValidation.test.js +5 -24
- package/plugins/draw/src/adapters/openlayers/OLDrawAdapter.js +10 -7
- package/plugins/draw/src/adapters/openlayers/OLDrawAdapter.test.js +12 -7
- package/plugins/draw/src/adapters/openlayers/core/OLDrawManager.js +5 -0
- package/plugins/draw/src/adapters/openlayers/core/OLDrawManager.test.js +7 -3
- package/plugins/draw/src/adapters/openlayers/core/styles.test.js +1 -1
- package/plugins/draw/src/adapters/openlayers/draw/DrawMode.js +11 -11
- package/plugins/draw/src/adapters/openlayers/draw/DrawMode.test.js +15 -15
- package/plugins/draw/src/adapters/openlayers/edit/EditMode.js +21 -28
- package/plugins/draw/src/adapters/openlayers/edit/EditMode.test.js +26 -5
- package/plugins/draw/src/adapters/openlayers/edit/selectionState.js +5 -6
- package/plugins/draw/src/adapters/openlayers/edit/selectionState.test.js +2 -12
- package/plugins/draw/src/adapters/openlayers/edit/undoOps.js +9 -0
- package/plugins/draw/src/adapters/openlayers/edit/undoOps.test.js +7 -0
- package/plugins/draw/src/adapters/openlayers/point/drawPointMode.js +6 -9
- package/plugins/draw/src/adapters/openlayers/point/drawPointMode.test.js +3 -3
- package/plugins/draw/src/adapters/openlayers/point/editPointMode.js +18 -9
- package/plugins/draw/src/adapters/openlayers/point/editPointMode.test.js +29 -4
- package/plugins/draw/src/adapters/openlayers/point/pointOps.js +3 -2
- package/plugins/draw/src/adapters/openlayers/point/pointOps.test.js +6 -0
- package/plugins/draw/src/adapters/openlayers/point/pointSelectionState.js +3 -4
- package/plugins/draw/src/adapters/openlayers/point/pointSelectionState.test.js +2 -12
- package/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js +1 -1
- package/plugins/draw/src/api/createNewShape.js +4 -4
- package/plugins/draw/src/api/createNewShape.test.js +1 -1
- package/plugins/draw/src/api/editFeature.js +8 -11
- package/plugins/draw/src/api/editFeature.test.js +33 -22
- package/plugins/draw/src/api/newLine.test.js +3 -3
- package/plugins/draw/src/api/newPoint.js +4 -5
- package/plugins/draw/src/api/newPoint.test.js +3 -3
- package/plugins/draw/src/api/newPolygon.test.js +3 -3
- package/plugins/draw/src/api/recheckGeometry.js +32 -0
- package/plugins/draw/src/api/recheckGeometry.test.js +55 -0
- package/plugins/draw/src/api/setGeometry.js +33 -0
- package/plugins/draw/src/api/setGeometry.test.js +48 -0
- package/plugins/draw/src/api/split.js +23 -22
- package/plugins/draw/src/api/split.test.js +33 -18
- package/plugins/draw/src/events.js +265 -77
- package/plugins/draw/src/events.test.js +708 -34
- package/plugins/draw/src/hooks/useSpatialList.js +10 -11
- package/plugins/draw/src/hooks/useSpatialList.test.js +3 -3
- package/plugins/draw/src/manifest.js +33 -17
- package/plugins/draw/src/manifest.test.js +104 -10
- package/plugins/draw/src/reducer.js +31 -9
- package/plugins/draw/src/reducer.test.js +35 -3
- package/plugins/draw/src/utils/drawModes.js +27 -0
- package/plugins/draw/src/utils/drawModes.test.js +27 -0
- package/plugins/draw/src/utils/needsDrawTarget.js +18 -0
- package/plugins/draw/src/utils/needsDrawTarget.test.js +32 -0
- package/plugins/draw/src/utils/touchTarget.js +34 -26
- package/plugins/draw/src/utils/touchTarget.test.js +32 -20
- package/plugins/draw/src/validation/commitChecks.js +185 -0
- package/plugins/draw/src/validation/commitChecks.test.js +205 -0
- package/plugins/draw/src/validation/liveDrawChecks.js +11 -11
- package/plugins/draw/src/validation/liveDrawChecks.test.js +37 -37
- package/plugins/draw/src/validation/liveStroke.js +6 -6
- package/plugins/draw/src/validation/liveStroke.test.js +27 -27
- package/plugins/draw/src/validation/rules.js +16 -14
- package/plugins/draw/src/validation/rules.test.js +5 -5
- package/plugins/draw/src/validation/validateGeometry.js +58 -31
- package/plugins/draw/src/validation/validateGeometry.test.js +68 -44
- package/plugins/draw-es/dist/esm/index.js +1 -0
- package/plugins/{beta/draw-es → draw-es}/src/DrawInit.jsx +1 -1
- package/plugins/{beta/draw-es → draw-es}/src/events.test.js +1 -1
- package/plugins/{beta/draw-es → draw-es}/src/graphic.js +1 -1
- package/plugins/frame/dist/esm/index.js +1 -0
- package/plugins/{beta/frame → frame}/dist/umd/im-frame-plugin.js +1 -1
- package/plugins/{beta/frame → frame}/dist/umd/index.js +1 -1
- package/plugins/{beta/frame → frame}/package.json +2 -2
- package/plugins/interact/dist/esm/im-interact-plugin.js +1 -1
- package/plugins/interact/dist/esm/index.js +1 -1
- package/plugins/interact/dist/umd/im-interact-plugin.js +1 -1
- package/plugins/interact/dist/umd/index.js +1 -1
- package/plugins/interact/src/InteractInit.jsx +3 -3
- package/plugins/interact/src/api/enable.test.js +13 -0
- package/plugins/interact/src/defaults.js +1 -0
- package/plugins/interact/src/hooks/useCrossHairVisibility.js +27 -17
- package/plugins/interact/src/hooks/useCrossHairVisibility.test.js +72 -7
- package/plugins/interact/src/hooks/useInteractionHandlers.js +3 -5
- package/plugins/interact/src/hooks/useInteractionHandlers.test.js +4 -3
- package/plugins/interact/src/hooks/useSpatialList.js +16 -17
- package/plugins/interact/src/hooks/useSpatialList.test.js +9 -9
- package/plugins/interact/src/manifest.js +4 -4
- package/plugins/interact/src/manifest.test.js +29 -0
- package/plugins/interact/src/reducer.js +7 -2
- package/plugins/interact/src/reducer.test.js +12 -2
- package/plugins/interact/src/utils/needsTarget.js +20 -0
- package/plugins/interact/src/utils/needsTarget.test.js +36 -0
- package/plugins/map-key/dist/esm/im-map-key-plugin.js +1 -1
- package/plugins/map-key/dist/esm/index.js +1 -1
- package/plugins/map-key/dist/umd/im-map-key-plugin.js +1 -1
- package/plugins/map-key/dist/umd/index.js +1 -1
- package/plugins/map-key/src/components/Key/KeySvgSymbol.jsx +4 -0
- package/plugins/map-key/src/components/Key/MapKey.jsx +15 -15
- package/plugins/map-key/src/components/Key/MapKey.test.jsx +29 -15
- package/plugins/map-key/src/initialise/MapKeyInit.jsx +5 -8
- package/plugins/map-key/src/initialise/MapKeyInit.test.jsx +9 -7
- package/plugins/map-key/src/manifest.test.js +0 -1
- package/plugins/map-key/src/reducers/mergeKeyGroupItems.js +14 -33
- package/plugins/map-key/src/reducers/mergeKeyGroupItems.test.js +34 -50
- package/plugins/map-key/src/reducers/pluginState.js +6 -1
- package/plugins/map-key/src/reducers/pluginState.test.js +13 -4
- package/plugins/map-styles/dist/esm/im-map-styles-plugin.js +1 -0
- package/plugins/map-styles/dist/esm/index.js +1 -0
- package/plugins/map-styles/dist/umd/im-map-styles-plugin.js +1 -0
- package/plugins/{beta/map-styles → map-styles}/dist/umd/index.js +1 -1
- package/plugins/{beta/map-styles → map-styles}/src/MapStyles.jsx +3 -3
- package/plugins/{beta/map-styles → map-styles}/src/MapStylesInit.jsx +1 -1
- package/plugins/menu/dist/esm/index.js +1 -1
- package/plugins/scale-bar/dist/esm/index.js +1 -0
- package/plugins/{beta/scale-bar → scale-bar}/dist/umd/im-scale-bar-plugin.js +1 -1
- package/plugins/{beta/scale-bar → scale-bar}/dist/umd/index.js +1 -1
- package/plugins/{beta/scale-bar → scale-bar}/package.json +2 -2
- package/plugins/search/dist/esm/im-search-plugin.js +1 -1
- package/plugins/search/dist/esm/index.js +1 -1
- package/plugins/search/dist/umd/im-search-plugin.js +1 -1
- package/plugins/search/dist/umd/index.js +1 -1
- package/plugins/search/src/components/Suggestions/Suggestions.jsx +3 -1
- package/plugins/search/src/components/Suggestions/Suggestions.test.jsx +11 -0
- package/plugins/search/src/utils/markedToElements.jsx +25 -0
- package/plugins/search/src/utils/markedToElements.test.jsx +49 -0
- package/plugins/search/src/utils/parseOsNamesResults.js +6 -4
- package/plugins/search/src/utils/parseOsNamesResults.test.js +18 -0
- package/plugins/use-location/dist/esm/index.js +1 -0
- package/plugins/{beta/use-location → use-location}/dist/umd/im-use-location-plugin.js +1 -1
- package/plugins/{beta/use-location → use-location}/dist/umd/index.js +1 -1
- package/providers/esri/dist/esm/index.js +1 -0
- package/providers/{beta/esri → esri}/src/esriProvider.js +1 -1
- package/providers/{beta/esri → esri}/src/mapEvents.js +2 -2
- package/providers/maplibre/dist/esm/index.js +1 -1
- package/providers/maplibre/dist/umd/index.js +1 -1
- package/providers/maplibre/src/index.js +11 -2
- package/providers/maplibre/src/index.test.js +23 -1
- package/providers/maplibre/src/utils/detectModuleWorker.js +8 -19
- package/providers/maplibre/src/utils/detectModuleWorker.test.js +19 -23
- package/providers/maplibre/src/utils/workerUrl.js +12 -0
- package/providers/maplibre/src/utils/workerUrl.test.js +14 -1
- package/providers/open-names/dist/esm/index.js +1 -0
- package/providers/{beta/open-names → open-names}/dist/umd/im-reverse-geocode.js +1 -1
- package/providers/{beta/open-names → open-names}/dist/umd/index.js +1 -1
- package/providers/openlayers/dist/esm/index.js +1 -0
- package/providers/openlayers/dist/umd/im-openlayers-provider.js +2 -0
- package/providers/{beta/openlayers → openlayers}/dist/umd/index.js +1 -1
- package/providers/{beta/openlayers → openlayers}/src/index.js +4 -4
- package/providers/{beta/openlayers → openlayers}/src/mapEvents.js +2 -2
- package/providers/{beta/openlayers → openlayers}/src/mapEvents.test.js +2 -2
- package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.js +3 -3
- package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.js +1 -1
- package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.js +1 -1
- package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.js +1 -1
- package/rollup.esm.mjs +43 -47
- package/sonar-project.properties +1 -1
- package/src/App/App.jsx +4 -1
- package/src/App/App.test.jsx +6 -0
- package/src/App/components/MapButton/MapButton.jsx +6 -0
- package/src/App/components/MapButton/MapButton.test.jsx +10 -0
- package/src/App/components/Markers/Markers.jsx +3 -5
- package/src/App/components/Markers/Markers.test.jsx +9 -11
- package/src/App/components/Panel/Panel.jsx +2 -9
- package/src/App/hooks/useInterfaceAPI.js +16 -4
- package/src/App/hooks/useInterfaceAPI.test.js +66 -1
- package/src/App/renderer/PluginInits.jsx +8 -7
- package/src/App/renderer/PluginInits.test.jsx +20 -5
- package/src/App/renderer/SlotItemsProvider.jsx +33 -0
- package/src/App/renderer/SlotItemsProvider.test.jsx +59 -0
- package/src/App/renderer/SlotRenderer.jsx +3 -14
- package/src/App/renderer/SlotRenderer.test.jsx +11 -44
- package/src/App/renderer/mapButtons.js +24 -12
- package/src/App/renderer/mapButtons.test.js +32 -1
- package/src/App/renderer/mapControls.js +6 -8
- package/src/App/renderer/mapControls.test.js +10 -0
- package/src/App/renderer/mapPanels.js +16 -19
- package/src/App/renderer/mapPanels.test.js +37 -9
- package/src/App/renderer/pluginWrapper.js +10 -8
- package/src/App/renderer/pluginWrapper.test.js +23 -9
- package/src/App/renderer/slotAggregator.js +18 -5
- package/src/App/renderer/slotAggregator.test.js +68 -25
- package/src/App/renderer/slotHelpers.js +13 -0
- package/src/App/renderer/slotHelpers.test.js +16 -1
- package/src/App/store/AppProvider.jsx +19 -1
- package/src/App/store/AppProvider.test.jsx +41 -0
- package/src/App/store/MapProvider.jsx +3 -0
- package/src/App/store/MapProvider.test.jsx +24 -0
- package/src/App/store/appActionsMap.js +10 -1
- package/src/App/store/appActionsMap.test.js +21 -0
- package/src/App/store/appDispatchMiddleware.js +29 -17
- package/src/App/store/appDispatchMiddleware.test.js +31 -0
- package/src/InteractiveMap/parseDataProperties.js +4 -4
- package/src/InteractiveMap/parseDataProperties.test.js +62 -6
- package/src/config/events.js +4 -2
- package/src/config/mapSizeScales.js +3 -0
- package/src/scss/tools/_govuk-content.scss +4 -3
- package/src/types.js +4 -0
- package/src/utils/focusAfterPanelClose.js +9 -0
- package/src/utils/focusAfterPanelClose.test.js +40 -0
- package/webpack.dev.mjs +9 -3
- package/webpack.prod.mjs +11 -4
- package/webpack.umd.mjs +6 -7
- package/plugins/beta/draw-es/dist/esm/index.js +0 -1
- package/plugins/beta/draw-ml/dist/esm/im-draw-ml-plugin.js +0 -1
- package/plugins/beta/draw-ml/dist/esm/index.js +0 -1
- package/plugins/beta/draw-ml/dist/umd/im-draw-ml-plugin.js +0 -1
- package/plugins/beta/draw-ml/dist/umd/index.js +0 -2
- package/plugins/beta/draw-ml/src/DrawInit.jsx +0 -85
- package/plugins/beta/draw-ml/src/api/addFeature.js +0 -27
- package/plugins/beta/draw-ml/src/api/deleteFeature.js +0 -13
- package/plugins/beta/draw-ml/src/api/editFeature.js +0 -75
- package/plugins/beta/draw-ml/src/api/merge.js +0 -9
- package/plugins/beta/draw-ml/src/api/newLine.js +0 -68
- package/plugins/beta/draw-ml/src/api/newPolygon.js +0 -68
- package/plugins/beta/draw-ml/src/api/split.js +0 -81
- package/plugins/beta/draw-ml/src/defaults.js +0 -17
- package/plugins/beta/draw-ml/src/draw.scss +0 -26
- package/plugins/beta/draw-ml/src/events.js +0 -185
- package/plugins/beta/draw-ml/src/index.js +0 -13
- package/plugins/beta/draw-ml/src/manifest.js +0 -110
- package/plugins/beta/draw-ml/src/mapboxDraw.js +0 -143
- package/plugins/beta/draw-ml/src/mapboxSnap.js +0 -321
- package/plugins/beta/draw-ml/src/modes/createDrawMode.js +0 -552
- package/plugins/beta/draw-ml/src/modes/disabledMode.js +0 -23
- package/plugins/beta/draw-ml/src/modes/drawLineMode.js +0 -18
- package/plugins/beta/draw-ml/src/modes/drawPolygonMode.js +0 -16
- package/plugins/beta/draw-ml/src/modes/editVertex/geometryHelpers.js +0 -135
- package/plugins/beta/draw-ml/src/modes/editVertex/helpers.js +0 -2
- package/plugins/beta/draw-ml/src/modes/editVertex/touchHandlers.js +0 -142
- package/plugins/beta/draw-ml/src/modes/editVertex/undoHandlers.js +0 -133
- package/plugins/beta/draw-ml/src/modes/editVertex/vertexOperations.js +0 -142
- package/plugins/beta/draw-ml/src/modes/editVertex/vertexQueries.js +0 -121
- package/plugins/beta/draw-ml/src/modes/editVertexMode.js +0 -495
- package/plugins/beta/draw-ml/src/reducer.js +0 -90
- package/plugins/beta/draw-ml/src/styles.js +0 -190
- package/plugins/beta/draw-ml/src/undoStack.js +0 -50
- package/plugins/beta/draw-ml/src/utils/debounce.js +0 -16
- package/plugins/beta/draw-ml/src/utils/flattenStyleProperties.js +0 -49
- package/plugins/beta/draw-ml/src/utils/snapHelpers.js +0 -200
- package/plugins/beta/draw-ml/src/utils/spatial.js +0 -258
- package/plugins/beta/draw-ol/dist/css/index.css +0 -1
- package/plugins/beta/draw-ol/dist/esm/DrawMode.js +0 -1
- package/plugins/beta/draw-ol/dist/esm/EditMode.js +0 -1
- package/plugins/beta/draw-ol/dist/esm/geometryHelpers.js +0 -1
- package/plugins/beta/draw-ol/dist/esm/im-draw-ol-plugin.js +0 -1
- package/plugins/beta/draw-ol/dist/esm/index.js +0 -1
- package/plugins/beta/draw-ol/src/DrawInit.jsx +0 -65
- package/plugins/beta/draw-ol/src/api/addFeature.js +0 -29
- package/plugins/beta/draw-ol/src/api/deleteFeature.js +0 -11
- package/plugins/beta/draw-ol/src/api/editFeature.js +0 -50
- package/plugins/beta/draw-ol/src/api/newLine.js +0 -44
- package/plugins/beta/draw-ol/src/api/newPolygon.js +0 -44
- package/plugins/beta/draw-ol/src/core/OLDrawManager.js +0 -153
- package/plugins/beta/draw-ol/src/core/featureStore.js +0 -65
- package/plugins/beta/draw-ol/src/core/styles.js +0 -98
- package/plugins/beta/draw-ol/src/core/undoStack.js +0 -31
- package/plugins/beta/draw-ol/src/defaults.js +0 -16
- package/plugins/beta/draw-ol/src/draw/DrawMode.js +0 -121
- package/plugins/beta/draw-ol/src/draw/drawInput.js +0 -243
- package/plugins/beta/draw-ol/src/draw.scss +0 -17
- package/plugins/beta/draw-ol/src/edit/EditMode.js +0 -424
- package/plugins/beta/draw-ol/src/edit/keyboardHandler.js +0 -229
- package/plugins/beta/draw-ol/src/edit/midpointLayer.js +0 -57
- package/plugins/beta/draw-ol/src/edit/touchHandler.js +0 -171
- package/plugins/beta/draw-ol/src/edit/undoOps.js +0 -95
- package/plugins/beta/draw-ol/src/edit/vertexHitTest.js +0 -72
- package/plugins/beta/draw-ol/src/edit/vertexLayer.js +0 -49
- package/plugins/beta/draw-ol/src/edit/vertexOps.js +0 -99
- package/plugins/beta/draw-ol/src/events.js +0 -114
- package/plugins/beta/draw-ol/src/index.js +0 -12
- package/plugins/beta/draw-ol/src/manifest.js +0 -125
- package/plugins/beta/draw-ol/src/olDraw.js +0 -38
- package/plugins/beta/draw-ol/src/reducer.js +0 -41
- package/plugins/beta/draw-ol/src/snap/snapEngine.js +0 -153
- package/plugins/beta/draw-ol/src/snap/snapGeometry.js +0 -177
- package/plugins/beta/draw-ol/src/snap/snapIndicator.js +0 -81
- package/plugins/beta/draw-ol/src/snap/snapInteraction.js +0 -57
- package/plugins/beta/draw-ol/src/snap/snapManager.js +0 -99
- package/plugins/beta/draw-ol/src/utils/flattenStyleProperties.js +0 -47
- package/plugins/beta/draw-ol/src/utils/geometryHelpers.js +0 -103
- package/plugins/beta/draw-ol/src/utils/olCoords.js +0 -35
- package/plugins/beta/draw-ol/src/utils/resolveColors.js +0 -39
- package/plugins/beta/draw-ol/src/utils/spatial.js +0 -24
- package/plugins/beta/draw-ol/src/utils/touchTarget.js +0 -61
- package/plugins/beta/frame/dist/esm/index.js +0 -1
- package/plugins/beta/map-styles/dist/esm/im-map-styles-plugin.js +0 -1
- package/plugins/beta/map-styles/dist/esm/index.js +0 -1
- package/plugins/beta/map-styles/dist/umd/im-map-styles-plugin.js +0 -1
- package/plugins/beta/scale-bar/dist/esm/index.js +0 -1
- package/plugins/beta/use-location/dist/esm/index.js +0 -1
- package/plugins/map-key/src/registry/getDatasetRegistry.js +0 -6
- package/plugins/map-key/src/registry/getDatasetRegistry.test.js +0 -23
- package/plugins/map-key/src/registry/index.js +0 -1
- package/plugins/map-key/src/registry/index.test.js +0 -7
- package/providers/beta/esri/dist/esm/index.js +0 -1
- package/providers/beta/open-names/dist/esm/index.js +0 -1
- package/providers/beta/openlayers/dist/esm/index.js +0 -1
- package/providers/beta/openlayers/dist/umd/im-openlayers-provider.js +0 -2
- package/providers/beta/openlayers/dist/umd/index.js.LICENSE.txt +0 -1
- /package/plugins/{beta/draw-es → draw-es}/dist/esm/im-draw-es-plugin.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/api/addFeature.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/api/deleteFeature.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/api/editFeature.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/api/newPolygon.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/api/removeSafeZone.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/events.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/index.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/manifest.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/reducer.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/sketchViewModel.js +0 -0
- /package/plugins/{beta/frame → frame}/dist/css/index.css +0 -0
- /package/plugins/{beta/frame → frame}/dist/esm/im-frame-plugin.js +0 -0
- /package/plugins/{beta/draw-ml → frame}/dist/umd/index.js.LICENSE.txt +0 -0
- /package/plugins/{beta/frame → frame}/src/Frame.jsx +0 -0
- /package/plugins/{beta/frame → frame}/src/FrameInit.jsx +0 -0
- /package/plugins/{beta/frame → frame}/src/api/addFrame.js +0 -0
- /package/plugins/{beta/frame → frame}/src/api/editFeature.js +0 -0
- /package/plugins/{beta/frame → frame}/src/config.js +0 -0
- /package/plugins/{beta/frame → frame}/src/frame.scss +0 -0
- /package/plugins/{beta/frame → frame}/src/index.js +0 -0
- /package/plugins/{beta/frame → frame}/src/manifest.js +0 -0
- /package/plugins/{beta/frame → frame}/src/reducer.js +0 -0
- /package/plugins/{beta/frame → frame}/src/utils.js +0 -0
- /package/plugins/{beta/map-styles → map-styles}/dist/css/index.css +0 -0
- /package/plugins/{beta/frame → map-styles}/dist/umd/index.js.LICENSE.txt +0 -0
- /package/plugins/{beta/map-styles → map-styles}/src/config.js +0 -0
- /package/plugins/{beta/map-styles → map-styles}/src/index.js +0 -0
- /package/plugins/{beta/map-styles → map-styles}/src/manifest.js +0 -0
- /package/plugins/{beta/map-styles → map-styles}/src/mapStyles.scss +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/dist/css/index.css +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/dist/esm/im-scale-bar-plugin.js +0 -0
- /package/plugins/{beta/map-styles → scale-bar}/dist/umd/index.js.LICENSE.txt +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.jsx +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.test.jsx +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/index.js +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/index.test.js +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/manifest.js +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/scaleBar.scss +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/utils.js +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/utils.test.js +0 -0
- /package/plugins/{beta/use-location → use-location}/dist/esm/im-use-location-plugin.js +0 -0
- /package/plugins/{beta/scale-bar → use-location}/dist/umd/index.js.LICENSE.txt +0 -0
- /package/plugins/{beta/use-location → use-location}/src/UseLocation.jsx +0 -0
- /package/plugins/{beta/use-location → use-location}/src/UseLocationInit.jsx +0 -0
- /package/plugins/{beta/use-location → use-location}/src/defaults.js +0 -0
- /package/plugins/{beta/use-location → use-location}/src/events.js +0 -0
- /package/plugins/{beta/use-location → use-location}/src/index.js +0 -0
- /package/plugins/{beta/use-location → use-location}/src/manifest.js +0 -0
- /package/plugins/{beta/use-location → use-location}/src/reducer.js +0 -0
- /package/providers/{beta/esri → esri}/dist/css/index.css +0 -0
- /package/providers/{beta/esri → esri}/dist/esm/im-esri-provider.js +0 -0
- /package/providers/{beta/esri → esri}/src/appEvents.js +0 -0
- /package/providers/{beta/esri → esri}/src/defaults.js +0 -0
- /package/providers/{beta/esri → esri}/src/esriProvider.scss +0 -0
- /package/providers/{beta/esri → esri}/src/index.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/coords.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/coords.test.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/detectWebGL.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/esriFixes.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/query.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/spatial.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/spatial.test.js +0 -0
- /package/providers/{beta/open-names → open-names}/dist/esm/im-reverse-geocode.js +0 -0
- /package/providers/{beta/open-names → open-names}/dist/umd/im-reverse-geocode.js.LICENSE.txt +0 -0
- /package/{plugins/beta/use-location → providers/open-names}/dist/umd/index.js.LICENSE.txt +0 -0
- /package/providers/{beta/open-names → open-names}/src/index.js +0 -0
- /package/providers/{beta/open-names → open-names}/src/reverseGeocode.js +0 -0
- /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.js +0 -0
- /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/dist/esm/im-openlayers-provider.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/dist/umd/im-openlayers-provider.js.LICENSE.txt +0 -0
- /package/providers/{beta/open-names → openlayers}/dist/umd/index.js.LICENSE.txt +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/appEvents.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/appEvents.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/defaults.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/index.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/bngProjection.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.test.js +0 -0
|
@@ -11,8 +11,8 @@ import { stringToKebab } from '../../utils/stringToKebab.js'
|
|
|
11
11
|
import { logger } from '../../services/logger.js'
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
|
-
* Maps every configured panel eligible for the given layout slot
|
|
15
|
-
* closed alike, so a button's aria-controls id always resolves to a stable, permanently-mounted
|
|
14
|
+
* Maps every configured panel eligible for the given layout slot (or, with no slot, for every
|
|
15
|
+
* slot) to a renderable entry — open or closed alike, so a button's aria-controls id always resolves to a stable, permanently-mounted
|
|
16
16
|
* <Panel> (hidden when closed). buildPanelBody only runs while open, so nothing expensive mounts
|
|
17
17
|
* before then.
|
|
18
18
|
*/
|
|
@@ -31,14 +31,16 @@ const getEligiblePanelConfig = (panelId, panelConfig, breakpoint, { slot, isFull
|
|
|
31
31
|
if (!isPanelSlotEligible(config, { targetSlot, slot, isFullscreen })) {
|
|
32
32
|
return null
|
|
33
33
|
}
|
|
34
|
-
return { config, bpConfig }
|
|
34
|
+
return { config, bpConfig, targetSlot }
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
// A losing modal panel (see getAllowedModalPanelId) still gets a shell — it's just not open.
|
|
38
38
|
const resolveIsOpen = (openEntry, bpConfig, panelId, allowedModalPanelId) =>
|
|
39
39
|
Boolean(openEntry) && (!bpConfig.modal || panelId === allowedModalPanelId)
|
|
40
40
|
|
|
41
|
-
|
|
41
|
+
// controlsBySlot (optional): controls already mapped for every slot, so a panel body can look up
|
|
42
|
+
// its `<panelId>-panel` controls instead of mapping them again.
|
|
43
|
+
export function mapPanels ({ slot, appState, evaluateProp, isHiddenByApplicationMode = hidesNothing, controlsBySlot }) {
|
|
42
44
|
const { breakpoint, pluginRegistry, panelConfig, openPanels } = appState
|
|
43
45
|
|
|
44
46
|
// Only the most-recently-opened modal panel is ever actually shown — see isOpen below.
|
|
@@ -49,7 +51,7 @@ export function mapPanels ({ slot, appState, evaluateProp, isHiddenByApplication
|
|
|
49
51
|
if (!eligible) {
|
|
50
52
|
return null
|
|
51
53
|
}
|
|
52
|
-
const { config, bpConfig } = eligible
|
|
54
|
+
const { config, bpConfig, targetSlot } = eligible
|
|
53
55
|
|
|
54
56
|
const openEntry = openPanels[panelId]
|
|
55
57
|
const isOpen = resolveIsOpen(openEntry, bpConfig, panelId, allowedModalPanelId)
|
|
@@ -66,6 +68,7 @@ export function mapPanels ({ slot, appState, evaluateProp, isHiddenByApplication
|
|
|
66
68
|
return {
|
|
67
69
|
id: panelId,
|
|
68
70
|
type: 'panel',
|
|
71
|
+
slot: targetSlot,
|
|
69
72
|
order: bpConfig.order ?? 0,
|
|
70
73
|
element: (
|
|
71
74
|
<Panel
|
|
@@ -76,7 +79,7 @@ export function mapPanels ({ slot, appState, evaluateProp, isHiddenByApplication
|
|
|
76
79
|
focusOnOpen={focusOnOpen}
|
|
77
80
|
isOpen={isOpen}
|
|
78
81
|
isHidden={isHidden}
|
|
79
|
-
{...(isOpen ? buildPanelBody({ panelId, config, bpConfig, props, plugin, pluginId, html, label, appState, evaluateProp, isHiddenByApplicationMode }) : {})}
|
|
82
|
+
{...(isOpen ? buildPanelBody({ panelId, config, bpConfig, props, plugin, pluginId, html, label, appState, evaluateProp, isHiddenByApplicationMode, controlsBySlot }) : {})}
|
|
80
83
|
label={label}
|
|
81
84
|
html={html}
|
|
82
85
|
/>
|
|
@@ -96,13 +99,11 @@ export function mapPanels ({ slot, appState, evaluateProp, isHiddenByApplication
|
|
|
96
99
|
* @returns {{ items?: object[], tabs?: object[] }} spread directly onto `<Panel>` — exactly one
|
|
97
100
|
* of `items`/`tabs` is set (or neither, for a static-html panel).
|
|
98
101
|
*/
|
|
99
|
-
function buildPanelBody ({ panelId, config, bpConfig, props, plugin, pluginId, html, label, appState, evaluateProp, isHiddenByApplicationMode }) {
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
evaluateProp,
|
|
104
|
-
isHiddenByApplicationMode
|
|
105
|
-
})
|
|
102
|
+
function buildPanelBody ({ panelId, config, bpConfig, props, plugin, pluginId, html, label, appState, evaluateProp, isHiddenByApplicationMode, controlsBySlot }) {
|
|
103
|
+
const panelSlot = `${stringToKebab(panelId)}-panel`
|
|
104
|
+
const injectedItems = controlsBySlot
|
|
105
|
+
? controlsBySlot.get(panelSlot) ?? []
|
|
106
|
+
: mapControls({ slot: panelSlot, appState, evaluateProp, isHiddenByApplicationMode })
|
|
106
107
|
|
|
107
108
|
if (html) {
|
|
108
109
|
/* istanbul ignore next */
|
|
@@ -114,12 +115,8 @@ function buildPanelBody ({ panelId, config, bpConfig, props, plugin, pluginId, h
|
|
|
114
115
|
|
|
115
116
|
let ownItem = null
|
|
116
117
|
if (config.render) {
|
|
117
|
-
const WrappedChild = withPluginContexts(config.render
|
|
118
|
-
|
|
119
|
-
pluginId,
|
|
120
|
-
pluginConfig: plugin?.config
|
|
121
|
-
})
|
|
122
|
-
ownItem = { id: panelId, order: 0, tab: bpConfig.tab, element: <WrappedChild {...props} /> }
|
|
118
|
+
const WrappedChild = withPluginContexts(config.render)
|
|
119
|
+
ownItem = { id: panelId, order: 0, tab: bpConfig.tab, element: <WrappedChild {...props} pluginId={pluginId} pluginConfig={plugin?.config} /> }
|
|
123
120
|
}
|
|
124
121
|
|
|
125
122
|
const allItems = ownItem ? [ownItem, ...injectedItems] : injectedItems
|
|
@@ -119,15 +119,13 @@ describe('mapPanels', () => {
|
|
|
119
119
|
registeredPlugins.push(plugin)
|
|
120
120
|
defaultAppState.pluginRegistry = { registeredPlugins: [plugin] }
|
|
121
121
|
defaultAppState.panelConfig = ({ p1: { ...baseConfig, render: renderFn } })
|
|
122
|
-
map()
|
|
123
|
-
expect(withPluginContexts).toHaveBeenCalledWith(
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
})
|
|
130
|
-
)
|
|
122
|
+
const result = map()
|
|
123
|
+
expect(withPluginContexts).toHaveBeenCalledWith(renderFn)
|
|
124
|
+
expect(result[0].element.props.items[0].element.props).toEqual(expect.objectContaining({
|
|
125
|
+
pluginId: 'plug1',
|
|
126
|
+
pluginConfig: { a: 1 },
|
|
127
|
+
foo: 'bar'
|
|
128
|
+
}))
|
|
131
129
|
})
|
|
132
130
|
|
|
133
131
|
it('builds an empty items list if there is no render function and no injected controls', () => {
|
|
@@ -158,6 +156,36 @@ describe('mapPanels', () => {
|
|
|
158
156
|
expect(result[0].element.props.items.map(i => i.id)).toEqual(['injected1', 'p1'])
|
|
159
157
|
})
|
|
160
158
|
|
|
159
|
+
it('maps panels for every slot, each tagged with its resolved slot, when no slot is given', () => {
|
|
160
|
+
defaultAppState.panelConfig = ({
|
|
161
|
+
p1: baseConfig,
|
|
162
|
+
p2: { desktop: { slot: 'left-top' } },
|
|
163
|
+
p3: { desktop: { slot: 'search-button' } },
|
|
164
|
+
p4: { desktop: { slot: 'header', modal: true } }
|
|
165
|
+
})
|
|
166
|
+
const result = mapPanels({ appState: defaultAppState, evaluateProp: (prop) => prop })
|
|
167
|
+
expect(result.map(({ id, slot }) => ({ id, slot }))).toEqual([
|
|
168
|
+
{ id: 'p1', slot: 'header' },
|
|
169
|
+
{ id: 'p2', slot: 'left-top' },
|
|
170
|
+
{ id: 'p3', slot: 'search-button' },
|
|
171
|
+
{ id: 'p4', slot: 'modal' }
|
|
172
|
+
])
|
|
173
|
+
})
|
|
174
|
+
|
|
175
|
+
it('takes injected controls from controlsBySlot, when given, instead of mapping them again', () => {
|
|
176
|
+
defaultAppState.panelConfig = ({ p1: { desktop: { slot: 'header' } } })
|
|
177
|
+
const controlsBySlot = new Map([['p1-panel', [{ id: 'injected1', order: 0, element: <span>injected</span> }]]])
|
|
178
|
+
const result = mapPanels({ slot: 'header', appState: defaultAppState, evaluateProp: (prop) => prop, controlsBySlot })
|
|
179
|
+
expect(mapControls).not.toHaveBeenCalled()
|
|
180
|
+
expect(result[0].element.props.items.map(i => i.id)).toEqual(['injected1'])
|
|
181
|
+
})
|
|
182
|
+
|
|
183
|
+
it('builds an empty body when controlsBySlot has nothing for the panel', () => {
|
|
184
|
+
defaultAppState.panelConfig = ({ p1: { desktop: { slot: 'header' } } })
|
|
185
|
+
const result = mapPanels({ slot: 'header', appState: defaultAppState, evaluateProp: (prop) => prop, controlsBySlot: new Map() })
|
|
186
|
+
expect(result[0].element.props.items).toEqual([])
|
|
187
|
+
})
|
|
188
|
+
|
|
161
189
|
it('returns just the injected controls when the panel has neither render nor html', () => {
|
|
162
190
|
mapControls.mockReturnValue([{ id: 'injected1', order: 0, element: <span>injected</span> }])
|
|
163
191
|
defaultAppState.panelConfig = ({ p1: { desktop: { slot: 'header' } } })
|
|
@@ -12,7 +12,8 @@ import { getIconRegistry } from '../registry/iconRegistry.js'
|
|
|
12
12
|
*
|
|
13
13
|
* Using the original component function as the key ensures that each plugin component
|
|
14
14
|
* is wrapped exactly once. This prevents unnecessary unmounting and remounting in React,
|
|
15
|
-
* which can break state and focus management.
|
|
15
|
+
* which can break state and focus management. The cache is shared by every map on the page,
|
|
16
|
+
* so a wrapper takes its plugin id and config as props rather than keeping them.
|
|
16
17
|
*
|
|
17
18
|
* @type {Map<Function, React.ComponentType>}
|
|
18
19
|
*/
|
|
@@ -24,7 +25,7 @@ export const wrapperCache = new Map()
|
|
|
24
25
|
* This function returns a stable React component type that:
|
|
25
26
|
* - Always receives app-level context: config, appState, mapState
|
|
26
27
|
* - Always receives core services: eventBus, announcer, reverseGeocode, etc
|
|
27
|
-
* - Always receives plugin-level config
|
|
28
|
+
* - Always receives plugin-level config, passed to the wrapper as the `pluginConfig` prop
|
|
28
29
|
* - Always receives plugin-specific state from PluginProvider
|
|
29
30
|
* - Receives mapProvider from appConfig
|
|
30
31
|
*
|
|
@@ -32,17 +33,18 @@ export const wrapperCache = new Map()
|
|
|
32
33
|
* Without caching, each call would produce a new component type, causing unmounts
|
|
33
34
|
* and remounts of child components, which can break focus, local state, or other effects.
|
|
34
35
|
*
|
|
36
|
+
* Render the wrapper with these props, which aren't passed on to the component:
|
|
37
|
+
* - `pluginId` - The unique ID of the plugin
|
|
38
|
+
* - `pluginConfig` - Static plugin configuration for this map's plugin
|
|
39
|
+
*
|
|
35
40
|
* @param {Function} Component - The original plugin component (can be anonymous)
|
|
36
|
-
* @param {Object} options
|
|
37
|
-
* @param {string} options.pluginId - The unique ID of the plugin
|
|
38
|
-
* @param {Object} options.pluginConfig - Static plugin configuration applied at implementation time
|
|
39
41
|
* @returns {React.ComponentType} - The wrapped component with all contexts injected
|
|
40
42
|
*/
|
|
41
|
-
export function withPluginContexts (Component
|
|
43
|
+
export function withPluginContexts (Component) {
|
|
42
44
|
const key = Component
|
|
43
45
|
|
|
44
46
|
if (!wrapperCache.has(key)) {
|
|
45
|
-
wrapperCache.set(key, function WrappedComponent (props) {
|
|
47
|
+
wrapperCache.set(key, function WrappedComponent ({ pluginId, pluginConfig, ...props }) {
|
|
46
48
|
const appConfig = useConfig()
|
|
47
49
|
const appState = useApp()
|
|
48
50
|
const mapState = useMap()
|
|
@@ -80,7 +82,7 @@ export function withPluginContexts (Component, { pluginId, pluginConfig }) {
|
|
|
80
82
|
Object.entries(appState.buttonConfig).filter(
|
|
81
83
|
([_, btn]) => btn.pluginId === pluginId
|
|
82
84
|
)
|
|
83
|
-
), [appState.buttonConfig])}
|
|
85
|
+
), [appState.buttonConfig, pluginId])}
|
|
84
86
|
/>
|
|
85
87
|
)
|
|
86
88
|
})
|
|
@@ -17,13 +17,14 @@ describe('withPluginContexts', () => {
|
|
|
17
17
|
|
|
18
18
|
it('creates a new wrapper and injects all contexts and plugin config/state', () => {
|
|
19
19
|
const Inner = jest.fn(() => <div>Inner</div>)
|
|
20
|
-
const Wrapped = withPluginContexts(Inner
|
|
20
|
+
const Wrapped = withPluginContexts(Inner)
|
|
21
21
|
|
|
22
|
-
render(<Wrapped customProp='xyz' />)
|
|
22
|
+
render(<Wrapped pluginId='plugin1' pluginConfig={{ foo: 'bar' }} customProp='xyz' />)
|
|
23
23
|
|
|
24
24
|
expect(Inner).toHaveBeenCalled()
|
|
25
25
|
|
|
26
26
|
const props = Inner.mock.calls[0][0]
|
|
27
|
+
expect(props).not.toHaveProperty('pluginId')
|
|
27
28
|
expect(props).toEqual(expect.objectContaining({
|
|
28
29
|
customProp: 'xyz',
|
|
29
30
|
pluginConfig: { foo: 'bar' },
|
|
@@ -42,8 +43,8 @@ describe('withPluginContexts', () => {
|
|
|
42
43
|
const dispatch = jest.fn()
|
|
43
44
|
require('../store/appContext.js').useApp.mockReturnValue({ buttonConfig: {}, dispatch })
|
|
44
45
|
const Inner = jest.fn(() => <div>Inner</div>)
|
|
45
|
-
const Wrapped = withPluginContexts(Inner
|
|
46
|
-
const { rerender } = render(<Wrapped />)
|
|
46
|
+
const Wrapped = withPluginContexts(Inner)
|
|
47
|
+
const { rerender } = render(<Wrapped pluginId='plugin1' pluginConfig={{}} />)
|
|
47
48
|
return { dispatch, Inner, Wrapped, rerender }
|
|
48
49
|
}
|
|
49
50
|
|
|
@@ -77,7 +78,7 @@ describe('withPluginContexts', () => {
|
|
|
77
78
|
|
|
78
79
|
it('passes the same functions on every render, so effects can depend on them', () => {
|
|
79
80
|
const { Inner, Wrapped, rerender } = setup()
|
|
80
|
-
rerender(<Wrapped />)
|
|
81
|
+
rerender(<Wrapped pluginId='plugin1' pluginConfig={{}} />)
|
|
81
82
|
const [firstProps, secondProps] = Inner.mock.calls.map(([props]) => props)
|
|
82
83
|
expect(secondProps.setApplicationMode).toBe(firstProps.setApplicationMode)
|
|
83
84
|
expect(secondProps.clearApplicationMode).toBe(firstProps.clearApplicationMode)
|
|
@@ -86,12 +87,25 @@ describe('withPluginContexts', () => {
|
|
|
86
87
|
|
|
87
88
|
it('returns the cached wrapper if called again with the same component', () => {
|
|
88
89
|
const Inner = jest.fn(() => <div>Inner</div>)
|
|
89
|
-
const Wrapped1 = withPluginContexts(Inner
|
|
90
|
-
const Wrapped2 = withPluginContexts(Inner
|
|
90
|
+
const Wrapped1 = withPluginContexts(Inner)
|
|
91
|
+
const Wrapped2 = withPluginContexts(Inner)
|
|
91
92
|
|
|
92
93
|
expect(Wrapped2).toBe(Wrapped1)
|
|
93
94
|
})
|
|
94
95
|
|
|
96
|
+
it('gives each map its own plugin config when maps share a component', () => {
|
|
97
|
+
const Inner = jest.fn(() => <div>Inner</div>)
|
|
98
|
+
const WrappedMapA = withPluginContexts(Inner)
|
|
99
|
+
const WrappedMapB = withPluginContexts(Inner)
|
|
100
|
+
|
|
101
|
+
render(<WrappedMapA pluginId='datasets' pluginConfig={{ datasets: ['map-a'] }} />)
|
|
102
|
+
render(<WrappedMapB pluginId='datasets' pluginConfig={{ datasets: ['map-b'] }} />)
|
|
103
|
+
|
|
104
|
+
expect(WrappedMapB).toBe(WrappedMapA)
|
|
105
|
+
expect(Inner.mock.calls[0][0].pluginConfig).toEqual({ datasets: ['map-a'] })
|
|
106
|
+
expect(Inner.mock.calls[1][0].pluginConfig).toEqual({ datasets: ['map-b'] })
|
|
107
|
+
})
|
|
108
|
+
|
|
95
109
|
it('filters buttonConfig by pluginId', () => {
|
|
96
110
|
const Inner = jest.fn(() => <div>Inner</div>)
|
|
97
111
|
|
|
@@ -108,9 +122,9 @@ describe('withPluginContexts', () => {
|
|
|
108
122
|
const { useApp } = require('../store/appContext.js')
|
|
109
123
|
useApp.mockImplementation(() => appStateMock)
|
|
110
124
|
|
|
111
|
-
const Wrapped = withPluginContexts(Inner
|
|
125
|
+
const Wrapped = withPluginContexts(Inner)
|
|
112
126
|
|
|
113
|
-
render(<Wrapped customProp='xyz' />)
|
|
127
|
+
render(<Wrapped pluginId='plugin1' pluginConfig={{ foo: 'bar' }} customProp='xyz' />)
|
|
114
128
|
|
|
115
129
|
const props = Inner.mock.calls[0][0]
|
|
116
130
|
|
|
@@ -3,13 +3,26 @@ import { mapControls } from './mapControls.js'
|
|
|
3
3
|
import { mapPanels } from './mapPanels.js'
|
|
4
4
|
import { mapButtons } from './mapButtons.js'
|
|
5
5
|
import { orderItems } from './orderItems.js'
|
|
6
|
+
import { groupBySlot } from './slotHelpers.js'
|
|
6
7
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
/**
|
|
9
|
+
* Builds the items for every slot in one pass, so each item's excludeWhen runs once per render
|
|
10
|
+
* rather than once per slot. Includes the nested `<buttonId>-button` slots; controls in a
|
|
11
|
+
* `<panelId>-panel` slot are rendered by their panel's body.
|
|
12
|
+
*
|
|
13
|
+
* args include isHiddenByApplicationMode (see useApplicationModeFilter), so every mapper asks the
|
|
14
|
+
* same precomputed application mode rules whether to hide each of its items.
|
|
15
|
+
*
|
|
16
|
+
* @returns {Map<string, object[]>} each slot's ordered items; slots with no items are absent
|
|
17
|
+
*/
|
|
18
|
+
export function getItemsBySlot (args) {
|
|
10
19
|
const controls = mapControls(args)
|
|
11
|
-
const panels = mapPanels(args)
|
|
20
|
+
const panels = mapPanels({ ...args, controlsBySlot: groupBySlot(controls) })
|
|
12
21
|
const buttons = mapButtons(args)
|
|
13
22
|
|
|
14
|
-
|
|
23
|
+
const bySlot = groupBySlot([...controls, ...panels, ...buttons])
|
|
24
|
+
for (const [slot, items] of bySlot) {
|
|
25
|
+
bySlot.set(slot, orderItems(items))
|
|
26
|
+
}
|
|
27
|
+
return bySlot
|
|
15
28
|
}
|
|
@@ -1,31 +1,74 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import { getItemsBySlot } from './slotAggregator.js'
|
|
2
|
+
jest.mock('../components/MapButton/MapButton.jsx', () => ({ MapButton: () => null }))
|
|
3
|
+
jest.mock('../components/Panel/Panel.jsx', () => ({ Panel: () => null }))
|
|
4
|
+
jest.mock('./pluginWrapper.js', () => ({ withPluginContexts: jest.fn((Comp) => Comp || (() => null)) }))
|
|
5
|
+
|
|
6
|
+
describe('getItemsBySlot', () => {
|
|
7
|
+
let appState
|
|
8
|
+
let excludeWhen
|
|
9
|
+
|
|
10
|
+
const evaluateProp = jest.fn((prop) => typeof prop === 'function' ? prop({}) : prop)
|
|
11
|
+
const build = () => getItemsBySlot({ appState, appConfig: { id: 'test' }, evaluateProp })
|
|
12
|
+
const ids = (items) => items.map(item => item.id)
|
|
5
13
|
|
|
6
|
-
describe('getSlotItems', () => {
|
|
7
14
|
beforeEach(() => {
|
|
8
|
-
jest.
|
|
15
|
+
jest.clearAllMocks()
|
|
16
|
+
excludeWhen = {
|
|
17
|
+
kept: jest.fn(() => false),
|
|
18
|
+
excluded: jest.fn(() => true),
|
|
19
|
+
search: jest.fn(() => false),
|
|
20
|
+
resultsControl: jest.fn(() => false),
|
|
21
|
+
topControl: jest.fn(() => false)
|
|
22
|
+
}
|
|
23
|
+
appState = {
|
|
24
|
+
breakpoint: 'desktop',
|
|
25
|
+
isFullscreen: true,
|
|
26
|
+
openPanels: { results: { props: {} } },
|
|
27
|
+
disabledButtons: new Set(),
|
|
28
|
+
hiddenButtons: new Set(),
|
|
29
|
+
pressedButtons: new Set(),
|
|
30
|
+
expandedButtons: new Set(),
|
|
31
|
+
pluginRegistry: { registeredPlugins: [] },
|
|
32
|
+
buttonConfig: {
|
|
33
|
+
kept: { label: 'Kept', excludeWhen: excludeWhen.kept, desktop: { slot: 'top-left' } },
|
|
34
|
+
excluded: { label: 'Excluded', excludeWhen: excludeWhen.excluded, desktop: { slot: 'top-left' } },
|
|
35
|
+
search: { label: 'Search', panelId: 'results', excludeWhen: excludeWhen.search, desktop: { slot: 'top-right' } },
|
|
36
|
+
menuItem: { label: 'Menu item', isMenuItem: true, desktop: { slot: 'top-left' } }
|
|
37
|
+
},
|
|
38
|
+
panelConfig: {
|
|
39
|
+
results: { label: 'Results', desktop: { slot: 'search-button' } }
|
|
40
|
+
},
|
|
41
|
+
controlConfig: {
|
|
42
|
+
resultsControl: { id: 'resultsControl', excludeWhen: excludeWhen.resultsControl, desktop: { slot: 'results-panel' } },
|
|
43
|
+
topControl: { id: 'topControl', excludeWhen: excludeWhen.topControl, desktop: { slot: 'top-right', order: 1 } }
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
})
|
|
47
|
+
|
|
48
|
+
it('groups items by slot, including a button\'s nested <buttonId>-button slot', () => {
|
|
49
|
+
const bySlot = build()
|
|
50
|
+
expect(ids(bySlot.get('top-left'))).toEqual(['kept'])
|
|
51
|
+
expect(ids(bySlot.get('search-button'))).toEqual(['results'])
|
|
52
|
+
expect(bySlot.has('header')).toBe(false)
|
|
53
|
+
})
|
|
54
|
+
|
|
55
|
+
it('orders each slot\'s controls, panels and buttons together', () => {
|
|
56
|
+
// topControl's order 1 splices it ahead of the unordered search button
|
|
57
|
+
expect(ids(build().get('top-right'))).toEqual(['topControl', 'search'])
|
|
58
|
+
})
|
|
59
|
+
|
|
60
|
+
it('renders a control in a <panelId>-panel slot in that panel\'s body', () => {
|
|
61
|
+
const [panel] = build().get('search-button')
|
|
62
|
+
expect(ids(panel.element.props.items)).toEqual(['resultsControl'])
|
|
63
|
+
})
|
|
64
|
+
|
|
65
|
+
it('runs each excludeWhen once, however many slots there are', () => {
|
|
66
|
+
build()
|
|
67
|
+
Object.values(excludeWhen).forEach(fn => expect(fn).toHaveBeenCalledTimes(1))
|
|
9
68
|
})
|
|
10
69
|
|
|
11
|
-
it('returns
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
])
|
|
15
|
-
jest.spyOn(mapPanelsModule, 'mapPanels').mockReturnValue([
|
|
16
|
-
{ id: 'panel1', order: 1, type: 'panel' }
|
|
17
|
-
])
|
|
18
|
-
jest.spyOn(mapButtonsModule, 'mapButtons').mockReturnValue([
|
|
19
|
-
{ id: 'button1', order: 2, type: 'button' }
|
|
20
|
-
])
|
|
21
|
-
|
|
22
|
-
const args = { slot: 'header', breakpoint: 'desktop', mode: 'view', openPanels: {} }
|
|
23
|
-
const result = getSlotItems(args)
|
|
24
|
-
|
|
25
|
-
expect(result).toEqual([
|
|
26
|
-
{ id: 'panel1', order: 1, type: 'panel' },
|
|
27
|
-
{ id: 'button1', order: 2, type: 'button' },
|
|
28
|
-
{ id: 'control1', order: 3, type: 'control' }
|
|
29
|
-
])
|
|
70
|
+
it('returns an empty map when nothing is configured', () => {
|
|
71
|
+
appState = { ...appState, buttonConfig: {}, panelConfig: {}, controlConfig: {} }
|
|
72
|
+
expect(build().size).toBe(0)
|
|
30
73
|
})
|
|
31
74
|
})
|
|
@@ -73,3 +73,16 @@ export const getAllowedModalPanelId = (openPanels, panelConfig, breakpoint) => {
|
|
|
73
73
|
export const hasOpenModalPanel = (openPanels, panelConfig, breakpoint) => {
|
|
74
74
|
return getAllowedModalPanelId(openPanels, panelConfig, breakpoint) !== null
|
|
75
75
|
}
|
|
76
|
+
|
|
77
|
+
// Splits items into a Map of slot -> items, keeping each slot's items in their original order.
|
|
78
|
+
export const groupBySlot = (items, getSlot = item => item.slot) => {
|
|
79
|
+
const bySlot = new Map()
|
|
80
|
+
for (const item of items) {
|
|
81
|
+
const slot = getSlot(item)
|
|
82
|
+
if (!bySlot.has(slot)) {
|
|
83
|
+
bySlot.set(slot, [])
|
|
84
|
+
}
|
|
85
|
+
bySlot.get(slot).push(item)
|
|
86
|
+
}
|
|
87
|
+
return bySlot
|
|
88
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { resolveTargetSlot, isControlVisible, isConsumerHtml, isPanelSlotEligible, getAllowedModalPanelId, hasOpenModalPanel } from './slotHelpers.js'
|
|
1
|
+
import { resolveTargetSlot, isControlVisible, isConsumerHtml, isPanelSlotEligible, getAllowedModalPanelId, hasOpenModalPanel, groupBySlot } from './slotHelpers.js'
|
|
2
2
|
|
|
3
3
|
jest.mock('./slots.js', () => ({ allowedSlots: { control: ['inset', 'banner', 'actions'], panel: ['header', 'modal', 'left-top'] } }))
|
|
4
4
|
|
|
@@ -136,3 +136,18 @@ describe('hasOpenModalPanel', () => {
|
|
|
136
136
|
expect(hasOpenModalPanel({ p1: { props: {} } }, panelConfig, 'desktop')).toBe(true)
|
|
137
137
|
})
|
|
138
138
|
})
|
|
139
|
+
|
|
140
|
+
describe('groupBySlot', () => {
|
|
141
|
+
it('groups items by their slot, keeping each slot\'s items in order', () => {
|
|
142
|
+
const items = [{ id: 'a', slot: 'header' }, { id: 'b', slot: 'banner' }, { id: 'c', slot: 'header' }]
|
|
143
|
+
expect([...groupBySlot(items)]).toEqual([
|
|
144
|
+
['header', [items[0], items[2]]],
|
|
145
|
+
['banner', [items[1]]]
|
|
146
|
+
])
|
|
147
|
+
})
|
|
148
|
+
|
|
149
|
+
it('reads the slot with getSlot when given', () => {
|
|
150
|
+
const entries = [['b1', { slot: 'header' }]]
|
|
151
|
+
expect([...groupBySlot(entries, ([, config]) => config.slot)]).toEqual([['header', entries]])
|
|
152
|
+
})
|
|
153
|
+
})
|
|
@@ -5,9 +5,21 @@ import { handleActionSideEffects } from './appDispatchMiddleware.js'
|
|
|
5
5
|
import { ConfigContext } from './configContext.js'
|
|
6
6
|
import { subscribeToInterfaceChanges } from '../../utils/detectInterfaceType.js'
|
|
7
7
|
import { useMediaQueryDispatch } from '../hooks/useMediaQueryDispatch.js'
|
|
8
|
+
import { addPanel, removePanel } from '../registry/panelRegistry.js'
|
|
8
9
|
|
|
9
10
|
export const AppContext = createContext(null)
|
|
10
11
|
|
|
12
|
+
// Mirrors the reducer's panelConfig changes for added and removed panels
|
|
13
|
+
const getNextPanelConfig = (panelConfig, { type, payload }) => {
|
|
14
|
+
if (type === 'ADD_PANEL') {
|
|
15
|
+
return addPanel(panelConfig, payload.id, payload.config)
|
|
16
|
+
}
|
|
17
|
+
if (type === 'REMOVE_PANEL') {
|
|
18
|
+
return removePanel(panelConfig, payload)
|
|
19
|
+
}
|
|
20
|
+
return panelConfig
|
|
21
|
+
}
|
|
22
|
+
|
|
11
23
|
export const AppProvider = ({ options, children }) => {
|
|
12
24
|
const { pluginRegistry, buttonRegistry, panelRegistry, controlRegistry, keyboardShortcutRegistry, spatialListRegistry, eventBus, breakpointDetector } = options
|
|
13
25
|
|
|
@@ -40,11 +52,17 @@ export const AppProvider = ({ options, children }) => {
|
|
|
40
52
|
|
|
41
53
|
const [state, rawDispatch] = useReducer(reducer, initialState(options))
|
|
42
54
|
|
|
55
|
+
// Panel config including panels added or removed since the last render, so side effects for
|
|
56
|
+
// e.g. addPanel() then showPanel() in the same tick see the new panel
|
|
57
|
+
const panelConfigRef = useRef(state.panelConfig)
|
|
58
|
+
panelConfigRef.current = state.panelConfig
|
|
59
|
+
|
|
43
60
|
// Wrap dispatch to handle side effects
|
|
44
61
|
const dispatch = useCallback((action) => {
|
|
45
|
-
const panelConfig =
|
|
62
|
+
const panelConfig = panelConfigRef.current || options.panelRegistry.getPanelConfig()
|
|
46
63
|
const previousState = state
|
|
47
64
|
rawDispatch(action)
|
|
65
|
+
panelConfigRef.current = getNextPanelConfig(panelConfig, action)
|
|
48
66
|
handleActionSideEffects(action, previousState, panelConfig, eventBus)
|
|
49
67
|
}, [state, options, eventBus])
|
|
50
68
|
|
|
@@ -98,6 +98,47 @@ describe('AppProvider', () => {
|
|
|
98
98
|
expect(contextValue.layoutRefs).toHaveProperty('bottomRef')
|
|
99
99
|
})
|
|
100
100
|
|
|
101
|
+
test('emits panel opened when a panel is added and opened before the next render', async () => {
|
|
102
|
+
mockOptions.initialBreakpoint = 'desktop'
|
|
103
|
+
mockOptions.eventBus.emit = jest.fn()
|
|
104
|
+
let dispatch
|
|
105
|
+
render(
|
|
106
|
+
<AppProvider options={mockOptions}>
|
|
107
|
+
<AppContext.Consumer>
|
|
108
|
+
{value => { dispatch = value.dispatch; return null }}
|
|
109
|
+
</AppContext.Consumer>
|
|
110
|
+
</AppProvider>
|
|
111
|
+
)
|
|
112
|
+
|
|
113
|
+
await act(async () => {
|
|
114
|
+
dispatch({ type: 'ADD_PANEL', payload: { id: 'newPanel', config: { desktop: { slot: 'left-top', open: false } } } })
|
|
115
|
+
dispatch({ type: 'OPEN_PANEL', payload: { panelId: 'newPanel', props: {} } })
|
|
116
|
+
})
|
|
117
|
+
|
|
118
|
+
expect(mockOptions.eventBus.emit).toHaveBeenCalledWith('app:panelopened', { panelId: 'newPanel', props: {} })
|
|
119
|
+
})
|
|
120
|
+
|
|
121
|
+
test('does not emit panel opened when a panel is removed and opened before the next render', async () => {
|
|
122
|
+
mockOptions.initialBreakpoint = 'desktop'
|
|
123
|
+
mockOptions.eventBus.emit = jest.fn()
|
|
124
|
+
let dispatch
|
|
125
|
+
render(
|
|
126
|
+
<AppProvider options={mockOptions}>
|
|
127
|
+
<AppContext.Consumer>
|
|
128
|
+
{value => { dispatch = value.dispatch; return null }}
|
|
129
|
+
</AppContext.Consumer>
|
|
130
|
+
</AppProvider>
|
|
131
|
+
)
|
|
132
|
+
|
|
133
|
+
await act(async () => {
|
|
134
|
+
dispatch({ type: 'ADD_PANEL', payload: { id: 'oldPanel', config: { desktop: { slot: 'left-top', open: false } } } })
|
|
135
|
+
dispatch({ type: 'REMOVE_PANEL', payload: 'oldPanel' })
|
|
136
|
+
dispatch({ type: 'OPEN_PANEL', payload: { panelId: 'oldPanel', props: {} } })
|
|
137
|
+
})
|
|
138
|
+
|
|
139
|
+
expect(mockOptions.eventBus.emit).not.toHaveBeenCalled()
|
|
140
|
+
})
|
|
141
|
+
|
|
101
142
|
test('dispatch fallback uses options.panelRegistry.getPanelConfig() when state.panelConfig missing', () => {
|
|
102
143
|
const getPanelConfigMock = jest.fn(() => ({ panel1: {} }))
|
|
103
144
|
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import React, { createContext, useEffect, useReducer, useMemo, useRef } from 'react'
|
|
3
3
|
import { initialState, reducer } from './mapReducer.js'
|
|
4
4
|
import { EVENTS as events } from '../../config/events.js'
|
|
5
|
+
import { getMapSizeScale } from '../../config/mapSizeScales.js'
|
|
5
6
|
|
|
6
7
|
export const MapContext = createContext(null)
|
|
7
8
|
|
|
@@ -68,8 +69,10 @@ export const MapProvider = ({ options, children }) => {
|
|
|
68
69
|
localStorage.setItem(`${options.id}:mapSize`, state.mapSize)
|
|
69
70
|
}, [state.mapStyle, state.mapSize])
|
|
70
71
|
|
|
72
|
+
// mapSizeScale is worked out from mapSize here rather than stored, so the two can't drift apart
|
|
71
73
|
const mapStore = useMemo(() => ({
|
|
72
74
|
...state,
|
|
75
|
+
mapSizeScale: getMapSizeScale(state.mapSize),
|
|
73
76
|
dispatch
|
|
74
77
|
}), [state])
|
|
75
78
|
|
|
@@ -125,6 +125,30 @@ describe('MapProvider', () => {
|
|
|
125
125
|
expect(contextValue.isMapReady).toBe(true)
|
|
126
126
|
})
|
|
127
127
|
|
|
128
|
+
test.each([
|
|
129
|
+
['small', 1],
|
|
130
|
+
['medium', 1.5],
|
|
131
|
+
['large', 2],
|
|
132
|
+
['unknown', 1]
|
|
133
|
+
])('provides mapSizeScale for map size %s', (mapSize, expected) => {
|
|
134
|
+
let contextValue
|
|
135
|
+
const Child = () => {
|
|
136
|
+
contextValue = React.useContext(MapContext)
|
|
137
|
+
return null
|
|
138
|
+
}
|
|
139
|
+
render(
|
|
140
|
+
<MapProvider options={{ id: 'map1', mapSize: 'small', eventBus: mockEventBus }}>
|
|
141
|
+
<Child />
|
|
142
|
+
</MapProvider>
|
|
143
|
+
)
|
|
144
|
+
|
|
145
|
+
act(() => {
|
|
146
|
+
capturedHandlers['map:setsize'](mapSize)
|
|
147
|
+
})
|
|
148
|
+
|
|
149
|
+
expect(contextValue.mapSizeScale).toBe(expected)
|
|
150
|
+
})
|
|
151
|
+
|
|
128
152
|
test('emits map:sizechange when mapSize changes after initial value', () => {
|
|
129
153
|
render(
|
|
130
154
|
<MapProvider options={{ id: 'map1', mapSize: '100x100', eventBus: mockEventBus }}>
|
|
@@ -9,6 +9,11 @@ import { registerControl as registerControlFn, addControl as addControlFn } from
|
|
|
9
9
|
function buildOpenPanels (state, panelId, breakpoint, props, focusOnOpen) {
|
|
10
10
|
const panelConfig = state.panelConfig || state.panelRegistry.getPanelConfig()
|
|
11
11
|
const bpConfig = panelConfig[panelId]?.[breakpoint]
|
|
12
|
+
// Missing panel, or no config at this breakpoint: leave the open panels unchanged.
|
|
13
|
+
if (!bpConfig) {
|
|
14
|
+
return state.openPanels
|
|
15
|
+
}
|
|
16
|
+
|
|
12
17
|
const isExclusiveNonModal = !!bpConfig.exclusive && !bpConfig.modal
|
|
13
18
|
const isModal = !!bpConfig.modal
|
|
14
19
|
|
|
@@ -87,11 +92,15 @@ const setInterfaceType = (state, payload) => {
|
|
|
87
92
|
|
|
88
93
|
const openPanel = (state, payload) => {
|
|
89
94
|
const { panelId, props = {}, focusOnOpen } = payload
|
|
95
|
+
const openPanels = buildOpenPanels(state, panelId, state.breakpoint, props, focusOnOpen)
|
|
96
|
+
if (openPanels === state.openPanels) {
|
|
97
|
+
return state
|
|
98
|
+
}
|
|
90
99
|
|
|
91
100
|
return {
|
|
92
101
|
...state,
|
|
93
102
|
previousOpenPanels: state.openPanels,
|
|
94
|
-
openPanels
|
|
103
|
+
openPanels
|
|
95
104
|
}
|
|
96
105
|
}
|
|
97
106
|
|
|
@@ -441,6 +441,27 @@ describe('actionsMap full coverage', () => {
|
|
|
441
441
|
expect(res.openPanels).toHaveProperty('p2')
|
|
442
442
|
expect(res.openPanels).toHaveProperty('p1')
|
|
443
443
|
})
|
|
444
|
+
|
|
445
|
+
test('missing panel is a no-op and does not throw', () => {
|
|
446
|
+
const tmp = {
|
|
447
|
+
...state,
|
|
448
|
+
panelConfig: { keyboardHelp: { desktop: { exclusive: true, modal: false } } },
|
|
449
|
+
openPanels: { keyboardHelp: { props: {} } }
|
|
450
|
+
}
|
|
451
|
+
const res = actionsMap.OPEN_PANEL(tmp, { panelId: 'datasetsLayers' })
|
|
452
|
+
expect(res).toBe(tmp)
|
|
453
|
+
})
|
|
454
|
+
|
|
455
|
+
test('panel with no config for the current breakpoint is a no-op', () => {
|
|
456
|
+
const tmp = {
|
|
457
|
+
...state,
|
|
458
|
+
panelConfig: { p1: { mobile: { exclusive: true, modal: false } } },
|
|
459
|
+
openPanels: { p2: { props: {} } },
|
|
460
|
+
breakpoint: 'desktop'
|
|
461
|
+
}
|
|
462
|
+
const res = actionsMap.OPEN_PANEL(tmp, { panelId: 'p1', props: {} })
|
|
463
|
+
expect(res).toBe(tmp)
|
|
464
|
+
})
|
|
444
465
|
})
|
|
445
466
|
|
|
446
467
|
describe('SET_LISTBOX_ACTIVE', () => {
|