Skip to content

🎥 Make videos programmatically with React

`@remotion/studio`: Emphasize selected timeline tracks

JonnyBurger2d840dd18710
diff --git a/packages/studio/src/components/Timeline/TimelineSelection.tsx b/packages/studio/src/components/Timeline/TimelineSelection.tsx
index 7a0a0a4852..c850ef1b36 100644
--- a/packages/studio/src/components/Timeline/TimelineSelection.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSelection.tsx
@@ -181,6 +181,20 @@ export type TimelineSelection =
readonly segmentIndex: number;
};
+export const getTimelineSequenceOpacity = ({
+ containsSelection,
+ selected,
+ selectedItems,
+}: {
+ readonly containsSelection: boolean;
+ readonly selected: boolean;
+ readonly selectedItems: readonly TimelineSelection[];
+}): number => {
+ const hasSelectedTrack = selectedItems.some((item) => item.type !== 'guide');
+
+ return hasSelectedTrack && !selected && !containsSelection ? 0.75 : 1;
+};
+
export type TimelineEasingSelection = Extract<
TimelineSelection,
{type: 'easing'}
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsx
index e84edf63c6..f88f7394e0 100644
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@ -46,11 +46,14 @@ import {LoopedTimelineIndicator} from './LoopedTimelineIndicators';
import {getTimelineAssetLinkInfo} from './timeline-asset-link';
import {TimelineImageInfo} from './TimelineImageInfo';
import {
+ getTimelineSequenceOpacity,
isTimelineSelectionModifierEvent,
shouldSelectTimelineRowOnPointerDown,
TIMELINE_MARQUEE_ITEM_ATTR,
useTimelineMarqueeSelectableItem,
+ useTimelineRowContainsSelection,
useTimelineRowSelection,
+ useTimelineSelection,
} from './TimelineSelection';
import {TimelineSequenceFrame} from './TimelineSequenceFrame';
import {
@@ -123,6 +126,8 @@ const TimelineSequenceCurrentFrame: React.FC<{
const ref = useRef<HTMLDivElement>(null);
const {onSelect, selectable, selected, selectionItem} =
useTimelineRowSelection(nodePathInfo);
+ const containsSelection = useTimelineRowContainsSelection(nodePathInfo);
+ const {selectedItems} = useTimelineSelection();
useTimelineMarqueeSelectableItem(selectionItem, ref);
const onPointerDown = useCallback(
@@ -172,9 +177,13 @@ const TimelineSequenceCurrentFrame: React.FC<{
const actualStyle: React.CSSProperties = useMemo(() => {
return {
...style,
- opacity: isInRange ? 1 : 0.5,
+ opacity: getTimelineSequenceOpacity({
+ containsSelection,
+ selected,
+ selectedItems,
+ }),
};
- }, [isInRange, style]);
+ }, [containsSelection, selected, selectedItems, style]);
return (
<div
diff --git a/packages/studio/src/test/timeline-selection.test.ts b/packages/studio/src/test/timeline-selection.test.ts
index a786de345b..109ffe6da5 100644
--- a/packages/studio/src/test/timeline-selection.test.ts
+++ b/packages/studio/src/test/timeline-selection.test.ts
@@ -118,6 +118,7 @@ import {
getTimelineSelectionAfterInteraction,
getTimelineSelectionFromNodePathInfo,
getTimelineSelectionKey,
+ getTimelineSequenceOpacity,
getTimelineSequenceSelectionForEscape,
getTimelineSequenceSelectionKey,
isTimelineSelectionModifierEvent,
@@ -3126,6 +3127,59 @@ test('Timeline hover highlight is weaker than selection', () => {
).toBe(TIMELINE_EXPANDED_SELECTED_BACKGROUND);
});
+test('Timeline sequence opacity emphasizes tracks containing selection', () => {
+ const nodePathInfo = makeNodePathInfo(['body', 0], []);
+ const sequenceSelection = {type: 'sequence' as const, nodePathInfo};
+ const propSelection = {
+ type: 'sequence-prop' as const,
+ nodePathInfo,
+ key: 'from',
+ };
+
+ expect(
+ getTimelineSequenceOpacity({
+ containsSelection: false,
+ selected: false,
+ selectedItems: [],
+ }),
+ ).toBe(1);
+ expect(
+ getTimelineSequenceOpacity({
+ containsSelection: true,
+ selected: false,
+ selectedItems: [propSelection],
+ }),
+ ).toBe(1);
+ expect(
+ getTimelineSequenceOpacity({
+ containsSelection: false,
+ selected: false,
+ selectedItems: [propSelection],
+ }),
+ ).toBe(0.75);
+ expect(
+ getTimelineSequenceOpacity({
+ containsSelection: false,
+ selected: false,
+ selectedItems: [sequenceSelection],
+ }),
+ ).toBe(0.75);
+ expect(
+ getTimelineSequenceOpacity({
+ containsSelection: false,
+ selected: true,
+ selectedItems: [sequenceSelection],
+ }),
+ ).toBe(1);
+ expect(
+ getTimelineSequenceOpacity({
+ containsSelection: false,
+ selected: false,
+ selectedItems: [{type: 'guide', guideId: 'guide'}],
+ }),
+ ).toBe(1);
+});
+
test('Timeline outlines visibility is enabled by default and persisted', () => {
withMockLocalStorage(() => {
expect(loadEditorShowOutlinesOption()).toBe(true);