fix(web): selection lost when update layer style etc. (#1192)

reearth · Oct 23, 2024 · 270a26d · 270a26d
1 parent 8b7e485
commit 270a26d
Show file tree

Hide file tree

Showing 6 changed files with 1,593 additions and 1,380 deletions.
diff --git a/web/src/beta/features/Editor/hooks/index.ts b/web/src/beta/features/Editor/hooks/index.ts
@@ -99,7 +99,7 @@ export default ({ sceneId, projectId, tab }: Props) => {
     currentProjectType,
     handleProjectTypeChange,
     handleLayerSelectFromUI,
-    handleCoreLayerSelectFromUI,
+    handleCoreLayerSelectFromMap,
     handleSceneSettingSelectFromUI,
     dataSourceLayerCreatorShown,
     openDataSourceLayerCreator,
@@ -333,7 +333,7 @@ export default ({ sceneId, projectId, tab }: Props) => {
     handleSketchFeatureCreate,
     handleSketchFeatureUpdate,
     handleIsVisualizerUpdate,
-    handleCoreLayerSelectFromUI,
+    handleCoreLayerSelectFromMap,
     selectStoryPage,
     selectWidgetArea,
     mapPageValue,

diff --git a/web/src/beta/features/Editor/hooks/useSketch.ts b/web/src/beta/features/Editor/hooks/useSketch.ts
@@ -120,7 +120,9 @@ export default ({
 
   useEffect(() => {
     // Workaround: in order to show the indicator of the selected sketch feature we need to unselect it first.
-    visualizerRef?.current?.layers.select(undefined);
+    if (pendingSketchSelectionRef.current) {
+      visualizerRef?.current?.layers.select(undefined);
+    }
     // Workaround: we can't get an notice from core after nlsLayers got updated.
     // Therefore we need to get and select the latest sketch feature manually delayed.
     setTimeout(() => {

diff --git a/web/src/beta/features/Editor/hooks/useUI.ts b/web/src/beta/features/Editor/hooks/useUI.ts
@@ -68,7 +68,7 @@ export default ({
     ]
   );
 
-  const handleCoreLayerSelectFromUI = useCallback(
+  const handleCoreLayerSelectFromMap = useCallback(
     (props: LayerSelectProps) => {
       handleSceneSettingSelect(undefined);
       handleCoreLayerSelect(props);
@@ -142,7 +142,7 @@ export default ({
     currentProjectType,
     handleProjectTypeChange,
     handleLayerSelectFromUI,
-    handleCoreLayerSelectFromUI,
+    handleCoreLayerSelectFromMap,
     handleSceneSettingSelectFromUI,
     dataSourceLayerCreatorShown,
     openDataSourceLayerCreator,

diff --git a/web/src/beta/features/Editor/hooks/useUISelection.ts b/web/src/beta/features/Editor/hooks/useUISelection.ts
@@ -14,29 +14,25 @@ export const useUISelection = ({
 }) => {
   const handleLayerStyleSelected = useCallback(
     (layerStyleId: string) => {
-      handleLayerSelect(undefined);
-      handleSceneSettingSelect(undefined);
       handleLayerStyleSelect(layerStyleId);
     },
-    [handleLayerStyleSelect, handleSceneSettingSelect, handleLayerSelect]
+    [handleLayerStyleSelect]
   );
 
   const handleLayerSelected = useCallback(
     (layerId: string) => {
-      handleLayerStyleSelect(undefined);
       handleSceneSettingSelect(undefined);
       handleLayerSelect({ layerId });
     },
-    [handleLayerSelect, handleSceneSettingSelect, handleLayerStyleSelect]
+    [handleLayerSelect, handleSceneSettingSelect]
   );
 
   const handleSceneSettingSelected = useCallback(
     (collection?: string) => {
-      handleLayerStyleSelect(undefined);
       handleLayerSelect(undefined);
       handleSceneSettingSelect(collection);
     },
-    [handleLayerSelect, handleSceneSettingSelect, handleLayerStyleSelect]
+    [handleLayerSelect, handleSceneSettingSelect]
   );
 
   return {

diff --git a/web/src/beta/features/Editor/index.tsx b/web/src/beta/features/Editor/index.tsx
@@ -42,7 +42,7 @@ const Editor: FC<Props> = ({ sceneId, projectId, workspaceId, tab }) => {
     handleSketchFeatureCreate,
     handleSketchFeatureUpdate,
     handleIsVisualizerUpdate,
-    handleCoreLayerSelectFromUI,
+    handleCoreLayerSelectFromMap,
     selectStoryPage,
     selectWidgetArea,
     mapPageValue,
@@ -92,7 +92,7 @@ const Editor: FC<Props> = ({ sceneId, projectId, workspaceId, tab }) => {
               onSketchFeatureCreate={handleSketchFeatureCreate}
               onSketchFeatureUpdate={handleSketchFeatureUpdate}
               onVisualizerReady={handleIsVisualizerUpdate}
-              onCoreLayerSelect={handleCoreLayerSelectFromUI}
+              onCoreLayerSelect={handleCoreLayerSelectFromMap}
               onCoreAPIReady={handleCoreAPIReady}
               setSelectedStoryPageId={selectStoryPage}
               selectWidgetArea={selectWidgetArea}