From eafb3c5e344c7145d7330531a43bd82059ed77b3 Mon Sep 17 00:00:00 2001 From: moklick Date: Tue, 16 Apr 2024 18:31:08 +0200 Subject: [PATCH] refactor(xydrag): cleanup --- packages/system/src/types/nodes.ts | 4 ++-- packages/system/src/xydrag/XYDrag.ts | 4 ++-- packages/system/src/xydrag/utils.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/system/src/types/nodes.ts b/packages/system/src/types/nodes.ts index a79ca24d..6ba7fbd4 100644 --- a/packages/system/src/types/nodes.ts +++ b/packages/system/src/types/nodes.ts @@ -120,8 +120,8 @@ export type NodeDragItem = { // distance from the mouse cursor to the node when start dragging distance: XYPosition; measured: { - width?: number; - height?: number; + width: number; + height: number; }; internals: { positionAbsolute: XYPosition; diff --git a/packages/system/src/xydrag/XYDrag.ts b/packages/system/src/xydrag/XYDrag.ts index 420947df..e205ced7 100644 --- a/packages/system/src/xydrag/XYDrag.ts +++ b/packages/system/src/xydrag/XYDrag.ts @@ -144,10 +144,10 @@ export function XYDrag voi if (dragItems.size > 1 && nodeExtent && !dragItem.extent) { const { positionAbsolute } = dragItem.internals; const x1 = positionAbsolute.x - nodesBox.x + nodeExtent[0][0]; - const x2 = positionAbsolute.x + (dragItem.measured?.width ?? 0) - nodesBox.x2 + nodeExtent[1][0]; + const x2 = positionAbsolute.x + dragItem.measured.width - nodesBox.x2 + nodeExtent[1][0]; const y1 = positionAbsolute.y - nodesBox.y + nodeExtent[0][1]; - const y2 = positionAbsolute.y + (dragItem.measured?.height ?? 0) - nodesBox.y2 + nodeExtent[1][1]; + const y2 = positionAbsolute.y + dragItem.measured.height - nodesBox.y2 + nodeExtent[1][1]; adjustedNodeExtent = [ [x1, y1], diff --git a/packages/system/src/xydrag/utils.ts b/packages/system/src/xydrag/utils.ts index a0a26cb2..bb836a32 100644 --- a/packages/system/src/xydrag/utils.ts +++ b/packages/system/src/xydrag/utils.ts @@ -63,8 +63,8 @@ export function getDragItems( positionAbsolute: internalNode.internals.positionAbsolute || { x: 0, y: 0 }, }, measured: { - width: internalNode.measured.width || 0, - height: internalNode.measured.height || 0, + width: internalNode.measured.width ?? 0, + height: internalNode.measured.height ?? 0, }, }); }