@reearth/core 0.0.7-alpha.61 → 0.0.7-alpha.63

package/dist/index.d.ts

@@ -6,11 +6,11 @@ import { CSSProperties } from 'react';
 import { Feature as Feature_2 } from 'geojson';
 import { ForwardRefExoticComponent } from 'react';
 import { LineString } from 'geojson';
+import { MemoExoticComponent } from 'react';
 import { MultiLineString } from 'geojson';
 import { MultiPoint } from 'geojson';
 import { MultiPolygon } from 'geojson';
 import { MutableRefObject } from 'react';
-import { NamedExoticComponent } from 'react';
 import { Point } from 'geojson';
 import { Polygon as Polygon_2 } from 'geojson';
 import { PropsWithoutRef } from 'react';
@@ -160,7 +160,6 @@ export declare type CameraProperty = {
 
 export declare type Cesium3DTilesAppearance = {
     show?: boolean;
-    height?: number;
     color?: string;
     styleUrl?: string;
     shadows?: "disabled" | "enabled" | "cast_only" | "receive_only";
@@ -280,7 +279,7 @@ declare type CommonProps = {
     sketchEditingFeature?: SketchEditingFeature;
 };
 
-export declare function computeAtom(cache?: typeof globalDataFeaturesCache): WritableAtom<ComputedLayer | undefined, [Command], void>;
+export declare function computeAtom(cache?: typeof globalDataFeaturesCache): WritableAtom<ComputedLayer | undefined, Command, void>;
 
 export declare type ComputedFeature = CommonFeature<"computedFeature"> & Partial<AppearanceTypes>;
 
@@ -335,9 +334,9 @@ declare type CoreContext = {
 
 export declare const coreContext: Context<CoreContext>;
 
-export declare const CoreVisualizer: NamedExoticComponent<CoreVisualizerProps & {
-children?: ReactNode | undefined;
-} & RefAttributes<MapRef>>;
+export declare const CoreVisualizer: MemoExoticComponent<ForwardRefExoticComponent<CoreVisualizerProps & {
+children?: ReactNode;
+} & RefAttributes<MapRef>>>;
 
 export declare type CoreVisualizerProps = {
     engine?: EngineType;
@@ -368,22 +367,16 @@ export declare type CoreVisualizerProps = {
     onSketchFeatureDelete?: (layerId: string, featureId: string) => void;
     onInteractionModeChange?: (mode: InteractionModeType) => void;
     onAPIReady?: () => void;
-    onCreditsUpdate?: (credits?: Credits) => void;
+    onCreditsUpdate?: (credits: Credit[]) => void;
 };
 
-export declare type CreditItem = {
+export declare type Credit = {
     html?: string;
 };
 
-export declare type Credits = {
-    engine: {
-        cesium?: CreditItem;
-    };
-    lightbox: CreditItem[];
-    screen: CreditItem[];
-};
+export declare type CursorType = "auto" | "grab" | "crosshair";
 
-declare type CursorType = "default" | "auto" | "help" | "pointer" | "grab" | "crosshair" | "wait";
+declare type CursorType_2 = "default" | "auto" | "help" | "pointer" | "grab" | "crosshair";
 
 export declare type Data = {
     type: DataType;
@@ -512,7 +505,7 @@ export declare type EngineProps = {
     shouldRender?: boolean;
     meta?: Record<string, unknown>;
     displayCredits?: boolean;
-    layersRef?: RefObject<LayersRef | null>;
+    layersRef?: RefObject<LayersRef>;
     requestingRenderMode?: MutableRefObject<RequestingRenderMode>;
     timelineManagerRef?: TimelineManagerRef;
     onLayerSelect?: (layerId: string | undefined, featureId?: string, options?: LayerSelectionReason, info?: SelectedFeatureInfo) => void;
@@ -526,7 +519,7 @@ export declare type EngineProps = {
     onLayerSelectWithRectStart?: (e: LayerSelectWithRectStart) => void;
     onLayerSelectWithRectMove?: (e: LayerSelectWithRectMove) => void;
     onLayerSelectWithRectEnd?: (e: LayerSelectWithRectEnd) => void;
-    onCreditsUpdate?: (credits?: Credits) => void;
+    onCreditsUpdate?: (credits: Credit[]) => void;
 };
 
 export declare type EngineRef = {
@@ -564,7 +557,7 @@ export declare type EngineRef = {
         type: SketchType;
         controlPoints: Position3d[];
     }) => LineString | Polygon_2 | MultiPolygon | Point | undefined;
-    setCursor: (cursor: CursorType) => void;
+    setCursor: (cursor: CursorType_2) => void;
     flyTo: FlyTo;
     flyToBBox: (bbox: [number, number, number, number], options?: CameraOptions & {
         heading?: number;
@@ -603,7 +596,7 @@ export declare type EngineRef = {
     tick: () => Date | void;
     inViewport: (location?: LatLng) => boolean;
     onTick: TickEvent;
-    tickEventCallback?: RefObject<TickEventCallback[] | null>;
+    tickEventCallback?: RefObject<TickEventCallback[]>;
     removeTickEventListener: TickEvent;
     findFeatureById: (layerId: string, featureId: string) => Feature | undefined;
     bringToFront: (layerId: string) => void;
@@ -615,7 +608,7 @@ export declare type EngineRef = {
     unselectFeatures: (layerId: string, featureId: string[]) => void;
     pickManyFromViewport: (windowPosition: [x: number, y: number], windowWidth: number, windowHeight: number, condition?: (f: PickedFeature) => boolean) => PickedFeature[] | undefined;
     calcRectangleControlPoint: (p1: Position3d, p2: Position3d, p3: Position3d) => [p1: Position3d, p2: Position3d, p3: Position3d];
-    getCredits: () => Credits | undefined;
+    getCredits: () => Credit[] | undefined;
 } & MouseEventHandles;
 
 export declare const engines: {
@@ -772,17 +765,6 @@ export declare type FrustumAppearance = {
     length?: number;
 };
 
-export declare type GeoidProperty = {
-    server: {
-        url: string;
-        geoidProperty: string;
-    };
-};
-
-declare type GeoidRef = {
-    getGeoidHeight: (lat?: number, lng?: number) => Promise<number | undefined>;
-};
-
 export declare type Geometry = Point | LineString | Polygon_2 | MultiPoint | MultiLineString | MultiPolygon;
 
 export declare type GeometryOptionsXYZ = {
@@ -794,11 +776,11 @@ export declare function getCompat(l: Layer | undefined): LayerCompat | undefined
 
 declare const globalDataFeaturesCache: {
     get: Atom_2<(key: string, key2: string) => Feature[] | undefined>;
-    set: WritableAtom<null, [value: {
+    set: WritableAtom<null, {
     key: string;
     key2: string;
     value?: Feature[] | undefined;
-    }], void> & {
+    }, void> & {
         init: null;
     };
     getAll: Atom_2<(key: string) => Feature[][] | undefined>;
@@ -1108,10 +1090,12 @@ export declare type LookAtDestination = {
 export declare type LUT = readonly ColorTuple[];
 
 declare const Map_2: ForwardRefExoticComponent<    {
-engines?: Record<string, Engine>;
-engine?: string;
-onAPIReady?: () => void;
-} & Omit<Props_2, "Feature" | "viewerProperty" | "selectionReason" | "delegatedDataTypes" | "clusterComponent" | "selectedLayerId"> & Omit<EngineProps, "onLayerSelect" | "selectedLayerId" | "layerSelectionReason"> & Omit<SketchProps, "engineRef" | "SketchComponent" | "layersRef"> & RefAttributes<MapRef>>;
+engines?: Record<string, Engine> | undefined;
+engine?: string | undefined;
+onAPIReady?: (() => void) | undefined;
+} & Omit<Props_2, "Feature" | "viewerProperty" | "selectionReason" | "delegatedDataTypes" | "clusterComponent" | "selectedLayerId"> & Omit<EngineProps, "onLayerSelect" | "selectedLayerId" | "layerSelectionReason"> & Omit<SketchProps, "engineRef" | "SketchComponent" | "layersRef"> & {
+cursor?: CursorType | undefined;
+} & RefAttributes<MapRef>>;
 export { Map_2 as Map }
 
 export declare type MapRef = {
@@ -1119,7 +1103,6 @@ export declare type MapRef = {
     layers: WrappedRef<LayersRef>;
     sketch: WrappedRef<SketchRef>;
     spatialId?: WrappedRef<SpatialIdRef>;
-    geoid: WrappedRef<GeoidRef>;
     timeline?: TimelineManagerRef;
 };
 
@@ -1172,7 +1155,6 @@ export declare type ModelAppearance = {
     model?: string;
     url?: string;
     heightReference?: "none" | "clamp" | "relative";
-    height?: number;
     heading?: number;
     pitch?: number;
     roll?: number;
@@ -1356,7 +1338,9 @@ export declare type Props = {
     engines?: Record<string, Engine>;
     engine?: string;
     onAPIReady?: () => void;
-} & Omit<Props_2, "Feature" | "clusterComponent" | "selectionReason" | "delegatedDataTypes" | "selectedLayerId" | "viewerProperty"> & Omit<EngineProps, "onLayerSelect" | "layerSelectionReason" | "selectedLayerId"> & Omit<SketchProps, "layersRef" | "engineRef" | "SketchComponent">;
+} & Omit<Props_2, "Feature" | "clusterComponent" | "selectionReason" | "delegatedDataTypes" | "selectedLayerId" | "viewerProperty"> & Omit<EngineProps, "onLayerSelect" | "layerSelectionReason" | "selectedLayerId"> & Omit<SketchProps, "layersRef" | "engineRef" | "SketchComponent"> & {
+    cursor?: CursorType;
+};
 
 declare type Props_2 = Omit<Props_3, "atomMap" | "isHidden" | "selectedLayerId"> & {
     selectedLayer?: {
@@ -1367,7 +1351,7 @@ declare type Props_2 = Omit<Props_3, "atomMap" | "isHidden" | "selectedLayerId">
     hiddenLayers?: string[];
     viewerProperty?: ViewerProperty;
     requestingRenderMode?: MutableRefObject<RequestingRenderMode>;
-    engineRef?: RefObject<EngineRef | null>;
+    engineRef?: RefObject<EngineRef>;
     onLayerSelect?: (layerId: string | undefined, featureId: string | undefined, layer: (() => Promise<ComputedLayer | undefined>) | undefined, reason: LayerSelectionReason | undefined, info: SelectedFeatureInfo | undefined) => void;
     onMount?: () => void;
 };
@@ -1551,8 +1535,8 @@ export declare type SketchOptions = {
 };
 
 export declare type SketchProps = {
-    layersRef: RefObject<LayersRef | null>;
-    engineRef: RefObject<EngineRef | null>;
+    layersRef: RefObject<LayersRef>;
+    engineRef: RefObject<EngineRef>;
     SketchComponent?: SketchComponentType;
     selectedFeature?: Feature;
     interactionMode?: InteractionModeType;
@@ -1616,16 +1600,9 @@ export declare type Spacing = {
 declare type SpatialIdPickSpaceOptions = {
     zoom?: number;
     maxHeight?: number;
-    minHeight?: number;
+    color?: string;
     dataOnly?: boolean;
     rightClickToExit?: boolean;
-    color?: string;
-    outlineColor?: string;
-    groundIndicatorColor?: string;
-    selectorColor?: string;
-    selectorOutlineColor?: string;
-    verticalSpaceIndicatorColor?: string;
-    verticalSpaceIndicatorOutlineColor?: string;
 };
 
 declare type SpatialIdRef = {
@@ -1727,7 +1704,7 @@ declare type TimelineCommit = (PlayCommand | PauseCommand | SetTimeCommand | Set
 };
 
 export declare type TimelineCommitter = {
-    source: string;
+    source: "widgetContext" | "pluginAPI" | "featureResource" | "storyTimelineBlock" | "storyPage" | "initialize";
     id?: string;
 };
 
@@ -1791,7 +1768,7 @@ export declare type Undefinable<T extends object> = {
 
 export declare function useGet<T>(value: T): () => T;
 
-export declare const useVisualizer: () => RefObject<MapRef | null>;
+export declare const useVisualizer: () => RefObject<MapRef>;
 
 export declare type ValueType = keyof ValueTypes;
 
@@ -1816,7 +1793,6 @@ export declare type ValueTypes = {
 
 export declare type ViewerProperty = {
     globe?: GlobeProperty;
-    geoid?: GeoidProperty;
     terrain?: TerrainProperty;
     scene?: SceneProperty;
     tiles?: TileProperty[];
@@ -1836,7 +1812,7 @@ export declare type Viewport = {
     query: Record<string, string>;
 };
 
-export declare type VisualizerContext = RefObject<MapRef | null>;
+export declare type VisualizerContext = RefObject<MapRef>;
 
 export declare type WrappedRef<T> = {
     [P in keyof T as T[P] extends (...args: any[]) => any ? P : never]: T[P] extends (...args: infer A) => infer R ? (...args: A) => R | undefined : never;
@@ -1845,8 +1821,38 @@ export declare type WrappedRef<T> = {
 export { }
 
 
+declare global {
+    interface Window {
+        REEARTH_E2E_ACCESS_TOKEN?: string;
+        REEARTH_E2E_CESIUM_VIEWER?: any;
+    }
+}
+
+
 declare module "@cesium/engine" {
     namespace SceneTransforms {
         function transformWindowToDrawingBuffer(scene: Scene, windowPosition: Cartesian2, result?: Cartesian2): Cartesian2;
     }
 }
+
+
+    namespace SceneTransforms {
+        function transformWindowToDrawingBuffer(scene: Scene, windowPosition: Cartesian2, result?: Cartesian2): Cartesian2;
+    }
+
+
+declare global {
+    namespace Vi {
+        interface JestAssertion<T = any> extends jest.Matchers<void, T>, EmotionMatchers {
+            toHaveStyleRule: EmotionMatchers["toHaveStyleRule"];
+        }
+    }
+}
+
+
+    namespace Vi {
+        interface JestAssertion<T = any> extends jest.Matchers<void, T>, EmotionMatchers {
+            toHaveStyleRule: EmotionMatchers["toHaveStyleRule"];
+        }
+    }
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reearth/core",
-  "version": "0.0.7-alpha.61",
+  "version": "0.0.7-alpha.63",
   "author": "Re:Earth contributors <community@reearth.io>",
   "license": "Apache-2.0",
   "description": "A library that abstracts a map engine as one common API.",

package/src/Map/Layers/hooks.ts

@@ -204,6 +204,12 @@ export default function useHooks({
     ),
   );
 
+  // Store getComputedLayer in a ref to avoid recreating prototypes on every change
+  const getComputedLayerRef = useRef(getComputedLayer);
+  useEffect(() => {
+    getComputedLayerRef.current = getComputedLayer;
+  }, [getComputedLayer]);
+
   const lazyComputedLayerPrototype = useMemo<object>(() => {
     return objectFromGetter(
       // id and layer should not be accessible
@@ -212,12 +218,12 @@ export default function useHooks({
         const id: string | undefined = (this as any).id;
         if (!id || typeof id !== "string") throw new Error("layer ID is not specified");
 
-        const layer = getComputedLayer(id);
+        const layer = getComputedLayerRef.current(id);
         if (!layer) return undefined;
         return (layer as any)[key];
       },
     );
-  }, [getComputedLayer]);
+  }, []);
 
   const lazyLayerPrototype = useMemo<object>(() => {
     return objectFromGetter(layerKeys, function (key) {
@@ -237,7 +243,7 @@ export default function useHooks({
       else if (key === "isVisible") return layer.visible;
       // computed
       else if (key === "computed") {
-        const computedLayer = getComputedLayer(layer.id);
+        const computedLayer = getComputedLayerRef.current(layer.id);
         if (!computedLayer) return undefined;
         const computed = Object.create(lazyComputedLayerPrototype);
         computed.id = id;
@@ -246,7 +252,7 @@ export default function useHooks({
 
       return (layer as any)[key];
     });
-  }, [getComputedLayer, layerMap, lazyComputedLayerPrototype]);
+  }, [layerMap, lazyComputedLayerPrototype]);
 
   const findById = useCallback(
     (layerId: string): LazyLayer | undefined => {