frontend
This commit is contained in:
@@ -3,6 +3,9 @@ import { useDesktopContext } from './context';
|
|||||||
import { preventAll } from './events';
|
import { preventAll } from './events';
|
||||||
import { clamp, formatTransform } from './math';
|
import { clamp, formatTransform } from './math';
|
||||||
|
|
||||||
|
const DRAG_HYSTERESIS_PX = 4;
|
||||||
|
const DRAG_HYSTERESIS_SQUARED = DRAG_HYSTERESIS_PX * DRAG_HYSTERESIS_PX;
|
||||||
|
|
||||||
const useDocumentDrag = () => {
|
const useDocumentDrag = () => {
|
||||||
const {
|
const {
|
||||||
layoutRef,
|
layoutRef,
|
||||||
@@ -59,7 +62,6 @@ const useDocumentDrag = () => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
preventAll(event);
|
preventAll(event);
|
||||||
const entry = layoutRef.current.get(docId) || null;
|
|
||||||
const docKey = docId != null ? String(docId) : null;
|
const docKey = docId != null ? String(docId) : null;
|
||||||
const doc = docKey ? documentLookup.get(docKey) : null;
|
const doc = docKey ? documentLookup.get(docKey) : null;
|
||||||
const { width: docWidth, height: docHeight } = ensureDocumentSize(doc);
|
const { width: docWidth, height: docHeight } = ensureDocumentSize(doc);
|
||||||
@@ -68,6 +70,7 @@ const useDocumentDrag = () => {
|
|||||||
Number.isFinite(baseScale) && baseScale > 0 ? baseScale : 1;
|
Number.isFinite(baseScale) && baseScale > 0 ? baseScale : 1;
|
||||||
const defaultCenterX = canvasPadding + docWidth / 2;
|
const defaultCenterX = canvasPadding + docWidth / 2;
|
||||||
const defaultCenterY = canvasPadding + docHeight / 2;
|
const defaultCenterY = canvasPadding + docHeight / 2;
|
||||||
|
const entry = layoutRef.current.get(docId) || null;
|
||||||
const centerX = typeof entry?.centerX === 'number' ? entry.centerX : defaultCenterX;
|
const centerX = typeof entry?.centerX === 'number' ? entry.centerX : defaultCenterX;
|
||||||
const centerY = typeof entry?.centerY === 'number' ? entry.centerY : defaultCenterY;
|
const centerY = typeof entry?.centerY === 'number' ? entry.centerY : defaultCenterY;
|
||||||
|
|
||||||
@@ -99,7 +102,6 @@ const useDocumentDrag = () => {
|
|||||||
dragScale: 1,
|
dragScale: 1,
|
||||||
baseScale: normalizedBaseScale,
|
baseScale: normalizedBaseScale,
|
||||||
capturedTarget,
|
capturedTarget,
|
||||||
raised: false,
|
|
||||||
};
|
};
|
||||||
setDraggingId(docId);
|
setDraggingId(docId);
|
||||||
},
|
},
|
||||||
@@ -166,18 +168,13 @@ const useDocumentDrag = () => {
|
|||||||
const clampedCenterX = clamp(nextCenterX, minCenterX, maxCenterX);
|
const clampedCenterX = clamp(nextCenterX, minCenterX, maxCenterX);
|
||||||
const clampedCenterY = clamp(nextCenterY, minCenterY, maxCenterY);
|
const clampedCenterY = clamp(nextCenterY, minCenterY, maxCenterY);
|
||||||
|
|
||||||
const prevCenterX = typeof entry.centerX === 'number' ? entry.centerX : state.originCenterX;
|
if (!state.moved) {
|
||||||
const prevCenterY = typeof entry.centerY === 'number' ? entry.centerY : state.originCenterY;
|
const distanceSquared = deltaX * deltaX + deltaY * deltaY;
|
||||||
if (Math.abs(clampedCenterX - prevCenterX) < 0.5 && Math.abs(clampedCenterY - prevCenterY) < 0.5) {
|
if (distanceSquared < DRAG_HYSTERESIS_SQUARED) {
|
||||||
if (debugDrag) {
|
|
||||||
console.log('[skeuo] handlePointerMove: movement under threshold for doc', state.docId);
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!state.raised) {
|
|
||||||
bringToFront(state.docId);
|
bringToFront(state.docId);
|
||||||
state.raised = true;
|
state.moved = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const updated = { ...entry, centerX: clampedCenterX, centerY: clampedCenterY };
|
const updated = { ...entry, centerX: clampedCenterX, centerY: clampedCenterY };
|
||||||
@@ -192,7 +189,6 @@ const useDocumentDrag = () => {
|
|||||||
state.dragScale || 1,
|
state.dragScale || 1,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
state.moved = true;
|
|
||||||
if (debugDrag) {
|
if (debugDrag) {
|
||||||
console.log('[skeuo] handlePointerMove: moved doc', state.docId, 'to', clampedCenterX, clampedCenterY);
|
console.log('[skeuo] handlePointerMove: moved doc', state.docId, 'to', clampedCenterX, clampedCenterY);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,10 +25,68 @@ const PreviewZoomOverlay = ({
|
|||||||
const portalTarget = ensureDocumentRoot();
|
const portalTarget = ensureDocumentRoot();
|
||||||
const [isNativeScale, setIsNativeScale] = useState(false);
|
const [isNativeScale, setIsNativeScale] = useState(false);
|
||||||
const [naturalSize, setNaturalSize] = useState({ width: null, height: null });
|
const [naturalSize, setNaturalSize] = useState({ width: null, height: null });
|
||||||
|
const [renderBackdrop, setRenderBackdrop] = useState(false);
|
||||||
|
const [isBackdropVisible, setBackdropVisible] = useState(false);
|
||||||
|
const [displaySnapshot, setDisplaySnapshot] = useState(null);
|
||||||
const scrollRef = useRef(null);
|
const scrollRef = useRef(null);
|
||||||
const imageRef = useRef(null);
|
const imageRef = useRef(null);
|
||||||
const focusRef = useRef(null);
|
const focusRef = useRef(null);
|
||||||
const previouslyFocusedRef = useRef(null);
|
const previouslyFocusedRef = useRef(null);
|
||||||
|
const visibilityTimerRef = useRef(null);
|
||||||
|
const displayTimerRef = useRef(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (display?.url) {
|
||||||
|
setDisplaySnapshot(display);
|
||||||
|
}
|
||||||
|
}, [display]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (visibilityTimerRef.current) {
|
||||||
|
clearTimeout(visibilityTimerRef.current);
|
||||||
|
visibilityTimerRef.current = null;
|
||||||
|
}
|
||||||
|
if (displayTimerRef.current) {
|
||||||
|
cancelAnimationFrame(displayTimerRef.current);
|
||||||
|
displayTimerRef.current = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (open && display?.url) {
|
||||||
|
setRenderBackdrop(true);
|
||||||
|
displayTimerRef.current = requestAnimationFrame(() => {
|
||||||
|
displayTimerRef.current = requestAnimationFrame(() => {
|
||||||
|
setBackdropVisible(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return () => {
|
||||||
|
if (displayTimerRef.current) {
|
||||||
|
cancelAnimationFrame(displayTimerRef.current);
|
||||||
|
displayTimerRef.current = null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
setBackdropVisible(false);
|
||||||
|
visibilityTimerRef.current = setTimeout(() => {
|
||||||
|
setRenderBackdrop(false);
|
||||||
|
}, 260);
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
if (visibilityTimerRef.current) {
|
||||||
|
clearTimeout(visibilityTimerRef.current);
|
||||||
|
visibilityTimerRef.current = null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}, [open, display?.url]);
|
||||||
|
|
||||||
|
useEffect(() => () => {
|
||||||
|
if (visibilityTimerRef.current) {
|
||||||
|
clearTimeout(visibilityTimerRef.current);
|
||||||
|
}
|
||||||
|
if (displayTimerRef.current) {
|
||||||
|
cancelAnimationFrame(displayTimerRef.current);
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setIsNativeScale(false);
|
setIsNativeScale(false);
|
||||||
@@ -75,7 +133,7 @@ const PreviewZoomOverlay = ({
|
|||||||
previouslyFocusedRef.current.focus();
|
previouslyFocusedRef.current.focus();
|
||||||
}
|
}
|
||||||
previouslyFocusedRef.current = null;
|
previouslyFocusedRef.current = null;
|
||||||
return undefined;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (typeof document !== 'undefined') {
|
if (typeof document !== 'undefined') {
|
||||||
@@ -86,24 +144,24 @@ const PreviewZoomOverlay = ({
|
|||||||
previouslyFocusedRef.current = null;
|
previouslyFocusedRef.current = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}, [open]);
|
||||||
|
|
||||||
const scrollEl = scrollRef.current;
|
const activeDisplay = open && display?.url ? display : displaySnapshot;
|
||||||
if (!scrollEl) {
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!renderBackdrop || !activeDisplay?.url) {
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
const frame = requestAnimationFrame(() => {
|
const frame = requestAnimationFrame(() => {
|
||||||
scrollEl.focus();
|
const scrollEl = scrollRef.current;
|
||||||
|
if (scrollEl && typeof scrollEl.focus === 'function') {
|
||||||
|
scrollEl.focus({ preventScroll: true });
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return () => {
|
return () => cancelAnimationFrame(frame);
|
||||||
cancelAnimationFrame(frame);
|
}, [renderBackdrop, activeDisplay?.url]);
|
||||||
if (previouslyFocusedRef.current && typeof previouslyFocusedRef.current.focus === 'function') {
|
|
||||||
previouslyFocusedRef.current.focus();
|
|
||||||
previouslyFocusedRef.current = null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}, [open]);
|
|
||||||
|
|
||||||
const handleKeyDown = (event) => {
|
const handleKeyDown = (event) => {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
@@ -119,26 +177,27 @@ const PreviewZoomOverlay = ({
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (event.key === 'ArrowLeft') {
|
if (event.key === 'ArrowLeft') {
|
||||||
if (display?.canGoPrev && display?.goPrev) {
|
if (activeDisplay?.canGoPrev && activeDisplay?.goPrev) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
display.goPrev();
|
activeDisplay.goPrev();
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.key === 'ArrowRight') {
|
if (event.key === 'ArrowRight') {
|
||||||
if (display?.canGoNext && display?.goNext) {
|
if (activeDisplay?.canGoNext && activeDisplay?.goNext) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
display.goNext();
|
activeDisplay.goNext();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!open || !display?.url || !portalTarget) {
|
if (!renderBackdrop || !activeDisplay?.url || !portalTarget) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const navVisible = Boolean(display?.canGoPrev || display?.canGoNext);
|
const effectiveDisplay = activeDisplay;
|
||||||
|
const navVisible = Boolean(effectiveDisplay?.canGoPrev || effectiveDisplay?.canGoNext);
|
||||||
const stageClassName = [
|
const stageClassName = [
|
||||||
'preview-zoom__stage',
|
'preview-zoom__stage',
|
||||||
]
|
]
|
||||||
@@ -152,6 +211,13 @@ const PreviewZoomOverlay = ({
|
|||||||
.filter(Boolean)
|
.filter(Boolean)
|
||||||
.join(' ');
|
.join(' ');
|
||||||
|
|
||||||
|
const backdropClassName = [
|
||||||
|
'preview-zoom-backdrop',
|
||||||
|
isBackdropVisible ? 'preview-zoom-backdrop--visible' : '',
|
||||||
|
]
|
||||||
|
.filter(Boolean)
|
||||||
|
.join(' ');
|
||||||
|
|
||||||
const imageStyle = isNativeScale
|
const imageStyle = isNativeScale
|
||||||
? {
|
? {
|
||||||
cursor: 'zoom-out',
|
cursor: 'zoom-out',
|
||||||
@@ -169,7 +235,7 @@ const PreviewZoomOverlay = ({
|
|||||||
return createPortal(
|
return createPortal(
|
||||||
(
|
(
|
||||||
<div
|
<div
|
||||||
className="preview-zoom-backdrop"
|
className={backdropClassName}
|
||||||
role="dialog"
|
role="dialog"
|
||||||
aria-modal="true"
|
aria-modal="true"
|
||||||
aria-label="Enlarged document preview"
|
aria-label="Enlarged document preview"
|
||||||
@@ -186,8 +252,8 @@ const PreviewZoomOverlay = ({
|
|||||||
tabIndex={-1}
|
tabIndex={-1}
|
||||||
>
|
>
|
||||||
<img
|
<img
|
||||||
src={display.url}
|
src={effectiveDisplay.url}
|
||||||
alt={display.alt || 'Document preview'}
|
alt={effectiveDisplay.alt || 'Document preview'}
|
||||||
className="preview-zoom__image"
|
className="preview-zoom__image"
|
||||||
ref={imageRef}
|
ref={imageRef}
|
||||||
draggable={false}
|
draggable={false}
|
||||||
@@ -227,12 +293,12 @@ const PreviewZoomOverlay = ({
|
|||||||
className="preview-zoom__nav-button"
|
className="preview-zoom__nav-button"
|
||||||
onClick={(event) => {
|
onClick={(event) => {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
if (display?.canGoPrev && display?.goPrev) {
|
if (effectiveDisplay?.canGoPrev && effectiveDisplay?.goPrev) {
|
||||||
display.goPrev();
|
effectiveDisplay.goPrev();
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
aria-label="Previous preview"
|
aria-label="Previous preview"
|
||||||
disabled={!display?.canGoPrev}
|
disabled={!effectiveDisplay?.canGoPrev}
|
||||||
>
|
>
|
||||||
<ArrowLeftIcon />
|
<ArrowLeftIcon />
|
||||||
</button>
|
</button>
|
||||||
@@ -241,12 +307,12 @@ const PreviewZoomOverlay = ({
|
|||||||
className="preview-zoom__nav-button"
|
className="preview-zoom__nav-button"
|
||||||
onClick={(event) => {
|
onClick={(event) => {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
if (display?.canGoNext && display?.goNext) {
|
if (effectiveDisplay?.canGoNext && effectiveDisplay?.goNext) {
|
||||||
display.goNext();
|
effectiveDisplay.goNext();
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
aria-label="Next preview"
|
aria-label="Next preview"
|
||||||
disabled={!display?.canGoNext}
|
disabled={!effectiveDisplay?.canGoNext}
|
||||||
>
|
>
|
||||||
<ArrowRightIcon />
|
<ArrowRightIcon />
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
+10
-1
@@ -244,13 +244,22 @@ button.danger:hover:not([disabled]) {
|
|||||||
.preview-zoom-backdrop {
|
.preview-zoom-backdrop {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
inset: 0;
|
inset: 0;
|
||||||
background: var(--overlay-backdrop);
|
background: rgba(15, 23, 42, 0);
|
||||||
|
transition: background 0.25s ease, opacity 0.25s ease;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
padding: 2rem;
|
padding: 2rem;
|
||||||
z-index: 3000;
|
z-index: 3000;
|
||||||
cursor: zoom-out;
|
cursor: zoom-out;
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.preview-zoom-backdrop--visible {
|
||||||
|
opacity: 1;
|
||||||
|
background: var(--overlay-backdrop);
|
||||||
|
pointer-events: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.preview-zoom__stage {
|
.preview-zoom__stage {
|
||||||
|
|||||||
Reference in New Issue
Block a user