Merge branch 'xyflow' of github.com:wbkd/react-flow into xyflow

packages/svelte/src/lib/store/derived-connection-props.ts

@@ -1,4 +1,4 @@
-import { derived } from 'svelte/store';
+import { derived, type Writable } from 'svelte/store';
 import {
   getBezierPath,
   getSmoothStepPath,
@@ -10,6 +10,35 @@ import {
 } from '@xyflow/system';
 
 import type { SvelteFlowStoreState } from './types';
+import type { ConnectionData } from '$lib/types';
+
+export type ConnectionProps = {
+  path: string | null;
+  sourceX: number | null;
+  sourceY: number | null;
+  sourcePosition: Position | undefined | null;
+  targetX: number | null;
+  targetY: number | null;
+  targetPosition: Position | undefined | null;
+  pointerPosition: ConnectionData['connectionPosition'] | null;
+  startHandle: ConnectionData['connectionStartHandle'] | null;
+  endHandle: ConnectionData['connectionEndHandle'] | null;
+  status: ConnectionData['connectionStatus'] | null;
+};
+
+export const initConnectionProps = {
+  path: null,
+  sourceX: null,
+  sourceY: null,
+  sourcePosition: null,
+  targetX: null,
+  targetY: null,
+  targetPosition: null,
+  pointerPosition: null,
+  startHandle: null,
+  endHandle: null,
+  status: null
+};
 
 const oppositePosition = {
   [Position.Left]: Position.Right,
@@ -18,10 +47,13 @@ const oppositePosition = {
   [Position.Bottom]: Position.Top
 };
 
-export function getConnectionPath(store: SvelteFlowStoreState) {
+export function getDerivedConnectionProps(
+  store: SvelteFlowStoreState,
+  currentConnection: Writable<ConnectionData>
+) {
   return derived(
     [
-      store.connection,
+      currentConnection,
       store.connectionLineType,
       store.connectionMode,
       store.nodes,
@@ -29,7 +61,7 @@ export function getConnectionPath(store: SvelteFlowStoreState) {
     ],
     ([connection, connectionLineType, connectionMode, nodes, transform]) => {
       if (!connection.connectionStartHandle?.nodeId) {
-        return null;
+        return initConnectionProps;
       }
 
       const fromNode = nodes.find((n) => n.id === connection.connectionStartHandle?.nodeId);
@@ -80,7 +112,14 @@ export function getConnectionPath(store: SvelteFlowStoreState) {
         [path] = getStraightPath(pathParams);
       }
 
-      return path;
+      return {
+        path,
+        ...pathParams,
+        pointerPosition: connection.connectionPosition,
+        startHandle: connection.connectionStartHandle,
+        endHandle: connection.connectionEndHandle,
+        status: connection.connectionStatus
+      };
     }
   );
 }

packages/svelte/src/lib/store/index.ts

@@ -1,5 +1,5 @@
 import { getContext, setContext } from 'svelte';
-import { derived, get } from 'svelte/store';
+import { derived, get, writable } from 'svelte/store';
 import {
   internalsSymbol,
   createMarkerIds,
@@ -19,18 +19,13 @@ import {
 } from '@xyflow/system';
 
 import { addEdge as addEdgeUtil } from '$lib/utils';
-import type { EdgeTypes, NodeTypes, Node, Edge, FitViewOptions } from '$lib/types';
-import { getConnectionPath } from './connection-path';
-import {
-  initConnectionData,
-  initialEdgeTypes,
-  initialNodeTypes,
-  getInitialStore
-} from './initial-store';
+import type { EdgeTypes, NodeTypes, Node, Edge, FitViewOptions, ConnectionData } from '$lib/types';
+import { initialEdgeTypes, initialNodeTypes, getInitialStore } from './initial-store';
 import type { SvelteFlowStore } from './types';
 import { syncNodeStores, syncEdgeStores } from './utils';
 import { getEdgeTree } from './edge-tree';
 import { getVisibleNodes } from './visible-nodes';
+import { getDerivedConnectionProps } from './derived-connection-props';
 
 export const key = Symbol();
 
@@ -256,25 +251,22 @@ export function createStore(): SvelteFlowStore {
     });
   }
 
-  const updateConnection: UpdateConnection = (update) => {
-    const currentConnectionData = get(store.connection);
+  const initConnectionUpdateData = {
+    connectionStartHandle: null,
+    connectionEndHandle: null,
+    connectionPosition: null,
+    connectionStatus: null
+  };
 
-    const nextConnectionData = currentConnectionData
-      ? {
-          ...initConnectionData,
-          ...currentConnectionData,
-          ...update
-        }
-      : {
-          ...initConnectionData,
-          ...update
-        };
-
-    store.connection.set(nextConnectionData);
+  // by creating an internal, unexposed store and using a derived store
+  // we prevent using slow get() calls
+  const currentConnection = writable<ConnectionData>(initConnectionUpdateData);
+  const updateConnection: UpdateConnection = (newConnection: ConnectionData) => {
+    currentConnection.set(newConnection);
   };
 
   function cancelConnection() {
-    updateConnection(initConnectionData);
+    updateConnection(initConnectionUpdateData);
   }
 
   function reset() {
@@ -296,7 +288,7 @@ export function createStore(): SvelteFlowStore {
 
     // derived state
     edgeTree: getEdgeTree(store),
-    connectionPath: getConnectionPath(store),
+    connection: getDerivedConnectionProps(store, currentConnection),
     visibleNodes: getVisibleNodes(store),
     markers: derived(
       [store.edges, store.defaultMarkerColor, store.flowId],
@@ -313,7 +305,9 @@ export function createStore(): SvelteFlowStore {
     updateNodeDimensions,
     zoomIn,
     zoomOut,
-    fitView,
+    fitView: (options?: FitViewOptions) => {
+      return fitView(get(store.nodes), options);
+    },
     setMinZoom,
     setMaxZoom,
     setTranslateExtent,

packages/svelte/src/lib/store/initial-store.ts

@@ -24,22 +24,9 @@ import BezierEdge from '$lib/components/edges/BezierEdge.svelte';
 import StraightEdge from '$lib/components/edges/StraightEdge.svelte';
 import SmoothStepEdge from '$lib/components/edges/SmoothStepEdge.svelte';
 import StepEdge from '$lib/components/edges/StepEdge.svelte';
-import type {
-  ConnectionData,
-  NodeTypes,
-  EdgeTypes,
-  EdgeLayouted,
-  Node,
-  FitViewOptions
-} from '$lib/types';
+import type { NodeTypes, EdgeTypes, EdgeLayouted, Node, FitViewOptions } from '$lib/types';
 import { createNodesStore, createEdgesStore } from './utils';
-
-export const initConnectionData = {
-  connectionStartHandle: null,
-  connectionEndHandle: null,
-  connectionPosition: null,
-  connectionStatus: null
-};
+import { initConnectionProps, type ConnectionProps } from './derived-connection-props';
 
 export const initialNodeTypes = {
   input: InputNode,
@@ -88,8 +75,7 @@ export const getInitialStore = () => ({
   transform: writable<Transform>([0, 0, 1]),
   connectionMode: writable<ConnectionMode>(ConnectionMode.Strict),
   domNode: writable<HTMLDivElement | null>(null),
-  connectionPath: readable<string | null>(null),
-  connection: writable<ConnectionData>(initConnectionData),
+  connection: readable<ConnectionProps>(initConnectionProps),
   connectionLineType: writable<ConnectionLineType>(ConnectionLineType.Bezier),
   connectionRadius: writable<number>(20),
   isValidConnection: writable<IsValidConnection>(() => true),