fixed errors but still WIP

This commit is contained in:
peterkogo
2024-04-10 09:30:00 +02:00
parent 47319ec747
commit 2d1d4717d9
16 changed files with 142 additions and 102 deletions
@@ -1,11 +1,6 @@
<script lang="ts">
import { onDestroy } from 'svelte';
import {
internalsSymbol,
getPositionWithOrigin,
getNodeDimensions,
nodeHasDimensions
} from '@xyflow/system';
import { getPositionWithOrigin, getNodeDimensions, nodeHasDimensions } from '@xyflow/system';
import { NodeWrapper } from '$lib/components/NodeWrapper';
import { useStore } from '$lib/store';
@@ -46,8 +41,8 @@
{#each $visibleNodes as node (node.id)}
{@const nodeDimesions = getNodeDimensions(node)}
{@const posOrigin = getPositionWithOrigin({
x: node.computed?.positionAbsolute?.x ?? 0,
y: node.computed?.positionAbsolute?.y ?? 0,
x: node.internals.positionAbsolute.x ?? 0,
y: node.internals.positionAbsolute.y ?? 0,
...nodeDimesions,
origin: node.origin
})}
@@ -66,26 +61,26 @@
node.connectable ||
($nodesConnectable && typeof node.connectable === 'undefined')
)}
positionX={node.computed?.positionAbsolute?.x ?? 0}
positionY={node.computed?.positionAbsolute?.y ?? 0}
positionX={node.internals.positionAbsolute?.x ?? 0}
positionY={node.internals.positionAbsolute?.y ?? 0}
positionOriginX={posOrigin.x ?? 0}
positionOriginY={posOrigin.y ?? 0}
isParent={!!node[internalsSymbol]?.isParent}
isParent={!!node.internals.isParent}
style={node.style}
class={node.class}
type={node.type ?? 'default'}
sourcePosition={node.sourcePosition}
targetPosition={node.targetPosition}
dragging={node.dragging}
zIndex={node[internalsSymbol]?.z ?? 0}
zIndex={node.internals.z ?? 0}
dragHandle={node.dragHandle}
initialized={nodeHasDimensions(node)}
width={node.width}
height={node.height}
initialWidth={node.initialWidth}
initialHeight={node.initialHeight}
computedWidth={node.computed?.width}
computedHeight={node.computed?.height}
computedWidth={node.measured.width}
computedHeight={node.measured.height}
{resizeObserver}
on:nodeclick
on:nodemouseenter
@@ -17,10 +17,7 @@
const isSelected = ids.includes(item.id);
if (item.selected !== isSelected) {
return {
...item,
selected: isSelected
};
item.selected = isSelected;
}
return item;
@@ -56,6 +53,7 @@
}>();
const {
nodes,
nodeLookup,
edges,
viewport,
dragging,
@@ -130,8 +128,8 @@
const prevSelectedNodeIds = selectedNodes.map((n) => n.id);
const prevSelectedEdgeIds = getConnectedEdges(selectedNodes, $edges).map((e) => e.id);
selectedNodes = getNodesInside<Node>(
$nodes,
selectedNodes = getNodesInside(
$nodeLookup,
nextUserSelectRect,
[$viewport.x, $viewport.y, $viewport.zoom],
$selectionMode === SelectionMode.Partial,
@@ -172,7 +170,7 @@
selectionRect.set(null);
if (selectedNodes.length > 0) {
selectionRectMode.set('nodes');
$selectionRectMode = 'nodes';
}
// onSelectionEnd?.(event);