Implemented handleSelector functionality

This commit is contained in:
Furkan Kalaycioglu
2022-04-24 02:40:19 +03:00
parent 579bf5ca7f
commit e3b6befc5b
2 changed files with 62 additions and 30 deletions
+1
View File
@@ -171,6 +171,7 @@ export default (NodeComponent: ComponentType<NodeProps>) => {
dragging: false, dragging: false,
}); });
// @TODO: Fix the bug "onNodeDragStop not getting called on first render"
if (onNodeDragStop && node) { if (onNodeDragStop && node) {
onNodeDragStop(event.sourceEvent as MouseEvent, { ...node, dragging: false }); onNodeDragStop(event.sourceEvent as MouseEvent, { ...node, dragging: false });
} }
+34 -3
View File
@@ -16,7 +16,6 @@ type UseDragParams = {
nodeRef: RefObject<Element>; nodeRef: RefObject<Element>;
disabled?: boolean; disabled?: boolean;
noDragClassName?: string; noDragClassName?: string;
// @TODO: implement handleSelector functionality
handleSelector?: string; handleSelector?: string;
nodeId?: string; nodeId?: string;
}; };
@@ -42,7 +41,27 @@ function getParentNodePosition(nodeInternals: NodeInternals, nodeId?: string): X
}; };
} }
function useDrag({ onStart, onDrag, onStop, nodeRef, disabled = false, noDragClassName, nodeId }: UseDragParams) { export function selectorExistsTargetToNode(target: Element, selector: string, nodeRef: RefObject<Element>): boolean {
let current = target;
do {
if (current?.matches(selector)) return true;
if (current === nodeRef.current) return false;
current = current.parentElement as Element;
} while (current);
return false;
}
function useDrag({
onStart,
onDrag,
onStop,
nodeRef,
disabled = false,
noDragClassName,
handleSelector,
nodeId,
}: UseDragParams) {
const store = useStoreApi(); const store = useStoreApi();
const startPos = useRef<XYPosition>({ x: 0, y: 0 }); const startPos = useRef<XYPosition>({ x: 0, y: 0 });
const lastPos = useRef<{ x: number | null; y: number | null }>({ x: null, y: null }); const lastPos = useRef<{ x: number | null; y: number | null }>({ x: null, y: null });
@@ -52,11 +71,16 @@ function useDrag({ onStart, onDrag, onStop, nodeRef, disabled = false, noDragCla
if (nodeRef?.current) { if (nodeRef?.current) {
const selection = select(nodeRef.current); const selection = select(nodeRef.current);
let isDragAllowedBySelector = true;
if (disabled) { if (disabled) {
selection.on('.drag', null); selection.on('.drag', null);
} else { } else {
const dragHandler = drag() const dragHandler = drag()
.on('start', (event: UseDragEvent) => { .on('start', (event: UseDragEvent) => {
if (handleSelector) {
isDragAllowedBySelector = selectorExistsTargetToNode(event.sourceEvent.target, handleSelector, nodeRef);
}
if (isDragAllowedBySelector) {
const { transform, nodeInternals } = store.getState(); const { transform, nodeInternals } = store.getState();
const offset = getOffset(event, nodeRef); const offset = getOffset(event, nodeRef);
parentPos.current = getParentNodePosition(nodeInternals, nodeId); parentPos.current = getParentNodePosition(nodeInternals, nodeId);
@@ -67,8 +91,10 @@ function useDrag({ onStart, onDrag, onStop, nodeRef, disabled = false, noDragCla
}; };
onStart(event); onStart(event);
}
}) })
.on('drag', (event: UseDragEvent) => { .on('drag', (event: UseDragEvent) => {
if (isDragAllowedBySelector) {
const { transform, snapGrid, snapToGrid } = store.getState(); const { transform, snapGrid, snapToGrid } = store.getState();
const pos = pointToRendererPoint( const pos = pointToRendererPoint(
{ {
@@ -92,8 +118,13 @@ function useDrag({ onStart, onDrag, onStop, nodeRef, disabled = false, noDragCla
dy: pos.y, dy: pos.y,
}); });
} }
}
})
.on('end', (event) => {
if (isDragAllowedBySelector) {
onStop(event);
}
}) })
.on('end', onStop)
.filter((event: any) => !event.ctrlKey && !event.button && !event.target.className.includes(noDragClassName)); .filter((event: any) => !event.ctrlKey && !event.button && !event.target.className.includes(noDragClassName));
selection.call(dragHandler); selection.call(dragHandler);