@bian-womp/spark-workbench 0.2.87 → 0.2.89

package/lib/cjs/index.cjs

@@ -5123,30 +5123,26 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
     };
     const onContextMenu = (e) => {
         e.preventDefault();
-        // First, check if the cursor is inside the rectangular bounds of the current selection
-        const selectionBounds = getSelectionScreenBounds();
-        if (selectionBounds) {
-            const { left, top, right, bottom } = selectionBounds;
-            if (e.clientX >= left &&
-                e.clientX <= right &&
-                e.clientY >= top &&
-                e.clientY <= bottom) {
-                setSelectionMenuPos({ x: e.clientX, y: e.clientY });
-                setSelectionMenuOpen(true);
-                setMenuOpen(false);
-                setNodeMenuOpen(false);
-                return;
-            }
-        }
+        const selection = wb.getSelection();
+        const isSingleNodeSelected = selection.nodes.length === 1;
+        const hasMultipleNodesSelected = selection.nodes.length > 1;
         // Determine if right-clicked over a node by hit-testing
         const target = e.target?.closest(".react-flow__node");
         if (target) {
             // Resolve node id from data-id attribute React Flow sets
             const nodeId = target.getAttribute("data-id");
-            const selection = wb.getSelection();
             const isSelected = nodeId && selection.nodes.includes(nodeId);
-            if (isSelected) {
-                // Right-clicked on a selected node - show selection menu
+            if (isSelected && isSingleNodeSelected) {
+                // Right-clicked on the single selected node - show node menu
+                setNodeAtMenu(nodeId);
+                setNodeMenuPos({ x: e.clientX, y: e.clientY });
+                setNodeMenuOpen(true);
+                setMenuOpen(false);
+                setSelectionMenuOpen(false);
+                return;
+            }
+            else if (isSelected) {
+                // Right-clicked on a node that's part of multi-selection - show selection menu
                 setSelectionMenuPos({ x: e.clientX, y: e.clientY });
                 setSelectionMenuOpen(true);
                 setMenuOpen(false);
@@ -5167,10 +5163,45 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
         const edgeTarget = e.target?.closest(".react-flow__edge");
         if (edgeTarget) {
             const edgeId = edgeTarget.getAttribute("data-id");
-            const selection = wb.getSelection();
             const isSelected = edgeId && selection.edges.includes(edgeId);
-            if (isSelected) {
-                // Right-clicked on a selected edge - show selection menu
+            if (isSelected && isSingleNodeSelected) {
+                // Right-clicked on an edge, but only one node is selected - show node menu
+                const nodeId = selection.nodes[0];
+                setNodeAtMenu(nodeId);
+                setNodeMenuPos({ x: e.clientX, y: e.clientY });
+                setNodeMenuOpen(true);
+                setMenuOpen(false);
+                setSelectionMenuOpen(false);
+                return;
+            }
+            else if (isSelected) {
+                // Right-clicked on a selected edge with multiple nodes - show selection menu
+                setSelectionMenuPos({ x: e.clientX, y: e.clientY });
+                setSelectionMenuOpen(true);
+                setMenuOpen(false);
+                setNodeMenuOpen(false);
+                return;
+            }
+        }
+        // If only one node is selected (even with edges), show node menu for empty space clicks
+        if (isSingleNodeSelected) {
+            const nodeId = selection.nodes[0];
+            setNodeAtMenu(nodeId);
+            setNodeMenuPos({ x: e.clientX, y: e.clientY });
+            setNodeMenuOpen(true);
+            setMenuOpen(false);
+            setSelectionMenuOpen(false);
+            return;
+        }
+        // Check if the cursor is inside the rectangular bounds of the current selection
+        // (for multi-selection when right-clicking on empty space within selection bounds)
+        const selectionBounds = getSelectionScreenBounds();
+        if (selectionBounds && hasMultipleNodesSelected) {
+            const { left, top, right, bottom } = selectionBounds;
+            if (e.clientX >= left &&
+                e.clientX <= right &&
+                e.clientY >= top &&
+                e.clientY <= bottom) {
                 setSelectionMenuPos({ x: e.clientX, y: e.clientY });
                 setSelectionMenuOpen(true);
                 setMenuOpen(false);
@@ -5178,7 +5209,7 @@ const WorkbenchCanvas = React.forwardRef(({ showValues, toString, toElement, get
                 return;
             }
         }
-        // Right-clicked on empty space - show default menu
+        // Right-clicked on empty space with no selection - show default menu
         setMenuPos({ x: e.clientX, y: e.clientY });
         setMenuOpen(true);
         setNodeMenuOpen(false);