@open-pioneer/map 1.4.0-dev.20260529073212 → 1.4.0-dev.20260625074633

package/CHANGELOG.md

@@ -1,11 +1,16 @@
 # @open-pioneer/map
 
-## 1.4.0-dev.20260529073212
+## 1.4.0-dev.20260625074633
 
 ### Minor Changes
 
+- c30396d: Update Chakra to 3.36.0
 - c9b3ced: Provide reactive rotation in MapModel
 
+### Patch Changes
+
+- b58a50f: Use new `shallowEqual` function to compare attribution arrays.
+
 ## 1.3.0
 
 ### Minor Changes

package/model/MapAttributions.js

@@ -1,5 +1,5 @@
 import { reactive, computed, effect } from '@conterra/reactivity-core';
-import { destroyResources } from '@open-pioneer/core';
+import { shallowEqual, destroyResources } from '@open-pioneer/core';
 import Attribution from 'ol/control/Attribution.js';
 import { sanitizeHtml } from '../utils/sanitize.js';
 
@@ -81,9 +81,6 @@ function createDummyTargetNode() {
   node.className = "map-attribution-dummy-target";
   return node;
 }
-function shallowEqual(a, b) {
-  return a.length === b.length && a.every((v, i) => v == b[i]);
-}
 
 export { MapAttributions };
 //# sourceMappingURL=MapAttributions.js.map

package/model/MapAttributions.js.map

@@ -1 +1 @@
-{"version":3,"file":"MapAttributions.js","sources":["MapAttributions.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2023-2025 Open Pioneer project (https://github.com/open-pioneer)\n// SPDX-License-Identifier: Apache-2.0\nimport { computed, effect, reactive, ReadonlyReactive } from \"@conterra/reactivity-core\";\nimport { destroyResources, Resource } from \"@open-pioneer/core\";\nimport { PackageIntl } from \"@open-pioneer/runtime\";\nimport OlMap, { FrameState } from \"ol/Map\";\nimport Attribution from \"ol/control/Attribution\";\nimport { sanitizeHtml } from \"../utils/sanitize\";\nimport { AttributionItem } from \"./MapModel\";\n\nexport class MapAttributions {\n    #olMap: OlMap;\n    #intl: ReadonlyReactive<PackageIntl>;\n\n    /**\n     * When default rendering of attributions is active, we simply display this control on the map (otherwise: hidden).\n     *\n     * The control is always active (even if invisible) because we re-use its rendering code to extract the attribution items.\n     * There is no real API to extract the attributions from OpenLayers, and we don't want to re-implement that logic right now.\n     * We will see if that approach remains stable.\n     */\n    #control: Attribution;\n\n    #attributionStrings = reactive<string[]>([], { equal: shallowEqual });\n\n    // Attribution strings wrapped in objects, for forward compat.\n    #attributionItems = computed<AttributionItem[]>(() =>\n        this.#attributionStrings.value.map((attribution) => ({\n            text: attribution\n        }))\n    );\n\n    #resources: Resource[] = [];\n\n    constructor(options: {\n        olMap: OlMap;\n        /** false: not rendered */\n        showControl: boolean;\n        intl: ReadonlyReactive<PackageIntl>;\n    }) {\n        this.#olMap = options.olMap;\n        this.#intl = options.intl;\n\n        const control = (this.#control = new Attribution({\n            collapsible: false,\n            target: options.showControl ? undefined : createDummyTargetNode()\n        }));\n        interceptAttributions(\n            control,\n            // Called by the attributions widgets as a side effect.\n            // NOTE: this is currently called very often (~ every map render).\n            (attributions) => {\n                this.#attributionStrings.value = attributions;\n            }\n        );\n\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const element = (control as any).element as HTMLElement | undefined;\n        if (element) {\n            element.role = \"region\";\n            this.#resources.push(\n                effect(() => {\n                    element.ariaLabel = this.#intl.value.formatMessage({ id: \"attribution.label\" });\n                })\n            );\n        }\n\n        this.#olMap.addControl(control);\n    }\n\n    destroy() {\n        this.#olMap.removeControl(this.#control);\n        destroyResources(this.#resources);\n        this.#control.dispose();\n    }\n\n    get attributionItems(): AttributionItem[] {\n        return this.#attributionItems.value;\n    }\n}\n\n// Overrides the OpenLayers widget to sanitize HTML attributions and to intercept the computed array of strings.\n// Note that this depends on OpenLayers internals that may change between versions.\nfunction interceptAttributions(attr: Attribution, onUpdate: (attributions: string[]) => void) {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-function-type\n    const originalCollectSourceAttributions = (attr as any).collectSourceAttributions_ as Function;\n    if (!originalCollectSourceAttributions) {\n        throw new Error(\"Internal error: failed to override attributions widget\");\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    (attr as any).collectSourceAttributions_ = (frameState: FrameState) => {\n        const rawAttributions = originalCollectSourceAttributions.call(\n            attr,\n            frameState\n        ) as string[];\n        if (!Array.isArray(rawAttributions)) {\n            throw new Error(\"Internal error: unexpected attributions result (should be an array)\");\n        }\n        const sanitizedAttributions = rawAttributions.map((a) => sanitizeHtml(a));\n        onUpdate(sanitizedAttributions);\n        return sanitizedAttributions;\n    };\n}\n\nfunction createDummyTargetNode() {\n    const node = document.createElement(\"div\");\n    node.style.display = \"none\";\n    node.className = \"map-attribution-dummy-target\";\n    return node;\n}\n\n// TODO: generic shallowEqual, deepEqual helpers @open-pioneer/core\nfunction shallowEqual<T>(a: T[], b: T[]) {\n    return a.length === b.length && a.every((v, i) => v == b[i]);\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"MapAttributions.js","sources":["MapAttributions.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2023-2025 Open Pioneer project (https://github.com/open-pioneer)\n// SPDX-License-Identifier: Apache-2.0\nimport { computed, effect, reactive, ReadonlyReactive } from \"@conterra/reactivity-core\";\nimport { destroyResources, Resource, shallowEqual } from \"@open-pioneer/core\";\nimport { PackageIntl } from \"@open-pioneer/runtime\";\nimport OlMap, { FrameState } from \"ol/Map\";\nimport Attribution from \"ol/control/Attribution\";\nimport { sanitizeHtml } from \"../utils/sanitize\";\nimport { AttributionItem } from \"./MapModel\";\n\nexport class MapAttributions {\n    #olMap: OlMap;\n    #intl: ReadonlyReactive<PackageIntl>;\n\n    /**\n     * When default rendering of attributions is active, we simply display this control on the map (otherwise: hidden).\n     *\n     * The control is always active (even if invisible) because we re-use its rendering code to extract the attribution items.\n     * There is no real API to extract the attributions from OpenLayers, and we don't want to re-implement that logic right now.\n     * We will see if that approach remains stable.\n     */\n    #control: Attribution;\n\n    #attributionStrings = reactive<string[]>([], { equal: shallowEqual });\n\n    // Attribution strings wrapped in objects, for forward compat.\n    #attributionItems = computed<AttributionItem[]>(() =>\n        this.#attributionStrings.value.map((attribution) => ({\n            text: attribution\n        }))\n    );\n\n    #resources: Resource[] = [];\n\n    constructor(options: {\n        olMap: OlMap;\n        /** false: not rendered */\n        showControl: boolean;\n        intl: ReadonlyReactive<PackageIntl>;\n    }) {\n        this.#olMap = options.olMap;\n        this.#intl = options.intl;\n\n        const control = (this.#control = new Attribution({\n            collapsible: false,\n            target: options.showControl ? undefined : createDummyTargetNode()\n        }));\n        interceptAttributions(\n            control,\n            // Called by the attributions widgets as a side effect.\n            // NOTE: this is currently called very often (~ every map render).\n            (attributions) => {\n                this.#attributionStrings.value = attributions;\n            }\n        );\n\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const element = (control as any).element as HTMLElement | undefined;\n        if (element) {\n            element.role = \"region\";\n            this.#resources.push(\n                effect(() => {\n                    element.ariaLabel = this.#intl.value.formatMessage({ id: \"attribution.label\" });\n                })\n            );\n        }\n\n        this.#olMap.addControl(control);\n    }\n\n    destroy() {\n        this.#olMap.removeControl(this.#control);\n        destroyResources(this.#resources);\n        this.#control.dispose();\n    }\n\n    get attributionItems(): AttributionItem[] {\n        return this.#attributionItems.value;\n    }\n}\n\n// Overrides the OpenLayers widget to sanitize HTML attributions and to intercept the computed array of strings.\n// Note that this depends on OpenLayers internals that may change between versions.\nfunction interceptAttributions(attr: Attribution, onUpdate: (attributions: string[]) => void) {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-function-type\n    const originalCollectSourceAttributions = (attr as any).collectSourceAttributions_ as Function;\n    if (!originalCollectSourceAttributions) {\n        throw new Error(\"Internal error: failed to override attributions widget\");\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    (attr as any).collectSourceAttributions_ = (frameState: FrameState) => {\n        const rawAttributions = originalCollectSourceAttributions.call(\n            attr,\n            frameState\n        ) as string[];\n        if (!Array.isArray(rawAttributions)) {\n            throw new Error(\"Internal error: unexpected attributions result (should be an array)\");\n        }\n        const sanitizedAttributions = rawAttributions.map((a) => sanitizeHtml(a));\n        onUpdate(sanitizedAttributions);\n        return sanitizedAttributions;\n    };\n}\n\nfunction createDummyTargetNode() {\n    const node = document.createElement(\"div\");\n    node.style.display = \"none\";\n    node.className = \"map-attribution-dummy-target\";\n    return node;\n}\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@open-pioneer/map",
-  "version": "1.4.0-dev.20260529073212",
+  "version": "1.4.0-dev.20260625074633",
   "description": "This package integrates OpenLayers maps into an open pioneer trails application.",
   "keywords": [
     "open-pioneer-trails"
@@ -14,20 +14,20 @@
     "directory": "src/packages/map"
   },
   "dependencies": {
-    "@chakra-ui/react": "^3.35.0",
-    "@conterra/reactivity-core": "^0.8.5",
-    "@conterra/reactivity-events": "^0.8.5",
+    "@chakra-ui/react": "^3.36.0",
+    "@conterra/reactivity-core": "^0.8.6",
+    "@conterra/reactivity-events": "^0.8.6",
     "@esri/arcgis-html-sanitizer": "^4.1.0",
-    "@open-pioneer/core": "^4.6.0",
-    "@open-pioneer/http": "^4.6.0",
-    "@open-pioneer/react-utils": "^4.6.0",
-    "@open-pioneer/reactivity": "^4.6.0",
-    "@open-pioneer/runtime": "^4.6.0",
+    "@open-pioneer/core": "4.7.0-dev.20260624141040",
+    "@open-pioneer/http": "4.7.0-dev.20260624141040",
+    "@open-pioneer/react-utils": "4.7.0-dev.20260624141040",
+    "@open-pioneer/reactivity": "4.7.0-dev.20260624141040",
+    "@open-pioneer/runtime": "4.7.0-dev.20260624141040",
     "ol": "^10.9.0",
-    "proj4": "^2.20.8",
-    "react-dom": "^19.2.6",
-    "react-use": "^17.6.0",
-    "react": "^19.2.6",
+    "proj4": "^2.20.9",
+    "react-dom": "^19.2.7",
+    "react-use": "^17.6.1",
+    "react": "^19.2.7",
     "uuid": "^14.0.0"
   },
   "exports": {

package/ui/DefaultMapProvider.d.ts

@@ -19,7 +19,7 @@ import { MapModelProps } from "./hooks/useMapModel";
  */
 export declare function DefaultMapProvider(props: Required<MapModelProps> & {
     children?: React.ReactNode;
-}): import("react/jsx-runtime").JSX.Element;
+}): import("react").JSX.Element;
 /**
  * Accesses the default map props provided by {@link DefaultMapProvider} (or returns undefined).
  *

package/ui/MapContainer.d.ts

@@ -73,4 +73,4 @@ export interface MapContainerProps extends CommonComponentProps, MapModelProps {
  *
  * @group UI Components and Hooks
  */
-export declare function MapContainer(props: MapContainerProps): import("react/jsx-runtime").JSX.Element;
+export declare function MapContainer(props: MapContainerProps): import("react").JSX.Element;

package/ui/OverlaysRenderer.d.ts

@@ -1,4 +1,4 @@
 import { MapModel } from "../model/MapModel";
 export declare function OverlaysRenderer(props: {
     map: MapModel;
-}): import("react/jsx-runtime").JSX.Element[];
+}): import("react").JSX.Element[];