Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions apps/web/reactCompiledFiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,5 @@ export const REACT_COMPILED_FILES = [
"apps/web/src/components/settings/ThemeImportDialog.tsx",
"apps/web/src/components/settings/SnapShotSettings.tsx",
"apps/web/src/components/settings/ConnectionsSettings.tsx",
"apps/web/src/hooks/useResizeDrag.ts",
] as const;
60 changes: 30 additions & 30 deletions apps/web/src/hooks/useResizeDrag.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { type PointerEvent, useCallback, useEffect, useLayoutEffect, useRef } from "react";
import { type PointerEvent, useEffect, useEffectEvent, useLayoutEffect, useRef } from "react";

interface ResizeSession {
width: number;
Expand All @@ -23,51 +23,51 @@ export function useResizeDrag<T extends HTMLElement>(
frame: number | null;
} | null>(null);

const flush = useCallback(() => {
const flush = () => {
const active = drag.current;
if (!active) return;
const delta = (active.pendingX - active.startX) * (active.session.edge === "left" ? -1 : 1);
active.moved ||= Math.abs(delta) > 2;
if (Math.abs(delta) > 2) active.moved = true;
active.width = active.session.resize(active.session.width + delta);
}, []);
};

const finish = useCallback(
(commit = true) => {
const active = drag.current;
if (!active) return;
if (active.frame !== null) cancelAnimationFrame(active.frame);
if (commit) flush();
// Release can synchronously dispatch lostpointercapture.
drag.current = null;
try {
if (active.target.hasPointerCapture(active.pointerId)) {
active.target.releasePointerCapture(active.pointerId);
}
} catch {}
document.body.style.removeProperty("cursor");
document.body.style.removeProperty("user-select");
active.session.cleanup?.(commit);
if (commit) active.session.finish(active.width, active.moved);
},
[flush],
);
const finish = (commit = true) => {
const active = drag.current;
if (!active) return;
if (active.frame !== null) cancelAnimationFrame(active.frame);
if (commit) flush();
// Release can synchronously dispatch lostpointercapture.
drag.current = null;
try {
if (active.target.hasPointerCapture(active.pointerId)) {
active.target.releasePointerCapture(active.pointerId);
}
} catch {}
document.body.style.removeProperty("cursor");
document.body.style.removeProperty("user-select");
active.session.cleanup?.(commit);
if (commit) active.session.finish(active.width, active.moved);
};

// The effects must not rerun while a drag is live: their cleanup cancels it.
const finishDrag = useEffectEvent((commit: boolean) => finish(commit));

const previousResetKey = useRef(resetKey);
useLayoutEffect(() => {
if (previousResetKey.current !== resetKey) {
finish(false);
finishDrag(false);
previousResetKey.current = resetKey;
}
}, [finish, resetKey]);
}, [resetKey]);

useEffect(() => {
const onBlur = () => finish();
const onBlur = () => finishDrag(true);
window.addEventListener("blur", onBlur);
return () => {
window.removeEventListener("blur", onBlur);
finish(false);
finishDrag(false);
};
}, [finish]);
}, []);

const end = (event: PointerEvent<T>, usePosition: boolean) => {
const active = drag.current;
Expand Down Expand Up @@ -109,7 +109,7 @@ export function useResizeDrag<T extends HTMLElement>(
if (!active || active.pointerId !== event.pointerId) return;
event.preventDefault();
active.pendingX = event.clientX;
active.moved ||= Math.abs(event.clientX - active.startX) > 2;
if (Math.abs(event.clientX - active.startX) > 2) active.moved = true;
if (active.frame !== null) return;
active.frame = requestAnimationFrame(() => {
active.frame = null;
Expand Down
Loading