Skip to content

fix: Fix dragging canvas in bigger containers. #6849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marks0351 merged 1 commit into from
Aug 26, 2021
Merged

fix: Fix dragging canvas in bigger containers. #6849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 48 additions & 5 deletions app/client/src/utils/hooks/useCanvasDragging.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,64 @@ export const useCanvasDragging = (
setDraggingNewWidget,
setDraggingState,
} = useWidgetDragResize();
const getCanvasToDrawTopOffset = (
scrollParentTop: number,
scrollParentTopHeight: number,
canvasTop: number,
canvasHeight: number,
) => {
return scrollParentTop > canvasTop
? Math.min(
scrollParentTop - canvasTop,
canvasHeight - scrollParentTopHeight,
)
: 0;
};

const updateCanvasStyles = () => {
const parentCanvas: Element | null = getNearestParentCanvas(
canvasRef.current,
);

if (parentCanvas && canvasDrawRef.current && canvasRef.current) {
const { height } = parentCanvas.getBoundingClientRect();
const {
height: scrollParentTopHeight,
} = parentCanvas.getBoundingClientRect();
const { width } = canvasRef.current.getBoundingClientRect();
canvasDrawRef.current.style.width = width + "px";
canvasDrawRef.current.style.position = canExtend ? "absolute" : "sticky";
canvasDrawRef.current.style.left = "0px";
canvasDrawRef.current.style.height = height + "px";
canvasDrawRef.current.style.top =
(canExtend ? parentCanvas.scrollTop : 0) + "px";
canvasDrawRef.current.style.top = getCanvasTopOffset() + "px";
canvasDrawRef.current.style.height = scrollParentTopHeight + "px";
}
};

const getCanvasTopOffset = () => {
const parentCanvas: Element | null = getNearestParentCanvas(
canvasRef.current,
);

if (parentCanvas && canvasDrawRef.current && canvasRef.current) {
if (canExtend) {
return parentCanvas.scrollTop;
} else {
const {
height: scrollParentTopHeight,
top: scrollParentTop,
} = parentCanvas.getBoundingClientRect();
const {
height: canvasHeight,
top: canvasTop,
} = canvasRef.current.getBoundingClientRect();
return getCanvasToDrawTopOffset(
scrollParentTop,
scrollParentTopHeight,
canvasTop,
canvasHeight,
);
}
}
return 0;
};

const canScroll = useCanvasDragToScroll(
Expand Down Expand Up @@ -293,7 +336,7 @@ export const useCanvasDragging = (
canvasIsDragging
) {
const canvasCtx: any = canvasDrawRef.current.getContext("2d");
const topOffset = canExtend ? scrollParent.scrollTop : 0;
const topOffset = getCanvasTopOffset();
const snappedXY = getSnappedXY(
snapColumnSpace,
snapRowSpace,
Expand Down