@dxos/react-ui-geo 0.8.4-main.ef1bc66f44 → 0.8.4-main.f466a3d56e

package/LICENSE

@@ -1,8 +1,105 @@
-MIT License 
-Copyright (c) 2022 DXOS
+# Functional Source License, Version 1.1, ALv2 Future License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+## Abbreviation
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+FSL-1.1-Apache-2.0
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+## Notice
+
+Copyright 2026 DXOS
+
+## Terms and Conditions
+
+### Licensor ("We")
+
+The party offering the Software under these Terms and Conditions.
+
+### The Software
+
+The "Software" is each version of the software that we make available under
+these Terms and Conditions, as indicated by our inclusion of these Terms and
+Conditions with the Software.
+
+### License Grant
+
+Subject to your compliance with this License Grant and the Patents,
+Redistribution and Trademark clauses below, we hereby grant you the right to
+use, copy, modify, create derivative works, publicly perform, publicly display
+and redistribute the Software for any Permitted Purpose identified below.
+
+### Permitted Purpose
+
+A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
+means making the Software available to others in a commercial product or
+service that:
+
+1. substitutes for the Software;
+
+2. substitutes for any other product or service we offer using the Software
+   that exists as of the date we make the Software available; or
+
+3. offers the same or substantially similar functionality as the Software.
+
+Permitted Purposes specifically include using the Software:
+
+1. for your internal use and access;
+
+2. for non-commercial education;
+
+3. for non-commercial research; and
+
+4. in connection with professional services that you provide to a licensee
+   using the Software in accordance with these Terms and Conditions.
+
+### Patents
+
+To the extent your use for a Permitted Purpose would necessarily infringe our
+patents, the license grant above includes a license under our patents. If you
+make a claim against any party that the Software infringes or contributes to
+the infringement of any patent, then your patent license to the Software ends
+immediately.
+
+### Redistribution
+
+The Terms and Conditions apply to all copies, modifications and derivatives of
+the Software.
+
+If you redistribute any copies, modifications or derivatives of the Software,
+you must include a copy of or a link to these Terms and Conditions and not
+remove any copyright notices provided in or with the Software.
+
+### Disclaimer
+
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
+
+IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
+SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
+EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
+
+### Trademarks
+
+Except for displaying the License Details and identifying us as the origin of
+the Software, you have no right under these Terms and Conditions to use our
+trademarks, trade names, service marks or product names.
+
+## Grant of Future License
+
+We hereby irrevocably grant you an additional license to use the Software under
+the Apache License, Version 2.0 that is effective on the second anniversary of
+the date we make the Software available. On or after that date, you may use the
+Software under the Apache License, Version 2.0, in which case the following
+will apply:
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.

package/dist/lib/browser/{countries-110m-ZM3ZIEFS.mjs → countries-110m-RE5RNRQG.mjs}

@@ -37856,4 +37856,4 @@ var countries_110m_default = {
 export {
   countries_110m_default as default
 };
-//# sourceMappingURL=countries-110m-ZM3ZIEFS.mjs.map
+//# sourceMappingURL=countries-110m-RE5RNRQG.mjs.map

package/dist/lib/browser/data.mjs

@@ -1,6 +1,7 @@
-import {
-  loadTopology
-} from "./chunk-GMWLKTLN.mjs";
+// src/data.ts
+var loadTopology = async () => {
+  return (await import("./countries-110m-RE5RNRQG.mjs")).default;
+};
 export {
   loadTopology
 };

package/dist/lib/browser/data.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
+  "sources": ["../../../src/data.ts"],
+  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Topology } from 'topojson-specification';\n\nexport const loadTopology = async (): Promise<Topology> => {\n  return (await import('../data/countries-110m.ts')).default;\n};\n"],
+  "mappings": ";AAMO,IAAMA,eAAe,YAAA;AAC1B,UAAQ,MAAM,OAAO,+BAAA,GAA8BC;AACrD;",
+  "names": ["loadTopology", "default"]
 }

package/dist/lib/browser/index.mjs

@@ -1,45 +1,14 @@
-import {
-  loadTopology
-} from "./chunk-GMWLKTLN.mjs";
-
 // src/components/Globe/Globe.tsx
 import { easeLinear, easeSinOut, geoMercator, geoOrthographic, geoPath as geoPath2, geoTransverseMercator, interpolateNumber, transition } from "d3";
-import React3, { forwardRef, useEffect as useEffect4, useImperativeHandle, useMemo as useMemo2, useRef, useState as useState3 } from "react";
+import React2, { forwardRef, useEffect as useEffect4, useImperativeHandle, useMemo as useMemo2, useRef, useState as useState3 } from "react";
 import { useResizeDetector } from "react-resize-detector";
-import { useDynamicRef, useThemeContext } from "@dxos/react-ui";
-import { mx } from "@dxos/ui-theme";
+import { useComposedRefs, useControlledState, useDynamicRef, useThemeContext } from "@dxos/react-ui";
+import { composable, composableProps, mx } from "@dxos/ui-theme";
 
 // src/hooks/context.tsx
-import React, { createContext, useContext } from "react";
+import { createContext, useContext } from "react";
 import { raise } from "@dxos/debug";
-import { useControlledState } from "@dxos/react-ui";
-var defaults = {
-  center: {
-    lat: 51,
-    lng: 0
-  },
-  zoom: 4
-};
 var GlobeContext = /* @__PURE__ */ createContext(void 0);
-var GlobeContextProvider = ({ children, size, center: centerProp = defaults.center, zoom: zoomProp = defaults.zoom, translation: translationProp, rotation: rotationProp }) => {
-  const [center, setCenter] = useControlledState(centerProp);
-  const [zoom, setZoom] = useControlledState(zoomProp);
-  const [translation, setTranslation] = useControlledState(translationProp);
-  const [rotation, setRotation] = useControlledState(rotationProp);
-  return /* @__PURE__ */ React.createElement(GlobeContext.Provider, {
-    value: {
-      size,
-      center,
-      zoom,
-      translation,
-      rotation,
-      setCenter,
-      setZoom,
-      setTranslation,
-      setRotation
-    }
-  }, children);
-};
 var useGlobeContext = () => {
   return useContext(GlobeContext) ?? raise(new Error("Missing GlobeContext"));
 };
@@ -624,25 +593,9 @@ var useTour = (controller, points, options = {}) => {
 };
 
 // src/components/Toolbar/Controls.tsx
-import React2 from "react";
+import React from "react";
 import { IconButton, Toolbar, useTranslation } from "@dxos/react-ui";
-
-// src/translations.ts
-var translationKey = "@dxos/react-ui-geo";
-var translations = [
-  {
-    "en-US": {
-      [translationKey]: {
-        "zoom in icon button": "Zoom in",
-        "zoom out icon button": "Zoom out",
-        "start icon button": "Start",
-        "toggle icon button": "Toggle"
-      }
-    }
-  }
-];
-
-// src/components/Toolbar/Controls.tsx
+import { translationKey } from "#translations";
 var controlPositions = {
   topleft: "top-2 left-2",
   topright: "top-2 right-2",
@@ -651,39 +604,39 @@ var controlPositions = {
 };
 var ZoomControls = ({ classNames, onAction }) => {
   const { t } = useTranslation(translationKey);
-  return /* @__PURE__ */ React2.createElement(Toolbar.Root, {
+  return /* @__PURE__ */ React.createElement(Toolbar.Root, {
     classNames: [
       "gap-2",
       classNames
     ]
-  }, /* @__PURE__ */ React2.createElement(IconButton, {
+  }, /* @__PURE__ */ React.createElement(IconButton, {
     icon: "ph--plus--regular",
     iconOnly: true,
-    label: t("zoom in icon button"),
+    label: t("zoom-in-icon.button"),
     onClick: () => onAction?.("zoom-in")
-  }), /* @__PURE__ */ React2.createElement(IconButton, {
+  }), /* @__PURE__ */ React.createElement(IconButton, {
     icon: "ph--minus--regular",
     iconOnly: true,
-    label: t("zoom out icon button"),
+    label: t("zoom-out-icon.button"),
     onClick: () => onAction?.("zoom-out")
   }));
 };
 var ActionControls = ({ classNames, onAction }) => {
   const { t } = useTranslation(translationKey);
-  return /* @__PURE__ */ React2.createElement(Toolbar.Root, {
+  return /* @__PURE__ */ React.createElement(Toolbar.Root, {
     classNames: [
       "gap-2",
       classNames
     ]
-  }, /* @__PURE__ */ React2.createElement(IconButton, {
+  }, /* @__PURE__ */ React.createElement(IconButton, {
     icon: "ph--path--regular",
     iconOnly: true,
-    label: t("start icon button"),
+    label: t("start-icon.button"),
     onClick: () => onAction?.("start")
-  }), /* @__PURE__ */ React2.createElement(IconButton, {
+  }), /* @__PURE__ */ React.createElement(IconButton, {
     icon: "ph--globe-hemisphere-west--regular",
     iconOnly: true,
-    label: t("toggle icon button"),
+    label: t("toggle-icon.button"),
     onClick: () => onAction?.("toggle")
   }));
 };
@@ -743,19 +696,38 @@ var getProjection = (type = "orthographic") => {
   }
   return type ?? geoOrthographic();
 };
-var GlobeRoot = ({ classNames, children, ...props }) => {
-  const { ref, width, height } = useResizeDetector();
-  return /* @__PURE__ */ React3.createElement("div", {
-    ref,
-    className: mx("relative flex grow overflow-hidden", classNames)
-  }, /* @__PURE__ */ React3.createElement(GlobeContextProvider, {
-    size: {
-      width,
-      height
-    },
-    ...props
+var GlobeRoot = composable(({ children, center: centerProp, zoom: zoomProp, translation: translationProp, rotation: rotationProp, ...props }, forwardedRef) => {
+  const localRef = useRef(null);
+  const composedRef = useComposedRefs(localRef, forwardedRef);
+  const { width, height } = useResizeDetector({
+    targetRef: localRef
+  });
+  const [center, setCenter] = useControlledState(centerProp);
+  const [zoom, setZoom] = useControlledState(zoomProp ?? 4);
+  const [translation, setTranslation] = useControlledState(translationProp);
+  const [rotation, setRotation] = useControlledState(rotationProp);
+  return /* @__PURE__ */ React2.createElement(GlobeContext.Provider, {
+    value: {
+      size: {
+        width,
+        height
+      },
+      center,
+      zoom,
+      translation,
+      rotation,
+      setCenter,
+      setZoom,
+      setTranslation,
+      setRotation
+    }
+  }, /* @__PURE__ */ React2.createElement("div", {
+    ...composableProps(props, {
+      classNames: "relative dx-container"
+    }),
+    ref: composedRef
   }, children));
-};
+});
 var GlobeCanvas = /* @__PURE__ */ forwardRef(({ projection: projectionProp, topology, features, styles: stylesProp }, forwardRef3) => {
   const { themeMode } = useThemeContext();
   const styles = useMemo2(() => stylesProp ?? defaultStyles[themeMode], [
@@ -843,7 +815,7 @@ var GlobeCanvas = /* @__PURE__ */ forwardRef(({ projection: projectionProp, topo
   if (!size.width || !size.height) {
     return null;
   }
-  return /* @__PURE__ */ React3.createElement("canvas", {
+  return /* @__PURE__ */ React2.createElement("canvas", {
     ref: canvasRef,
     width: size.width,
     height: size.height
@@ -851,9 +823,9 @@ var GlobeCanvas = /* @__PURE__ */ forwardRef(({ projection: projectionProp, topo
 });
 var GlobeDebug = ({ position = "topleft" }) => {
   const { size, zoom, translation, rotation } = useGlobeContext();
-  return /* @__PURE__ */ React3.createElement("div", {
-    className: mx("z-10 absolute is-96 p-2 overflow-hidden border border-green-700 rounded", controlPositions[position])
-  }, /* @__PURE__ */ React3.createElement("pre", {
+  return /* @__PURE__ */ React2.createElement("div", {
+    className: mx("z-10 absolute w-96 p-2 overflow-hidden border border-green-700 rounded-sm", controlPositions[position])
+  }, /* @__PURE__ */ React2.createElement("pre", {
     className: "font-mono text-xs text-green-700"
   }, JSON.stringify({
     size,
@@ -863,25 +835,25 @@ var GlobeDebug = ({ position = "topleft" }) => {
   }, null, 2)));
 };
 var GlobePanel = ({ position, classNames, children }) => {
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React2.createElement("div", {
     className: mx("z-10 absolute overflow-hidden", controlPositions[position], classNames)
   }, children);
 };
 var CustomControl = ({ position, children }) => {
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React2.createElement("div", {
     className: mx("z-10 absolute overflow-hidden", controlPositions[position])
   }, children);
 };
-var GlobeZoom = ({ onAction, position = "bottomleft", ...props }) => /* @__PURE__ */ React3.createElement(CustomControl, {
+var GlobeZoom = ({ onAction, position = "bottomleft", ...props }) => /* @__PURE__ */ React2.createElement(CustomControl, {
   position,
   ...props
-}, /* @__PURE__ */ React3.createElement(ZoomControls, {
+}, /* @__PURE__ */ React2.createElement(ZoomControls, {
   onAction
 }));
-var GlobeAction = ({ onAction, position = "bottomright", ...props }) => /* @__PURE__ */ React3.createElement(CustomControl, {
+var GlobeAction = ({ onAction, position = "bottomright", ...props }) => /* @__PURE__ */ React2.createElement(CustomControl, {
   position,
   ...props
-}, /* @__PURE__ */ React3.createElement(ActionControls, {
+}, /* @__PURE__ */ React2.createElement(ActionControls, {
   onAction
 }));
 var Globe = {
@@ -897,21 +869,36 @@ var Globe = {
 import "leaflet/dist/leaflet.css";
 import { createContext as createContext2 } from "@radix-ui/react-context";
 import L, { Control, DomEvent, DomUtil, latLngBounds } from "leaflet";
-import React4, { forwardRef as forwardRef2, useEffect as useEffect5, useImperativeHandle as useImperativeHandle2, useRef as useRef2, useState as useState4 } from "react";
+import React3, { forwardRef as forwardRef2, useEffect as useEffect5, useImperativeHandle as useImperativeHandle2, useRef as useRef2 } from "react";
 import { createRoot } from "react-dom/client";
 import { MapContainer, Marker, Popup, TileLayer, useMap, useMapEvents } from "react-leaflet";
 import { ThemeProvider, Tooltip } from "@dxos/react-ui";
-import { defaultTx, mx as mx2 } from "@dxos/ui-theme";
-var defaults2 = {
+import { composable as composable2, composableProps as composableProps2, defaultTx, mx as mx2 } from "@dxos/ui-theme";
+var defaults = {
   center: {
     lat: 51,
     lng: 0
   },
   zoom: 4
 };
-var [MapContextProvier, useMapContext] = createContext2("Map");
-var MapRoot = /* @__PURE__ */ forwardRef2(({ classNames, scrollWheelZoom = true, doubleClickZoom = true, touchZoom = true, center, zoom, onChange, ...props }, forwardedRef) => {
-  const [attention, setAttention] = useState4(false);
+var [MapContextProvider, useMapContext] = createContext2("Map");
+var MapRoot = composable2(({ children, onChange, ...props }, forwardedRef) => {
+  const attention = false;
+  return /* @__PURE__ */ React3.createElement(MapContextProvider, {
+    attention,
+    onChange
+  }, /* @__PURE__ */ React3.createElement("div", {
+    ...composableProps2(props, {
+      role: "none",
+      classNames: "dx-container grid dx-focus-ring-inset"
+    }),
+    ref: forwardedRef
+  }, children));
+});
+MapRoot.displayName = "Map.Root";
+var MAP_CONTENT_NAME = "Map.Content";
+var MapContent = /* @__PURE__ */ forwardRef2(({ classNames, scrollWheelZoom = true, doubleClickZoom = true, touchZoom = true, center, zoom, children, ...props }, forwardedRef) => {
+  const { attention } = useMapContext(MAP_CONTENT_NAME);
   const mapRef = useRef2(null);
   const map = mapRef.current;
   useImperativeHandle2(forwardedRef, () => ({
@@ -935,23 +922,22 @@ var MapRoot = /* @__PURE__ */ forwardRef2(({ classNames, scrollWheelZoom = true,
     map,
     attention
   ]);
-  return /* @__PURE__ */ React4.createElement(MapContextProvier, {
-    attention,
-    onChange
-  }, /* @__PURE__ */ React4.createElement(MapContainer, {
+  return /* @__PURE__ */ React3.createElement(MapContainer, {
     ...props,
-    ref: mapRef,
-    className: mx2("group relative grid bs-full is-full !bg-baseSurface dx-focus-ring-inset", classNames),
+    className: mx2("group relative grid bg-base-surface!", classNames),
     attributionControl: false,
     zoomControl: false,
     scrollWheelZoom,
     doubleClickZoom,
     touchZoom,
-    center: center ?? defaults2.center,
-    zoom: zoom ?? defaults2.zoom
-  }));
+    center: center ?? defaults.center,
+    zoom: zoom ?? defaults.zoom,
+    whenReady: () => {
+    },
+    ref: mapRef
+  }, children);
 });
-MapRoot.displayName = "Map.Root";
+MapContent.displayName = "Map.Content";
 var MAP_TILES_NAME = "Map.Tiles";
 var MapTiles = (_props) => {
   const ref = useRef2(null);
@@ -972,7 +958,7 @@ var MapTiles = (_props) => {
   }, [
     attention
   ]);
-  return /* @__PURE__ */ React4.createElement(React4.Fragment, null, /* @__PURE__ */ React4.createElement(TileLayer, {
+  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(TileLayer, {
     ref,
     "data-attention": attention,
     detectRetina: true,
@@ -989,13 +975,13 @@ var MapMarkers = ({ selected, markers }) => {
       const bounds = latLngBounds(markers.map((marker) => marker.location));
       map.fitBounds(bounds);
     } else {
-      map.setView(defaults2.center, defaults2.zoom);
+      map.setView(defaults.center, defaults.zoom);
     }
   }, [
     markers
   ]);
-  return /* @__PURE__ */ React4.createElement(React4.Fragment, null, markers?.map(({ id, title, location: { lat, lng } }) => {
-    return /* @__PURE__ */ React4.createElement(Marker, {
+  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, markers?.map(({ id, title, location: { lat, lng } }) => {
+    return /* @__PURE__ */ React3.createElement(Marker, {
       key: id,
       position: {
         lat,
@@ -1026,7 +1012,7 @@ var MapMarkers = ({ selected, markers }) => {
           ]
         })
       )
-    }, title && /* @__PURE__ */ React4.createElement(Popup, null, title));
+    }, title && /* @__PURE__ */ React3.createElement(Popup, null, title));
   }));
 };
 MapMarkers.displayName = "Map.Markers";
@@ -1037,13 +1023,13 @@ var CustomControl2 = ({ position, children }) => {
       position
     });
     control.onAdd = () => {
-      const container = DomUtil.create("div", mx2("!m-0", controlPositions[position]));
+      const container = DomUtil.create("div", mx2("m-0!", controlPositions[position]));
       DomEvent.disableClickPropagation(container);
       DomEvent.disableScrollPropagation(container);
       const root = createRoot(container);
-      root.render(/* @__PURE__ */ React4.createElement(ThemeProvider, {
+      root.render(/* @__PURE__ */ React3.createElement(ThemeProvider, {
         tx: defaultTx
-      }, /* @__PURE__ */ React4.createElement(Tooltip.Provider, null, children)));
+      }, /* @__PURE__ */ React3.createElement(Tooltip.Provider, null, children)));
       return container;
     };
     control.addTo(map);
@@ -1057,20 +1043,21 @@ var CustomControl2 = ({ position, children }) => {
   ]);
   return null;
 };
-var MapZoom = ({ onAction, position = "bottomleft", ...props }) => /* @__PURE__ */ React4.createElement(CustomControl2, {
+var MapZoom = ({ onAction, position = "bottomleft", ...props }) => /* @__PURE__ */ React3.createElement(CustomControl2, {
   position,
   ...props
-}, /* @__PURE__ */ React4.createElement(ZoomControls, {
+}, /* @__PURE__ */ React3.createElement(ZoomControls, {
   onAction
 }));
-var MapAction = ({ onAction, position = "bottomright", ...props }) => /* @__PURE__ */ React4.createElement(CustomControl2, {
+var MapAction = ({ onAction, position = "bottomright", ...props }) => /* @__PURE__ */ React3.createElement(CustomControl2, {
   position,
   ...props
-}, /* @__PURE__ */ React4.createElement(ActionControls, {
+}, /* @__PURE__ */ React3.createElement(ActionControls, {
   onAction
 }));
 var Map = {
   Root: MapRoot,
+  Content: MapContent,
   Tiles: MapTiles,
   Markers: MapMarkers,
   Zoom: MapZoom,
@@ -1079,7 +1066,7 @@ var Map = {
 export {
   ActionControls,
   Globe,
-  GlobeContextProvider,
+  GlobeContext,
   Map,
   ZoomControls,
   closestPoint,
@@ -1091,13 +1078,10 @@ export {
   geoPoint,
   geoToPosition,
   getDistance,
-  loadTopology,
   positionToRotation,
   renderLayers,
   restrictAxis,
   timer,
-  translationKey,
-  translations,
   useDrag,
   useGlobeContext,
   useGlobeZoomHandler,