🎥 Make videos programmatically with React
Fix context menu double-click recovery
JonnyBurgereaa56da4d440
diff --git a/packages/example/e2e/timeline-right-edge.test.mts b/packages/example/e2e/timeline-right-edge.test.mtsindex ac0f3d65a9..e33ff2d17e 100644--- a/packages/example/e2e/timeline-right-edge.test.mts+++ b/packages/example/e2e/timeline-right-edge.test.mts@@ -1,5 +1,5 @@-import fs from 'fs';import {expect, test} from '@playwright/test';+import fs from 'fs';import {rootFile, STUDIO_URL} from './constants.mts';import {startStudio, stopStudio} from './studio-server.mts';@@ -128,6 +128,7 @@ export const E2eTestRoot = () => <Composition id="timeline-edges" component={Laybuttons: 0,pointerId: 1,});+ await movableLayer.dispatchEvent('click', {button: 0, detail: 2});await movableLayer.dispatchEvent('dblclick', {button: 0, detail: 2});await page.waitForTimeout(100);expect(openInEditorRequests).toHaveLength(0);diff --git a/packages/studio/src/components/SelectedOutlinePolygon.tsx b/packages/studio/src/components/SelectedOutlinePolygon.tsxindex fe6f7963be..36c6a8b441 100644--- a/packages/studio/src/components/SelectedOutlinePolygon.tsx+++ b/packages/studio/src/components/SelectedOutlinePolygon.tsx@@ -515,17 +515,7 @@ const SelectedOutlinePolygonUnmemoized: React.FC<{);const onClick = React.useCallback((event: React.MouseEvent<SVGPolygonElement>) => {- if (!dragAwareDoubleClick.recoverDoubleClick(event.detail)) {- return;- }-- performDoubleClick(event);- },- [dragAwareDoubleClick, performDoubleClick],- );- const onDoubleClick = React.useCallback(- (event: React.MouseEvent<SVGPolygonElement>) => {- if (!dragAwareDoubleClick.acceptDoubleClick()) {+ if (!dragAwareDoubleClick.acceptClickAsDoubleClick(event.detail)) {return;}@@ -631,7 +621,6 @@ const SelectedOutlinePolygonUnmemoized: React.FC<{onPointerDown={onPointerDown}onPointerDownCapture={dragAwareDoubleClick.beginPointerGesture}onClick={onClick}- onDoubleClick={onDoubleClick}onDragOver={onEffectDragOver}onDragLeave={onEffectDragLeave}onDrop={onEffectDrop}diff --git a/packages/studio/src/components/Timeline/TimelineRowChrome.tsx b/packages/studio/src/components/Timeline/TimelineRowChrome.tsxindex 98b3699c09..9d490c9d19 100644--- a/packages/studio/src/components/Timeline/TimelineRowChrome.tsx+++ b/packages/studio/src/components/Timeline/TimelineRowChrome.tsx@@ -169,17 +169,7 @@ export const TimelineRowChrome: React.FC<{);const onClick = useCallback((e: React.MouseEvent<HTMLDivElement>) => {- if (!doubleClickTracker.recoverDoubleClick(e.detail)) {- return;- }-- performDoubleClickIfNotInteractive(e);- },- [doubleClickTracker, performDoubleClickIfNotInteractive],- );- const onDoubleClickIfNotInteractive = useCallback(- (e: React.MouseEvent<HTMLDivElement>) => {- if (!doubleClickTracker.acceptDoubleClick()) {+ if (!doubleClickTracker.acceptClickAsDoubleClick(e.detail)) {return;}@@ -258,7 +248,6 @@ export const TimelineRowChrome: React.FC<{onPointerDown={selectable ? onPointerDown : undefined}onClick={onClick}onContextMenu={selectable ? onContextMenu : undefined}- onDoubleClick={onDoubleClickIfNotInteractive}onPointerEnter={onPointerEnter}onPointerLeave={onPointerLeave}>@@ -276,7 +265,6 @@ export const TimelineRowChrome: React.FC<{onPointerDown={selectable ? onPointerDown : undefined}onClick={onClick}onContextMenu={selectable ? onContextMenu : undefined}- onDoubleClick={onDoubleClickIfNotInteractive}onPointerEnter={onPointerEnter}onPointerLeave={onPointerLeave}style={innerRowStyle}diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsxindex f19db24cfa..ae9f026746 100644--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx@@ -8,8 +8,8 @@ import {Internals, useCurrentFrame} from 'remotion';import {StudioServerConnectionCtx} from '../../helpers/client-id';import {BLUE,- TIMELINE_BACKGROUND_COLOR,TIMELINE_AUDIO_GRADIENT,+ TIMELINE_BACKGROUND_COLOR,TIMELINE_NEGATIVE_START_BACKGROUND_COLOR,TIMELINE_NEGATIVE_START_BORDER_COLOR,TIMELINE_VIDEO_GRADIENT,@@ -192,7 +192,6 @@ const TimelineSequenceCurrentFrame: React.FC<{) => void;readonly onPointerDownCapture: React.PointerEventHandler<HTMLDivElement>;readonly onClick: React.MouseEventHandler<HTMLDivElement> | null;- readonly onDoubleClick?: (e: React.MouseEvent<HTMLDivElement>) => void;}> = ({s,displayDurationInFrames,@@ -211,7 +210,6 @@ const TimelineSequenceCurrentFrame: React.FC<{onMoveDragPointerDown,onPointerDownCapture,onClick,- onDoubleClick,}) => {const ref = useRef<HTMLDivElement>(null);const {onSelect, selectable, selected, selectionItem} =@@ -347,7 +345,6 @@ const TimelineSequenceCurrentFrame: React.FC<{onPointerDownCapture={onPointerDownCapture}onPointerDown={selectable ? onPointerDown : undefined}onClick={onClick ?? undefined}- onDoubleClick={onDoubleClick}>{negativeStart ? (<>@@ -584,17 +581,7 @@ const TimelineSequenceInner: React.FC<{);const onSequenceClick = useCallback((e: React.MouseEvent<HTMLDivElement>) => {- if (!dragAwareDoubleClick.recoverDoubleClick(e.detail)) {- return;- }-- performSequenceDoubleClick(e);- },- [dragAwareDoubleClick, performSequenceDoubleClick],- );- const onSequenceDoubleClick = useCallback(- (e: React.MouseEvent<HTMLDivElement>) => {- if (!dragAwareDoubleClick.acceptDoubleClick()) {+ if (!dragAwareDoubleClick.acceptClickAsDoubleClick(e.detail)) {return;}@@ -1026,9 +1013,6 @@ const TimelineSequenceInner: React.FC<{) : null}</>}- onDoubleClick={- canHandleSequenceDoubleClick ? onSequenceDoubleClick : undefined- }>{s.type === 'audio' && visibleLayout.media ? (<div style={mediaVisualizationStyle}>diff --git a/packages/studio/src/helpers/drag-aware-double-click.ts b/packages/studio/src/helpers/drag-aware-double-click.tsindex f9f5169596..b58f81acbd 100644--- a/packages/studio/src/helpers/drag-aware-double-click.ts+++ b/packages/studio/src/helpers/drag-aware-double-click.ts@@ -2,8 +2,7 @@ export type DragAwareDoubleClickTracker = {readonly beginPointerGesture: (event: Pick<PointerEvent, 'button'>) => void;readonly endPointerGesture: (wasDragged: boolean) => void;readonly consumePointerGestureWasDragged: () => boolean;- readonly acceptDoubleClick: () => boolean;- readonly recoverDoubleClick: (clickCount: number) => boolean;+ readonly acceptClickAsDoubleClick: (clickCount: number) => boolean;};export const createDragAwareDoubleClickTracker =@@ -11,7 +10,6 @@ export const createDragAwareDoubleClickTracker =let pointerGestureWasDragged = false;let previousPointerButton: number | null = null;let currentPointerButton: number | null = null;- let mixedButtonDoubleClickWasRejected = false;return {beginPointerGesture: (event) => {@@ -27,28 +25,13 @@ export const createDragAwareDoubleClickTracker =pointerGestureWasDragged = false;return wasDragged;},- acceptDoubleClick: () => {- const isPrimary =- previousPointerButton === 0 && currentPointerButton === 0;- mixedButtonDoubleClickWasRejected = !isPrimary;- return isPrimary;- },- recoverDoubleClick: (clickCount) => {- if (clickCount < 3) {- mixedButtonDoubleClickWasRejected = false;- return false;- }-- if (- !mixedButtonDoubleClickWasRejected ||- previousPointerButton !== 0 ||- currentPointerButton !== 0- ) {- return false;- }-- mixedButtonDoubleClickWasRejected = false;- return true;+ acceptClickAsDoubleClick: (clickCount) => {+ return (+ clickCount > 0 &&+ clickCount % 2 === 0 &&+ 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.tsindex afe32531be..077b87584b 100644--- a/packages/studio/src/test/drag-aware-double-click.test.ts+++ b/packages/studio/src/test/drag-aware-double-click.test.ts@@ -16,26 +16,26 @@ test('Drag-aware double clicks consume the drag from the current pointer gestureexpect(tracker.consumePointerGestureWasDragged()).toBe(false);});-test('Double clicks require two primary-button pointer gestures', () => {+test('Double clicks require an even click count and two primary-button pointer gestures', () => {const tracker = createDragAwareDoubleClickTracker();tracker.beginPointerGesture({button: 2});tracker.beginPointerGesture({button: 0});- expect(tracker.acceptDoubleClick()).toBe(false);+ expect(tracker.acceptClickAsDoubleClick(2)).toBe(false);tracker.beginPointerGesture({button: 0});- expect(tracker.acceptDoubleClick()).toBe(true);+ expect(tracker.acceptClickAsDoubleClick(1)).toBe(false);+ expect(tracker.acceptClickAsDoubleClick(2)).toBe(true);});-test('A rejected mixed-button double click can recover within the same click succession', () => {+test('A mixed-button click succession can recover on the next primary double click', () => {const tracker = createDragAwareDoubleClickTracker();tracker.beginPointerGesture({button: 2});- expect(tracker.acceptDoubleClick()).toBe(false);+ expect(tracker.acceptClickAsDoubleClick(2)).toBe(false);tracker.beginPointerGesture({button: 0});- expect(tracker.recoverDoubleClick(3)).toBe(false);+ expect(tracker.acceptClickAsDoubleClick(3)).toBe(false);tracker.beginPointerGesture({button: 0});- expect(tracker.recoverDoubleClick(4)).toBe(true);- expect(tracker.recoverDoubleClick(4)).toBe(false);+ expect(tracker.acceptClickAsDoubleClick(4)).toBe(true);});