Skip to content

🎥 Make videos programmatically with React

Make double-click recovery remount-safe

JonnyBurgerb751ae837a82
diff --git a/packages/studio/src/components/SelectedOutlinePolygon.tsx b/packages/studio/src/components/SelectedOutlinePolygon.tsx
index 36c6a8b441..05d50dcc93 100644
--- a/packages/studio/src/components/SelectedOutlinePolygon.tsx
+++ b/packages/studio/src/components/SelectedOutlinePolygon.tsx
@@ -515,7 +515,7 @@ const SelectedOutlinePolygonUnmemoized: React.FC<{
);
const onClick = React.useCallback(
(event: React.MouseEvent<SVGPolygonElement>) => {
- if (!dragAwareDoubleClick.acceptClickAsDoubleClick(event.detail)) {
+ if (!dragAwareDoubleClick.acceptClickAsDoubleClick(event)) {
return;
}
diff --git a/packages/studio/src/components/Timeline/TimelineRowChrome.tsx b/packages/studio/src/components/Timeline/TimelineRowChrome.tsx
index 9d490c9d19..f2aae9b593 100644
--- a/packages/studio/src/components/Timeline/TimelineRowChrome.tsx
+++ b/packages/studio/src/components/Timeline/TimelineRowChrome.tsx
@@ -169,7 +169,7 @@ export const TimelineRowChrome: React.FC<{
);
const onClick = useCallback(
(e: React.MouseEvent<HTMLDivElement>) => {
- if (!doubleClickTracker.acceptClickAsDoubleClick(e.detail)) {
+ if (!doubleClickTracker.acceptClickAsDoubleClick(e)) {
return;
}
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsx
index ae9f026746..c5e86cd277 100644
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@ -581,7 +581,7 @@ const TimelineSequenceInner: React.FC<{
);
const onSequenceClick = useCallback(
(e: React.MouseEvent<HTMLDivElement>) => {
- if (!dragAwareDoubleClick.acceptClickAsDoubleClick(e.detail)) {
+ if (!dragAwareDoubleClick.acceptClickAsDoubleClick(e)) {
return;
}
diff --git a/packages/studio/src/helpers/drag-aware-double-click.ts b/packages/studio/src/helpers/drag-aware-double-click.ts
index 28c6c8c6d3..adadff9b3b 100644
--- a/packages/studio/src/helpers/drag-aware-double-click.ts
+++ b/packages/studio/src/helpers/drag-aware-double-click.ts
@@ -2,7 +2,9 @@ export type DragAwareDoubleClickTracker = {
readonly beginPointerGesture: (event: Pick<PointerEvent, 'button'>) => void;
readonly endPointerGesture: (wasDragged: boolean) => void;
readonly consumePointerGestureWasDragged: () => boolean;
- readonly acceptClickAsDoubleClick: (clickCount: number) => boolean;
+ readonly acceptClickAsDoubleClick: (
+ event: Pick<MouseEvent, 'button' | 'detail'>,
+ ) => boolean;
};
export const createDragAwareDoubleClickTracker =
@@ -25,12 +27,13 @@ export const createDragAwareDoubleClickTracker =
pointerGestureWasDragged = false;
return wasDragged;
},
- acceptClickAsDoubleClick: (clickCount) => {
+ acceptClickAsDoubleClick: (event) => {
return (
- clickCount > 0 &&
- clickCount % 2 === 0 &&
- currentPointerButton === 0 &&
- (clickCount > 2 || previousPointerButton === 0)
+ event.button === 0 &&
+ event.detail > 0 &&
+ event.detail % 2 === 0 &&
+ (event.detail > 2 ||
+ (previousPointerButton === 0 && currentPointerButton === 0))
);
},
};
diff --git a/packages/studio/src/test/drag-aware-double-click.test.ts b/packages/studio/src/test/drag-aware-double-click.test.ts
index fc37bf980e..10a0363693 100644
--- a/packages/studio/src/test/drag-aware-double-click.test.ts
+++ b/packages/studio/src/test/drag-aware-double-click.test.ts
@@ -21,29 +21,29 @@ test('Double clicks require an even click count and two primary-button pointer g
tracker.beginPointerGesture({button: 2});
tracker.beginPointerGesture({button: 0});
- expect(tracker.acceptClickAsDoubleClick(2)).toBe(false);
+ expect(tracker.acceptClickAsDoubleClick({button: 0, detail: 2})).toBe(false);
tracker.beginPointerGesture({button: 0});
- expect(tracker.acceptClickAsDoubleClick(1)).toBe(false);
- expect(tracker.acceptClickAsDoubleClick(2)).toBe(true);
+ expect(tracker.acceptClickAsDoubleClick({button: 0, detail: 1})).toBe(false);
+ expect(tracker.acceptClickAsDoubleClick({button: 0, detail: 2})).toBe(true);
});
test('A mixed-button click succession can recover on the next primary double click', () => {
const tracker = createDragAwareDoubleClickTracker();
tracker.beginPointerGesture({button: 2});
- expect(tracker.acceptClickAsDoubleClick(2)).toBe(false);
+ expect(tracker.acceptClickAsDoubleClick({button: 0, detail: 2})).toBe(false);
tracker.beginPointerGesture({button: 0});
- expect(tracker.acceptClickAsDoubleClick(3)).toBe(false);
+ expect(tracker.acceptClickAsDoubleClick({button: 0, detail: 3})).toBe(false);
tracker.beginPointerGesture({button: 0});
- expect(tracker.acceptClickAsDoubleClick(4)).toBe(true);
+ expect(tracker.acceptClickAsDoubleClick({button: 0, detail: 4})).toBe(true);
});
test('A continued click succession can recover after the tracker remounts', () => {
const tracker = createDragAwareDoubleClickTracker();
- tracker.beginPointerGesture({button: 0});
- expect(tracker.acceptClickAsDoubleClick(2)).toBe(false);
- expect(tracker.acceptClickAsDoubleClick(4)).toBe(true);
+ expect(tracker.acceptClickAsDoubleClick({button: 0, detail: 2})).toBe(false);
+ expect(tracker.acceptClickAsDoubleClick({button: 0, detail: 4})).toBe(true);
+ expect(tracker.acceptClickAsDoubleClick({button: 2, detail: 4})).toBe(false);
});