@defra/interactive-map 0.0.54-alpha → 0.0.56-alpha
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/templates/add-polygons.njk +1 -1
- package/assets/templates/add-symbols.njk +4 -4
- package/assets/templates/draw-tools.njk +7 -7
- package/assets/templates/marker-panel.njk +5 -5
- package/assets/templates/place-marker.njk +8 -8
- package/assets/templates/search-control.njk +1 -1
- package/assets/templates/select-feature.njk +7 -7
- package/assets/templates/style-switcher.njk +6 -6
- package/assets/templates/toggle-marker-label.njk +3 -3
- package/dist/esm/im-core.js +1 -1
- package/dist/esm/im-shell.js +1 -1
- package/dist/esm/index.js +1 -1
- package/dist/umd/im-core.js +1 -1
- package/dist/umd/im-core.js.LICENSE.txt +0 -30
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.LICENSE.txt +0 -20
- package/docs/api/context.md +2 -0
- package/docs/api.md +20 -14
- package/docs/architecture/interactive-map.likec4 +4 -4
- package/docs/building-a-plugin.md +2 -2
- package/docs/examples/add-marker-with-panel.mdx +46 -44
- package/docs/examples/add-polygons.mdx +100 -98
- package/docs/examples/add-symbols.mdx +75 -73
- package/docs/examples/basic-map.mdx +16 -14
- package/docs/examples/button-map.mdx +16 -14
- package/docs/examples/draw-tools.mdx +119 -117
- package/docs/examples/place-marker.mdx +51 -49
- package/docs/examples/search-control.mdx +22 -20
- package/docs/examples/select-feature.mdx +107 -105
- package/docs/examples/style-switcher.mdx +47 -45
- package/docs/examples/toggle-marker-label.mdx +30 -28
- package/docs/getting-started.md +26 -24
- package/docs/plugins/datasets.md +11 -0
- package/docs/plugins/draw.md +18 -12
- package/docs/plugins/interact.md +33 -10
- package/docs/plugins/plugin-descriptor.md +1 -1
- package/docs/plugins/search.md +5 -5
- package/docusaurus.config.cjs +48 -3
- package/govuk-prototype-kit.config.json +6 -7
- package/package.json +22 -29
- 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/layerAdapter.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-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 +47 -26
- package/plugins/draw/src/DrawInit.test.jsx +90 -2
- package/plugins/draw/src/adapters/maplibre/styles.js +3 -2
- package/plugins/draw/src/adapters/maplibre/styles.test.js +3 -3
- 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/im-draw-es-plugin.js +1 -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/im-frame-plugin.js +1 -0
- package/plugins/frame/dist/esm/index.js +1 -0
- package/plugins/frame/dist/umd/im-frame-plugin.js +1 -0
- package/plugins/frame/dist/umd/index.js +2 -0
- 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/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/map-styles/dist/umd/index.js +2 -0
- 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/im-menu-plugin.js +1 -1
- package/plugins/menu/dist/esm/index.js +1 -1
- package/plugins/menu/dist/umd/im-menu-plugin.js +1 -1
- package/plugins/menu/dist/umd/index.js +1 -1
- package/plugins/scale-bar/dist/esm/im-scale-bar-plugin.js +1 -0
- package/plugins/scale-bar/dist/esm/index.js +1 -0
- package/plugins/scale-bar/dist/umd/im-scale-bar-plugin.js +1 -0
- package/plugins/scale-bar/dist/umd/index.js +2 -0
- 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/im-use-location-plugin.js +1 -0
- package/plugins/use-location/dist/esm/index.js +1 -0
- package/plugins/use-location/dist/umd/im-use-location-plugin.js +1 -0
- package/plugins/use-location/dist/umd/index.js +2 -0
- package/providers/esri/dist/esm/im-esri-provider.js +1 -0
- 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/im-maplibre-provider.js +1 -1
- package/providers/maplibre/dist/esm/index.js +1 -1
- package/providers/maplibre/dist/umd/im-maplibre-framework.js +1 -1
- package/providers/maplibre/dist/umd/im-maplibre-framework.js.LICENSE.txt +3 -3
- package/providers/maplibre/dist/umd/im-maplibre-provider.js +1 -1
- package/providers/maplibre/dist/umd/im-maplibre-worker.js +2 -0
- package/providers/maplibre/dist/umd/im-maplibre-worker.js.LICENSE.txt +4 -0
- package/providers/maplibre/dist/umd/index.js +1 -1
- package/providers/maplibre/src/index.js +41 -12
- package/providers/maplibre/src/index.test.js +43 -12
- package/providers/maplibre/src/utils/detectModuleWorker.js +25 -0
- package/providers/maplibre/src/utils/detectModuleWorker.test.js +40 -0
- package/providers/maplibre/src/utils/spatial.js +22 -12
- package/providers/maplibre/src/utils/spatial.test.js +6 -6
- package/providers/maplibre/src/utils/workerUrl.js +15 -0
- package/providers/maplibre/src/utils/workerUrl.test.js +14 -0
- package/providers/open-names/dist/esm/im-reverse-geocode.js +1 -0
- package/providers/open-names/dist/esm/index.js +1 -0
- package/providers/open-names/dist/umd/im-reverse-geocode.js +2 -0
- package/providers/open-names/dist/umd/index.js +2 -0
- package/providers/openlayers/dist/esm/im-openlayers-provider.js +1 -0
- package/providers/openlayers/dist/esm/index.js +1 -0
- package/providers/openlayers/dist/umd/im-openlayers-provider.js +2 -0
- package/providers/openlayers/dist/umd/index.js +2 -0
- package/providers/openlayers/src/index.js +60 -0
- package/providers/openlayers/src/index.test.js +47 -0
- 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 +79 -46
- 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/InteractiveMap.js +2 -1
- package/src/InteractiveMap/InteractiveMap.test.js +9 -2
- package/src/InteractiveMap/domStateManager.js +21 -1
- package/src/InteractiveMap/domStateManager.test.js +48 -1
- package/src/InteractiveMap/parseDataProperties.js +4 -4
- package/src/InteractiveMap/parseDataProperties.test.js +62 -6
- package/src/InteractiveMap/polyfills.js +4 -3
- package/src/InteractiveMap/polyfills.test.js +12 -0
- package/src/config/events.js +4 -2
- package/src/scss/tools/_govuk-content.scss +4 -3
- package/src/types.js +3 -5
- package/webpack.dev.mjs +11 -3
- package/webpack.prod.mjs +11 -4
- package/webpack.umd.mjs +34 -14
- package/plugins/beta/draw-es/dist/esm/im-draw-es-plugin.js +0 -1
- 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/im-frame-plugin.js +0 -1
- package/plugins/beta/frame/dist/esm/index.js +0 -1
- package/plugins/beta/frame/dist/umd/im-frame-plugin.js +0 -1
- package/plugins/beta/frame/dist/umd/index.js +0 -2
- 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/map-styles/dist/umd/index.js +0 -2
- package/plugins/beta/scale-bar/dist/esm/im-scale-bar-plugin.js +0 -1
- package/plugins/beta/scale-bar/dist/esm/index.js +0 -1
- package/plugins/beta/scale-bar/dist/umd/im-scale-bar-plugin.js +0 -1
- package/plugins/beta/scale-bar/dist/umd/index.js +0 -2
- package/plugins/beta/use-location/dist/esm/im-use-location-plugin.js +0 -1
- package/plugins/beta/use-location/dist/esm/index.js +0 -1
- package/plugins/beta/use-location/dist/umd/im-use-location-plugin.js +0 -1
- package/plugins/beta/use-location/dist/umd/index.js +0 -2
- 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/im-esri-provider.js +0 -1
- package/providers/beta/esri/dist/esm/index.js +0 -1
- package/providers/beta/open-names/dist/esm/im-reverse-geocode.js +0 -1
- package/providers/beta/open-names/dist/esm/index.js +0 -1
- package/providers/beta/open-names/dist/umd/im-reverse-geocode.js +0 -2
- package/providers/beta/open-names/dist/umd/index.js +0 -2
- package/providers/beta/openlayers/dist/esm/im-openlayers-provider.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 +0 -2
- package/providers/beta/openlayers/dist/umd/index.js.LICENSE.txt +0 -1
- package/providers/beta/openlayers/src/index.js +0 -37
- /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/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/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/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}/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/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/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/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
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
/*! For license information please see index.js.LICENSE.txt */
|
|
2
|
+
!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("defra",[],t):"object"==typeof exports?exports.defra=t():(e.defra=e.defra||{},e.defra.openLayersProvider=t())}(Object("undefined"!=typeof self?self:this),function(){return function(){"use strict";var e,t,r={},n={};function o(e){var t=n[e];if(void 0!==t)return t.exports;var i=n[e]={exports:{}};return r[e](i,i.exports,o),i.exports}o.m=r,o.d=function(e,t){for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.f={},o.e=function(e){return Promise.all(Object.keys(o.f).reduce(function(t,r){return o.f[r](e,t),t},[]))},o.u=function(e){return"im-openlayers-provider.js"},o.miniCssF=function(e){},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},e={},t="defra.openLayersProvider:",o.l=function(r,n,i,u){if(e[r])e[r].push(n);else{var a,c;if(void 0!==i)for(var f=document.getElementsByTagName("script"),p=0;p<f.length;p++){var s=f[p];if(s.getAttribute("src")==r||s.getAttribute("data-webpack")==t+i){a=s;break}}a||(c=!0,(a=document.createElement("script")).charset="utf-8",o.nc&&a.setAttribute("nonce",o.nc),a.setAttribute("data-webpack",t+i),a.src=r),e[r]=[n];var l=function(t,n){a.onerror=a.onload=null,clearTimeout(d);var o=e[r];if(delete e[r],a.parentNode&&a.parentNode.removeChild(a),o&&o.forEach(function(e){return e(n)}),t)return t(n)},d=setTimeout(l.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=l.bind(null,a.onerror),a.onload=l.bind(null,a.onload),c&&document.head.appendChild(a)}},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},function(){var e;o.g.importScripts&&(e=o.g.location+"");var t=o.g.document;if(!e&&t&&(t.currentScript&&"SCRIPT"===t.currentScript.tagName.toUpperCase()&&(e=t.currentScript.src),!e)){var r=t.getElementsByTagName("script");if(r.length)for(var n=r.length-1;n>-1&&(!e||!/^http(s?):/.test(e));)e=r[n--].src}if(!e)throw new Error("Automatic publicPath is not supported in this browser");e=e.replace(/^blob:/,"").replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),o.p=e}(),function(){var e={57:0};o.f.j=function(t,r){var n=o.o(e,t)?e[t]:void 0;if(0!==n)if(n)r.push(n[2]);else{var i=new Promise(function(r,o){n=e[t]=[r,o]});r.push(n[2]=i);var u=o.p+o.u(t),a=new Error;o.l(u,function(r){if(o.o(e,t)&&(0!==(n=e[t])&&(e[t]=void 0),n)){var i=r&&("load"===r.type?"missing":r.type),u=r&&r.target&&r.target.src;a.message="Loading chunk "+t+" failed.\n("+i+": "+u+")",a.name="ChunkLoadError",a.type=i,a.request=u,n[1](a)}},"chunk-"+t,t)}};var t=function(t,r){var n,i,u=r[0],a=r[1],c=r[2],f=0;if(u.some(function(t){return 0!==e[t]})){for(n in a)o.o(a,n)&&(o.m[n]=a[n]);c&&c(o)}for(t&&t(r);f<u.length;f++)i=u[f],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0},r=Object("undefined"!=typeof self?self:this).webpackChunkdefra_DefraMap=Object("undefined"!=typeof self?self:this).webpackChunkdefra_DefraMap||[];r.forEach(t.bind(null,0)),r.push=t.bind(null,r.push.bind(r))}();var i={};function u(){var e,t,r="function"==typeof Symbol?Symbol:{},n=r.iterator||"@@iterator",o=r.toStringTag||"@@toStringTag";function i(r,n,o,i){var u=n&&n.prototype instanceof f?n:f,p=Object.create(u.prototype);return a(p,"_invoke",function(r,n,o){var i,u,a,f=0,p=o||[],s=!1,l={p:0,n:0,v:e,a:d,f:d.bind(e,4),d:function(t,r){return i=t,u=0,a=e,l.n=r,c}};function d(r,n){for(u=r,a=n,t=0;!s&&f&&!o&&t<p.length;t++){var o,i=p[t],d=l.p,v=i[2];r>3?(o=v===n)&&(a=i[(u=i[4])?5:(u=3,3)],i[4]=i[5]=e):i[0]<=d&&((o=r<2&&d<i[1])?(u=0,l.v=n,l.n=i[1]):d<v&&(o=r<3||i[0]>n||n>v)&&(i[4]=r,i[5]=n,l.n=v,u=0))}if(o||r>1)return c;throw s=!0,n}return function(o,p,v){if(f>1)throw TypeError("Generator is already running");for(s&&1===p&&d(p,v),u=p,a=v;(t=u<2?e:a)||!s;){i||(u?u<3?(u>1&&(l.n=-1),d(u,a)):l.n=a:l.v=a);try{if(f=2,i){if(u||(o="next"),t=i[o]){if(!(t=t.call(i,a)))throw TypeError("iterator result is not an object");if(!t.done)return t;a=t.value,u<2&&(u=0)}else 1===u&&(t=i.return)&&t.call(i),u<2&&(a=TypeError("The iterator does not provide a '"+o+"' method"),u=1);i=e}else if((t=(s=l.n<0)?a:r.call(n,l))!==c)break}catch(t){i=e,u=1,a=t}finally{f=1}}return{value:t,done:s}}}(r,o,i),!0),p}var c={};function f(){}function p(){}function s(){}t=Object.getPrototypeOf;var l=[][n]?t(t([][n]())):(a(t={},n,function(){return this}),t),d=s.prototype=f.prototype=Object.create(l);function v(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,s):(e.__proto__=s,a(e,o,"GeneratorFunction")),e.prototype=Object.create(d),e}return p.prototype=s,a(d,"constructor",s),a(s,"constructor",p),p.displayName="GeneratorFunction",a(s,o,"GeneratorFunction"),a(d),a(d,o,"Generator"),a(d,n,function(){return this}),a(d,"toString",function(){return"[object Generator]"}),(u=function(){return{w:i,m:v}})()}function a(e,t,r,n){var o=Object.defineProperty;try{o({},"",{})}catch(e){o=0}a=function(e,t,r,n){function i(t,r){a(e,t,function(e){return this._invoke(t,r,e)})}t?o?o(e,t,{value:r,enumerable:!n,configurable:!n,writable:!n}):e[t]=r:(i("next",0),i("throw",1),i("return",2))},a(e,t,r,n)}function c(e,t,r,n,o,i,u){try{var a=e[i](u),c=a.value}catch(e){return void r(e)}a.done?t(c):Promise.resolve(c).then(n,o)}function f(){var e,t,r=(arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}).zoomAlignment;return{checkDeviceCapabilities:function(){var e=document.documentMode?"Internet Explorer is not supported":document.createElement("canvas").getContext?"function"!=typeof[].at?"Browser does not support the JavaScript features OpenLayers requires":void 0:"Canvas is not supported in this browser";return{isSupported:!e,error:e}},load:(e=u().m(function e(){var t,n;return u().w(function(e){for(;;)switch(e.n){case 0:return e.n=1,o.e(142).then(o.bind(o,57));case 1:return t=e.v.default,n={zoomAlignment:r,crs:"EPSG:27700"},e.a(2,{MapProvider:t,mapProviderConfig:n})}},e)}),t=function(){var t=this,r=arguments;return new Promise(function(n,o){var i=e.apply(t,r);function u(e){c(i,n,o,u,a,"next",e)}function a(e){c(i,n,o,u,a,"throw",e)}u(void 0)})},function(){return t.apply(this,arguments)})}}return o.d(i,{default:function(){return f}}),i.default}()});
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @typedef {import('../../../src/types.js').MapProviderDescriptor} MapProviderDescriptor
|
|
3
|
+
* @typedef {import('../../../src/types.js').MapProviderLoadResult} MapProviderLoadResult
|
|
4
|
+
* @typedef {import('../../../src/types.js').MapProviderConfig} MapProviderConfig
|
|
5
|
+
* @typedef {import('../../../src/types.js').OpenLayersProviderConfig} OpenLayersProviderConfig
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Returns the reason the device cannot run OpenLayers, or undefined if it can.
|
|
10
|
+
* OpenLayers uses class fields and private methods (Chrome 84 / Firefox 90 /
|
|
11
|
+
* Safari 15); `Array.prototype.at` (Chrome 92 / Firefox 90 / Safari 15.4) is the proxy.
|
|
12
|
+
*
|
|
13
|
+
* @returns {string|undefined}
|
|
14
|
+
*/
|
|
15
|
+
function getUnsupportedReason () {
|
|
16
|
+
if (document.documentMode) {
|
|
17
|
+
return 'Internet Explorer is not supported'
|
|
18
|
+
}
|
|
19
|
+
if (!document.createElement('canvas').getContext) {
|
|
20
|
+
return 'Canvas is not supported in this browser'
|
|
21
|
+
}
|
|
22
|
+
if (typeof [].at !== 'function') {
|
|
23
|
+
return 'Browser does not support the JavaScript features OpenLayers requires'
|
|
24
|
+
}
|
|
25
|
+
return undefined
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* Creates an OpenLayers provider descriptor for lazy-loading the map provider.
|
|
30
|
+
*
|
|
31
|
+
* @param {OpenLayersProviderConfig} [config={}] - Optional provider configuration overrides.
|
|
32
|
+
* @returns {MapProviderDescriptor} The map provider descriptor.
|
|
33
|
+
*/
|
|
34
|
+
export default function createOpenLayersProvider ({ zoomAlignment } = {}) {
|
|
35
|
+
return {
|
|
36
|
+
checkDeviceCapabilities: () => {
|
|
37
|
+
const error = getUnsupportedReason()
|
|
38
|
+
return {
|
|
39
|
+
isSupported: !error,
|
|
40
|
+
error
|
|
41
|
+
}
|
|
42
|
+
},
|
|
43
|
+
/** @returns {Promise<MapProviderLoadResult>} */
|
|
44
|
+
load: async () => {
|
|
45
|
+
const MapProvider = (await import(/* webpackChunkName: "im-openlayers-provider" */ './openlayersProvider.js')).default
|
|
46
|
+
|
|
47
|
+
/** @type {MapProviderConfig} */
|
|
48
|
+
const mapProviderConfig = {
|
|
49
|
+
zoomAlignment,
|
|
50
|
+
// Fixed, not user-configurable — the OpenLayers provider is BNG-native only.
|
|
51
|
+
crs: 'EPSG:27700'
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
return {
|
|
55
|
+
MapProvider,
|
|
56
|
+
mapProviderConfig
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import createOpenLayersProvider from './index.js'
|
|
2
|
+
|
|
3
|
+
describe('createOpenLayersProvider checkDeviceCapabilities', () => {
|
|
4
|
+
test('modern browser with canvas → isSupported true', () => {
|
|
5
|
+
const result = createOpenLayersProvider().checkDeviceCapabilities()
|
|
6
|
+
|
|
7
|
+
expect(result.isSupported).toBe(true)
|
|
8
|
+
expect(result.error).toBeFalsy()
|
|
9
|
+
})
|
|
10
|
+
|
|
11
|
+
test('Internet Explorer → isSupported false', () => {
|
|
12
|
+
Object.defineProperty(document, 'documentMode', { get: () => 11, configurable: true })
|
|
13
|
+
|
|
14
|
+
try {
|
|
15
|
+
const result = createOpenLayersProvider().checkDeviceCapabilities()
|
|
16
|
+
expect(result.isSupported).toBe(false)
|
|
17
|
+
expect(result.error).toBe('Internet Explorer is not supported')
|
|
18
|
+
} finally {
|
|
19
|
+
Object.defineProperty(document, 'documentMode', { get: () => undefined, configurable: true })
|
|
20
|
+
}
|
|
21
|
+
})
|
|
22
|
+
|
|
23
|
+
test('no canvas support → isSupported false', () => {
|
|
24
|
+
const createElement = jest.spyOn(document, 'createElement').mockReturnValue({})
|
|
25
|
+
|
|
26
|
+
try {
|
|
27
|
+
const result = createOpenLayersProvider().checkDeviceCapabilities()
|
|
28
|
+
expect(result.isSupported).toBe(false)
|
|
29
|
+
expect(result.error).toBe('Canvas is not supported in this browser')
|
|
30
|
+
} finally {
|
|
31
|
+
createElement.mockRestore()
|
|
32
|
+
}
|
|
33
|
+
})
|
|
34
|
+
|
|
35
|
+
test('no Array.prototype.at → isSupported false', () => {
|
|
36
|
+
const restoreAt = Array.prototype.at
|
|
37
|
+
delete Array.prototype.at // eslint-disable-line no-extend-native
|
|
38
|
+
|
|
39
|
+
try {
|
|
40
|
+
const result = createOpenLayersProvider().checkDeviceCapabilities()
|
|
41
|
+
expect(result.isSupported).toBe(false)
|
|
42
|
+
expect(result.error).toBe('Browser does not support the JavaScript features OpenLayers requires')
|
|
43
|
+
} finally {
|
|
44
|
+
Array.prototype.at = restoreAt // eslint-disable-line no-extend-native
|
|
45
|
+
}
|
|
46
|
+
})
|
|
47
|
+
})
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { debounce } from '
|
|
2
|
-
import { throttle } from '
|
|
1
|
+
import { debounce } from '../../../src/utils/debounce.js'
|
|
2
|
+
import { throttle } from '../../../src/utils/throttle.js'
|
|
3
3
|
import { ZOOM_TOLERANCE } from './defaults.js'
|
|
4
4
|
|
|
5
5
|
const DEBOUNCE_IDLE_TIME = 500
|
|
@@ -3,7 +3,7 @@ import { attachMapEvents } from './mapEvents.js'
|
|
|
3
3
|
|
|
4
4
|
const mockDebounceFns = []
|
|
5
5
|
|
|
6
|
-
jest.mock('
|
|
6
|
+
jest.mock('../../../src/utils/debounce.js', () => ({
|
|
7
7
|
__esModule: true,
|
|
8
8
|
debounce: (fn) => {
|
|
9
9
|
const wrapper = jest.fn()
|
|
@@ -14,7 +14,7 @@ jest.mock('../../../../src/utils/debounce.js', () => ({
|
|
|
14
14
|
}))
|
|
15
15
|
|
|
16
16
|
// Passthrough throttle: calls fn immediately (no cancel needed, not added to debouncers)
|
|
17
|
-
jest.mock('
|
|
17
|
+
jest.mock('../../../src/utils/throttle.js', () => ({
|
|
18
18
|
__esModule: true,
|
|
19
19
|
throttle: (fn) => jest.fn(fn)
|
|
20
20
|
}))
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @typedef {import('
|
|
3
|
-
* @typedef {import('
|
|
2
|
+
* @typedef {import('../../../src/types.js').MapProvider} MapProvider
|
|
3
|
+
* @typedef {import('../../../src/types.js').MapProviderConfig} MapProviderConfig
|
|
4
4
|
*/
|
|
5
|
-
import { MapProvider } from '
|
|
5
|
+
import { MapProvider } from '../../mapProvider.js'
|
|
6
6
|
import OlMap from 'ol/Map.js'
|
|
7
7
|
import View from 'ol/View.js'
|
|
8
8
|
import { defaults as defaultInteractions } from 'ol/interaction/defaults.js'
|
|
@@ -7,7 +7,7 @@ import Stroke from 'ol/style/Stroke.js'
|
|
|
7
7
|
import Fill from 'ol/style/Fill.js'
|
|
8
8
|
import Icon from 'ol/style/Icon.js'
|
|
9
9
|
import { collectTileFragments } from './vtTileFragments.js'
|
|
10
|
-
import { hasSymbol } from '
|
|
10
|
+
import { hasSymbol } from '../../../../src/utils/symbolUtils.js'
|
|
11
11
|
|
|
12
12
|
const CRS = 'EPSG:27700'
|
|
13
13
|
const geoJsonFormat = new GeoJSON({ dataProjection: CRS, featureProjection: CRS })
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Fill from 'ol/style/Fill.js'
|
|
2
|
-
import { RecentImageSets } from '
|
|
2
|
+
import { RecentImageSets } from '../../../../src/utils/recentImageSets.js'
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* The OpenLayers provider's pattern fills: each pattern image as an ol/style/Fill whose colour
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import IconImage from 'ol/style/IconImage.js'
|
|
2
2
|
import { shared as iconImageCache } from 'ol/style/IconImageCache.js'
|
|
3
3
|
import ImageState from 'ol/ImageState.js'
|
|
4
|
-
import { RecentImageSets } from '
|
|
4
|
+
import { RecentImageSets } from '../../../../src/utils/recentImageSets.js'
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
7
|
* The OL "last mile" for symbolRegistry's rasterised symbol images: turns the ImageData
|
package/rollup.esm.mjs
CHANGED
|
@@ -10,9 +10,14 @@ import replace from '@rollup/plugin-replace'
|
|
|
10
10
|
import terser from '@rollup/plugin-terser'
|
|
11
11
|
import postcss from 'rollup-plugin-postcss'
|
|
12
12
|
import { visualizer } from 'rollup-plugin-visualizer'
|
|
13
|
+
import { transformAsync } from '@babel/core'
|
|
13
14
|
|
|
14
15
|
const __dirname = dirname(fileURLToPath(import.meta.url)) // NOSONAR - Standard Node.js convention in bundler configs
|
|
15
16
|
|
|
17
|
+
// The @babel/runtime range we ship. Without it, the runtime transform assumes an old runtime and
|
|
18
|
+
// imports the CommonJS-only @babel/runtime/regenerator, which Rollup can't load without a plugin.
|
|
19
|
+
const BABEL_RUNTIME_VERSION = JSON.parse(fs.readFileSync(path.resolve(__dirname, 'package.json'), 'utf8')).dependencies['@babel/runtime']
|
|
20
|
+
|
|
16
21
|
/**
|
|
17
22
|
* Cleans output directories before each build starts.
|
|
18
23
|
* Mirrors the RemoveFilesPlugin (before) behaviour from webpack.esm.mjs.
|
|
@@ -29,6 +34,40 @@ const cleanPlugin = (dirs) => ({
|
|
|
29
34
|
}
|
|
30
35
|
})
|
|
31
36
|
|
|
37
|
+
/**
|
|
38
|
+
* Compiles the chunks that load before the device check (entries and the chunks
|
|
39
|
+
* they import statically) to ES5, so older browsers can parse them and show the
|
|
40
|
+
* not-supported message. Hosts' bundlers usually don't transpile node_modules.
|
|
41
|
+
* Lazily loaded chunks keep modern syntax; they only load once the check passes.
|
|
42
|
+
* import/export, import() and import.meta are left for the host's bundler.
|
|
43
|
+
*/
|
|
44
|
+
const es5InitialChunksPlugin = () => ({
|
|
45
|
+
name: 'es5-initial-chunks',
|
|
46
|
+
async renderChunk (code, chunk, _outputOptions, { chunks }) {
|
|
47
|
+
const initial = new Set()
|
|
48
|
+
const addWithStaticImports = (fileName) => {
|
|
49
|
+
if (initial.has(fileName)) {
|
|
50
|
+
return
|
|
51
|
+
}
|
|
52
|
+
initial.add(fileName)
|
|
53
|
+
chunks[fileName]?.imports.forEach(addWithStaticImports)
|
|
54
|
+
}
|
|
55
|
+
Object.values(chunks).filter(c => c.isEntry).forEach(c => addWithStaticImports(c.fileName))
|
|
56
|
+
|
|
57
|
+
if (!initial.has(chunk.fileName)) {
|
|
58
|
+
return null
|
|
59
|
+
}
|
|
60
|
+
const result = await transformAsync(code, {
|
|
61
|
+
babelrc: false,
|
|
62
|
+
configFile: false,
|
|
63
|
+
sourceType: 'module',
|
|
64
|
+
presets: [['@babel/preset-env', { targets: { ie: '11' }, modules: false }]],
|
|
65
|
+
plugins: [['@babel/plugin-transform-runtime', { version: BABEL_RUNTIME_VERSION }]]
|
|
66
|
+
})
|
|
67
|
+
return { code: result.code, map: null }
|
|
68
|
+
}
|
|
69
|
+
})
|
|
70
|
+
|
|
32
71
|
// Adds webpackChunkName magic comments to all relative dynamic imports in the
|
|
33
72
|
// output, deriving the name from the imported file's basename.
|
|
34
73
|
// Must run AFTER terser() so the comments survive minification.
|
|
@@ -82,6 +121,26 @@ const PREACT_EXTERNALS = [
|
|
|
82
121
|
// dependency so it auto-installs for consumers and is resolved transparently.
|
|
83
122
|
const BABEL_RUNTIME_EXTERNAL = /@babel\/runtime/
|
|
84
123
|
|
|
124
|
+
const babelPlugin = () => babel({
|
|
125
|
+
// 'runtime' mode imports helpers from @babel/runtime rather than
|
|
126
|
+
// inlining them. This prevents Rollup from deduplicating helpers across
|
|
127
|
+
// chunks (which caused static imports between entry and lazy chunks).
|
|
128
|
+
babelHelpers: 'runtime',
|
|
129
|
+
exclude: /node_modules/,
|
|
130
|
+
extensions: ['.js', '.jsx'],
|
|
131
|
+
plugins: [['@babel/plugin-transform-runtime', { version: BABEL_RUNTIME_VERSION }]],
|
|
132
|
+
// Override babel.config.json targets for ESM: target browsers that
|
|
133
|
+
// natively support ES modules (Chrome 61+, Firefox 60+, Safari 10.1+).
|
|
134
|
+
// The UMD build targets old browsers; the ESM build ships modern syntax
|
|
135
|
+
// and lets the consumer's bundler handle their own browser targets.
|
|
136
|
+
// This avoids transpiling classes, arrow functions, async/await etc.
|
|
137
|
+
// into verbose ES5 — the single biggest driver of ESM bundle size.
|
|
138
|
+
presets: [
|
|
139
|
+
['@babel/preset-env', { targets: { chrome: '92', edge: '92', firefox: '90', safari: '15.4', ios: '15.4' }, bugfixes: true }],
|
|
140
|
+
['@babel/preset-react', { runtime: 'automatic' }]
|
|
141
|
+
]
|
|
142
|
+
})
|
|
143
|
+
|
|
85
144
|
const createESMConfig = (entryPath, outDir, isCore = false, manualChunks = null, chunkNames = {}) => {
|
|
86
145
|
const esmDir = path.resolve(__dirname, outDir)
|
|
87
146
|
// Use the parent dir as output.dir so CSS can be emitted to css/index.css
|
|
@@ -138,30 +197,12 @@ const createESMConfig = (entryPath, outDir, isCore = false, manualChunks = null,
|
|
|
138
197
|
extensions: ['.js', '.jsx'],
|
|
139
198
|
// Force these packages to resolve from root node_modules only,
|
|
140
199
|
// preventing nested copies inside geojson-rbush and mapbox-gl-snap
|
|
141
|
-
// from being bundled separately (saves ~200 KB in draw
|
|
200
|
+
// from being bundled separately (saves ~200 KB in draw).
|
|
142
201
|
dedupe: ['@turf/meta', '@turf/helpers', 'robust-predicates']
|
|
143
202
|
}),
|
|
144
203
|
commonjs({ include: /node_modules/ }),
|
|
145
204
|
|
|
146
|
-
|
|
147
|
-
// 'runtime' mode imports helpers from @babel/runtime rather than
|
|
148
|
-
// inlining them. This prevents Rollup from deduplicating helpers across
|
|
149
|
-
// chunks (which caused static imports between entry and lazy chunks).
|
|
150
|
-
babelHelpers: 'runtime',
|
|
151
|
-
exclude: /node_modules/,
|
|
152
|
-
extensions: ['.js', '.jsx'],
|
|
153
|
-
plugins: ['@babel/plugin-transform-runtime'],
|
|
154
|
-
// Override babel.config.json targets for ESM: target browsers that
|
|
155
|
-
// natively support ES modules (Chrome 61+, Firefox 60+, Safari 10.1+).
|
|
156
|
-
// The UMD build targets old browsers; the ESM build ships modern syntax
|
|
157
|
-
// and lets the consumer's bundler handle their own browser targets.
|
|
158
|
-
// This avoids transpiling classes, arrow functions, async/await etc.
|
|
159
|
-
// into verbose ES5 — the single biggest driver of ESM bundle size.
|
|
160
|
-
presets: [
|
|
161
|
-
['@babel/preset-env', { targets: { esmodules: true } }],
|
|
162
|
-
['@babel/preset-react', { runtime: 'automatic' }]
|
|
163
|
-
]
|
|
164
|
-
}),
|
|
205
|
+
babelPlugin(),
|
|
165
206
|
|
|
166
207
|
// extract is an absolute path; Rollup resolves it relative to output.dir
|
|
167
208
|
// (rootDir) → "css/index.css" — no ".." in the emitted fileName.
|
|
@@ -171,6 +212,8 @@ const createESMConfig = (entryPath, outDir, isCore = false, manualChunks = null,
|
|
|
171
212
|
minimize: true
|
|
172
213
|
}),
|
|
173
214
|
|
|
215
|
+
es5InitialChunksPlugin(),
|
|
216
|
+
|
|
174
217
|
terser(),
|
|
175
218
|
|
|
176
219
|
// webpackChunkNamesPlugin must come after terser so comments survive
|
|
@@ -223,30 +266,30 @@ const ALL_BUILDS = [
|
|
|
223
266
|
manualChunks: (id) => id.includes('/maplibreProvider') ? 'im-maplibre-provider' : undefined
|
|
224
267
|
},
|
|
225
268
|
{
|
|
226
|
-
entryPath: './providers/
|
|
227
|
-
outDir: 'providers/
|
|
269
|
+
entryPath: './providers/open-names/src/index.js',
|
|
270
|
+
outDir: 'providers/open-names/dist/esm',
|
|
228
271
|
manualChunks: (id) => id.includes('/reverseGeocode') ? 'im-reverse-geocode' : undefined
|
|
229
272
|
},
|
|
230
273
|
{
|
|
231
|
-
entryPath: './providers/
|
|
232
|
-
outDir: 'providers/
|
|
274
|
+
entryPath: './providers/esri/src/index.js',
|
|
275
|
+
outDir: 'providers/esri/dist/esm',
|
|
233
276
|
manualChunks: (id) => id.includes('/esriProvider') ? 'im-esri-provider' : undefined
|
|
234
277
|
},
|
|
235
278
|
{
|
|
236
|
-
entryPath: './providers/
|
|
237
|
-
outDir: 'providers/
|
|
279
|
+
entryPath: './providers/openlayers/src/index.js',
|
|
280
|
+
outDir: 'providers/openlayers/dist/esm',
|
|
238
281
|
manualChunks: (id) => id.includes('/openlayersProvider') ? 'im-openlayers-provider' : undefined
|
|
239
282
|
},
|
|
240
283
|
|
|
241
284
|
// Plugins — each lazy-loads ./manifest.js; manualChunks names that split chunk
|
|
242
285
|
{
|
|
243
|
-
entryPath: './plugins/
|
|
244
|
-
outDir: 'plugins/
|
|
286
|
+
entryPath: './plugins/scale-bar/src/index.js',
|
|
287
|
+
outDir: 'plugins/scale-bar/dist/esm',
|
|
245
288
|
manualChunks: (id) => id.includes('/manifest') ? 'im-scale-bar-plugin' : undefined
|
|
246
289
|
},
|
|
247
290
|
{
|
|
248
|
-
entryPath: './plugins/
|
|
249
|
-
outDir: 'plugins/
|
|
291
|
+
entryPath: './plugins/use-location/src/index.js',
|
|
292
|
+
outDir: 'plugins/use-location/dist/esm',
|
|
250
293
|
manualChunks: (id) => id.includes('/manifest') ? 'im-use-location-plugin' : undefined
|
|
251
294
|
},
|
|
252
295
|
{
|
|
@@ -267,8 +310,8 @@ const ALL_BUILDS = [
|
|
|
267
310
|
chunkNames: { maplibreLayerAdapter: 'im-datasets-ml-adapter', openlayersLayerAdapter: 'im-datasets-ol-adapter', esriLayerAdapter: 'im-datasets-esri-adapter' }
|
|
268
311
|
},
|
|
269
312
|
{
|
|
270
|
-
entryPath: './plugins/
|
|
271
|
-
outDir: 'plugins/
|
|
313
|
+
entryPath: './plugins/map-styles/src/index.js',
|
|
314
|
+
outDir: 'plugins/map-styles/dist/esm',
|
|
272
315
|
manualChunks: (id) => id.includes('/manifest') ? 'im-map-styles-plugin' : undefined
|
|
273
316
|
},
|
|
274
317
|
{
|
|
@@ -282,23 +325,13 @@ const ALL_BUILDS = [
|
|
|
282
325
|
chunkNames: { MaplibreDrawAdapter: 'im-draw-ml-adapter', OLDrawAdapter: 'im-draw-ol-adapter' }
|
|
283
326
|
},
|
|
284
327
|
{
|
|
285
|
-
entryPath: './plugins/
|
|
286
|
-
outDir: 'plugins/
|
|
287
|
-
manualChunks: (id) => id.includes('/manifest') ? 'im-draw-ml-plugin' : undefined
|
|
288
|
-
},
|
|
289
|
-
{
|
|
290
|
-
entryPath: './plugins/beta/draw-es/src/index.js',
|
|
291
|
-
outDir: 'plugins/beta/draw-es/dist/esm',
|
|
328
|
+
entryPath: './plugins/draw-es/src/index.js',
|
|
329
|
+
outDir: 'plugins/draw-es/dist/esm',
|
|
292
330
|
manualChunks: (id) => id.includes('/manifest') ? 'im-draw-es-plugin' : undefined
|
|
293
331
|
},
|
|
294
332
|
{
|
|
295
|
-
entryPath: './plugins/
|
|
296
|
-
outDir: 'plugins/
|
|
297
|
-
manualChunks: (id) => id.includes('/manifest') ? 'im-draw-ol-plugin' : undefined
|
|
298
|
-
},
|
|
299
|
-
{
|
|
300
|
-
entryPath: './plugins/beta/frame/src/index.js',
|
|
301
|
-
outDir: 'plugins/beta/frame/dist/esm',
|
|
333
|
+
entryPath: './plugins/frame/src/index.js',
|
|
334
|
+
outDir: 'plugins/frame/dist/esm',
|
|
302
335
|
manualChunks: (id) => id.includes('/manifest') ? 'im-frame-plugin' : undefined
|
|
303
336
|
},
|
|
304
337
|
{
|
package/sonar-project.properties
CHANGED
|
@@ -11,7 +11,7 @@ sonar.javascript.lcov.reportPaths=coverage/lcov.info
|
|
|
11
11
|
sonar.sourceEncoding=UTF-8
|
|
12
12
|
|
|
13
13
|
sonar.sources=src,plugins,providers
|
|
14
|
-
sonar.exclusions=**/*.test.*,**/__mocks__/**,**/__stubs__/**,**/__helpers__/**,**/dist/**,**/node_modules/**,plugins/
|
|
14
|
+
sonar.exclusions=**/*.test.*,**/__mocks__/**,**/__stubs__/**,**/__helpers__/**,**/dist/**,**/node_modules/**,plugins/draw-es/**,plugins/frame/**,plugins/map-styles/**,plugins/scale-bar/**,plugins/use-location/**,providers/esri/**,providers/open-names/**,providers/openlayers/**
|
|
15
15
|
sonar.tests=src,plugins,providers
|
|
16
16
|
sonar.test.inclusions=**/*.test.*,**/__mocks__/**,**/__stubs__/**
|
|
17
17
|
sonar.cpd.exclusions=**/*.test.*,**/__mocks__/**,**/__stubs__/**,**/__helpers__/**
|
package/src/App/App.jsx
CHANGED
|
@@ -5,6 +5,7 @@ import { ServiceProvider } from './store/ServiceProvider.jsx'
|
|
|
5
5
|
import { removeLoadingState } from '..//InteractiveMap/domStateManager.js'
|
|
6
6
|
import { PluginProvider } from './store/PluginProvider.jsx'
|
|
7
7
|
import { PluginInits } from './renderer/PluginInits.jsx'
|
|
8
|
+
import { SlotItemsProvider } from './renderer/SlotItemsProvider.jsx'
|
|
8
9
|
import { Layout } from './layout/Layout.jsx'
|
|
9
10
|
import { EVENTS as events } from '../config/events.js'
|
|
10
11
|
|
|
@@ -22,7 +23,9 @@ export const App = (props) => {
|
|
|
22
23
|
<ServiceProvider eventBus={props.eventBus} pluginRegistry={props.pluginRegistry}>
|
|
23
24
|
<PluginProvider>
|
|
24
25
|
<PluginInits />
|
|
25
|
-
<
|
|
26
|
+
<SlotItemsProvider>
|
|
27
|
+
<Layout />
|
|
28
|
+
</SlotItemsProvider>
|
|
26
29
|
</PluginProvider>
|
|
27
30
|
</ServiceProvider>
|
|
28
31
|
</MapProvider>
|
package/src/App/App.test.jsx
CHANGED
|
@@ -53,6 +53,12 @@ jest.mock('./renderer/PluginInits.jsx', () => ({
|
|
|
53
53
|
PluginInits: jest.fn(() => <div data-testid='plugin-inits' />)
|
|
54
54
|
}))
|
|
55
55
|
|
|
56
|
+
jest.mock('./renderer/SlotItemsProvider.jsx', () => ({
|
|
57
|
+
SlotItemsProvider: jest.fn(({ children }) => (
|
|
58
|
+
<div data-testid='slot-items-provider'>{children}</div>
|
|
59
|
+
))
|
|
60
|
+
}))
|
|
61
|
+
|
|
56
62
|
jest.mock('./layout/Layout.jsx', () => ({
|
|
57
63
|
Layout: jest.fn(() => <div data-testid='layout' />)
|
|
58
64
|
}))
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// src/core/PluginInits.jsx
|
|
2
|
-
import React, { useEffect } from 'react'
|
|
2
|
+
import React, { useEffect, useMemo } from 'react'
|
|
3
3
|
import { withPluginContexts } from './pluginWrapper.js'
|
|
4
4
|
import { withPluginApiContexts, usePluginApiState } from './pluginApiWrapper.js'
|
|
5
5
|
import { useInterfaceAPI } from '../hooks/useInterfaceAPI.js'
|
|
@@ -27,18 +27,19 @@ const PluginInit = ({ plugin }) => {
|
|
|
27
27
|
}, [plugin, stateRef])
|
|
28
28
|
|
|
29
29
|
const { InitComponent } = plugin
|
|
30
|
-
|
|
30
|
+
// The same object on every render, so plugins can depend on it in effects
|
|
31
|
+
const pluginConfig = useMemo(() => {
|
|
32
|
+
const { api, ...config } = plugin?.config || {}
|
|
33
|
+
return config
|
|
34
|
+
}, [plugin])
|
|
31
35
|
|
|
32
36
|
if (!InitComponent) {
|
|
33
37
|
return null
|
|
34
38
|
}
|
|
35
39
|
|
|
36
|
-
const WrappedInit = withPluginContexts(InitComponent
|
|
37
|
-
pluginId: plugin.id,
|
|
38
|
-
pluginConfig
|
|
39
|
-
})
|
|
40
|
+
const WrappedInit = withPluginContexts(InitComponent)
|
|
40
41
|
|
|
41
|
-
return <WrappedInit />
|
|
42
|
+
return <WrappedInit pluginId={plugin.id} pluginConfig={pluginConfig} />
|
|
42
43
|
}
|
|
43
44
|
|
|
44
45
|
export const PluginInits = () => {
|
|
@@ -77,7 +77,7 @@ describe('PluginInits', () => {
|
|
|
77
77
|
})
|
|
78
78
|
|
|
79
79
|
it('renders wrapped InitComponent for plugin with InitComponent and valid mode', () => {
|
|
80
|
-
const InitComp = () => <div data-testid='init' />
|
|
80
|
+
const InitComp = jest.fn(() => <div data-testid='init' />)
|
|
81
81
|
const plugin = {
|
|
82
82
|
id: 'plugin1',
|
|
83
83
|
_originalPlugin: {},
|
|
@@ -88,10 +88,25 @@ describe('PluginInits', () => {
|
|
|
88
88
|
|
|
89
89
|
const { getByTestId } = render(<PluginInits />)
|
|
90
90
|
expect(getByTestId('init')).toBeTruthy()
|
|
91
|
-
expect(withPluginContexts).toHaveBeenCalledWith(
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
91
|
+
expect(withPluginContexts).toHaveBeenCalledWith(InitComp)
|
|
92
|
+
// The plugin's id and config, without its api, are passed when rendering
|
|
93
|
+
expect(InitComp.mock.calls[0][0]).toEqual({ pluginId: 'plugin1', pluginConfig: { foo: 'bar' } })
|
|
94
|
+
})
|
|
95
|
+
|
|
96
|
+
it('passes the same pluginConfig object on every render', () => {
|
|
97
|
+
const InitComp = jest.fn(() => <div data-testid='init' />)
|
|
98
|
+
pluginRegistryMock.registeredPlugins.push({
|
|
99
|
+
id: 'plugin1',
|
|
100
|
+
_originalPlugin: {},
|
|
101
|
+
config: { foo: 'bar', api: {} },
|
|
102
|
+
InitComponent: InitComp
|
|
103
|
+
})
|
|
104
|
+
|
|
105
|
+
const { rerender } = render(<PluginInits />)
|
|
106
|
+
rerender(<PluginInits />)
|
|
107
|
+
|
|
108
|
+
const [firstProps, secondProps] = InitComp.mock.calls.map(([props]) => props)
|
|
109
|
+
expect(secondProps.pluginConfig).toBe(firstProps.pluginConfig)
|
|
95
110
|
})
|
|
96
111
|
|
|
97
112
|
it('skips plugin without InitComponent', () => {
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
// src/core/renderers/SlotItemsProvider.jsx
|
|
2
|
+
import React, { createContext, useContext } from 'react'
|
|
3
|
+
import { useConfig } from '../store/configContext.js'
|
|
4
|
+
import { useApp } from '../store/appContext.js'
|
|
5
|
+
import { getItemsBySlot } from './slotAggregator.js'
|
|
6
|
+
import { useEvaluateProp } from '../hooks/useEvaluateProp.js'
|
|
7
|
+
import { useApplicationModeFilter } from '../hooks/useApplicationModeFilter.js'
|
|
8
|
+
|
|
9
|
+
const SlotItemsContext = createContext(new Map())
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Builds every slot's items once per render and shares them with each SlotRenderer below it.
|
|
13
|
+
* Kept separate from Layout so that a plugin state change re-renders only this provider and the
|
|
14
|
+
* slots, not the rest of the layout.
|
|
15
|
+
*/
|
|
16
|
+
export const SlotItemsProvider = ({ children }) => {
|
|
17
|
+
const appConfig = useConfig()
|
|
18
|
+
const appState = useApp()
|
|
19
|
+
const evaluateProp = useEvaluateProp()
|
|
20
|
+
const isHiddenByApplicationMode = useApplicationModeFilter()
|
|
21
|
+
|
|
22
|
+
const itemsBySlot = getItemsBySlot({ appConfig, appState, evaluateProp, isHiddenByApplicationMode })
|
|
23
|
+
|
|
24
|
+
return (
|
|
25
|
+
<SlotItemsContext.Provider value={itemsBySlot}>
|
|
26
|
+
{children}
|
|
27
|
+
</SlotItemsContext.Provider>
|
|
28
|
+
)
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
const noItems = []
|
|
32
|
+
|
|
33
|
+
export const useSlotItems = (slot) => useContext(SlotItemsContext).get(slot) ?? noItems
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import React from 'react'
|
|
2
|
+
import { render } from '@testing-library/react'
|
|
3
|
+
import { SlotItemsProvider, useSlotItems } from './SlotItemsProvider.jsx'
|
|
4
|
+
import { getItemsBySlot } from './slotAggregator.js'
|
|
5
|
+
import { useApp } from '../store/appContext.js'
|
|
6
|
+
import { useConfig } from '../store/configContext.js'
|
|
7
|
+
import { useEvaluateProp } from '../hooks/useEvaluateProp.js'
|
|
8
|
+
import { useApplicationModeFilter } from '../hooks/useApplicationModeFilter.js'
|
|
9
|
+
|
|
10
|
+
jest.mock('./slotAggregator.js', () => ({ getItemsBySlot: jest.fn() }))
|
|
11
|
+
jest.mock('../store/appContext.js', () => ({ useApp: jest.fn() }))
|
|
12
|
+
jest.mock('../store/configContext.js', () => ({ useConfig: jest.fn() }))
|
|
13
|
+
jest.mock('../hooks/useEvaluateProp.js', () => ({ useEvaluateProp: jest.fn() }))
|
|
14
|
+
jest.mock('../hooks/useApplicationModeFilter.js', () => ({ useApplicationModeFilter: jest.fn() }))
|
|
15
|
+
|
|
16
|
+
const SlotIds = ({ slot }) => <div data-testid={slot}>{useSlotItems(slot).map(item => item.id).join(',')}</div>
|
|
17
|
+
|
|
18
|
+
describe('SlotItemsProvider', () => {
|
|
19
|
+
const appConfig = { id: 'test' }
|
|
20
|
+
const appState = { breakpoint: 'desktop' }
|
|
21
|
+
const evaluateProp = jest.fn()
|
|
22
|
+
const isHiddenByApplicationMode = jest.fn()
|
|
23
|
+
|
|
24
|
+
beforeEach(() => {
|
|
25
|
+
jest.clearAllMocks()
|
|
26
|
+
useConfig.mockReturnValue(appConfig)
|
|
27
|
+
useApp.mockReturnValue(appState)
|
|
28
|
+
useEvaluateProp.mockReturnValue(evaluateProp)
|
|
29
|
+
useApplicationModeFilter.mockReturnValue(isHiddenByApplicationMode)
|
|
30
|
+
getItemsBySlot.mockReturnValue(new Map([['header', [{ id: 'a' }, { id: 'b' }]]]))
|
|
31
|
+
})
|
|
32
|
+
|
|
33
|
+
it('builds every slot\'s items once per render, however many slots read them', () => {
|
|
34
|
+
render(
|
|
35
|
+
<SlotItemsProvider>
|
|
36
|
+
<SlotIds slot='header' />
|
|
37
|
+
<SlotIds slot='banner' />
|
|
38
|
+
</SlotItemsProvider>
|
|
39
|
+
)
|
|
40
|
+
expect(getItemsBySlot).toHaveBeenCalledTimes(1)
|
|
41
|
+
expect(getItemsBySlot).toHaveBeenCalledWith({ appConfig, appState, evaluateProp, isHiddenByApplicationMode })
|
|
42
|
+
})
|
|
43
|
+
|
|
44
|
+
it('gives each slot its own items, and none to a slot with no items', () => {
|
|
45
|
+
const { getByTestId } = render(
|
|
46
|
+
<SlotItemsProvider>
|
|
47
|
+
<SlotIds slot='header' />
|
|
48
|
+
<SlotIds slot='banner' />
|
|
49
|
+
</SlotItemsProvider>
|
|
50
|
+
)
|
|
51
|
+
expect(getByTestId('header')).toHaveTextContent('a,b')
|
|
52
|
+
expect(getByTestId('banner')).toBeEmptyDOMElement()
|
|
53
|
+
})
|
|
54
|
+
|
|
55
|
+
it('gives no items outside a provider', () => {
|
|
56
|
+
const { getByTestId } = render(<SlotIds slot='header' />)
|
|
57
|
+
expect(getByTestId('header')).toBeEmptyDOMElement()
|
|
58
|
+
})
|
|
59
|
+
})
|
|
@@ -1,22 +1,11 @@
|
|
|
1
1
|
// src/core/renderers/SlotRenderer.jsx
|
|
2
2
|
import React from 'react'
|
|
3
|
-
import {
|
|
4
|
-
import { useApp } from '../store/appContext.js'
|
|
5
|
-
import { getSlotItems } from './slotAggregator.js'
|
|
3
|
+
import { useSlotItems } from './SlotItemsProvider.jsx'
|
|
6
4
|
import { Actions } from '../components/Actions/Actions.jsx'
|
|
7
|
-
import { useEvaluateProp } from '../hooks/useEvaluateProp.js'
|
|
8
|
-
import { useApplicationModeFilter } from '../hooks/useApplicationModeFilter.js'
|
|
9
5
|
|
|
10
6
|
export const SlotRenderer = ({ slot }) => {
|
|
11
|
-
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
// Shared evaluateProp hook for this render cycle
|
|
15
|
-
const evaluateProp = useEvaluateProp()
|
|
16
|
-
const isHiddenByApplicationMode = useApplicationModeFilter()
|
|
17
|
-
|
|
18
|
-
// Get all slot items (controls, panels, buttons)
|
|
19
|
-
const slotItems = getSlotItems({ slot, appConfig, appState, evaluateProp, isHiddenByApplicationMode })
|
|
7
|
+
// Built for every slot at once by SlotItemsProvider
|
|
8
|
+
const slotItems = useSlotItems(slot)
|
|
20
9
|
|
|
21
10
|
if (!slotItems.length) {
|
|
22
11
|
return null
|