Skip to content

fix(DomeGallery): Resolve mobile tap/touch conflict and sizing animation across all variants #582

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

Closed
wants to merge 2 commits into from
+137 −139
Closed

fix(DomeGallery): Resolve mobile tap/touch conflict and sizing animation across all variants #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
980e920
fix(DomeGallery): Resolve mobile tap/touch conflict and sizing animation
KartikKar19 Oct 18, 2025
990fa00
fix(DomeGallery): Resolve mobile tap/touch conflict and enlargement a…
KartikKar19 Oct 18, 2025
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
103 changes: 56 additions & 47 deletions src/content/Components/DomeGallery/DomeGallery.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ export default function DomeGallery({
const openingRef = useRef(false);
const openStartedAtRef = useRef(0);
const lastDragEndAt = useRef(0);

const cancelTapRef = useRef(false);
const pointerTypeRef = useRef('mouse');
const tapTargetRef = useRef(null);
const scrollLockedRef = useRef(false);
const lockScroll = useCallback(() => {
if (scrollLockedRef.current) return;
Expand Down Expand Up @@ -300,49 +302,89 @@ export default function DomeGallery({
onDragStart: ({ event }) => {
if (focusedElRef.current) return;
stopInertia();
const evt = event;

pointerTypeRef.current = event.pointerType || 'mouse';
if (pointerTypeRef.current === 'touch') event.preventDefault();
if (pointerTypeRef.current === 'touch') lockScroll(); // Lock scroll on touch start

draggingRef.current = true;
cancelTapRef.current = false;
movedRef.current = false;
startRotRef.current = { ...rotationRef.current };
startPosRef.current = { x: evt.clientX, y: evt.clientY };
startPosRef.current = { x: event.clientX, y: event.clientY };

const potential = event.target.closest?.('.item__image');
tapTargetRef.current = potential || null;
},
onDrag: ({ event, last, velocity = [0, 0], direction = [0, 0], movement }) => {
onDrag: ({ event, last, velocity: velArr = [0, 0], direction: dirArr = [0, 0], movement }) => {
if (focusedElRef.current || !draggingRef.current || !startPosRef.current) return;
const evt = event;
const dxTotal = evt.clientX - startPosRef.current.x;
const dyTotal = evt.clientY - startPosRef.current.y;

if (pointerTypeRef.current === 'touch') event.preventDefault();

const dxTotal = event.clientX - startPosRef.current.x;
const dyTotal = event.clientY - startPosRef.current.y;

if (!movedRef.current) {
const dist2 = dxTotal * dxTotal + dyTotal * dyTotal;
if (dist2 > 16) movedRef.current = true;
}

const nextX = clamp(
startRotRef.current.x - dyTotal / dragSensitivity,
-maxVerticalRotationDeg,
maxVerticalRotationDeg
);
const nextY = wrapAngleSigned(startRotRef.current.y + dxTotal / dragSensitivity);

if (rotationRef.current.x !== nextX || rotationRef.current.y !== nextY) {
rotationRef.current = { x: nextX, y: nextY };
applyTransform(nextX, nextY);
}

if (last) {
draggingRef.current = false;
let [vMagX, vMagY] = velocity;
const [dirX, dirY] = direction;
let isTap = false;

if (startPosRef.current) {
const dx = event.clientX - startPosRef.current.x;
const dy = event.clientY - startPosRef.current.y;
const dist2 = dx * dx + dy * dy;
const TAP_THRESH_PX = pointerTypeRef.current === 'touch' ? 10 : 6;
if (dist2 <= TAP_THRESH_PX * TAP_THRESH_PX) {
isTap = true;
}
}

let [vMagX, vMagY] = velArr;
const [dirX, dirY] = dirArr;
let vx = vMagX * dirX;
let vy = vMagY * dirY;
if (Math.abs(vx) < 0.001 && Math.abs(vy) < 0.001 && Array.isArray(movement)) {

if (!isTap && Math.abs(vx) < 0.001 && Math.abs(vy) < 0.001 && Array.isArray(movement)) {
const [mx, my] = movement;
vx = clamp((mx / dragSensitivity) * 0.02, -1.2, 1.2);
vy = clamp((my / dragSensitivity) * 0.02, -1.2, 1.2);
}
if (Math.abs(vx) > 0.005 || Math.abs(vy) > 0.005) startInertia(vx, vy);

if (!isTap && (Math.abs(vx) > 0.005 || Math.abs(vy) > 0.005)) {
startInertia(vx, vy);
}
startPosRef.current = null;
cancelTapRef.current = !isTap;

if (isTap && tapTargetRef.current && !focusedElRef.current) {
openItemFromElement(tapTargetRef.current);
}
tapTargetRef.current = null;

if (cancelTapRef.current) setTimeout(() => (cancelTapRef.current = false), 120);
if (movedRef.current) lastDragEndAt.current = performance.now();
movedRef.current = false;
if (pointerTypeRef.current === 'touch') unlockScroll(); // Unlock scroll on drag end
}
}
},
{ target: mainRef, eventOptions: { passive: true } }
{ target: mainRef, eventOptions: { passive: false } }
);

useEffect(() => {
Expand Down Expand Up @@ -541,37 +583,6 @@ export default function DomeGallery({
[enlargeTransitionMs, lockScroll, openedImageHeight, openedImageWidth, segments]
);

const onTileClick = useCallback(
e => {
if (draggingRef.current) return;
if (performance.now() - lastDragEndAt.current < 80) return;
if (openingRef.current) return;
openItemFromElement(e.currentTarget);
},
[openItemFromElement]
);

const onTilePointerUp = useCallback(
e => {
if (e.pointerType !== 'touch') return;
if (draggingRef.current) return;
if (performance.now() - lastDragEndAt.current < 80) return;
if (openingRef.current) return;
openItemFromElement(e.currentTarget);
},
[openItemFromElement]
);

const onTileTouchEnd = useCallback(
e => {
if (draggingRef.current) return;
if (performance.now() - lastDragEndAt.current < 80) return;
if (openingRef.current) return;
openItemFromElement(e.currentTarget);
},
[openItemFromElement]
);

useEffect(() => {
return () => {
document.body.classList.remove('dg-scroll-lock');
Expand Down Expand Up @@ -611,13 +622,11 @@ export default function DomeGallery({
}}
>
<div
className="item__image"
className="item__image absolute block overflow-hidden cursor-pointer bg-gray-200 transition-transform duration-300"
role="button"
tabIndex={0}
aria-label={it.alt || 'Open image'}
onClick={onTileClick}
onPointerUp={onTilePointerUp}
onTouchEnd={onTileTouchEnd}

>
<img src={it.src} draggable={false} alt={it.alt} />
</div>
Expand Down
8 changes: 0 additions & 8 deletions src/tailwind/Components/DomeGallery/DomeGallery.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,14 +796,6 @@ export default function DomeGallery({
role="button"
tabIndex={0}
aria-label={it.alt || 'Open image'}
onClick={e => {
if (performance.now() - lastDragEndAt.current < 80) return;
openItemFromElement(e.currentTarget);
}}
onTouchEnd={e => {
if (performance.now() - lastDragEndAt.current < 80) return;
openItemFromElement(e.currentTarget);
}}
style={{
inset: '10px',
borderRadius: `var(--tile-radius, ${imageBorderRadius})`,
Expand Down
157 changes: 81 additions & 76 deletions src/ts-default/Components/DomeGallery/DomeGallery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ export default function DomeGallery({
const openingRef = useRef(false);
const openStartedAtRef = useRef(0);
const lastDragEndAt = useRef(0);

const cancelTapRef = useRef(false);
const pointerTypeRef = useRef<'mouse' | 'pen' | 'touch'>('mouse');
const tapTargetRef = useRef<HTMLElement | null>(null);
const scrollLockedRef = useRef(false);
const lockScroll = useCallback(() => {
if (scrollLockedRef.current) return;
Expand Down Expand Up @@ -338,66 +340,95 @@ export default function DomeGallery({
);

useGesture(
{
onDragStart: ({ event }) => {
if (focusedElRef.current) return;
stopInertia();
const evt = event as PointerEvent;
draggingRef.current = true;
movedRef.current = false;
startRotRef.current = { ...rotationRef.current };
startPosRef.current = { x: evt.clientX, y: evt.clientY };
},
onDrag: ({ event, last, velocity = [0, 0], direction = [0, 0], movement }) => {
if (focusedElRef.current || !draggingRef.current || !startPosRef.current) return;

const evt = event as PointerEvent;
const dxTotal = evt.clientX - startPosRef.current.x;
const dyTotal = evt.clientY - startPosRef.current.y;

if (!movedRef.current) {
const dist2 = dxTotal * dxTotal + dyTotal * dyTotal;
if (dist2 > 16) movedRef.current = true;
}
{
onDragStart: ({ event }) => {
if (focusedElRef.current) return;
stopInertia();

const nextX = clamp(
startRotRef.current.x - dyTotal / dragSensitivity,
-maxVerticalRotationDeg,
maxVerticalRotationDeg
);
const nextY = wrapAngleSigned(startRotRef.current.y + dxTotal / dragSensitivity);
const evt = event as PointerEvent;
pointerTypeRef.current = (evt.pointerType as any) || 'mouse';
if (pointerTypeRef.current === 'touch') evt.preventDefault();
if (pointerTypeRef.current === 'touch') lockScroll();

draggingRef.current = true;
cancelTapRef.current = false;
movedRef.current = false;
startRotRef.current = { ...rotationRef.current };
startPosRef.current = { x: evt.clientX, y: evt.clientY };
const potential = (evt.target as Element).closest?.('.item__image') as HTMLElement | null;
tapTargetRef.current = potential || null;
},
onDrag: ({ event, last, velocity: velArr = [0, 0], direction: dirArr = [0, 0], movement }) => {
if (focusedElRef.current || !draggingRef.current || !startPosRef.current) return;

if (rotationRef.current.x !== nextX || rotationRef.current.y !== nextY) {
rotationRef.current = { x: nextX, y: nextY };
applyTransform(nextX, nextY);
}
const evt = event as PointerEvent;
if (pointerTypeRef.current === 'touch') evt.preventDefault();

if (last) {
draggingRef.current = false;
const dxTotal = evt.clientX - startPosRef.current.x;
const dyTotal = evt.clientY - startPosRef.current.y;

let [vMagX, vMagY] = velocity;
const [dirX, dirY] = direction;
let vx = vMagX * dirX;
let vy = vMagY * dirY;
if (!movedRef.current) {
const dist2 = dxTotal * dxTotal + dyTotal * dyTotal;
if (dist2 > 16) movedRef.current = true;
}

if (Math.abs(vx) < 0.001 && Math.abs(vy) < 0.001 && Array.isArray(movement)) {
const [mx, my] = movement;
vx = clamp((mx / dragSensitivity) * 0.02, -1.2, 1.2);
vy = clamp((my / dragSensitivity) * 0.02, -1.2, 1.2);
}
const nextX = clamp(
startRotRef.current.x - dyTotal / dragSensitivity,
-maxVerticalRotationDeg,
maxVerticalRotationDeg
);
const nextY = wrapAngleSigned(startRotRef.current.y + dxTotal / dragSensitivity);

if (Math.abs(vx) > 0.005 || Math.abs(vy) > 0.005) {
startInertia(vx, vy);
if (rotationRef.current.x !== nextX || rotationRef.current.y !== nextY) {
rotationRef.current = { x: nextX, y: nextY };
applyTransform(nextX, nextY);
}

if (last) {
draggingRef.current = false;
let isTap = false;

if (startPosRef.current) {
const dx = evt.clientX - startPosRef.current.x;
const dy = evt.clientY - startPosRef.current.y;
const dist2 = dx * dx + dy * dy;
const TAP_THRESH_PX = pointerTypeRef.current === 'touch' ? 10 : 6;
if (dist2 <= TAP_THRESH_PX * TAP_THRESH_PX) {
isTap = true;
}
}

let [vMagX, vMagY] = velArr;
const [dirX, dirY] = dirArr;
let vx = vMagX * dirX;
let vy = vMagY * dirY;

if (!isTap && Math.abs(vx) < 0.001 && Math.abs(vy) < 0.001 && Array.isArray(movement)) {
const [mx, my] = movement;
vx = clamp((mx / dragSensitivity) * 0.02, -1.2, 1.2);
vy = clamp((my / dragSensitivity) * 0.02, -1.2, 1.2);
}

if (movedRef.current) lastDragEndAt.current = performance.now();
if (!isTap && (Math.abs(vx) > 0.005 || Math.abs(vy) > 0.005)) {
startInertia(vx, vy);
}
startPosRef.current = null;
cancelTapRef.current = !isTap;

movedRef.current = false;
if (isTap && tapTargetRef.current && !focusedElRef.current) {
openItemFromElement(tapTargetRef.current);
}
tapTargetRef.current = null;

if (cancelTapRef.current) setTimeout(() => (cancelTapRef.current = false), 120);
if (movedRef.current) lastDragEndAt.current = performance.now();
movedRef.current = false;
if (pointerTypeRef.current === 'touch') unlockScroll();
}
},
{ target: mainRef, eventOptions: { passive: true } }
);
}
},
{ target: mainRef, eventOptions: { passive: false } }
);

const openItemFromElement = (el: HTMLElement) => {
if (openingRef.current) return;
Expand Down Expand Up @@ -507,29 +538,6 @@ export default function DomeGallery({
overlay.addEventListener('transitionend', onFirstEnd);
}
};

const onTileClick = useCallback((e: React.MouseEvent<HTMLDivElement>) => {
if (draggingRef.current) return;
if (performance.now() - lastDragEndAt.current < 80) return;
if (openingRef.current) return;
openItemFromElement(e.currentTarget);
}, []);

const onTilePointerUp = useCallback((e: React.PointerEvent<HTMLDivElement>) => {
if (e.pointerType !== 'touch') return;
if (draggingRef.current) return;
if (performance.now() - lastDragEndAt.current < 80) return;
if (openingRef.current) return;
openItemFromElement(e.currentTarget);
}, []);

const onTileTouchEnd = useCallback((e: React.TouchEvent<HTMLDivElement>) => {
if (draggingRef.current) return;
if (performance.now() - lastDragEndAt.current < 80) return;
if (openingRef.current) return;
openItemFromElement(e.currentTarget);
}, []);

useEffect(() => {
const scrim = scrimRef.current;
if (!scrim) return;
Expand Down Expand Up @@ -716,9 +724,6 @@ export default function DomeGallery({
role="button"
tabIndex={0}
aria-label={it.alt || 'Open image'}
onClick={onTileClick}
onPointerUp={onTilePointerUp}
onTouchEnd={onTileTouchEnd}
>
<img src={it.src} draggable={false} alt={it.alt} />
</div>
Expand Down
8 changes: 0 additions & 8 deletions src/ts-tailwind/Components/DomeGallery/DomeGallery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,14 +810,6 @@ export default function DomeGallery({
role="button"
tabIndex={0}
aria-label={it.alt || 'Open image'}
onClick={e => {
if (performance.now() - lastDragEndAt.current < 80) return;
openItemFromElement(e.currentTarget as HTMLElement);
}}
onTouchEnd={e => {
if (performance.now() - lastDragEndAt.current < 80) return;
openItemFromElement(e.currentTarget);
}}
style={{
inset: '10px',
borderRadius: `var(--tile-radius, ${imageBorderRadius})`,
Expand Down