@defra/interactive-map 0.0.55-alpha → 0.0.56-alpha
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- 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/context.md +2 -0
- package/docs/api.md +17 -1
- package/docs/architecture/interactive-map.likec4 +4 -4
- package/docs/plugins/datasets.md +11 -0
- package/docs/plugins/draw.md +8 -2
- 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 +48 -26
- package/plugins/datasets/src/initialise/DatasetsInit.test.jsx +160 -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-plugin.js +1 -1
- package/plugins/draw/dist/esm/index.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 +47 -26
- package/plugins/draw/src/DrawInit.test.jsx +90 -2
- package/plugins/draw/src/adapters/openlayers/core/styles.test.js +1 -1
- package/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js +1 -1
- package/plugins/draw/src/manifest.js +3 -2
- package/plugins/draw/src/manifest.test.js +13 -1
- package/plugins/draw/src/utils/needsDrawTarget.js +22 -0
- package/plugins/draw/src/utils/needsDrawTarget.test.js +42 -0
- 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/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/index.js +1 -0
- package/plugins/{beta/map-styles → map-styles}/dist/umd/im-map-styles-plugin.js +1 -1
- package/plugins/{beta/map-styles → map-styles}/dist/umd/index.js +1 -1
- package/plugins/{beta/map-styles → map-styles}/src/MapStyles.jsx +2 -2
- 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/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/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 +22 -11
- package/src/App/renderer/mapButtons.test.js +23 -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/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/scss/tools/_govuk-content.scss +4 -3
- 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/index.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/map-styles → map-styles}/dist/esm/im-map-styles-plugin.js +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
|
@@ -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
|
|
44
|
+
if ((slot !== undefined && bpConfig?.slot !== slot) || !allowedSlots.button.includes(bpConfig?.slot)) {
|
|
43
45
|
return false
|
|
44
46
|
}
|
|
45
47
|
|
|
@@ -153,6 +155,7 @@ function buildUngroupedItems (members, ctx) {
|
|
|
153
155
|
return members.map(([buttonId, config]) => ({
|
|
154
156
|
id: buttonId,
|
|
155
157
|
type: 'button',
|
|
158
|
+
slot: config[ctx.breakpoint].slot,
|
|
156
159
|
order: config[ctx.breakpoint]?.order ?? 0,
|
|
157
160
|
element: <SlotButton key={buttonId} {...slotButtonProps({ buttonId, config, isHidden: isButtonHidden(buttonId, config, ctx), ...ctx })} />
|
|
158
161
|
}))
|
|
@@ -183,6 +186,7 @@ function buildGroupItem (key, members, ctx) {
|
|
|
183
186
|
return {
|
|
184
187
|
id: buttonId,
|
|
185
188
|
type: 'button',
|
|
189
|
+
slot: config[ctx.breakpoint].slot,
|
|
186
190
|
order,
|
|
187
191
|
element: <SlotButton key={buttonId} {...slotButtonProps({ buttonId, config, isHidden: isButtonHidden(buttonId, config, ctx), ...ctx })} />
|
|
188
192
|
}
|
|
@@ -200,6 +204,7 @@ function buildGroupItem (key, members, ctx) {
|
|
|
200
204
|
return {
|
|
201
205
|
id: `group-${key}`,
|
|
202
206
|
type: 'group',
|
|
207
|
+
slot: firstConfig[ctx.breakpoint].slot,
|
|
203
208
|
order,
|
|
204
209
|
element: (
|
|
205
210
|
<div // NOSONAR - div with role="group" is correct for a button group
|
|
@@ -216,19 +221,12 @@ function buildGroupItem (key, members, ctx) {
|
|
|
216
221
|
}
|
|
217
222
|
}
|
|
218
223
|
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
const raw = getMatchingButtons({ appState, appConfig, buttonConfig, slot, evaluateProp })
|
|
223
|
-
const matching = applySlotExclusivity(raw, appState)
|
|
224
|
-
|
|
225
|
-
if (!matching.length) {
|
|
226
|
-
return []
|
|
227
|
-
}
|
|
224
|
+
// Builds one slot's items from the buttons matched for it
|
|
225
|
+
function buildSlotItems (raw, ctx) {
|
|
226
|
+
const matching = applySlotExclusivity(raw, ctx.appState)
|
|
228
227
|
|
|
229
228
|
// Partition into named groups (keyed by kebab-cased group.label) plus one ungrouped bucket
|
|
230
229
|
const buckets = groupByKey({ items: matching, keyFn: ([, config]) => config.group?.label })
|
|
231
|
-
const ctx = { breakpoint, appState, appConfig, evaluateProp, isHiddenByApplicationMode }
|
|
232
230
|
|
|
233
231
|
const result = []
|
|
234
232
|
for (const [key, members] of buckets) {
|
|
@@ -242,6 +240,19 @@ function mapButtons ({ slot, appState, appConfig, evaluateProp, isHiddenByApplic
|
|
|
242
240
|
return result
|
|
243
241
|
}
|
|
244
242
|
|
|
243
|
+
// Maps buttons for the given slot or, with no slot, for every slot. Exclusivity and groups apply
|
|
244
|
+
// within a slot, so matching buttons are split by slot first.
|
|
245
|
+
function mapButtons ({ slot, appState, appConfig, evaluateProp, isHiddenByApplicationMode = hidesNothing }) {
|
|
246
|
+
const { buttonConfig, breakpoint } = appState
|
|
247
|
+
|
|
248
|
+
const raw = getMatchingButtons({ appState, appConfig, buttonConfig, slot, evaluateProp })
|
|
249
|
+
const ctx = { breakpoint, appState, appConfig, evaluateProp, isHiddenByApplicationMode }
|
|
250
|
+
|
|
251
|
+
const bySlot = groupBySlot(raw, ([, config]) => config[breakpoint].slot)
|
|
252
|
+
|
|
253
|
+
return [...bySlot.values()].flatMap(entries => buildSlotItems(entries, ctx))
|
|
254
|
+
}
|
|
255
|
+
|
|
245
256
|
export {
|
|
246
257
|
mapButtons,
|
|
247
258
|
getMatchingButtons,
|
|
@@ -257,7 +257,29 @@ describe('mapButtons module', () => {
|
|
|
257
257
|
it('returns a flat list of buttons with type and order', () => {
|
|
258
258
|
appState.buttonConfig = ({ b1: baseBtn })
|
|
259
259
|
const result = map()
|
|
260
|
-
expect(result[0]).toMatchObject({ id: 'b1', type: 'button', order: 1 })
|
|
260
|
+
expect(result[0]).toMatchObject({ id: 'b1', type: 'button', slot: 'header', order: 1 })
|
|
261
|
+
})
|
|
262
|
+
|
|
263
|
+
it('maps buttons for every slot, each tagged with its slot, when no slot is given', () => {
|
|
264
|
+
appState.buttonConfig = ({ b1: baseBtn, b2: { ...baseBtn, desktop: { slot: 'sidebar' } } })
|
|
265
|
+
const result = mapButtons({ appState, appConfig, evaluateProp })
|
|
266
|
+
expect(result.map(({ id, slot }) => ({ id, slot }))).toEqual([{ id: 'b1', slot: 'header' }, { id: 'b2', slot: 'sidebar' }])
|
|
267
|
+
})
|
|
268
|
+
|
|
269
|
+
it('applies slot exclusivity within each slot when mapping every slot', () => {
|
|
270
|
+
appState.buttonConfig = {
|
|
271
|
+
drawCancel: { ...baseBtn, pluginId: 'draw', exclusiveSlot: true },
|
|
272
|
+
journeyBack: { ...baseBtn },
|
|
273
|
+
sidebarBtn: { ...baseBtn, desktop: { slot: 'sidebar' } }
|
|
274
|
+
}
|
|
275
|
+
const result = mapButtons({ appState, appConfig, evaluateProp })
|
|
276
|
+
expect(result.map(r => r.id)).toEqual(['drawCancel', 'sidebarBtn'])
|
|
277
|
+
})
|
|
278
|
+
|
|
279
|
+
it('tags a button group with its members\' slot', () => {
|
|
280
|
+
const group = { label: 'G1' }
|
|
281
|
+
appState.buttonConfig = ({ b1: { ...baseBtn, group }, b2: { ...baseBtn, group } })
|
|
282
|
+
expect(map()[0]).toMatchObject({ id: 'group-g1', type: 'group', slot: 'header' })
|
|
261
283
|
})
|
|
262
284
|
|
|
263
285
|
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' } }
|
|
@@ -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
|
+
})
|