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

…lect tool
epam · Feb 27, 2024 · 29989d6 · 29989d6
1 parent 9e7af50
commit 29989d6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/...totests/tests/Reactions/Reaction-tools/Plus-and-Arrow-tools/plus-and-arrows-tools.spec.ts b/...totests/tests/Reactions/Reaction-tools/Plus-and-Arrow-tools/plus-and-arrows-tools.spec.ts
@@ -238,7 +238,7 @@ test.describe('Plus and Arrows tools ', () => {
       page,
     }) => {
       await copyAndPaste(page);
-      await page.mouse.move(point.x - 100, point.y - 100);
+      await page.mouse.click(point.x - 100, point.y - 100);
       await takeEditorScreenshot(page);
       await selectTopPanelButton(TopPanelButton.Undo, page);
       await takeEditorScreenshot(page);
@@ -305,7 +305,7 @@ test.describe('Plus and Arrows tools ', () => {
       page,
     }) => {
       await copyAndPaste(page);
-      await page.mouse.move(point.x - 100, point.y - 100);
+      await page.mouse.click(point.x - 100, point.y - 100);
       await takeEditorScreenshot(page);
       await selectTopPanelButton(TopPanelButton.Undo, page);
       await takeEditorScreenshot(page);

diff --git a/...-Undo-Redo-Actions-when-switch-reset-to-Select-tool-is-Off-1-chromium-linux.png b/...-Undo-Redo-Actions-when-switch-reset-to-Select-tool-is-Off-1-chromium-linux.png
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();
   }