@dxos/solid-ui-geo 0.8.4-main.6fa680abb7 → 0.8.4-main.74a063c4e0

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.6fa680abb7",
3
+ "version": "0.8.4-main.74a063c4e0",
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/async": "0.8.4-main.6fa680abb7",
53
- "@dxos/node-std": "0.8.4-main.6fa680abb7",
54
- "@dxos/log": "0.8.4-main.6fa680abb7",
55
- "@dxos/debug": "0.8.4-main.6fa680abb7",
56
- "@dxos/ui-theme": "0.8.4-main.6fa680abb7",
57
- "@dxos/util": "0.8.4-main.6fa680abb7"
52
+ "@dxos/async": "0.8.4-main.74a063c4e0",
53
+ "@dxos/debug": "0.8.4-main.74a063c4e0",
54
+ "@dxos/log": "0.8.4-main.74a063c4e0",
55
+ "@dxos/node-std": "0.8.4-main.74a063c4e0",
56
+ "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
57
+ "@dxos/util": "0.8.4-main.74a063c4e0"
58
58
  },
59
59
  "devDependencies": {
60
60
  "@solidjs/testing-library": "^0.8.10",
@@ -68,7 +68,7 @@
68
68
  "geojson2h3": "^1.2.0",
69
69
  "solid-js": "^1.9.11",
70
70
  "vite-plugin-solid": "^2.11.10",
71
- "@dxos/storybook-utils": "0.8.4-main.6fa680abb7"
71
+ "@dxos/storybook-utils": "0.8.4-main.74a063c4e0"
72
72
  },
73
73
  "peerDependencies": {
74
74
  "solid-js": "^1.9.11"
@@ -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
 
@@ -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[] }) => {
@@ -64,8 +64,8 @@ const useMapContext = (displayName: string) => {
64
64
  //
65
65
 
66
66
  type MapRootProps = {
67
- children: JSX.Element;
68
67
  ref?: (controller: MapController) => void;
68
+ children: JSX.Element;
69
69
  class?: string;
70
70
  scrollWheelZoom?: boolean;
71
71
  doubleClickZoom?: boolean;
@@ -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>;