@dxos/solid-ui-geo 0.8.4-main.fbb7a13 → 0.8.4-main.fcfe5033a5

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/solid-ui-geo",
3
- "version": "0.8.4-main.fbb7a13",
3
+ "version": "0.8.4-main.fcfe5033a5",
4
4
  "description": "Geo components for SolidJS.",
5
5
  "homepage": "https://github.com/dxos",
6
6
  "bugs": "https://github.com/dxos/issues",
@@ -49,12 +49,12 @@
49
49
  "topojson-client": "^3.1.0",
50
50
  "topojson-simplify": "^3.0.3",
51
51
  "versor": "^0.2.0",
52
- "@dxos/debug": "0.8.4-main.fbb7a13",
53
- "@dxos/async": "0.8.4-main.fbb7a13",
54
- "@dxos/log": "0.8.4-main.fbb7a13",
55
- "@dxos/node-std": "0.8.4-main.fbb7a13",
56
- "@dxos/ui-theme": "0.8.4-main.fbb7a13",
57
- "@dxos/util": "0.8.4-main.fbb7a13"
52
+ "@dxos/async": "0.8.4-main.fcfe5033a5",
53
+ "@dxos/debug": "0.8.4-main.fcfe5033a5",
54
+ "@dxos/log": "0.8.4-main.fcfe5033a5",
55
+ "@dxos/ui-theme": "0.8.4-main.fcfe5033a5",
56
+ "@dxos/util": "0.8.4-main.fcfe5033a5",
57
+ "@dxos/node-std": "0.8.4-main.fcfe5033a5"
58
58
  },
59
59
  "devDependencies": {
60
60
  "@solidjs/testing-library": "^0.8.10",
@@ -66,12 +66,12 @@
66
66
  "@types/topojson-specification": "^1.0.5",
67
67
  "JSONStream": "^1.3.5",
68
68
  "geojson2h3": "^1.2.0",
69
- "solid-js": "^1.9.9",
69
+ "solid-js": "^1.9.11",
70
70
  "vite-plugin-solid": "^2.11.10",
71
- "@dxos/storybook-utils": "0.8.4-main.fbb7a13"
71
+ "@dxos/storybook-utils": "0.8.4-main.fcfe5033a5"
72
72
  },
73
73
  "peerDependencies": {
74
- "solid-js": "^1.9.9"
74
+ "solid-js": "^1.9.11"
75
75
  },
76
76
  "publishConfig": {
77
77
  "access": "public"
@@ -11,7 +11,6 @@ import { type Vector, useDrag, useGlobeZoomHandler, useSpinner, useTour } from '
11
11
  import { type LatLngLiteral } from '../../types';
12
12
  import { type StyleSet, closestPoint } from '../../util';
13
13
  import { type ControlProps } from '../Toolbar';
14
-
15
14
  import { Globe, type GlobeCanvasProps, type GlobeController, type GlobeRootProps } from './Globe';
16
15
 
17
16
  // TODO(burdon): Load from JSON at runtime?
@@ -122,7 +121,7 @@ const createTrip = (
122
121
  );
123
122
  };
124
123
 
125
- type StoryProps = Pick<GlobeRootProps, 'zoom' | 'translation' | 'rotation'> &
124
+ type DefaultStoryProps = Pick<GlobeRootProps, 'zoom' | 'translation' | 'rotation'> &
126
125
  Pick<GlobeCanvasProps, 'projection' | 'styles'> & {
127
126
  drag?: boolean;
128
127
  spin?: boolean;
@@ -140,7 +139,7 @@ const DefaultStory = ({
140
139
  spin = false,
141
140
  tour = false,
142
141
  xAxis = false,
143
- }: StoryProps) => {
142
+ }: DefaultStoryProps) => {
144
143
  const [controller, setController] = createSignal<GlobeController | null>(null);
145
144
 
146
145
  const [dots] = createResource(async () => {
@@ -18,6 +18,8 @@ import { type ControlPosition } from 'leaflet';
18
18
  import { type Accessor, type JSX, type Setter, Show, createEffect, createMemo, createSignal } from 'solid-js';
19
19
  import { type Topology } from 'topojson-specification';
20
20
 
21
+ import { mx } from '@dxos/ui-theme';
22
+
21
23
  import { GlobeContextProvider, type GlobeContextProviderProps, useGlobeContext } from '../../hooks';
22
24
  import {
23
25
  type Features,
@@ -135,11 +137,11 @@ const GlobeRoot = (props: GlobeRootProps) => {
135
137
  );
136
138
 
137
139
  return (
138
- <div ref={containerRef} class={`relative flex grow overflow-hidden ${props.class ?? ''}`} {...props}>
139
- <GlobeContextProvider size={size()} {...props}>
140
+ <GlobeContextProvider size={size()} {...props}>
141
+ <div ref={containerRef} class={mx('relative dx-container')} {...props}>
140
142
  {props.children}
141
- </GlobeContextProvider>
142
- </div>
143
+ </div>
144
+ </GlobeContextProvider>
143
145
  );
144
146
  };
145
147
 
@@ -205,9 +207,9 @@ const GlobeCanvas = (props: GlobeCanvasProps) => {
205
207
  },
206
208
  translation,
207
209
  rotation,
208
- setZoom: (s) => {
209
- if (typeof s === 'function') {
210
- const is = interpolateNumber(zoomValue, s(zoomValue));
210
+ setZoom: (state) => {
211
+ if (typeof state === 'function') {
212
+ const is = interpolateNumber(zoomValue, state(zoomValue));
211
213
  // Stop easing if already zooming.
212
214
  transition()
213
215
  .ease(zooming ? easeLinear : easeSinOut)
@@ -221,8 +223,8 @@ const GlobeCanvas = (props: GlobeCanvasProps) => {
221
223
  zooming = false;
222
224
  });
223
225
  } else {
224
- zoomValue = s;
225
- setZoom(s);
226
+ zoomValue = state;
227
+ setZoom(state);
226
228
  }
227
229
  },
228
230
  setTranslation,
@@ -278,7 +280,7 @@ const GlobeDebug = (props: { position?: ControlPosition }) => {
278
280
  const { size, zoom, translation, rotation } = useGlobeContext();
279
281
  return (
280
282
  <div
281
- class={`z-10 absolute w-96 p-2 overflow-hidden border border-green-700 rounded ${
283
+ class={`z-10 absolute w-96 p-2 overflow-hidden border border-green-700 rounded-sm ${
282
284
  controlPositions[props.position ?? 'topleft']
283
285
  }`}
284
286
  >
@@ -7,7 +7,6 @@ import { type Meta, type StoryObj } from 'storybook-solidjs-vite';
7
7
 
8
8
  import { useMapZoomHandler } from '../../hooks';
9
9
  import { type GeoMarker } from '../../types';
10
-
11
10
  import { Map, type MapController } from './Map';
12
11
 
13
12
  const DefaultStory = ({ markers = [] }: { markers?: GeoMarker[] }) => {
@@ -55,6 +55,7 @@ const useMapContext = (displayName: string) => {
55
55
  if (!context) {
56
56
  throw new Error(`${displayName} must be used within Map.Root`);
57
57
  }
58
+
58
59
  return context;
59
60
  };
60
61
 
@@ -63,8 +64,8 @@ const useMapContext = (displayName: string) => {
63
64
  //
64
65
 
65
66
  type MapRootProps = {
66
- children: JSX.Element;
67
67
  ref?: (controller: MapController) => void;
68
+ children: JSX.Element;
68
69
  class?: string;
69
70
  scrollWheelZoom?: boolean;
70
71
  doubleClickZoom?: boolean;
@@ -277,7 +278,7 @@ const CustomControl = (props: { children: JSX.Element; position: ControlPosition
277
278
 
278
279
  const Control = L.Control.extend({
279
280
  onAdd: () => {
280
- const container = L.DomUtil.create('div', `${controlPositions[props.position]} !m-0`);
281
+ const container = L.DomUtil.create('div', `${controlPositions[props.position]} m-0!`);
281
282
  L.DomEvent.disableClickPropagation(container);
282
283
  L.DomEvent.disableScrollPropagation(container);
283
284
 
@@ -24,7 +24,7 @@ export const ZoomControls = (props: ControlProps): JSX.Element => {
24
24
  <div class={`flex flex-row gap-2 ${props.class ?? ''}`}>
25
25
  <button
26
26
  type='button'
27
- class='dx-button dx-focus-ring w-10 h-10 min-bs-[2.5rem] pli-3 rounded-sm flex items-center justify-center'
27
+ class='dx-button dx-focus-ring w-10 h-10 min-h-[2.5rem] px-3 rounded-xs flex items-center justify-center'
28
28
  onClick={() => props.onAction?.('zoom-in')}
29
29
  title='Zoom in'
30
30
  >
@@ -32,7 +32,7 @@ export const ZoomControls = (props: ControlProps): JSX.Element => {
32
32
  </button>
33
33
  <button
34
34
  type='button'
35
- class='dx-button dx-focus-ring w-10 h-10 min-bs-[2.5rem] pli-3 rounded-sm flex items-center justify-center'
35
+ class='dx-button dx-focus-ring w-10 h-10 min-h-[2.5rem] px-3 rounded-xs flex items-center justify-center'
36
36
  onClick={() => props.onAction?.('zoom-out')}
37
37
  title='Zoom out'
38
38
  >
@@ -47,7 +47,7 @@ export const ActionControls = (props: ControlProps): JSX.Element => {
47
47
  <div class={`flex flex-row gap-2 ${props.class ?? ''}`}>
48
48
  <button
49
49
  type='button'
50
- class='dx-button dx-focus-ring w-10 h-10 min-bs-[2.5rem] pli-3 rounded-sm flex items-center justify-center'
50
+ class='dx-button dx-focus-ring w-10 h-10 min-h-[2.5rem] px-3 rounded-xs flex items-center justify-center'
51
51
  onClick={() => props.onAction?.('start')}
52
52
  title='Start'
53
53
  >
@@ -55,7 +55,7 @@ export const ActionControls = (props: ControlProps): JSX.Element => {
55
55
  </button>
56
56
  <button
57
57
  type='button'
58
- class='dx-button dx-focus-ring w-10 h-10 min-bs-[2.5rem] pli-3 rounded-sm flex items-center justify-center'
58
+ class='dx-button dx-focus-ring w-10 h-10 min-h-[2.5rem] px-3 rounded-xs flex items-center justify-center'
59
59
  onClick={() => props.onAction?.('toggle')}
60
60
  title='Toggle'
61
61
  >
@@ -7,7 +7,6 @@ import { type Timer } from 'd3';
7
7
  import { createEffect, createSignal, onCleanup } from 'solid-js';
8
8
 
9
9
  import { type GlobeController } from '../components';
10
-
11
10
  import { type Vector } from './context';
12
11
 
13
12
  export type SpinnerOptions = {
@@ -7,7 +7,6 @@ import { feature, mesh } from 'topojson-client';
7
7
  import { type Topology } from 'topojson-specification';
8
8
 
9
9
  import { type LatLngLiteral } from '../types';
10
-
11
10
  import { geoLine, geoPoint } from './path';
12
11
 
13
12
  export type Styles = Record<string, any>;