@reearth/core 0.0.7-alpha.26 → 0.0.7-alpha.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reearth/core",
-  "version": "0.0.7-alpha.26",
+  "version": "0.0.7-alpha.28",
   "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

@@ -385,13 +385,9 @@ export default function ({
   interactionModeRef.current = interactionMode;
 
   useEffect(() => {
-    overrideInteractionModeRef.current?.(
-      type || sketchEditingFeature
-        ? "sketch"
-        : interactionModeRef.current === "sketch"
-          ? "default"
-          : interactionModeRef.current,
-    );
+    if ((sketchEditingFeature || type) && interactionModeRef.current !== "sketch") {
+      overrideInteractionModeRef.current?.("sketch");
+    }
   }, [type, sketchEditingFeature]);
 
   const isEditingRef = useRef(isEditing);
@@ -404,6 +400,11 @@ export default function ({
     if (isEditingRef.current) {
       cancelEditRef.current();
     }
+    if (type === undefined) {
+      overrideInteractionModeRef.current?.(
+        interactionModeRef.current === "sketch" ? "default" : interactionModeRef.current,
+      );
+    }
   }, [type]);
 
   const typeRef = useRef(type);
@@ -413,8 +414,6 @@ export default function ({
     if (interactionMode !== "sketch") {
       if (isEditingRef.current) {
         cancelEditRef.current();
-      } else if (typeRef.current !== undefined) {
-        updateType(undefined);
       }
     }
   }, [interactionMode, updateType]);