diff --git a/packages/svelte/src/lib/actions/drag/index.ts b/packages/svelte/src/lib/actions/drag/index.ts index 84b7b5fb..da2b66a9 100644 --- a/packages/svelte/src/lib/actions/drag/index.ts +++ b/packages/svelte/src/lib/actions/drag/index.ts @@ -94,7 +94,7 @@ export default function drag( const dragHandler = d3Drag() .on('start', (event: UseDragEvent) => { const pointerPos = getPointerPosition(event); - + console.log(pointerPos); lastPos = pointerPos; dragItems = getDragItems(get(nodesStore), pointerPos, nodeId); }) diff --git a/packages/svelte/src/lib/actions/drag/utils.ts b/packages/svelte/src/lib/actions/drag/utils.ts index bfb384a3..b5c701a7 100644 --- a/packages/svelte/src/lib/actions/drag/utils.ts +++ b/packages/svelte/src/lib/actions/drag/utils.ts @@ -41,7 +41,6 @@ export function hasSelector(target: Element, selector: string, domNode: Element) // looks for all selected nodes and created a NodeDragItem for each of them export function getDragItems(nodes: Node[], mousePos: XYPosition, nodeId?: string): NodeDragItem[] { - console.log(mousePos, nodes); return nodes .filter( (n) => (n.selected || n.id === nodeId) && (!n.parentNode || !isParentSelected(n, nodes)) diff --git a/packages/svelte/src/lib/actions/zoom/index.ts b/packages/svelte/src/lib/actions/zoom/index.ts index 29d0a106..6c1ee091 100644 --- a/packages/svelte/src/lib/actions/zoom/index.ts +++ b/packages/svelte/src/lib/actions/zoom/index.ts @@ -40,9 +40,9 @@ function filter(event: any, params: ZoomParams): boolean { // } // // if the target element is inside an element with the nopan class, we prevent panning - // if (isWrappedWithClass(event, noPanClassName) && event.type !== 'wheel') { - // return false; - // } + if (isWrappedWithClass(event, 'nopan') && event.type !== 'wheel') { + return false; + } // if (!zoomOnPinch && event.ctrlKey && event.type === 'wheel') { // return false; diff --git a/packages/svelte/src/lib/components/NodeSelection/index.svelte b/packages/svelte/src/lib/components/NodeSelection/index.svelte index 04295e15..64a9e409 100644 --- a/packages/svelte/src/lib/components/NodeSelection/index.svelte +++ b/packages/svelte/src/lib/components/NodeSelection/index.svelte @@ -3,16 +3,20 @@ import { useStore } from '$lib/store'; import Selection from '$lib/components/Selection/index.svelte'; + import drag from '$lib/actions/drag' - const { selectionRectModeStore, nodesStore, nodeOriginStore } = useStore(); + const { selectionRectModeStore, nodesStore, nodeOriginStore, transformStore, updateNodePositions } = useStore(); $: selectedNodes = $nodesStore.filter(n => n.selected); $: rect = getRectOfNodes(selectedNodes, $nodeOriginStore); - - // @todo: use zoom action for selection {#if selectedNodes} +