@babylonjs/node-editor 5.0.4 → 5.3.0

package/dist/babylon.nodeEditor.max.js

@@ -65199,7 +65199,7 @@ class GraphCanvasComponent extends react__WEBPACK_IMPORTED_MODULE_1__.Component
         this._frameIsMoving = false;
         this._isLoading = false;
         props.globalState.onSelectionChangedObservable.add((options) => {
-            const { selection, forceKeepSelection } = options || {};
+            const { selection, forceKeepSelection, marqueeSelection = false } = options || {};
             if (!selection) {
                 this._selectedNodes = [];
                 this._selectedLink = null;
@@ -65213,41 +65213,6 @@ class GraphCanvasComponent extends react__WEBPACK_IMPORTED_MODULE_1__.Component
                     this._selectedLink = selection;
                     this._selectedPort = null;
                 }
-                else if (selection instanceof _graphFrame__WEBPACK_IMPORTED_MODULE_7__.GraphFrame && !this._selectedNodes.length) {
-                    if (selection.isCollapsed) {
-                        if (this._ctrlKeyIsPressed || forceKeepSelection) {
-                            if (this._selectedFrames.indexOf(selection) === -1) {
-                                this._selectedFrames.push(selection);
-                            }
-                        }
-                        else {
-                            this._selectedFrames = [selection];
-                            this._selectedNodes = [];
-                            this._selectedLink = null;
-                            this._selectedPort = null;
-                        }
-                    }
-                    else {
-                        this._selectedNodes = [];
-                        this._selectedFrames = [selection];
-                        this._selectedLink = null;
-                        this._selectedPort = null;
-                    }
-                }
-                else if (selection instanceof _graphNode__WEBPACK_IMPORTED_MODULE_3__.GraphNode) {
-                    if (this._ctrlKeyIsPressed || forceKeepSelection) {
-                        if (this._selectedNodes.indexOf(selection) === -1) {
-                            this._selectedNodes.push(selection);
-                            this._selectedFrames = [];
-                        }
-                    }
-                    else {
-                        this._selectedNodes = [selection];
-                        this._selectedFrames = [];
-                        this._selectedLink = null;
-                        this._selectedPort = null;
-                    }
-                }
                 else if (selection instanceof _nodePort__WEBPACK_IMPORTED_MODULE_6__.NodePort) {
                     this._selectedNodes = [];
                     this._selectedFrames = [];
@@ -65260,6 +65225,57 @@ class GraphCanvasComponent extends react__WEBPACK_IMPORTED_MODULE_1__.Component
                     this._selectedLink = null;
                     this._selectedPort = selection.port;
                 }
+                else if (selection instanceof _graphNode__WEBPACK_IMPORTED_MODULE_3__.GraphNode || selection instanceof _graphFrame__WEBPACK_IMPORTED_MODULE_7__.GraphFrame) {
+                    // If in marquee selection mode, always prioritize selecting nodes. Otherwise, always prioritize selecting the type of
+                    // the selected element
+                    if (marqueeSelection) {
+                        if (selection instanceof _graphFrame__WEBPACK_IMPORTED_MODULE_7__.GraphFrame && !this._selectedFrames.includes(selection)) {
+                            this._selectedFrames.push(selection);
+                        }
+                        else if (selection instanceof _graphNode__WEBPACK_IMPORTED_MODULE_3__.GraphNode && !this._selectedNodes.includes(selection)) {
+                            this._selectedNodes.push(selection);
+                        }
+                        if (this._selectedFrameAndNodesConflict(this.selectedFrames, this.selectedNodes)) {
+                            const framesToRemove = new Set();
+                            for (const selectedNode of this._selectedNodes) {
+                                for (const selectedFrame of this._selectedFrames) {
+                                    if (selectedFrame.nodes.includes(selectedNode)) {
+                                        framesToRemove.add(selectedFrame);
+                                    }
+                                }
+                            }
+                            this._selectedFrames = this._selectedFrames.filter((f) => !framesToRemove.has(f));
+                        }
+                    }
+                    else {
+                        if (selection instanceof _graphFrame__WEBPACK_IMPORTED_MODULE_7__.GraphFrame) {
+                            if (this._ctrlKeyIsPressed || forceKeepSelection) {
+                                if (!this._selectedFrameAndNodesConflict([selection], this._selectedNodes) && !this._selectedFrames.includes(selection)) {
+                                    this._selectedFrames.push(selection);
+                                }
+                            }
+                            else {
+                                this._selectedFrames = [selection];
+                                this._selectedNodes = [];
+                                this._selectedLink = null;
+                                this._selectedPort = null;
+                            }
+                        }
+                        else if (selection instanceof _graphNode__WEBPACK_IMPORTED_MODULE_3__.GraphNode) {
+                            if (this._ctrlKeyIsPressed || forceKeepSelection) {
+                                if (!this._selectedFrameAndNodesConflict(this._selectedFrames, [selection]) && !this._selectedNodes.includes(selection)) {
+                                    this._selectedNodes.push(selection);
+                                }
+                            }
+                            else {
+                                this._selectedFrames = [];
+                                this._selectedNodes = [selection];
+                                this._selectedLink = null;
+                                this._selectedPort = null;
+                            }
+                        }
+                    }
+                }
             }
         });
         props.globalState.onCandidatePortSelectedObservable.add((port) => {
@@ -65363,6 +65379,17 @@ class GraphCanvasComponent extends react__WEBPACK_IMPORTED_MODULE_1__.Component
     get frameContainer() {
         return this._frameContainer;
     }
+    // There is a selection conflict between nodes and frames if any selected node is inside any selected frame
+    _selectedFrameAndNodesConflict(frameSelection, nodeSelection) {
+        for (const frame of frameSelection) {
+            for (const node of nodeSelection) {
+                if (frame.nodes.includes(node)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
     getGridPosition(position, useCeil = false) {
         const gridSize = this.gridSize;
         if (gridSize === 0) {
@@ -66581,7 +66608,7 @@ class GraphFrame {
             const rect2 = this.element.getBoundingClientRect();
             const overlap = !(rect1.right < rect2.left || rect1.left > rect2.right || rect1.bottom < rect2.top || rect1.top > rect2.bottom);
             if (overlap) {
-                canvas.globalState.onSelectionChangedObservable.notifyObservers({ selection: this, forceKeepSelection: true });
+                canvas.globalState.onSelectionChangedObservable.notifyObservers({ selection: this, forceKeepSelection: true, marqueeSelection: true });
             }
         });
         this._onGraphNodeRemovalObserver = canvas.globalState.onGraphNodeRemovalObservable.add((node) => {
@@ -67416,7 +67443,7 @@ class GraphNode {
         this._onSelectionBoxMovedObserver = this._globalState.onSelectionBoxMoved.add((rect1) => {
             const rect2 = this._visual.getBoundingClientRect();
             const overlap = !(rect1.right < rect2.left || rect1.left > rect2.right || rect1.bottom < rect2.top || rect1.top > rect2.bottom);
-            this.isSelected = overlap;
+            this.setIsSelected(overlap, true);
         });
         this._onFrameCreatedObserver = this._globalState.onFrameCreatedObservable.add((frame) => {
             if (this._ownerCanvas.frames.some((f) => f.nodes.indexOf(this) !== -1)) {
@@ -67514,6 +67541,9 @@ class GraphNode {
         this._enclosingFrameId = value;
     }
     set isSelected(value) {
+        this.setIsSelected(value, false);
+    }
+    setIsSelected(value, marqueeSelection) {
         if (this._isSelected === value) {
             return;
         }
@@ -67526,7 +67556,7 @@ class GraphNode {
             }
         }
         else {
-            this._globalState.onSelectionChangedObservable.notifyObservers({ selection: this });
+            this._globalState.onSelectionChangedObservable.notifyObservers({ selection: this, marqueeSelection });
         }
     }
     isOverlappingFrame(frame) {
@@ -67622,7 +67652,7 @@ class GraphNode {
             this._globalState.onSelectionChangedObservable.notifyObservers({ selection: this });
         }
         else if (evt.ctrlKey) {
-            this.isSelected = false;
+            this.setIsSelected(false, false);
         }
         evt.stopPropagation();
         for (const selectedNode of this._ownerCanvas.selectedNodes) {
@@ -67775,10 +67805,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "NodeLink": () => (/* binding */ NodeLink)
 /* harmony export */ });
 /* harmony import */ var _graphCanvas__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./graphCanvas */ "../../../tools/nodeEditor/dist/diagram/graphCanvas.js");
-/* harmony import */ var core_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core/Misc/observable */ "core/Misc/dataStorage");
+/* harmony import */ var core_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core/Materials/Node/Enums/nodeMaterialBlockConnectionPointTypes */ "core/Misc/dataStorage");
 /* harmony import */ var core_Misc_observable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_Misc_observable__WEBPACK_IMPORTED_MODULE_1__);
 
 
+
 class NodeLink {
     constructor(graphCanvas, portA, nodeA, portB, nodeB) {
         this._isVisible = true;
@@ -67872,13 +67903,16 @@ class NodeLink {
     }
     onClick(evt) {
         if (evt.altKey) {
+            const nodeA = this._nodeA;
+            const pointA = this._portA.connectionPoint;
+            const nodeB = this._nodeB;
+            const pointB = this._portB.connectionPoint;
+            if (pointA.type === core_Misc_observable__WEBPACK_IMPORTED_MODULE_1__.NodeMaterialBlockConnectionPointTypes.Object || pointB.type === core_Misc_observable__WEBPACK_IMPORTED_MODULE_1__.NodeMaterialBlockConnectionPointTypes.Object) {
+                return; // We do not support Elbow on complex types
+            }
             // Create an elbow at the clicked location
             this._graphCanvas.globalState.onNewNodeCreatedObservable.addOnce((newNode) => {
                 const newElbowBlock = newNode.block;
-                const nodeA = this._nodeA;
-                const pointA = this._portA.connectionPoint;
-                const nodeB = this._nodeB;
-                const pointB = this._portB.connectionPoint;
                 // Delete previous link
                 this.dispose();
                 // Connect to Elbow block