@dxos/react-ui-geo 0.8.4-main.84f28bd → 0.8.4-main.a4bbb77

package/dist/lib/node-esm/data.mjs

@@ -1,7 +1,7 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   loadTopology
-} from "./chunk-OPJPAAEK.mjs";
+} from "./chunk-JODBF4CC.mjs";
 export {
   loadTopology
 };

package/dist/lib/node-esm/index.mjs

@@ -1,11 +1,11 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   loadTopology
-} from "./chunk-OPJPAAEK.mjs";
+} from "./chunk-JODBF4CC.mjs";
 
 // src/components/Globe/Globe.tsx
 import { useSignals as _useSignals3 } from "@preact-signals/safe-react/tracking";
-import { geoMercator, geoOrthographic, geoPath as geoPath2, geoTransverseMercator, interpolateNumber, transition, easeLinear, easeSinOut } from "d3";
+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 { useResizeDetector } from "react-resize-detector";
 import { useDynamicRef, useThemeContext } from "@dxos/react-ui";
@@ -17,22 +17,22 @@ import React, { createContext, useContext } from "react";
 import { raise } from "@dxos/debug";
 import { useControlledState } from "@dxos/react-ui";
 var GlobeContext = /* @__PURE__ */ createContext(void 0);
-var GlobeContextProvider = ({ children, size, center: _center, scale: _scale, translation: _translation, rotation: _rotation }) => {
+var GlobeContextProvider = ({ children, size, center: _center, zoom: _zoom, translation: _translation, rotation: _rotation }) => {
   var _effect = _useSignals();
   try {
     const [center, setCenter] = useControlledState(_center);
-    const [scale, setScale] = useControlledState(_scale);
+    const [zoom, setZoom] = useControlledState(_zoom);
     const [translation, setTranslation] = useControlledState(_translation);
     const [rotation, setRotation] = useControlledState(_rotation);
     return /* @__PURE__ */ React.createElement(GlobeContext.Provider, {
       value: {
         size,
         center,
-        scale,
+        zoom,
         translation,
         rotation,
         setCenter,
-        setScale,
+        setZoom,
         setTranslation,
         setRotation
       }
@@ -65,7 +65,7 @@ var timer = (cb) => {
 };
 
 // src/util/inertia.ts
-import { select, drag, timer as timer2 } from "d3";
+import { drag, select, timer as timer2 } from "d3";
 import versor from "versor";
 var restrictAxis = (axis) => (original, current) => current.map((d, i) => axis[i] ? d : original[i]);
 var geoInertiaDrag = (target, render, projection, options) => {
@@ -377,8 +377,8 @@ var renderLayers = (generator, layers = [], scale, styles) => {
           generator.pointRadius(value * scale);
         } else {
           context[key] = value;
-          fill ||= key === "fillStyle";
-          stroke ||= key === "strokeStyle";
+          fill || (fill = key === "fillStyle");
+          stroke || (stroke = key === "strokeStyle");
         }
       });
     }
@@ -435,11 +435,11 @@ var useGlobeZoomHandler = (controller) => {
     }
     switch (event) {
       case "zoom-in": {
-        controller.setScale((scale) => scale * 1.1);
+        controller.setZoom((zoom) => zoom * 1.1);
         break;
       }
       case "zoom-out": {
-        controller.setScale((scale) => scale * 0.9);
+        controller.setZoom((zoom) => zoom * 0.9);
         break;
       }
     }
@@ -524,8 +524,8 @@ var useSpinner = (controller, options = {}) => {
 };
 
 // src/hooks/useTour.ts
-import { geoPath, geoInterpolate, geoDistance, selection as d3Selection } from "d3";
-import { useEffect as useEffect3, useState as useState2, useMemo } from "react";
+import { selection as d3Selection, geoDistance, geoInterpolate, geoPath } from "d3";
+import { useEffect as useEffect3, useMemo, useState as useState2 } from "react";
 import versor2 from "versor";
 var TRANSITION_NAME = "globe-tour";
 var defaultDuration = 1500;
@@ -572,7 +572,7 @@ var useTour = (controller, points, options = {}) => {
               {
                 context.beginPath();
                 context.strokeStyle = options?.styles?.arc?.strokeStyle ?? "yellow";
-                context.lineWidth = (options?.styles?.arc?.lineWidth ?? 1.5) * (controller?.scale ?? 1);
+                context.lineWidth = (options?.styles?.arc?.lineWidth ?? 1.5) * (controller?.zoom ?? 1);
                 context.setLineDash(options?.styles?.arc?.lineDash ?? []);
                 path({
                   type: "LineString",
@@ -584,7 +584,7 @@ var useTour = (controller, points, options = {}) => {
                 context.stroke();
                 context.beginPath();
                 context.fillStyle = options?.styles?.cursor?.fillStyle ?? "orange";
-                path.pointRadius((options?.styles?.cursor?.pointRadius ?? 2) * (controller?.scale ?? 1));
+                path.pointRadius((options?.styles?.cursor?.pointRadius ?? 2) * (controller?.zoom ?? 1));
                 path({
                   type: "Point",
                   coordinates: ip(t22)
@@ -598,7 +598,7 @@ var useTour = (controller, points, options = {}) => {
             await transition2.end();
             last = next;
           }
-        } catch (err) {
+        } catch {
         } finally {
           setRunning(false);
         }
@@ -634,11 +634,10 @@ var ZoomControls = ({ classNames, onAction }) => {
   try {
     return /* @__PURE__ */ React2.createElement(Toolbar.Root, {
       classNames: [
-        "gap-1",
+        "gap-2",
         classNames
       ]
     }, /* @__PURE__ */ React2.createElement(IconButton, {
-      //
       icon: "ph--plus--regular",
       label: "zoom in",
       iconOnly: true,
@@ -646,7 +645,6 @@ var ZoomControls = ({ classNames, onAction }) => {
       classNames: "px-0 aspect-square",
       onClick: () => onAction?.("zoom-in")
     }), /* @__PURE__ */ React2.createElement(IconButton, {
-      //
       icon: "ph--minus--regular",
       label: "zoom out",
       iconOnly: true,
@@ -663,11 +661,10 @@ var ActionControls = ({ classNames, onAction }) => {
   try {
     return /* @__PURE__ */ React2.createElement(Toolbar.Root, {
       classNames: [
-        "gap-1",
+        "gap-2",
         classNames
       ]
     }, /* @__PURE__ */ React2.createElement(IconButton, {
-      //
       icon: "ph--play--regular",
       label: "start",
       iconOnly: true,
@@ -675,7 +672,6 @@ var ActionControls = ({ classNames, onAction }) => {
       classNames: "px-0 aspect-square",
       onClick: () => onAction?.("start")
     }), /* @__PURE__ */ React2.createElement(IconButton, {
-      //
       icon: "ph--globe-hemisphere-west--regular",
       label: "toggle",
       iconOnly: true,
@@ -781,11 +777,11 @@ var GlobeCanvas = /* @__PURE__ */ forwardRef(({ projection: _projection, topolog
       features,
       styles
     ]);
-    const { size, center, scale, translation, rotation, setCenter, setScale, setTranslation, setRotation } = useGlobeContext();
-    const scaleRef = useDynamicRef(scale);
+    const { size, center, zoom, translation, rotation, setCenter, setZoom, setTranslation, setRotation } = useGlobeContext();
+    const zoomRef = useDynamicRef(zoom);
     useEffect4(() => {
       if (center) {
-        setScale(1);
+        setZoom(1);
         setRotation(positionToRotation(geoToPosition(center)));
       }
     }, [
@@ -797,20 +793,20 @@ var GlobeCanvas = /* @__PURE__ */ forwardRef(({ projection: _projection, topolog
         canvas,
         projection,
         center,
-        get scale() {
-          return scaleRef.current;
+        get zoom() {
+          return zoomRef.current;
         },
         translation,
         rotation,
         setCenter,
-        setScale: (s) => {
+        setZoom: (s) => {
           if (typeof s === "function") {
-            const is = interpolateNumber(scaleRef.current, s(scaleRef.current));
-            transition().ease(zooming.current ? easeLinear : easeSinOut).duration(200).tween("scale", () => (t) => setScale(is(t))).on("end", () => {
+            const is = interpolateNumber(zoomRef.current, s(zoomRef.current));
+            transition().ease(zooming.current ? easeLinear : easeSinOut).duration(200).tween("scale", () => (t) => setZoom(is(t))).on("end", () => {
               zooming.current = false;
             });
           } else {
-            setScale(s);
+            setZoom(s);
           }
         },
         setTranslation,
@@ -828,7 +824,7 @@ var GlobeCanvas = /* @__PURE__ */ forwardRef(({ projection: _projection, topolog
     useEffect4(() => {
       if (canvas && projection) {
         timer(() => {
-          projection.scale(Math.min(size.width, size.height) / 2 * scale).translate([
+          projection.scale(Math.min(size.width, size.height) / 2 * zoom).translate([
             size.width / 2 + (translation?.x ?? 0),
             size.height / 2 + (translation?.y ?? 0)
           ]).rotate(rotation ?? [
@@ -836,13 +832,13 @@ var GlobeCanvas = /* @__PURE__ */ forwardRef(({ projection: _projection, topolog
             0,
             0
           ]);
-          renderLayers(generator, layers, scale, styles);
+          renderLayers(generator, layers, zoom, styles);
         });
       }
     }, [
       generator,
       size,
-      scale,
+      zoom,
       translation,
       rotation,
       layers
@@ -862,14 +858,14 @@ var GlobeCanvas = /* @__PURE__ */ forwardRef(({ projection: _projection, topolog
 var GlobeDebug = ({ position = "topleft" }) => {
   var _effect = _useSignals3();
   try {
-    const { size, scale, translation, rotation } = useGlobeContext();
+    const { size, zoom, translation, rotation } = useGlobeContext();
     return /* @__PURE__ */ React3.createElement("div", {
       className: mx("z-10 absolute w-96 p-2 overflow-hidden border border-green-700 rounded", controlPositions[position])
     }, /* @__PURE__ */ React3.createElement("pre", {
       className: "font-mono text-xs text-green-700"
     }, JSON.stringify({
       size,
-      scale,
+      zoom,
       translation,
       rotation
     }, null, 2)));
@@ -897,35 +893,37 @@ var CustomControl = ({ position, children }) => {
     _effect.f();
   }
 };
+var GlobeZoom = ({ onAction, position = "bottomleft", ...props }) => {
+  var _effect = _useSignals3();
+  try {
+    return /* @__PURE__ */ React3.createElement(CustomControl, {
+      position,
+      ...props
+    }, /* @__PURE__ */ React3.createElement(ZoomControls, {
+      onAction
+    }));
+  } finally {
+    _effect.f();
+  }
+};
+var GlobeAction = ({ onAction, position = "bottomright", ...props }) => {
+  var _effect = _useSignals3();
+  try {
+    return /* @__PURE__ */ React3.createElement(CustomControl, {
+      position,
+      ...props
+    }, /* @__PURE__ */ React3.createElement(ActionControls, {
+      onAction
+    }));
+  } finally {
+    _effect.f();
+  }
+};
 var Globe = {
   Root: GlobeRoot,
   Canvas: GlobeCanvas,
-  Zoom: ({ onAction, position = "bottomleft", ...props }) => {
-    var _effect = _useSignals3();
-    try {
-      return /* @__PURE__ */ React3.createElement(CustomControl, {
-        position,
-        ...props
-      }, /* @__PURE__ */ React3.createElement(ZoomControls, {
-        onAction
-      }));
-    } finally {
-      _effect.f();
-    }
-  },
-  Action: ({ onAction, position = "bottomright", ...props }) => {
-    var _effect = _useSignals3();
-    try {
-      return /* @__PURE__ */ React3.createElement(CustomControl, {
-        position,
-        ...props
-      }, /* @__PURE__ */ React3.createElement(ActionControls, {
-        onAction
-      }));
-    } finally {
-      _effect.f();
-    }
-  },
+  Zoom: GlobeZoom,
+  Action: GlobeAction,
   Debug: GlobeDebug,
   Panel: GlobePanel
 };
@@ -933,76 +931,42 @@ var Globe = {
 // src/components/Map/Map.tsx
 import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
 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 } from "react";
+import React4, { forwardRef as forwardRef2, useEffect as useEffect5, useImperativeHandle as useImperativeHandle2, useRef as useRef2, useState as useState4 } from "react";
 import { createRoot } from "react-dom/client";
 import { MapContainer, Marker, Popup, TileLayer, useMap } from "react-leaflet";
-import { useResizeDetector as useResizeDetector2 } from "react-resize-detector";
 import { debounce } from "@dxos/async";
 import { ThemeProvider, Tooltip } from "@dxos/react-ui";
 import { defaultTx, mx as mx2 } from "@dxos/react-ui-theme";
 var defaults = {
-  // TODO(burdon): Guess location.
   center: {
     lat: 51,
     lng: 0
   },
   zoom: 4
 };
-var MapRoot = ({ classNames, center = defaults.center, zoom = defaults.zoom, ...props }) => {
-  var _effect = _useSignals4();
-  try {
-    return /* @__PURE__ */ React4.createElement(MapContainer, {
-      className: mx2("relative grid grow bg-baseSurface", classNames),
-      attributionControl: false,
-      // TODO(burdon): Only if attention.
-      scrollWheelZoom: true,
-      zoomControl: false,
-      center,
-      zoom,
-      ...props
-    });
-  } finally {
-    _effect.f();
-  }
-};
-var MapCanvas = /* @__PURE__ */ forwardRef2(({ markers, center, zoom, onChange }, forwardedRef) => {
+var [MapContextProvier, useMapContext] = createContext2("Map");
+var MapRoot = /* @__PURE__ */ forwardRef2(({ classNames, scrollWheelZoom = true, doubleClickZoom = true, touchZoom = true, center = defaults.center, zoom = defaults.zoom, onChange, ...props }, forwardedRef) => {
   var _effect = _useSignals4();
   try {
-    const { ref, width, height } = useResizeDetector2({
-      refreshRate: 200
-    });
-    const map = useMap();
+    const [attention, setAttention] = useState4(false);
+    const mapRef = useRef2(null);
+    const map = mapRef.current;
     useImperativeHandle2(forwardedRef, () => ({
       setCenter: (center2, zoom2) => {
-        map.setView(center2, zoom2);
+        mapRef.current?.setView(center2, zoom2);
       },
       setZoom: (cb) => {
-        map.setZoom(cb(map.getZoom()));
+        mapRef.current?.setZoom(cb(mapRef.current?.getZoom() ?? 0));
       }
-    }), [
-      map
-    ]);
+    }), []);
     useEffect5(() => {
-      if (width && height) {
-        map.invalidateSize();
-      }
-    }, [
-      width,
-      height
-    ]);
-    useEffect5(() => {
-      if (center) {
-        map.setView(center, zoom);
-      } else if (zoom !== void 0) {
-        map.setZoom(zoom);
+      if (!map) {
+        return;
       }
-    }, [
-      center,
-      zoom
-    ]);
-    useEffect5(() => {
       const handler = debounce(() => {
+        setAttention(true);
         onChange?.({
           center: map.getCenter(),
           zoom: map.getZoom()
@@ -1010,14 +974,79 @@ var MapCanvas = /* @__PURE__ */ forwardRef2(({ markers, center, zoom, onChange }
       }, 100);
       map.on("move", handler);
       map.on("zoom", handler);
+      map.on("focus", () => setAttention(true));
+      map.on("blur", () => setAttention(false));
       return () => {
-        map.off("move", handler);
-        map.off("zoom", handler);
+        map.off("move");
+        map.off("zoom");
+        map.off("focus");
+        map.off("blur");
       };
     }, [
       map,
       onChange
     ]);
+    useEffect5(() => {
+      if (!map) {
+        return;
+      }
+      if (attention) {
+        map.scrollWheelZoom.enable();
+      } else {
+        map.scrollWheelZoom.disable();
+      }
+    }, [
+      map,
+      attention
+    ]);
+    return /* @__PURE__ */ React4.createElement(MapContextProvier, {
+      attention
+    }, /* @__PURE__ */ React4.createElement(MapContainer, {
+      ...props,
+      ref: mapRef,
+      className: mx2("group relative grid bs-full is-full !bg-baseSurface dx-focus-ring-inset", classNames),
+      attributionControl: false,
+      zoomControl: false,
+      scrollWheelZoom,
+      doubleClickZoom,
+      touchZoom,
+      center,
+      zoom
+    }));
+  } finally {
+    _effect.f();
+  }
+});
+MapRoot.displayName = "Map.Root";
+var MapTiles = (_props) => {
+  var _effect = _useSignals4();
+  try {
+    const ref = useRef2(null);
+    const { attention } = useMapContext(MapTiles.displayName);
+    useEffect5(() => {
+      if (ref.current) {
+        ref.current.getContainer().dataset.attention = attention ? "1" : "0";
+      }
+    }, [
+      attention
+    ]);
+    return /* @__PURE__ */ React4.createElement(React4.Fragment, null, /* @__PURE__ */ React4.createElement(TileLayer, {
+      ref,
+      "data-attention": attention,
+      detectRetina: true,
+      className: 'dark:grayscale dark:invert data-[attention="0"]:!opacity-80',
+      url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+      keepBuffer: 4
+    }));
+  } finally {
+    _effect.f();
+  }
+};
+MapTiles.displayName = "Map.Tiles";
+var MapMarkers = ({ selected, markers }) => {
+  var _effect = _useSignals4();
+  try {
+    const map = useMap();
     useEffect5(() => {
       if (markers.length > 0) {
         const bounds = latLngBounds(markers.map((marker) => marker.location));
@@ -1028,13 +1057,7 @@ var MapCanvas = /* @__PURE__ */ forwardRef2(({ markers, center, zoom, onChange }
     }, [
       markers
     ]);
-    return /* @__PURE__ */ React4.createElement("div", {
-      ref,
-      className: "flex w-full h-full overflow-hidden bg-baseSurface"
-    }, /* @__PURE__ */ React4.createElement(TileLayer, {
-      className: "dark:filter dark:grayscale dark:invert",
-      url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-    }), markers?.map(({ id, title, location: { lat, lng } }) => {
+    return /* @__PURE__ */ React4.createElement(React4.Fragment, null, markers?.map(({ id, title, location: { lat, lng } }) => {
       return /* @__PURE__ */ React4.createElement(Marker, {
         key: id,
         position: {
@@ -1043,6 +1066,7 @@ var MapCanvas = /* @__PURE__ */ forwardRef2(({ markers, center, zoom, onChange }
         },
         icon: (
           // TODO(burdon): Create custom icon from bundled assets.
+          // TODO(burdon): Selection state.
           new L.Icon({
             iconUrl: "https://dxos.network/marker-icon.png",
             iconRetinaUrl: "https://dxos.network/marker-icon-2x.png",
@@ -1070,7 +1094,8 @@ var MapCanvas = /* @__PURE__ */ forwardRef2(({ markers, center, zoom, onChange }
   } finally {
     _effect.f();
   }
-});
+};
+MapMarkers.displayName = "Map.Markers";
 var CustomControl2 = ({ position, children }) => {
   var _effect = _useSignals4();
   try {
@@ -1103,35 +1128,38 @@ var CustomControl2 = ({ position, children }) => {
     _effect.f();
   }
 };
+var MapZoom = ({ onAction, position = "bottomleft", ...props }) => {
+  var _effect = _useSignals4();
+  try {
+    return /* @__PURE__ */ React4.createElement(CustomControl2, {
+      position,
+      ...props
+    }, /* @__PURE__ */ React4.createElement(ZoomControls, {
+      onAction
+    }));
+  } finally {
+    _effect.f();
+  }
+};
+var MapAction = ({ onAction, position = "bottomright", ...props }) => {
+  var _effect = _useSignals4();
+  try {
+    return /* @__PURE__ */ React4.createElement(CustomControl2, {
+      position,
+      ...props
+    }, /* @__PURE__ */ React4.createElement(ActionControls, {
+      onAction
+    }));
+  } finally {
+    _effect.f();
+  }
+};
 var Map = {
   Root: MapRoot,
-  Canvas: MapCanvas,
-  Zoom: ({ onAction, position = "bottomleft", ...props }) => {
-    var _effect = _useSignals4();
-    try {
-      return /* @__PURE__ */ React4.createElement(CustomControl2, {
-        position,
-        ...props
-      }, /* @__PURE__ */ React4.createElement(ZoomControls, {
-        onAction
-      }));
-    } finally {
-      _effect.f();
-    }
-  },
-  Action: ({ onAction, position = "bottomright", ...props }) => {
-    var _effect = _useSignals4();
-    try {
-      return /* @__PURE__ */ React4.createElement(CustomControl2, {
-        position,
-        ...props
-      }, /* @__PURE__ */ React4.createElement(ActionControls, {
-        onAction
-      }));
-    } finally {
-      _effect.f();
-    }
-  }
+  Tiles: MapTiles,
+  Markers: MapMarkers,
+  Zoom: MapZoom,
+  Action: MapAction
 };
 export {
   ActionControls,