refactor(svelte): simplify nodes and edges store handling
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
import { writable, type Writable } from 'svelte/store';
|
||||
import {
|
||||
isNodeBase,
|
||||
isEdgeBase,
|
||||
@@ -6,14 +5,10 @@ import {
|
||||
getOutgoersBase,
|
||||
getIncomersBase,
|
||||
updateEdgeBase,
|
||||
getConnectedEdgesBase,
|
||||
isNumeric,
|
||||
getNodePositionWithOrigin,
|
||||
internalsSymbol,
|
||||
type XYZPosition
|
||||
getConnectedEdgesBase
|
||||
} from '@xyflow/system';
|
||||
|
||||
import type { DefaultEdgeOptions, DefaultNodeOptions, Edge, Node } from '$lib/types';
|
||||
import type { Edge, Node } from '$lib/types';
|
||||
|
||||
export const isNode = isNodeBase<Node, Edge>;
|
||||
export const isEdge = isEdgeBase<Node, Edge>;
|
||||
@@ -22,126 +17,3 @@ export const getIncomers = getIncomersBase<Node, Edge>;
|
||||
export const addEdge = addEdgeBase<Edge>;
|
||||
export const updateEdge = updateEdgeBase<Edge>;
|
||||
export const getConnectedEdges = getConnectedEdgesBase<Node, Edge>;
|
||||
|
||||
export const createNodes = (
|
||||
nodes: Node[],
|
||||
defaultOptions?: DefaultNodeOptions
|
||||
): Writable<Node[]> & { setDefaultOptions: (opts: DefaultNodeOptions) => void } => {
|
||||
const { subscribe, set, update } = writable<Node[]>([]);
|
||||
let value = nodes;
|
||||
let defaults = defaultOptions || {};
|
||||
|
||||
const _set: typeof set = (nds: Node[]) => {
|
||||
const parentNodes: Record<string, boolean> = {};
|
||||
|
||||
const nextNodes = nds.map((n) => {
|
||||
const node: Node = { ...defaults, ...n, positionAbsolute: n.position };
|
||||
const z = (isNumeric(node.zIndex) ? node.zIndex : 0) + (node.selected ? 1 : 0);
|
||||
|
||||
if (node.parentNode) {
|
||||
parentNodes[node.parentNode] = true;
|
||||
}
|
||||
|
||||
Object.defineProperty(node, internalsSymbol, {
|
||||
value: {
|
||||
handleBounds: node?.[internalsSymbol]?.handleBounds,
|
||||
z
|
||||
}
|
||||
});
|
||||
|
||||
return node;
|
||||
});
|
||||
|
||||
const nodesWithPositions = nextNodes.map((node) => {
|
||||
if (node.parentNode && !parentNodes[node.parentNode]) {
|
||||
throw new Error(`Parent node ${node.parentNode} not found`);
|
||||
}
|
||||
|
||||
if (node.parentNode || parentNodes?.[node.id]) {
|
||||
const { x, y, z } = calculateXYZPosition(node, nextNodes, {
|
||||
...node.position,
|
||||
z: node[internalsSymbol]?.z ?? 0
|
||||
});
|
||||
|
||||
node.positionAbsolute = {
|
||||
x,
|
||||
y
|
||||
};
|
||||
|
||||
node[internalsSymbol]!.z = z;
|
||||
|
||||
if (parentNodes?.[node.id]) {
|
||||
node[internalsSymbol]!.isParent = true;
|
||||
}
|
||||
}
|
||||
|
||||
return node;
|
||||
});
|
||||
|
||||
value = nodesWithPositions;
|
||||
|
||||
set(value);
|
||||
};
|
||||
|
||||
const _update: typeof update = (fn: (nds: Node[]) => Node[]) => _set(fn(value));
|
||||
|
||||
const setDefaultOptions = (options: DefaultNodeOptions) => {
|
||||
defaults = options;
|
||||
};
|
||||
|
||||
_set(value);
|
||||
|
||||
return {
|
||||
subscribe,
|
||||
set: _set,
|
||||
update: _update,
|
||||
setDefaultOptions
|
||||
};
|
||||
};
|
||||
|
||||
export const createEdges = (
|
||||
edges: Edge[],
|
||||
defaultOptions?: DefaultEdgeOptions
|
||||
): Writable<Edge[]> & { setDefaultOptions: (opts: DefaultEdgeOptions) => void } => {
|
||||
const { subscribe, set, update } = writable<Edge[]>([]);
|
||||
let value = edges;
|
||||
let defaults = defaultOptions || {};
|
||||
|
||||
const _set: typeof set = (eds: Edge[]) => {
|
||||
const nextEdges = defaults ? eds.map((edge) => ({ ...defaults, ...edge })) : eds;
|
||||
value = nextEdges;
|
||||
set(value);
|
||||
};
|
||||
|
||||
const _update: typeof update = (fn: (eds: Edge[]) => Edge[]) => _set(fn(value));
|
||||
|
||||
const setDefaultOptions = (options: DefaultEdgeOptions) => {
|
||||
defaults = options;
|
||||
};
|
||||
|
||||
_set(value);
|
||||
|
||||
return {
|
||||
subscribe,
|
||||
set: _set,
|
||||
update: _update,
|
||||
setDefaultOptions
|
||||
};
|
||||
};
|
||||
|
||||
function calculateXYZPosition(node: Node, nodes: Node[], result: XYZPosition): XYZPosition {
|
||||
if (!node.parentNode) {
|
||||
return result;
|
||||
}
|
||||
const parentNode = nodes.find((n) => n.id === node.parentNode)!;
|
||||
const parentNodePosition = getNodePositionWithOrigin(parentNode, parentNode?.origin);
|
||||
|
||||
return calculateXYZPosition(parentNode, nodes, {
|
||||
x: (result.x ?? 0) + parentNodePosition.x,
|
||||
y: (result.y ?? 0) + parentNodePosition.y,
|
||||
z:
|
||||
(parentNode[internalsSymbol]?.z ?? 0) > (result.z ?? 0)
|
||||
? parentNode[internalsSymbol]?.z ?? 0
|
||||
: result.z ?? 0
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user