From c451f99ab2a1893e6174ea9711dd1ab1b2366cb3 Mon Sep 17 00:00:00 2001 From: moklick Date: Tue, 19 Aug 2025 15:58:26 +0200 Subject: [PATCH] chore(extent): allow null #5458 --- packages/system/src/types/nodes.ts | 9 ++------- packages/system/src/utils/general.ts | 4 ++-- packages/system/src/xyresizer/XYResizer.ts | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/system/src/types/nodes.ts b/packages/system/src/types/nodes.ts index 687f81ba..37293e61 100644 --- a/packages/system/src/types/nodes.ts +++ b/packages/system/src/types/nodes.ts @@ -57,7 +57,7 @@ export type NodeBase< * Boundary a node can be moved in. * @example 'parent' or [[0, 0], [100, 100]] */ - extent?: 'parent' | CoordinateExtent; + extent?: 'parent' | CoordinateExtent | null; /** * When `true`, the parent node will automatically expand if this node is dragged to the edge of * the parent node's bounds. @@ -151,12 +151,7 @@ export type NodeDragItem = { internals: { positionAbsolute: XYPosition; }; - extent?: 'parent' | CoordinateExtent; - parentId?: string; - dragging?: boolean; - origin?: NodeOrigin; - expandParent?: boolean; -}; +} & Pick; /** * The origin of a Node determines how it is placed relative to its own coordinates. diff --git a/packages/system/src/utils/general.ts b/packages/system/src/utils/general.ts index fdfd6b75..a57b25a2 100644 --- a/packages/system/src/utils/general.ts +++ b/packages/system/src/utils/general.ts @@ -335,8 +335,8 @@ export const getViewportForBounds = ( export const isMacOs = () => typeof navigator !== 'undefined' && navigator?.userAgent?.indexOf('Mac') >= 0; -export function isCoordinateExtent(extent?: CoordinateExtent | 'parent'): extent is CoordinateExtent { - return extent !== undefined && extent !== 'parent'; +export function isCoordinateExtent(extent?: CoordinateExtent | 'parent' | null): extent is CoordinateExtent { + return extent !== undefined && extent !== null && extent !== 'parent'; } export function getNodeDimensions(node: { diff --git a/packages/system/src/xyresizer/XYResizer.ts b/packages/system/src/xyresizer/XYResizer.ts index 03a0675e..e6aace30 100644 --- a/packages/system/src/xyresizer/XYResizer.ts +++ b/packages/system/src/xyresizer/XYResizer.ts @@ -41,7 +41,7 @@ export type XYResizerChange = { export type XYResizerChildChange = { id: string; position: XYPosition; - extent?: 'parent' | CoordinateExtent; + extent?: NodeBase['extent']; }; type XYResizerParams = {