Skip to content

🎥 Make videos programmatically with React

Merge remote-tracking branch 'origin/main' into codex/studio-accessible-names

JonnyBurger7a900a65ed76
diff --cc packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
index fd9b5b5d46,a8270dc5aa..10ed7746ba
--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
@@@ -1480,13 -1529,18 +1529,18 @@@ const TimelineSequenceLeftEdgeDragHandl
};
return (
- <div
- role="separator"
- aria-orientation="vertical"
- aria-label="Drag to trim start"
- style={style}
- onPointerDown={onPointerDown}
- />
+ <>
+ <div
+ role="separator"
+ aria-orientation="vertical"
- title="Drag to trim start"
++ aria-label="Drag to trim start"
+ style={style}
+ onPointerDown={onPointerDown}
+ />
+ {trimTooltip === null ? null : (
+ <TimelineTrimTooltip state={trimTooltip} fps={fps} />
+ )}
+ </>
);
};
@@@ -2077,13 -2166,18 +2166,18 @@@ const TimelineSequenceRightEdgeDragHand
};
return (
- <div
- role="separator"
- aria-orientation="vertical"
- aria-label="Drag to change duration"
- style={style}
- onPointerDown={onPointerDown}
- />
+ <>
+ <div
+ role="separator"
+ aria-orientation="vertical"
- title="Drag to change duration"
++ aria-label="Drag to change duration"
+ style={style}
+ onPointerDown={onPointerDown}
+ />
+ {trimTooltip === null ? null : (
+ <TimelineTrimTooltip state={trimTooltip} fps={fps} />
+ )}
+ </>
);
};