#3005 - Unable to 'undo' the paste action, if there is no reset to Se…

…lect tool
epam · Feb 27, 2024 · ab96b27 · ab96b27
1 parent 9e7af50
commit ab96b27
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/packages/ketcher-react/src/script/editor/Editor.ts b/packages/ketcher-react/src/script/editor/Editor.ts
@@ -538,17 +538,18 @@ class Editor implements KetcherEditor {
 
     this.selection(null);
 
-    if (this._tool instanceof toolsMap.paste) {
-      this.event.change.dispatch();
-      return;
-    }
-
     this.historyPtr--;
     const stack = this.historyStack[this.historyPtr];
     const action = stack.perform(this.render.ctab);
 
     this.historyStack[this.historyPtr] = action;
-    this.event.change.dispatch(action);
+
+    if (this._tool instanceof toolsMap.paste) {
+      this.event.change.dispatch();
+    } else {
+      this.event.change.dispatch(action);
+    }
+
     this.render.update();
   }
 
@@ -562,15 +563,17 @@ class Editor implements KetcherEditor {
     }
 
     this.selection(null);
-    if (this._tool instanceof toolsMap.paste) {
-      this.event.change.dispatch();
-      return;
-    }
 
     const action = this.historyStack[this.historyPtr].perform(this.render.ctab);
     this.historyStack[this.historyPtr] = action;
     this.historyPtr++;
-    this.event.change.dispatch(action);
+
+    if (this._tool instanceof toolsMap.paste) {
+      this.event.change.dispatch();
+    } else {
+      this.event.change.dispatch(action);
+    }
+
     this.render.update();
   }