@dxos/react-ui-geo 0.8.4-main.67995b8 → 0.8.4-main.a4bbb77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-geo",
-  "version": "0.8.4-main.67995b8",
+  "version": "0.8.4-main.a4bbb77",
   "description": "Geo components.",
   "homepage": "https://github.com/dxos",
   "bugs": "https://github.com/dxos/issues",
@@ -10,16 +10,16 @@
   "type": "module",
   "exports": {
     "./data": {
+      "source": "./src/data.ts",
       "types": "./dist/types/src/data.d.ts",
       "browser": "./dist/lib/browser/data.mjs",
-      "node": "./dist/lib/node-esm/data.mjs",
-      "source": "./src/data.ts"
+      "node": "./dist/lib/node-esm/data.mjs"
     },
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
-      "source": "./src/index.ts"
+      "node": "./dist/lib/node-esm/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -37,31 +37,32 @@
   ],
   "dependencies": {
     "@preact-signals/safe-react": "^0.9.0",
+    "@radix-ui/react-context": "^1.0.5",
     "d3": "^7.9.0",
     "d3-geo-projection": "^4.0.0",
     "d3-hexbin": "^0.2.2",
     "geojson": "^0.5.0",
     "leaflet": "^1.9.4",
     "lodash.defaultsdeep": "^4.6.1",
-    "react-leaflet": "^4.2.1",
+    "react-leaflet": "^5.0.0",
     "react-resize-detector": "^11.0.1",
     "topojson-client": "^3.1.0",
     "topojson-simplify": "^3.0.3",
     "versor": "^0.2.0",
-    "@dxos/async": "0.8.4-main.67995b8",
-    "@dxos/debug": "0.8.4-main.67995b8",
-    "@dxos/log": "0.8.4-main.67995b8",
-    "@dxos/node-std": "0.8.4-main.67995b8",
-    "@dxos/util": "0.8.4-main.67995b8"
+    "@dxos/async": "0.8.4-main.a4bbb77",
+    "@dxos/log": "0.8.4-main.a4bbb77",
+    "@dxos/debug": "0.8.4-main.a4bbb77",
+    "@dxos/node-std": "0.8.4-main.a4bbb77",
+    "@dxos/util": "0.8.4-main.a4bbb77"
   },
   "devDependencies": {
     "@react-three/drei": "^9.99.0",
-    "@react-three/fiber": "^8.15.0",
+    "@react-three/fiber": "^9.3.0",
     "@types/d3": "^7.4.3",
     "@types/geojson": "^7946.0.14",
     "@types/leaflet": "^1.9.16",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
+    "@types/react": "~19.2.0",
+    "@types/react-dom": "~19.2.0",
     "@types/three": "0.165.0",
     "@types/topojson-client": "^3.1.4",
     "@types/topojson-simplify": "^3.0.3",
@@ -69,18 +70,18 @@
     "JSONStream": "^1.3.5",
     "geojson2h3": "^1.2.0",
     "leva": "^0.9.35",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
     "three": "0.165.0",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8",
-    "@dxos/storybook-utils": "0.8.4-main.67995b8"
+    "@dxos/react-ui": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77",
+    "@dxos/storybook-utils": "0.8.4-main.a4bbb77"
   },
   "peerDependencies": {
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Globe/Globe.stories.tsx

@@ -2,22 +2,22 @@
 // Copyright 2018 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import { type FeatureCollection, type Geometry, type Position } from 'geojson';
 import { Leva } from 'leva';
 import React, { useMemo, useRef, useState } from 'react';
 import { type Topology } from 'topojson-specification';
 
 import { useAsyncState } from '@dxos/react-ui';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { Globe, type GlobeCanvasProps, type GlobeController, type GlobeRootProps } from './Globe';
-import { useDrag, useGlobeZoomHandler, useSpinner, useTour, type Vector } from '../../hooks';
-import { closestPoint, type LatLng, type StyleSet } from '../../util';
+import { type Vector, useDrag, useGlobeZoomHandler, useSpinner, useTour } from '../../hooks';
+import { type LatLngLiteral } from '../../types';
+import { type StyleSet, closestPoint } from '../../util';
 import { type ControlProps } from '../Toolbar';
 
+import { Globe, type GlobeCanvasProps, type GlobeController, type GlobeRootProps } from './Globe';
+
 // TODO(burdon): Load from JSON at runtime?
 const useTopology = () => {
   return useAsyncState(async () => (await import('../../../data/countries-110m.ts')).default);
@@ -95,8 +95,11 @@ const createTrip = (
   routes: Record<string, string[]>,
   points: Position[] = [],
 ) => {
-  let previousHub: LatLng;
-  return Object.entries(routes).reduce<{ points: LatLng[]; lines: { source: LatLng; target: LatLng }[] }>(
+  let previousHub: LatLngLiteral;
+  return Object.entries(routes).reduce<{
+    points: LatLngLiteral[];
+    lines: { source: LatLngLiteral; target: LatLngLiteral }[];
+  }>(
     (features, [hub, regional]) => {
       const hubAirport = airports.features.find(({ properties }) => properties.iata === hub);
       if (hubAirport) {
@@ -125,7 +128,7 @@ const createTrip = (
   );
 };
 
-type StoryProps = Pick<GlobeRootProps, 'scale' | 'translation' | 'rotation'> &
+type StoryProps = Pick<GlobeRootProps, 'zoom' | 'translation' | 'rotation'> &
   Pick<GlobeCanvasProps, 'projection' | 'styles'> & {
     drag?: boolean;
     spin?: boolean;
@@ -133,8 +136,8 @@ type StoryProps = Pick<GlobeRootProps, 'scale' | 'translation' | 'rotation'> &
     xAxis?: boolean;
   };
 
-const Story = ({
-  scale: _scale = 1,
+const DefaultStory = ({
+  zoom: _zoom = 1,
   translation,
   rotation = [0, 0, 0],
   projection,
@@ -154,6 +157,7 @@ const Story = ({
   });
   const [topology] = useTopology();
   const [airports] = useAsyncState(async () => (await import('../../../data/airports.ts')).default);
+
   const features = useMemo(() => {
     return airports ? createTrip(airports, routes, (dots?.objects.dots as any)?.geometries[0].coordinates) : undefined;
   }, [airports, routes, dots]);
@@ -188,18 +192,18 @@ const Story = ({
         break;
       }
       case 'zoom-in': {
-        controller.current.setScale((scale) => scale * 1.1);
+        controller.current.setZoom((scale) => scale * 1.1);
         break;
       }
       case 'zoom-out': {
-        controller.current.setScale((scale) => scale * 0.9);
+        controller.current.setZoom((scale) => scale * 0.9);
         break;
       }
     }
   };
 
   return (
-    <Globe.Root classNames='absolute inset-0' scale={_scale} translation={translation} rotation={rotation}>
+    <Globe.Root classNames='absolute inset-0' zoom={_zoom} translation={translation} rotation={rotation}>
       <Globe.Canvas
         ref={controller}
         topology={styles?.dots ? dots : topology}
@@ -219,11 +223,15 @@ const Story = ({
 
 const initialRotation: Vector = [0, -40, 0];
 
-const meta: Meta = {
+const meta = {
   title: 'ui/react-ui-geo/Globe',
   component: Globe.Root,
-  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'bg-[#000]' })],
-};
+  render: DefaultStory,
+  decorators: [withTheme],
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta;
 
 export default meta;
 
@@ -234,7 +242,7 @@ export const Earth1 = () => {
   useDrag(controller);
 
   return (
-    <Globe.Root scale={1.2} rotation={[Math.random() * 360, 0, 0]}>
+    <Globe.Root zoom={1.2} rotation={[Math.random() * 360, 0, 0]}>
       <Globe.Canvas ref={setController} topology={topology} styles={defaultStyles} />
       <Globe.Zoom onAction={handleAction} />
     </Globe.Root>
@@ -249,7 +257,7 @@ export const Earth2 = () => {
 
   return (
     <div className='absolute bottom-0 left-0 right-0 '>
-      <Globe.Root classNames='h-[400px]' scale={2.8} translation={{ x: 0, y: 400 }}>
+      <Globe.Root classNames='h-[400px]' zoom={2.8} translation={{ x: 0, y: 400 }}>
         <Globe.Canvas ref={setController} topology={topology} styles={defaultStyles} />
         <Globe.Zoom onAction={handleAction} />
       </Globe.Root>
@@ -283,33 +291,73 @@ export const Mercator = () => {
   useDrag(controller);
 
   return (
-    <Globe.Root classNames='flex grow overflow-hidden' scale={0.7} rotation={initialRotation}>
+    <Globe.Root classNames='flex grow overflow-hidden' zoom={0.7} rotation={initialRotation}>
       <Globe.Canvas ref={setController} topology={topology} projection='mercator' styles={monochrome} />
       <Globe.Zoom onAction={handleAction} />
     </Globe.Root>
   );
 };
 
-export const Globe1 = () => {
-  return <Story drag projection='mercator' scale={0.8} rotation={initialRotation} styles={defaultStyles} />;
+type Story = StoryObj<typeof DefaultStory>;
+
+export const Globe1: Story = {
+  args: {
+    drag: true,
+    projection: 'mercator',
+    zoom: 0.8,
+    rotation: initialRotation,
+    styles: defaultStyles,
+  },
 };
 
-export const Globe2 = () => {
-  return <Story drag projection='transverse-mercator' scale={0.8} rotation={initialRotation} styles={defaultStyles} />;
+export const Globe2: Story = {
+  args: {
+    drag: true,
+    projection: 'transverse-mercator',
+    zoom: 0.8,
+    rotation: initialRotation,
+    styles: defaultStyles,
+  },
 };
 
-export const Globe3 = () => {
-  return <Story drag spin scale={1.5} rotation={initialRotation} styles={defaultStyles} />;
+export const Globe3: Story = {
+  args: {
+    drag: true,
+    spin: true,
+    zoom: 1.5,
+    rotation: initialRotation,
+    styles: defaultStyles,
+  },
 };
 
-export const Globe4 = () => {
-  return <Story drag tour scale={2} rotation={initialRotation} styles={defaultStyles} />;
+export const Globe4: Story = {
+  args: {
+    drag: true,
+    tour: true,
+    zoom: 2,
+    rotation: initialRotation,
+    styles: defaultStyles,
+  },
 };
 
-export const Globe5 = () => {
-  return <Story drag tour scale={0.9} rotation={initialRotation} styles={dotStyles} />;
+export const Globe5: Story = {
+  args: {
+    drag: true,
+    tour: true,
+    zoom: 0.9,
+    rotation: initialRotation,
+    styles: dotStyles,
+  },
 };
 
-export const Globe6 = () => {
-  return <Story drag xAxis tour scale={2} translation={{ x: 0, y: 600 }} rotation={[0, -20, 0]} styles={dotStyles} />;
+export const Globe6: Story = {
+  args: {
+    drag: true,
+    xAxis: true,
+    tour: true,
+    zoom: 2,
+    translation: { x: 0, y: 600 },
+    rotation: [0, -20, 0],
+    styles: dotStyles,
+  },
 };

package/src/components/Globe/Globe.tsx

@@ -4,14 +4,14 @@
 
 import {
   type GeoProjection,
+  easeLinear,
+  easeSinOut,
   geoMercator,
   geoOrthographic,
   geoPath,
   geoTransverseMercator,
   interpolateNumber,
   transition,
-  easeLinear,
-  easeSinOut,
 } from 'd3';
 import { type ControlPosition } from 'leaflet';
 import React, {
@@ -26,7 +26,7 @@ import React, {
 import { useResizeDetector } from 'react-resize-detector';
 import { type Topology } from 'topojson-specification';
 
-import { type ThemedClassName, type ThemeMode, useDynamicRef, useThemeContext } from '@dxos/react-ui';
+import { type ThemeMode, type ThemedClassName, useDynamicRef, useThemeContext } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
 import {
@@ -44,7 +44,7 @@ import {
   renderLayers,
   timer,
 } from '../../util';
-import { ZoomControls, ActionControls, type ControlProps, controlPositions } from '../Toolbar';
+import { ActionControls, type ControlProps, ZoomControls, controlPositions } from '../Toolbar';
 
 /**
  * https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute
@@ -103,7 +103,7 @@ const defaultStyles: Record<ThemeMode, StyleSet> = {
 export type GlobeController = {
   canvas: HTMLCanvasElement;
   projection: GeoProjection;
-} & Pick<GlobeContextType, 'scale' | 'translation' | 'rotation' | 'setScale' | 'setTranslation' | 'setRotation'>;
+} & Pick<GlobeContextType, 'zoom' | 'translation' | 'rotation' | 'setZoom' | 'setTranslation' | 'setRotation'>;
 
 export type ProjectionType = 'orthographic' | 'mercator' | 'transverse-mercator';
 
@@ -154,6 +154,7 @@ type GlobeCanvasProps = {
  * Basic globe renderer.
  * https://github.com/topojson/world-atlas
  */
+// TODO(burdon): Move controller to root.
 const GlobeCanvas = forwardRef<GlobeController, GlobeCanvasProps>(
   ({ projection: _projection, topology, features, styles: _styles }, forwardRef) => {
     const { themeMode } = useThemeContext();
@@ -173,15 +174,14 @@ const GlobeCanvas = forwardRef<GlobeController, GlobeCanvasProps>(
     }, [topology, features, styles]);
 
     // State.
-    const { size, center, scale, translation, rotation, setCenter, setScale, setTranslation, setRotation } =
+    const { size, center, zoom, translation, rotation, setCenter, setZoom, setTranslation, setRotation } =
       useGlobeContext();
-
-    const scaleRef = useDynamicRef(scale);
+    const zoomRef = useDynamicRef(zoom);
 
     // Update rotation.
     useEffect(() => {
       if (center) {
-        setScale(1);
+        setZoom(1);
         setRotation(positionToRotation(geoToPosition(center)));
       }
     }, [center]);
@@ -193,25 +193,25 @@ const GlobeCanvas = forwardRef<GlobeController, GlobeCanvasProps>(
         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));
+            const is = interpolateNumber(zoomRef.current, s(zoomRef.current));
             // Stop easing if already zooming.
             transition()
               .ease(zooming.current ? easeLinear : easeSinOut)
               .duration(200)
-              .tween('scale', () => (t) => setScale(is(t)))
+              .tween('scale', () => (t) => setZoom(is(t)))
               .on('end', () => {
                 zooming.current = false;
               });
           } else {
-            setScale(s);
+            setZoom(s);
           }
         },
         setTranslation,
@@ -232,14 +232,14 @@ const GlobeCanvas = forwardRef<GlobeController, GlobeCanvasProps>(
         timer(() => {
           // https://d3js.org/d3-geo/projection
           projection
-            .scale((Math.min(size.width, size.height) / 2) * scale)
+            .scale((Math.min(size.width, size.height) / 2) * zoom)
             .translate([size.width / 2 + (translation?.x ?? 0), size.height / 2 + (translation?.y ?? 0)])
             .rotate(rotation ?? [0, 0, 0]);
 
-          renderLayers(generator, layers, scale, styles);
+          renderLayers(generator, layers, zoom, styles);
         });
       }
-    }, [generator, size, scale, translation, rotation, layers]);
+    }, [generator, size, zoom, translation, rotation, layers]);
 
     if (!size.width || !size.height) {
       return null;
@@ -249,8 +249,12 @@ const GlobeCanvas = forwardRef<GlobeController, GlobeCanvasProps>(
   },
 );
 
+//
+// Debug
+//
+
 const GlobeDebug = ({ position = 'topleft' }: { position?: ControlPosition }) => {
-  const { size, scale, translation, rotation } = useGlobeContext();
+  const { size, zoom, translation, rotation } = useGlobeContext();
   return (
     <div
       className={mx(
@@ -259,12 +263,16 @@ const GlobeDebug = ({ position = 'topleft' }: { position?: ControlPosition }) =>
       )}
     >
       <pre className='font-mono text-xs text-green-700'>
-        {JSON.stringify({ size, scale, translation, rotation }, null, 2)}
+        {JSON.stringify({ size, zoom, translation, rotation }, null, 2)}
       </pre>
     </div>
   );
 };
 
+//
+// Panel
+//
+
 const GlobePanel = ({
   position,
   classNames,
@@ -273,25 +281,37 @@ const GlobePanel = ({
   return <div className={mx('z-10 absolute overflow-hidden', controlPositions[position], classNames)}>{children}</div>;
 };
 
+//
+// Controls
+//
+
 const CustomControl = ({ position, children }: PropsWithChildren<{ position: ControlPosition }>) => {
   return <div className={mx('z-10 absolute overflow-hidden', controlPositions[position])}>{children}</div>;
 };
 
 type GlobeControlProps = { position?: ControlPosition } & Pick<ControlProps, 'onAction'>;
 
+const GlobeZoom = ({ onAction, position = 'bottomleft', ...props }: GlobeControlProps) => (
+  <CustomControl position={position} {...props}>
+    <ZoomControls onAction={onAction} />
+  </CustomControl>
+);
+
+const GlobeAction = ({ onAction, position = 'bottomright', ...props }: GlobeControlProps) => (
+  <CustomControl position={position} {...props}>
+    <ActionControls onAction={onAction} />
+  </CustomControl>
+);
+
+//
+// Globe
+//
+
 export const Globe = {
   Root: GlobeRoot,
   Canvas: GlobeCanvas,
-  Zoom: ({ onAction, position = 'bottomleft', ...props }: GlobeControlProps) => (
-    <CustomControl position={position} {...props}>
-      <ZoomControls onAction={onAction} />
-    </CustomControl>
-  ),
-  Action: ({ onAction, position = 'bottomright', ...props }: GlobeControlProps) => (
-    <CustomControl position={position} {...props}>
-      <ActionControls onAction={onAction} />
-    </CustomControl>
-  ),
+  Zoom: GlobeZoom,
+  Action: GlobeAction,
   Debug: GlobeDebug,
   Panel: GlobePanel,
 };

package/src/components/Map/Map.stories.tsx

@@ -2,45 +2,56 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { Map, type MapController } from './Map';
 import { useMapZoomHandler } from '../../hooks';
-import { type MapMarker } from '../../types';
+import { type GeoMarker } from '../../types';
+
+import { Map, type MapController } from './Map';
 
-const DefaultStory = ({ markers = [] }: { markers?: MapMarker[] }) => {
+const DefaultStory = ({ markers = [] }: { markers?: GeoMarker[] }) => {
   const [controller, setController] = useState<MapController>();
   const handleZoomAction = useMapZoomHandler(controller);
 
   return (
-    <Map.Root>
-      <Map.Canvas ref={setController} markers={markers} />
+    <Map.Root ref={setController}>
+      <Map.Tiles />
+      <Map.Markers markers={markers} />
       <Map.Zoom position='bottomleft' onAction={handleZoomAction} />
       <Map.Action position='bottomright' />
     </Map.Root>
   );
 };
 
-const meta: Meta<typeof DefaultStory> = {
+const meta = {
   title: 'ui/react-ui-geo/Map',
+  component: Map.Root as any,
   render: DefaultStory,
-  decorators: [withTheme, withLayout({ fullscreen: true })],
-};
+  decorators: [withTheme],
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-type Story = StoryObj<typeof DefaultStory>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {};
 
 export const WithMarkers: Story = {
   args: {
     markers: [
+      { id: 'los angeles', title: 'Los Angeles', location: { lat: 34.0522, lng: -118.2437 } },
+      { id: 'new york', title: 'New York', location: { lat: 40.7128, lng: -74.006 } },
+      { id: 'warsaw', title: 'Warsaw', location: { lat: 52.2297, lng: 21.0122 } },
+      { id: 'london', title: 'London', location: { lat: 51.5074, lng: -0.1278 } },
+      { id: 'toronto', title: 'Toronto', location: { lat: 43.6532, lng: -79.3832 } },
+      { id: 'seattle', title: 'Seattle', location: { lat: 47.6062, lng: -122.3321 } },
+      { id: 'barcelona', title: 'Barcelona', location: { lat: 41.3851, lng: 2.1734 } },
       { id: 'tokyo', title: 'Tokyo', location: { lat: 35.6762, lng: 139.6503 } },
       { id: 'sydney', title: 'Sydney', location: { lat: -33.8688, lng: 151.2093 } },
       { id: 'auckland', title: 'Auckland', location: { lat: -36.8509, lng: 174.7645 } },
@@ -56,6 +67,6 @@ export const WithMarkers: Story = {
       { id: 'phnom-penh', title: 'Phnom Penh', location: { lat: 11.5564, lng: 104.9282 } },
       { id: 'vientiane', title: 'Vientiane', location: { lat: 17.9757, lng: 102.6331 } },
       { id: 'yangon', title: 'Yangon', location: { lat: 16.8661, lng: 96.1951 } },
-    ] as MapMarker[],
+    ] as GeoMarker[],
   },
 };