@reearth/core 0.0.7-alpha.31 → 0.0.7-alpha.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reearth/core",
-  "version": "0.0.7-alpha.31",
+  "version": "0.0.7-alpha.32",
   "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/Sketch/hooks.ts

@@ -16,6 +16,7 @@ import { v4 as uuidv4 } from "uuid";
 import { InterpreterFrom, StateFrom } from "xstate";
 
 import { ControlPointMouseEventHandler } from "../../engines/Cesium/Sketch";
+import { useWindowEvent } from "../../utils/use-window-event";
 import { InteractionModeType } from "../../Visualizer/interactionMode";
 import { Feature, EngineRef, LayersRef, SketchRef } from "../types";
 import { useGet } from "../utils";
@@ -34,7 +35,6 @@ import {
 import usePluginSketchLayer from "./usePluginSketchLayer";
 import useSketch from "./useSketch";
 import useSketchFeature from "./useSketchFeature";
-import { useWindowEvent } from "./utils";
 
 import { OnLayerSelectType } from ".";
 

package/src/Map/SpatialId/hooks.ts

@@ -10,6 +10,7 @@ import {
 } from "react";
 import { v4 as uuid } from "uuid";
 
+import { useWindowEvent } from "../../utils/use-window-event";
 import { InteractionModeType } from "../../Visualizer";
 import { EngineRef, MouseEventProps } from "../types";
 
@@ -48,6 +49,7 @@ export default ({
   const [verticalSpaceIndicator, setVerticalSpaceIndicator] =
     useState<VerticalSpaceIndicatorType | null>(null);
   const [coordinateSelector, setCoordinateSelector] = useState<CoordinateSelectorType | null>(null);
+  const lastCoordinateSelector = useRef<CoordinateSelectorType | null>(null);
   const [spaceSelector, setSpaceSelector] = useState<SpatialIdSpaceType | null>(null);
 
   const [basePosition, setBasePosition] = useState<[number, number, number] | null>(null);
@@ -114,6 +116,7 @@ export default ({
     setBaseCoordinate(null);
     setSpaceSelector(null);
     setCoordinateSelector(null);
+    lastCoordinateSelector.current = null;
     setVerticalSpaceIndicator(null);
     overrideInteractionMode?.(
       interactionModeRef.current === "spatialId"
@@ -141,6 +144,7 @@ export default ({
           }) ?? null,
         );
 
+        lastCoordinateSelector.current = coordinateSelector;
         setCoordinateSelector(null);
 
         const initialSpaceSelectorSpace = createSpatialIdSpace(
@@ -271,7 +275,7 @@ export default ({
     ],
   );
 
-  const handleMouseRightClick = useCallback(() => {
+  const cancel = useCallback(() => {
     if (state === "idle") return;
     if (state === "coordinate" && pickOptions.rightClickToExit) {
       finishPicking();
@@ -280,11 +284,22 @@ export default ({
       setBasePosition(null);
       setBaseCoordinate(null);
       setVerticalSpaceIndicator(null);
+      setCoordinateSelector(lastCoordinateSelector.current);
       setState("coordinate");
     }
     engineRef.current?.requestRender();
   }, [state, pickOptions, engineRef, finishPicking]);
 
+  const handleMouseRightClick = useCallback(() => {
+    cancel();
+  }, [cancel]);
+
+  useWindowEvent("keydown", event => {
+    if (event.code === "Escape") {
+      cancel();
+    }
+  });
+
   // bind mouse events
   const eventsBinded = useRef(false);