@inditextech/weave-sdk 5.1.5 → 5.2.1

package/dist/sdk.js

@@ -36,13 +36,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-//#region ../../node_modules/emittery/maps.js
+//#region node_modules/emittery/maps.js
 const anyMap = new WeakMap();
 const eventsMap = new WeakMap();
 const producersMap = new WeakMap();
 
 //#endregion
-//#region ../../node_modules/emittery/index.js
+//#region node_modules/emittery/index.js
 const anyProducer = Symbol("anyProducer");
 const resolvedPromise = Promise.resolve();
 const listenerAdded = Symbol("listenerAdded");
@@ -4432,23 +4432,12 @@ var TransformerController = class {
 			if (this.tr.nodes().length === 1 && this.tr.nodes()[0].getAttrs().isContainerPrincipal) {
 				const pos = stage.getPointerPosition();
 				if (!pos) return;
+				const back = this.tr.findOne(".back");
+				if (!back) return;
 				const shapeUnder = stage.getIntersection(pos);
-				if (!shapeUnder) {
-					this.tr.setAttrs({ listening: true });
-					this.tr.forceUpdate();
-				}
-				if (shapeUnder && this.tr.getChildren().includes(shapeUnder) && shapeUnder.name() === "back") {
-					this.tr.setAttrs({ listening: false });
-					this.tr.forceUpdate();
-				}
-				if (shapeUnder && this.tr.nodes()[0].getChildren().includes(shapeUnder)) {
-					this.tr.setAttrs({ listening: false });
-					this.tr.forceUpdate();
-				}
-				if (shapeUnder && !this.tr.getChildren().includes(shapeUnder) && this.tr.nodes()[0].getChildren().includes(shapeUnder)) {
-					this.tr.setAttrs({ listening: true });
-					this.tr.forceUpdate();
-				}
+				if (shapeUnder === back) back.listening(false);
+				else back.listening(true);
+				this.tr.forceUpdate();
 			}
 		};
 		stage.on("pointermove", (0, import_throttle.default)(handlePointerMoveInit, DEFAULT_THROTTLE_MS));
@@ -5029,7 +5018,7 @@ function handlePointerDown(ctx, e) {
 	const stage = ctx.getWeaveInstance().getStage();
 	if (stage.mode() !== WEAVE_STAGE_DEFAULT_MODE) return;
 	const selectedGroup = getTargetedNode(ctx.getWeaveInstance());
-	if (selectedGroup?.getParent() instanceof Konva.Transformer) {
+	if (selectedGroup?.getParent() instanceof Konva.Transformer && selectedGroup?.hasName("back")) {
 		ctx.setAreaSelecting(false);
 		ctx.getEdgePanning().stop();
 		ctx.getAreaSelector().hide();
@@ -8598,6 +8587,20 @@ var WeaveGroupsManager = class {
 			parentId
 		};
 	}
+	selectRenderedNode(nodeId, triggerSelectionEvent = false) {
+		this.instance.addOnceEventListener("onStateChange", () => {
+			this.getNodesMultiSelectionFeedbackPlugin()?.cleanupSelectedHalos();
+			const node = this.instance.getStage().findOne(`#${nodeId}`);
+			const selectionPlugin = this.instance.getPlugin("nodesSelection");
+			if (node && selectionPlugin) {
+				const tr = selectionPlugin.getTransformer();
+				selectionPlugin.setSelectedNodes([node]);
+				tr.show();
+				tr.forceUpdate();
+				if (triggerSelectionEvent) selectionPlugin.triggerSelectedNodesEvent();
+			}
+		});
+	}
 	group(nodes) {
 		this.instance.stateTransactional(() => {
 			this.logger.debug({ nodes }, "Grouping nodes");
@@ -8688,17 +8691,7 @@ var WeaveGroupsManager = class {
 				groupNode.y(0);
 				this.instance.updateNodeNT(groupHandler.serialize(groupNode));
 			}
-			setTimeout(() => {
-				this.getNodesMultiSelectionFeedbackPlugin()?.cleanupSelectedHalos();
-				const groupNode$1 = stage.findOne(`#${groupId}`);
-				const selectionPlugin$1 = this.instance.getPlugin("nodesSelection");
-				if (groupNode$1 && selectionPlugin$1) {
-					const tr = selectionPlugin$1.getTransformer();
-					selectionPlugin$1.setSelectedNodes([groupNode$1]);
-					tr.show();
-					tr.forceUpdate();
-				}
-			}, 10);
+			this.selectRenderedNode(groupId);
 		});
 	}
 	unGroup(group) {
@@ -8710,6 +8703,11 @@ var WeaveGroupsManager = class {
 				this.logger.debug({ group }, "Group instance doesn't exists, cannot un-group");
 				return;
 			}
+			const selectionPlugin = this.instance.getPlugin("nodesSelection");
+			if (selectionPlugin) {
+				const tr = selectionPlugin.getTransformer();
+				tr.hide();
+			}
 			let nodeId = void 0;
 			let newLayer = this.instance.getMainLayer();
 			if (konvaGroup.getParent() && konvaGroup.getParent() instanceof Konva.Group && konvaGroup.getParent()?.getAttrs().nodeId) {
@@ -8762,6 +8760,7 @@ var WeaveGroupsManager = class {
 					node.key = newNodeId;
 					node.props.id = newNodeId;
 					for (const prop of Object.keys(node.props)) if (typeof node.props[prop] === "string") node.props[prop] = node.props[prop].replace(oldId, newNodeId);
+					newChildId = newNodeId;
 					this.instance.addNodeNT(node, nodeId ?? newLayer.getAttrs().id);
 				}
 				child.destroy();
@@ -8771,12 +8770,7 @@ var WeaveGroupsManager = class {
 				const groupNode = groupHandler.serialize(konvaGroup);
 				this.instance.removeNodeNT(groupNode, { emitUserChangeEvent: false });
 			}
-			setTimeout(() => {
-				this.getNodesMultiSelectionFeedbackPlugin()?.cleanupSelectedHalos();
-				const firstElement = newLayer.findOne(`#${newChildId}`);
-				const selectionPlugin = this.instance.getPlugin("nodesSelection");
-				if (firstElement && selectionPlugin) selectionPlugin.setSelectedNodes([firstElement]);
-			}, 0);
+			if (newChildId) this.selectRenderedNode(newChildId, true);
 		});
 	}
 	extractTransformFromMatrix(m) {
@@ -9782,7 +9776,7 @@ var WeaveRegisterManager = class {
 
 //#endregion
 //#region package.json
-var version = "5.1.5";
+var version = "5.2.1";
 
 //#endregion
 //#region src/managers/setup.ts
@@ -15670,7 +15664,9 @@ var WeaveImageNode = class extends WeaveNode {
 				transformer.hide();
 				utilityLayer?.destroyChildren();
 				this.renderCropMode(utilityLayer, image);
-				utilityLayer?.show();
+				utilityLayer.show();
+				utilityLayer.draw();
+				this.updateCropCursorForCurrentPointer();
 			});
 			image.on("onCmdCtrlReleased", () => {
 				const utilityLayer = this.instance.getUtilityLayer();
@@ -15750,6 +15746,24 @@ var WeaveImageNode = class extends WeaveNode {
 			y: 1 / stageScale
 		});
 	}
+	getCropAnchorCursor(position) {
+		if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_LEFT || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.TOP_RIGHT) return "nesw-resize";
+		if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.TOP_LEFT || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_RIGHT) return "nwse-resize";
+		if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.MIDDLE_RIGHT || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.MIDDLE_LEFT) return "ew-resize";
+		if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.TOP_CENTER || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_CENTER) return "ns-resize";
+		return void 0;
+	}
+	updateCropCursorForCurrentPointer() {
+		const stage = this.instance.getStage();
+		const pointerPosition = stage.getPointerPosition?.();
+		if (!pointerPosition) return;
+		const intersection = stage.getIntersection?.(pointerPosition);
+		if (!intersection) return;
+		const position = intersection.getAttr("cropAnchorPosition");
+		if (!position) return;
+		const cursor = this.getCropAnchorCursor(position);
+		if (cursor) stage.container().style.cursor = cursor;
+	}
 	renderCropAnchor(position, node, layer, onClick) {
 		const transform = node.getAbsoluteTransform().copy();
 		const stage = this.instance.getStage();
@@ -15801,6 +15815,7 @@ var WeaveImageNode = class extends WeaveNode {
 			name: "cropMode",
 			rotation: node.rotation()
 		});
+		anchor.setAttr("cropAnchorPosition", position);
 		this.config.cropMode.selection.anchorStyleFunc(anchor, position);
 		layer.add(anchor);
 		anchor.scale({
@@ -15823,10 +15838,8 @@ var WeaveImageNode = class extends WeaveNode {
 		if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.MIDDLE_LEFT) anchor.setAbsolutePosition(absoluteCorners[6]);
 		if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_CENTER) anchor.setAbsolutePosition(absoluteCorners[7]);
 		anchor.on("pointerover", () => {
-			if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_LEFT || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.TOP_RIGHT) this.instance.getStage().container().style.cursor = "nesw-resize";
-			if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.TOP_LEFT || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_RIGHT) this.instance.getStage().container().style.cursor = "nwse-resize";
-			if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.MIDDLE_RIGHT || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.MIDDLE_LEFT) this.instance.getStage().container().style.cursor = "ew-resize";
-			if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.TOP_CENTER || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_CENTER) this.instance.getStage().container().style.cursor = "ns-resize";
+			const cursor = this.getCropAnchorCursor(position);
+			if (cursor) this.instance.getStage().container().style.cursor = cursor;
 		});
 		anchor.on("pointerdown", () => {
 			onClick();
@@ -30885,6 +30898,7 @@ var WeaveContextMenuPlugin = class extends WeavePlugin {
 	triggerContextMenu(eventTarget, target) {
 		const stage = this.instance.getStage();
 		const selectionPlugin = this.getSelectionPlugin();
+		const selectedNodes = selectionPlugin?.getSelectedNodes() ?? [];
 		let nodes = [];
 		if (target && target !== stage) {
 			const nodeHandler = this.instance.getNodeHandler(target.getAttrs().nodeType);
@@ -30901,6 +30915,14 @@ var WeaveContextMenuPlugin = class extends WeavePlugin {
 				node: nodeHandler?.serialize(node)
 			};
 		});
+		const targetIsPartOfMultiSelection = target !== void 0 && selectedNodes.length > 1 && selectedNodes.some((selectedNode) => selectedNode.getAttrs().id === target.getAttrs().id);
+		if (targetIsPartOfMultiSelection) nodes = selectedNodes.map((node) => {
+			const nodeHandler = this.instance.getNodeHandler(node.getAttrs().nodeType);
+			return {
+				instance: node,
+				node: nodeHandler?.serialize(node)
+			};
+		});
 		if (this.contextMenuVisible) this.closeContextMenu();
 		let allNodesMutexUnlocked = true;
 		let allNodesUnlocked = true;
@@ -30918,7 +30940,7 @@ var WeaveContextMenuPlugin = class extends WeavePlugin {
 			}
 		}
 		if (!allNodesMutexUnlocked || !allNodesUnlocked) return;
-		if (selectionPlugin && !(eventTarget.getParent() instanceof Konva.Transformer && selectionPlugin.getSelectedNodes().length > 0)) {
+		if (selectionPlugin && !(eventTarget.getParent() instanceof Konva.Transformer && selectedNodes.length > 0) && !targetIsPartOfMultiSelection) {
 			selectionPlugin.setSelectedNodes([...nodes.map((node) => node.instance)]);
 			selectionPlugin.getHoverTransformer().nodes([]);
 		}

package/dist/sdk.node.js

@@ -36,13 +36,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-//#region ../../node_modules/emittery/maps.js
+//#region node_modules/emittery/maps.js
 const anyMap = new WeakMap();
 const eventsMap = new WeakMap();
 const producersMap = new WeakMap();
 
 //#endregion
-//#region ../../node_modules/emittery/index.js
+//#region node_modules/emittery/index.js
 const anyProducer = Symbol("anyProducer");
 const resolvedPromise = Promise.resolve();
 const listenerAdded = Symbol("listenerAdded");
@@ -4431,23 +4431,12 @@ var TransformerController = class {
 			if (this.tr.nodes().length === 1 && this.tr.nodes()[0].getAttrs().isContainerPrincipal) {
 				const pos = stage.getPointerPosition();
 				if (!pos) return;
+				const back = this.tr.findOne(".back");
+				if (!back) return;
 				const shapeUnder = stage.getIntersection(pos);
-				if (!shapeUnder) {
-					this.tr.setAttrs({ listening: true });
-					this.tr.forceUpdate();
-				}
-				if (shapeUnder && this.tr.getChildren().includes(shapeUnder) && shapeUnder.name() === "back") {
-					this.tr.setAttrs({ listening: false });
-					this.tr.forceUpdate();
-				}
-				if (shapeUnder && this.tr.nodes()[0].getChildren().includes(shapeUnder)) {
-					this.tr.setAttrs({ listening: false });
-					this.tr.forceUpdate();
-				}
-				if (shapeUnder && !this.tr.getChildren().includes(shapeUnder) && this.tr.nodes()[0].getChildren().includes(shapeUnder)) {
-					this.tr.setAttrs({ listening: true });
-					this.tr.forceUpdate();
-				}
+				if (shapeUnder === back) back.listening(false);
+				else back.listening(true);
+				this.tr.forceUpdate();
 			}
 		};
 		stage.on("pointermove", (0, import_throttle.default)(handlePointerMoveInit, DEFAULT_THROTTLE_MS));
@@ -5028,7 +5017,7 @@ function handlePointerDown(ctx, e) {
 	const stage = ctx.getWeaveInstance().getStage();
 	if (stage.mode() !== WEAVE_STAGE_DEFAULT_MODE) return;
 	const selectedGroup = getTargetedNode(ctx.getWeaveInstance());
-	if (selectedGroup?.getParent() instanceof Konva.Transformer) {
+	if (selectedGroup?.getParent() instanceof Konva.Transformer && selectedGroup?.hasName("back")) {
 		ctx.setAreaSelecting(false);
 		ctx.getEdgePanning().stop();
 		ctx.getAreaSelector().hide();
@@ -8597,6 +8586,20 @@ var WeaveGroupsManager = class {
 			parentId
 		};
 	}
+	selectRenderedNode(nodeId, triggerSelectionEvent = false) {
+		this.instance.addOnceEventListener("onStateChange", () => {
+			this.getNodesMultiSelectionFeedbackPlugin()?.cleanupSelectedHalos();
+			const node = this.instance.getStage().findOne(`#${nodeId}`);
+			const selectionPlugin = this.instance.getPlugin("nodesSelection");
+			if (node && selectionPlugin) {
+				const tr = selectionPlugin.getTransformer();
+				selectionPlugin.setSelectedNodes([node]);
+				tr.show();
+				tr.forceUpdate();
+				if (triggerSelectionEvent) selectionPlugin.triggerSelectedNodesEvent();
+			}
+		});
+	}
 	group(nodes) {
 		this.instance.stateTransactional(() => {
 			this.logger.debug({ nodes }, "Grouping nodes");
@@ -8687,17 +8690,7 @@ var WeaveGroupsManager = class {
 				groupNode.y(0);
 				this.instance.updateNodeNT(groupHandler.serialize(groupNode));
 			}
-			setTimeout(() => {
-				this.getNodesMultiSelectionFeedbackPlugin()?.cleanupSelectedHalos();
-				const groupNode$1 = stage.findOne(`#${groupId}`);
-				const selectionPlugin$1 = this.instance.getPlugin("nodesSelection");
-				if (groupNode$1 && selectionPlugin$1) {
-					const tr = selectionPlugin$1.getTransformer();
-					selectionPlugin$1.setSelectedNodes([groupNode$1]);
-					tr.show();
-					tr.forceUpdate();
-				}
-			}, 10);
+			this.selectRenderedNode(groupId);
 		});
 	}
 	unGroup(group) {
@@ -8709,6 +8702,11 @@ var WeaveGroupsManager = class {
 				this.logger.debug({ group }, "Group instance doesn't exists, cannot un-group");
 				return;
 			}
+			const selectionPlugin = this.instance.getPlugin("nodesSelection");
+			if (selectionPlugin) {
+				const tr = selectionPlugin.getTransformer();
+				tr.hide();
+			}
 			let nodeId = void 0;
 			let newLayer = this.instance.getMainLayer();
 			if (konvaGroup.getParent() && konvaGroup.getParent() instanceof Konva.Group && konvaGroup.getParent()?.getAttrs().nodeId) {
@@ -8761,6 +8759,7 @@ var WeaveGroupsManager = class {
 					node.key = newNodeId;
 					node.props.id = newNodeId;
 					for (const prop of Object.keys(node.props)) if (typeof node.props[prop] === "string") node.props[prop] = node.props[prop].replace(oldId, newNodeId);
+					newChildId = newNodeId;
 					this.instance.addNodeNT(node, nodeId ?? newLayer.getAttrs().id);
 				}
 				child.destroy();
@@ -8770,12 +8769,7 @@ var WeaveGroupsManager = class {
 				const groupNode = groupHandler.serialize(konvaGroup);
 				this.instance.removeNodeNT(groupNode, { emitUserChangeEvent: false });
 			}
-			setTimeout(() => {
-				this.getNodesMultiSelectionFeedbackPlugin()?.cleanupSelectedHalos();
-				const firstElement = newLayer.findOne(`#${newChildId}`);
-				const selectionPlugin = this.instance.getPlugin("nodesSelection");
-				if (firstElement && selectionPlugin) selectionPlugin.setSelectedNodes([firstElement]);
-			}, 0);
+			if (newChildId) this.selectRenderedNode(newChildId, true);
 		});
 	}
 	extractTransformFromMatrix(m) {
@@ -9781,7 +9775,7 @@ var WeaveRegisterManager = class {
 
 //#endregion
 //#region package.json
-var version = "5.1.5";
+var version = "5.2.1";
 
 //#endregion
 //#region src/managers/setup.ts
@@ -15669,7 +15663,9 @@ var WeaveImageNode = class extends WeaveNode {
 				transformer.hide();
 				utilityLayer?.destroyChildren();
 				this.renderCropMode(utilityLayer, image);
-				utilityLayer?.show();
+				utilityLayer.show();
+				utilityLayer.draw();
+				this.updateCropCursorForCurrentPointer();
 			});
 			image.on("onCmdCtrlReleased", () => {
 				const utilityLayer = this.instance.getUtilityLayer();
@@ -15749,6 +15745,24 @@ var WeaveImageNode = class extends WeaveNode {
 			y: 1 / stageScale
 		});
 	}
+	getCropAnchorCursor(position) {
+		if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_LEFT || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.TOP_RIGHT) return "nesw-resize";
+		if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.TOP_LEFT || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_RIGHT) return "nwse-resize";
+		if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.MIDDLE_RIGHT || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.MIDDLE_LEFT) return "ew-resize";
+		if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.TOP_CENTER || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_CENTER) return "ns-resize";
+		return void 0;
+	}
+	updateCropCursorForCurrentPointer() {
+		const stage = this.instance.getStage();
+		const pointerPosition = stage.getPointerPosition?.();
+		if (!pointerPosition) return;
+		const intersection = stage.getIntersection?.(pointerPosition);
+		if (!intersection) return;
+		const position = intersection.getAttr("cropAnchorPosition");
+		if (!position) return;
+		const cursor = this.getCropAnchorCursor(position);
+		if (cursor) stage.container().style.cursor = cursor;
+	}
 	renderCropAnchor(position, node, layer, onClick) {
 		const transform = node.getAbsoluteTransform().copy();
 		const stage = this.instance.getStage();
@@ -15800,6 +15814,7 @@ var WeaveImageNode = class extends WeaveNode {
 			name: "cropMode",
 			rotation: node.rotation()
 		});
+		anchor.setAttr("cropAnchorPosition", position);
 		this.config.cropMode.selection.anchorStyleFunc(anchor, position);
 		layer.add(anchor);
 		anchor.scale({
@@ -15822,10 +15837,8 @@ var WeaveImageNode = class extends WeaveNode {
 		if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.MIDDLE_LEFT) anchor.setAbsolutePosition(absoluteCorners[6]);
 		if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_CENTER) anchor.setAbsolutePosition(absoluteCorners[7]);
 		anchor.on("pointerover", () => {
-			if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_LEFT || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.TOP_RIGHT) this.instance.getStage().container().style.cursor = "nesw-resize";
-			if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.TOP_LEFT || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_RIGHT) this.instance.getStage().container().style.cursor = "nwse-resize";
-			if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.MIDDLE_RIGHT || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.MIDDLE_LEFT) this.instance.getStage().container().style.cursor = "ew-resize";
-			if (position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.TOP_CENTER || position === WEAVE_IMAGE_CROP_ANCHOR_POSITION.BOTTOM_CENTER) this.instance.getStage().container().style.cursor = "ns-resize";
+			const cursor = this.getCropAnchorCursor(position);
+			if (cursor) this.instance.getStage().container().style.cursor = cursor;
 		});
 		anchor.on("pointerdown", () => {
 			onClick();
@@ -30905,6 +30918,7 @@ var WeaveContextMenuPlugin = class extends WeavePlugin {
 	triggerContextMenu(eventTarget, target) {
 		const stage = this.instance.getStage();
 		const selectionPlugin = this.getSelectionPlugin();
+		const selectedNodes = selectionPlugin?.getSelectedNodes() ?? [];
 		let nodes = [];
 		if (target && target !== stage) {
 			const nodeHandler = this.instance.getNodeHandler(target.getAttrs().nodeType);
@@ -30921,6 +30935,14 @@ var WeaveContextMenuPlugin = class extends WeavePlugin {
 				node: nodeHandler?.serialize(node)
 			};
 		});
+		const targetIsPartOfMultiSelection = target !== void 0 && selectedNodes.length > 1 && selectedNodes.some((selectedNode) => selectedNode.getAttrs().id === target.getAttrs().id);
+		if (targetIsPartOfMultiSelection) nodes = selectedNodes.map((node) => {
+			const nodeHandler = this.instance.getNodeHandler(node.getAttrs().nodeType);
+			return {
+				instance: node,
+				node: nodeHandler?.serialize(node)
+			};
+		});
 		if (this.contextMenuVisible) this.closeContextMenu();
 		let allNodesMutexUnlocked = true;
 		let allNodesUnlocked = true;
@@ -30938,7 +30960,7 @@ var WeaveContextMenuPlugin = class extends WeavePlugin {
 			}
 		}
 		if (!allNodesMutexUnlocked || !allNodesUnlocked) return;
-		if (selectionPlugin && !(eventTarget.getParent() instanceof Konva.Transformer && selectionPlugin.getSelectedNodes().length > 0)) {
+		if (selectionPlugin && !(eventTarget.getParent() instanceof Konva.Transformer && selectedNodes.length > 0) && !targetIsPartOfMultiSelection) {
 			selectionPlugin.setSelectedNodes([...nodes.map((node) => node.instance)]);
 			selectionPlugin.getHoverTransformer().nodes([]);
 		}