Fix node resizing while zooming
This commit is contained in:
@@ -4,4 +4,4 @@
|
|||||||
'@xyflow/svelte': patch
|
'@xyflow/svelte': patch
|
||||||
---
|
---
|
||||||
|
|
||||||
Fix node dragging while zooming on flow that does not cover whole browser window.
|
Fix node dragging & resizing while zooming on flow that does not cover whole browser window.
|
||||||
|
|||||||
@@ -56,13 +56,14 @@ function ResizeControl({
|
|||||||
domNode: resizeControlRef.current,
|
domNode: resizeControlRef.current,
|
||||||
nodeId: id,
|
nodeId: id,
|
||||||
getStoreItems: () => {
|
getStoreItems: () => {
|
||||||
const { nodeLookup, transform, snapGrid, snapToGrid, nodeOrigin } = store.getState();
|
const { nodeLookup, transform, snapGrid, snapToGrid, nodeOrigin, domNode } = store.getState();
|
||||||
return {
|
return {
|
||||||
nodeLookup,
|
nodeLookup,
|
||||||
transform,
|
transform,
|
||||||
snapGrid,
|
snapGrid,
|
||||||
snapToGrid,
|
snapToGrid,
|
||||||
nodeOrigin,
|
nodeOrigin,
|
||||||
|
paneDomNode: domNode,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
onChange: (change: XYResizerChange, childChanges: XYResizerChildChange[]) => {
|
onChange: (change: XYResizerChange, childChanges: XYResizerChildChange[]) => {
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
let className: $$Props['class'] = '';
|
let className: $$Props['class'] = '';
|
||||||
export { className as class };
|
export { className as class };
|
||||||
|
|
||||||
const { nodeLookup, snapGrid, viewport, nodes, nodeOrigin } = useStore();
|
const { nodeLookup, snapGrid, viewport, nodes, nodeOrigin, domNode } = useStore();
|
||||||
|
|
||||||
const contextNodeId = getContext<string>('svelteflow__node_id');
|
const contextNodeId = getContext<string>('svelteflow__node_id');
|
||||||
$: id = typeof nodeId === 'string' ? nodeId : contextNodeId;
|
$: id = typeof nodeId === 'string' ? nodeId : contextNodeId;
|
||||||
@@ -65,7 +65,8 @@
|
|||||||
transform: [$viewport.x, $viewport.y, $viewport.zoom],
|
transform: [$viewport.x, $viewport.y, $viewport.zoom],
|
||||||
snapGrid: $snapGrid ?? undefined,
|
snapGrid: $snapGrid ?? undefined,
|
||||||
snapToGrid: !!$snapGrid,
|
snapToGrid: !!$snapGrid,
|
||||||
nodeOrigin: $nodeOrigin
|
nodeOrigin: $nodeOrigin,
|
||||||
|
paneDomNode: $domNode
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
onChange: (change: XYResizerChange, childChanges: XYResizerChildChange[]) => {
|
onChange: (change: XYResizerChange, childChanges: XYResizerChildChange[]) => {
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ type XYResizerParams = {
|
|||||||
snapGrid?: [number, number];
|
snapGrid?: [number, number];
|
||||||
snapToGrid: boolean;
|
snapToGrid: boolean;
|
||||||
nodeOrigin: NodeOrigin;
|
nodeOrigin: NodeOrigin;
|
||||||
|
paneDomNode: HTMLDivElement | null;
|
||||||
};
|
};
|
||||||
onChange: (changes: XYResizerChange, childChanges: XYResizerChildChange[]) => void;
|
onChange: (changes: XYResizerChange, childChanges: XYResizerChildChange[]) => void;
|
||||||
onEnd?: () => void;
|
onEnd?: () => void;
|
||||||
@@ -109,6 +110,7 @@ export function XYResizer({ domNode, nodeId, getStoreItems, onChange, onEnd }: X
|
|||||||
const controlDirection = getControlDirection(controlPosition);
|
const controlDirection = getControlDirection(controlPosition);
|
||||||
|
|
||||||
let node: InternalNodeBase | undefined = undefined;
|
let node: InternalNodeBase | undefined = undefined;
|
||||||
|
let containerBounds: DOMRect | null = null;
|
||||||
let childNodes: XYResizerChildChange[] = [];
|
let childNodes: XYResizerChildChange[] = [];
|
||||||
let parentNode: InternalNodeBase | undefined = undefined; // Needed to fix expandParent
|
let parentNode: InternalNodeBase | undefined = undefined; // Needed to fix expandParent
|
||||||
let parentExtent: CoordinateExtent | undefined = undefined;
|
let parentExtent: CoordinateExtent | undefined = undefined;
|
||||||
@@ -116,14 +118,20 @@ export function XYResizer({ domNode, nodeId, getStoreItems, onChange, onEnd }: X
|
|||||||
|
|
||||||
const dragHandler = drag<HTMLDivElement, unknown>()
|
const dragHandler = drag<HTMLDivElement, unknown>()
|
||||||
.on('start', (event: ResizeDragEvent) => {
|
.on('start', (event: ResizeDragEvent) => {
|
||||||
const { nodeLookup, transform, snapGrid, snapToGrid, nodeOrigin } = getStoreItems();
|
const { nodeLookup, transform, snapGrid, snapToGrid, nodeOrigin, paneDomNode } = getStoreItems();
|
||||||
node = nodeLookup.get(nodeId);
|
node = nodeLookup.get(nodeId);
|
||||||
|
|
||||||
if (!node) {
|
if (!node) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { xSnapped, ySnapped } = getPointerPosition(event.sourceEvent, { transform, snapGrid, snapToGrid });
|
containerBounds = paneDomNode?.getBoundingClientRect() ?? null;
|
||||||
|
const { xSnapped, ySnapped } = getPointerPosition(event.sourceEvent, {
|
||||||
|
transform,
|
||||||
|
snapGrid,
|
||||||
|
snapToGrid,
|
||||||
|
containerBounds,
|
||||||
|
});
|
||||||
|
|
||||||
prevValues = {
|
prevValues = {
|
||||||
width: node.measured.width ?? 0,
|
width: node.measured.width ?? 0,
|
||||||
@@ -178,7 +186,13 @@ export function XYResizer({ domNode, nodeId, getStoreItems, onChange, onEnd }: X
|
|||||||
})
|
})
|
||||||
.on('drag', (event: ResizeDragEvent) => {
|
.on('drag', (event: ResizeDragEvent) => {
|
||||||
const { transform, snapGrid, snapToGrid, nodeOrigin: storeNodeOrigin } = getStoreItems();
|
const { transform, snapGrid, snapToGrid, nodeOrigin: storeNodeOrigin } = getStoreItems();
|
||||||
const pointerPosition = getPointerPosition(event.sourceEvent, { transform, snapGrid, snapToGrid });
|
|
||||||
|
const pointerPosition = getPointerPosition(event.sourceEvent, {
|
||||||
|
transform,
|
||||||
|
snapGrid,
|
||||||
|
snapToGrid,
|
||||||
|
containerBounds,
|
||||||
|
});
|
||||||
const childChanges: XYResizerChildChange[] = [];
|
const childChanges: XYResizerChildChange[] = [];
|
||||||
|
|
||||||
if (!node) {
|
if (!node) {
|
||||||
|
|||||||
Reference in New Issue
Block a user