diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 31339add..ef9af8c3 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -41,7 +41,10 @@ export { getConnectedEdges, getTransformForBounds, getRectOfNodes, - graphPosToZoomedPos, + pointToRendererPoint, + rendererPointToPoint, + /** @deprecated will be removed in the next major version, use `rendererPointToPoint` instead */ + rendererPointToPoint as graphPosToZoomedPos, getNodesInside, getMarkerId, getBoundsofRects, diff --git a/packages/core/src/utils/graph.ts b/packages/core/src/utils/graph.ts index 64bf9215..79afb031 100644 --- a/packages/core/src/utils/graph.ts +++ b/packages/core/src/utils/graph.ts @@ -65,18 +65,22 @@ export function getHostForElement(element: HTMLElement): Document { } } +// todo: refactor generic to use MaybeElement export function isEdge(element: MaybeElement): element is Edge { return element && 'id' in element && 'source' in element && 'target' in element } +// todo: refactor generic to use MaybeElement export function isGraphEdge(element: MaybeElement): element is GraphEdge { return isEdge(element) && 'sourceNode' in element && 'targetNode' in element } +// todo: refactor generic to use MaybeElement export function isNode(element: MaybeElement): element is Node { return element && 'id' in element && !isEdge(element) } +// todo: refactor generic to use MaybeElement export function isGraphNode(element: MaybeElement): element is GraphNode { return isNode(element) && 'computedPosition' in element } @@ -257,7 +261,7 @@ export function pointToRendererPoint( { x, y }: XYPosition, { x: tx, y: ty, zoom: tScale }: ViewportTransform, snapToGrid: boolean, - [snapX, snapY]: [number, number], + [snapX, snapY]: [snapX: number, snapY: number], ): XYPosition { const position: XYPosition = { x: (x - tx) / tScale, @@ -301,6 +305,7 @@ export function boxToRect({ x, y, x2, y2 }: Box): Rect { } } +// todo: fix typo export function getBoundsofRects(rect1: Rect, rect2: Rect) { return boxToRect(getBoundsOfBoxes(rectToBox(rect1), rectToBox(rect2))) } @@ -321,13 +326,6 @@ export function getRectOfNodes(nodes: GraphNode[]) { return boxToRect(box) } -export function graphPosToZoomedPos({ x, y }: XYPosition, { x: tx, y: ty, zoom: tScale }: ViewportTransform): XYPosition { - return { - x: x * tScale + tx, - y: y * tScale + ty, - } -} - export function getNodesInside( nodes: GraphNode[], rect: Rect,