From 7b40a30dd8f52254e31776a6de54b305be8e1ff5 Mon Sep 17 00:00:00 2001 From: Steven Roussey Date: Tue, 9 Apr 2024 11:01:31 -0700 Subject: [PATCH] [web] Update to "@xyflow/react beta 13 --- bun.lockb | Bin 221396 -> 221348 bytes packages/web/package.json | 2 +- packages/web/src/App.tsx | 2 +- packages/web/src/RunGraphFlow.tsx | 18 +++++++++--------- packages/web/src/TurboEdge.tsx | 2 +- packages/web/src/TurboNode.tsx | 2 +- packages/web/src/layout.ts | 10 +++++----- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bun.lockb b/bun.lockb index 1af71cf3cfcdf0985d8ec9738dee9cdcaa50d486..a8dd9bc7d31835ad93fb28e0d690ad173cb57b14 100755 GIT binary patch delta 16817 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 y}(V`iUFUHuN_tt%5Q-#bvh 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 diff --git a/packages/web/package.json b/packages/web/package.json index 384590b..2a42011 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "@sroussey/xyflow-react": "^12.0.0-beta.13", + "@xyflow/react": "^12.0.0-beta.13", "react": "^18.2.0", "react-dom": "^18.2.0", "@uiw/react-codemirror": "^4.21.25", diff --git a/packages/web/src/App.tsx b/packages/web/src/App.tsx index ccd8ce1..b889806 100644 --- a/packages/web/src/App.tsx +++ b/packages/web/src/App.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useEffect, useState } from "react"; -import { ReactFlowProvider } from "@sroussey/xyflow-react"; +import { ReactFlowProvider } from "@xyflow/react"; import { RunGraphFlow } from "./RunGraphFlow"; import { JsonEditor } from "./JsonEditor"; import { diff --git a/packages/web/src/RunGraphFlow.tsx b/packages/web/src/RunGraphFlow.tsx index b3045ee..9e808a6 100644 --- a/packages/web/src/RunGraphFlow.tsx +++ b/packages/web/src/RunGraphFlow.tsx @@ -8,9 +8,9 @@ import { useNodesInitialized, useReactFlow, Edge, -} from "@sroussey/xyflow-react"; +} from "@xyflow/react"; -import "@sroussey/xyflow-react/dist/base.css"; +import "@xyflow/react/dist/base.css"; import "./RunGraphFlow.css"; import { TurboNodeData, SingleNode, CompoundNode } from "./TurboNode"; import TurboEdge from "./TurboEdge"; @@ -39,7 +39,7 @@ function sortNodes(nodes: Node[]): Node[] { // Group nodes by parent ID nodes.forEach((node) => { - const parent = node.parentNode || "###root###"; + const parent = node.parentId || "###root###"; if (!parentMap.has(parent)) { parentMap.set(parent, []); } @@ -82,7 +82,7 @@ function convertGraphToNodes(graph: TaskGraph): Node[] { const subNodes = convertGraphToNodes(node.subGraph).map((n) => { return { ...n, - parentNode: node.config.id as string, + parentId: node.config.id as string, extent: "parent", selectable: false, connectable: false, @@ -95,7 +95,7 @@ function convertGraphToNodes(graph: TaskGraph): Node[] { return nodes; } -function listenToNode(task: Task, setNodes: Dispatch[]>>) { +function listenToTask(task: Task, setNodes: Dispatch[]>>) { task.on("progress", (progress, progressText) => { setNodes((nds) => nds.map((nd) => { @@ -175,14 +175,14 @@ function listenToNode(task: Task, setNodes: Dispatch ({ ...n, - parentNode: task.config.id as string, + parentId: task.config.id as string, extent: "parent", selectable: false, connectable: false, }) as Node ); listenToGraphNodes(task.subGraph, setNodes); - let returnNodes = nodes.filter((n) => n.parentNode !== task.config.id); // remove old children + let returnNodes = nodes.filter((n) => n.parentId !== task.config.id); // remove old children returnNodes = [...returnNodes, ...children]; // add new children returnNodes = sortNodes(returnNodes); // sort all nodes (parent, children, parent, children, ...) return returnNodes; @@ -197,7 +197,7 @@ function listenToGraphNodes( ) { const nodes = graph.getNodes(); for (const node of nodes) { - listenToNode(node, setNodes); + listenToTask(node, setNodes); } } @@ -222,7 +222,7 @@ export const RunGraphFlow: React.FC<{ const [edges, setEdges, onEdgesChange] = useEdgesState([]); const graphRef = useRef(null); - const initialized = useNodesInitialized() && !nodes.some((n) => !n.computed); + const initialized = useNodesInitialized() && !nodes.some((n) => !n.measured); const { fitView } = useReactFlow(); useEffect(() => { diff --git a/packages/web/src/TurboEdge.tsx b/packages/web/src/TurboEdge.tsx index 7ba1bde..a25cdc2 100644 --- a/packages/web/src/TurboEdge.tsx +++ b/packages/web/src/TurboEdge.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { EdgeProps, getBezierPath } from "@sroussey/xyflow-react"; +import { EdgeProps, getBezierPath } from "@xyflow/react"; export default function CustomEdge({ id, diff --git a/packages/web/src/TurboNode.tsx b/packages/web/src/TurboNode.tsx index 1d0a841..566d498 100644 --- a/packages/web/src/TurboNode.tsx +++ b/packages/web/src/TurboNode.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import { Handle, NodeProps, Position, Node } from "@sroussey/xyflow-react"; +import { Handle, NodeProps, Position, Node } from "@xyflow/react"; import { FiCloud, FiCloudLightning } from "react-icons/fi"; export type TurboNodeData = { diff --git a/packages/web/src/layout.ts b/packages/web/src/layout.ts index a881d4c..60adcf2 100644 --- a/packages/web/src/layout.ts +++ b/packages/web/src/layout.ts @@ -1,4 +1,4 @@ -import { Edge, Node, Position } from "@sroussey/xyflow-react"; +import { Edge, Node, Position } from "@xyflow/react"; import { DirectedAcyclicGraph } from "@sroussey/typescript-graph"; type PositionXY = { @@ -105,11 +105,11 @@ export class GraphPipelineLayout implements LayoutOptions { } protected getNodeHeight(node: T): number { - return Math.max(node.computed?.height, this.nodeHeightMin); + return Math.max(node.measured?.height, this.nodeHeightMin); } protected getNodeWidth(node: T): number { - return Math.max(node.computed?.width, this.nodeWidthMin); + return Math.max(node.measured?.width, this.nodeWidthMin); } public getNodePosition(nodeIdentity: string): PositionXY | undefined { @@ -154,7 +154,7 @@ export function computeLayout( nodes = nodes.filter((node) => !node.hidden); const topLevelNodes = nodes.filter( - (node) => node.parentNode === undefined || node.parentNode === parentId + (node) => node.parentId === undefined || node.parentId === parentId ); topLevelNodes.forEach((node) => { @@ -184,7 +184,7 @@ export function computeLayout( }); for (const node of topLevelNodes) { - const children = nodes.filter((n) => n.parentNode === node.id); + const children = nodes.filter((n) => n.parentId === node.id); if (children.length > 0) { const childNodes = computeLayout(