fix: Prevent losing preserved state on initialization

Gondragos · Gondragos · commit 2f79dd13eef8 · 2025-02-06T16:31:42.000Z
Add an `isInitial` flag to differentiate between initial and user-triggered tool selection. This prevents unnecessary actions during default tool assignment or preserved tool restoration. Updates ensure proper handling of state transitions with minimal side effects.
diff --git a/web/libs/editor/src/mixins/Tool.js b/web/libs/editor/src/mixins/Tool.js
@@ -73,11 +73,11 @@ const ToolMixin = types
     },
   }))
   .actions((self) => ({
-    setSelected(selected) {
+    setSelected(selected, isInitial) {
       self.selected = selected;
       self.afterUpdateSelected();
 
-      if (selected && self.obj) {
+      if (!isInitial && selected && self.obj) {
         const storeName = `selected-tool:${self.obj.name}`;
 
         if (self.shouldPreserveSelectedState) {
diff --git a/web/libs/editor/src/tools/Manager.js b/web/libs/editor/src/tools/Manager.js
@@ -73,13 +73,13 @@ class ToolsManager {
     if (this.preservedTool && tool.shouldPreserveSelectedState) {
       if (tool.fullName === this.preservedTool && tool.setSelected) {
         this.unselectAll();
-        this.selectTool(tool, true);
+        this.selectTool(tool, true, true);
         return;
       }
     }
 
     if (this._default_tool && !this.hasSelected) {
-      this.selectTool(this._default_tool, true);
+      this.selectTool(this._default_tool, true, true);
     }
   }
 
@@ -97,7 +97,7 @@ class ToolsManager {
     }
   }
 
-  selectTool(tool, selected) {
+  selectTool(tool, selected, isInitial = false) {
     const currentTool = this.findSelectedTool();
     const newSelection = tool?.group;
 
@@ -122,7 +122,7 @@ class ToolsManager {
 
     if (selected) {
       this.unselectAll();
-      tool.setSelected?.(true);
+      tool.setSelected?.(true, isInitial);
     } else {
       const drawingTool = this.findDrawingTool();
 

Original file line number	Diff line number	Diff line change
`@@ -73,13 +73,13 @@ class ToolsManager {`
`73`	`73`	`if (this.preservedTool && tool.shouldPreserveSelectedState) {`
`74`	`74`	`if (tool.fullName === this.preservedTool && tool.setSelected) {`
`75`	`75`	`this.unselectAll();`
`76`		`- this.selectTool(tool, true);`
	`76`	`+ this.selectTool(tool, true, true);`
`77`	`77`	`return;`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`if (this._default_tool && !this.hasSelected) {`
`82`		`- this.selectTool(this._default_tool, true);`
	`82`	`+ this.selectTool(this._default_tool, true, true);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`@@ -97,7 +97,7 @@ class ToolsManager {`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`		`- selectTool(tool, selected) {`
	`100`	`+ selectTool(tool, selected, isInitial = false) {`
`101`	`101`	`const currentTool = this.findSelectedTool();`
`102`	`102`	`const newSelection = tool?.group;`
`103`	`103`
`@@ -122,7 +122,7 @@ class ToolsManager {`
`122`	`122`
`123`	`123`	`if (selected) {`
`124`	`124`	`this.unselectAll();`
`125`		`- tool.setSelected?.(true);`
	`125`	`+ tool.setSelected?.(true, isInitial);`
`126`	`126`	`} else {`
`127`	`127`	`const drawingTool = this.findDrawingTool();`
`128`	`128`