Fix nodes getting unselected after drag

- [Part of comment](#166 (review))
MOV-AI · Jul 24, 2023 · 84cecbc · 84cecbc
1 parent 01ac748
commit 84cecbc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/src/editors/Flow/view/Components/interface/MainInterface.js b/src/editors/Flow/view/Components/interface/MainInterface.js
@@ -422,8 +422,6 @@ export default class MainInterface {
    * @returns {MainInterface} : The instance
    */
   addSubscribers = () => {
-    this.mode.default.onEnter.subscribe(this.onDefault);
-
     // drag mode -> onExit event
     this.mode.drag.onExit.subscribe(this.onDragEnd);
 
@@ -464,10 +462,6 @@ export default class MainInterface {
    *                                                                                      */
   //========================================================================================
 
-  onDefault = () => {
-    this.selectedNodes = [];
-  };
-
   onDragEnd = draggedNode => {
     const selectedNodesSet = new Set([draggedNode].concat(this._selectedNodes));
     const nodes = Array.from(selectedNodesSet).filter(obj => obj);

diff --git a/src/editors/Flow/view/Components/interface/canvas.js b/src/editors/Flow/view/Components/interface/canvas.js
@@ -3,6 +3,7 @@ import { Subject } from "rxjs";
 import FlowModel from "../../../model/Flow";
 import { defaultFunction } from "../../../../../utils/Utils";
 import Factory from "../../Components/Nodes/Factory";
+import { PLUGINS } from "../../../../../utils/Constants";
 import {
   FLOW_VIEW_MODE,
   CANVAS_LIMITS,
@@ -522,8 +523,13 @@ class Canvas {
     if (this.mode.current.onClick)
       this.mode.current.onClick.next();
     else {
-      this.setMode(EVT_NAMES.DEFAULT, null, true);
       this.mInterface.selectedNodes = [];
+      this.mInterface.docManager(
+        PLUGINS.RIGHT_DRAWER.NAME,
+        PLUGINS.RIGHT_DRAWER.CALL.REMOVE_BOOKMARK,
+        "node-menu",
+        "detail-menu"
+      );
     }
   };
 

diff --git a/src/editors/Flow/view/Core/Graph/GraphBase.js b/src/editors/Flow/view/Core/Graph/GraphBase.js
@@ -626,8 +626,6 @@ export default class GraphBase {
   };
 
   reset() {
-    // Reset all selected nodes
-    this.mInterface.selectedNodes = [];
     // Reset selected link
     if (this.selectedLink) {
       this.selectedLink.onSelected(false);

diff --git a/src/editors/Flow/view/Flow.jsx b/src/editors/Flow/view/Flow.jsx
@@ -756,7 +756,6 @@ export const Flow = (props, ref) => {
   const setFlowsToDefault = useCallback(() => {
     activateEditor();
     // Remove selected node and link bookmark
-    onNodeSelected(null);
     onLinkSelected(null);
     // Update render of right menu
     // broadcast event to other flows
@@ -766,7 +765,7 @@ export const Flow = (props, ref) => {
       PLUGINS.DOC_MANAGER.ON.FLOW_EDITOR,
       { action: "setMode", value: EVT_NAMES.DEFAULT }
     );
-  }, [call, onLinkSelected, onNodeSelected]);
+  }, [call, onLinkSelected]);
 
   /**
    * Subscribe to mainInterface and canvas events