@remotion/studio 4.0.478 → 4.0.481

package/dist/components/Timeline/call-delete-keyframe.d.ts

@@ -1,11 +1,11 @@
-import type { SequencePropsSubscriptionKey, SequenceSchema } from 'remotion';
+import type { SequencePropsSubscriptionKey, InteractivitySchema } from 'remotion';
 import type { SetPropStatuses } from './save-sequence-prop';
 export type DeleteSequenceKeyframeChange = {
     fileName: string;
     nodePath: SequencePropsSubscriptionKey;
     fieldKey: string;
     sourceFrame: number;
-    schema: SequenceSchema;
+    schema: InteractivitySchema;
 };
 export type DeleteEffectKeyframeChange = DeleteSequenceKeyframeChange & {
     effectIndex: number;
@@ -15,7 +15,7 @@ export declare const callDeleteSequenceKeyframe: ({ fileName, nodePath, fieldKey
     nodePath: SequencePropsSubscriptionKey;
     fieldKey: string;
     sourceFrame: number;
-    schema: SequenceSchema;
+    schema: InteractivitySchema;
     setPropStatuses: SetPropStatuses;
     clientId: string;
 }) => Promise<void>;
@@ -25,7 +25,7 @@ export declare const callDeleteEffectKeyframe: ({ fileName, nodePath, effectInde
     effectIndex: number;
     fieldKey: string;
     sourceFrame: number;
-    schema: SequenceSchema;
+    schema: InteractivitySchema;
     setPropStatuses: SetPropStatuses;
     clientId: string;
 }) => Promise<void>;

package/dist/components/Timeline/call-move-keyframe.d.ts

@@ -1,4 +1,4 @@
-import type { SequencePropsSubscriptionKey, SequenceSchema } from 'remotion';
+import type { SequencePropsSubscriptionKey, InteractivitySchema } from 'remotion';
 import type { SetPropStatuses } from './save-sequence-prop';
 export type MoveSequenceKeyframeChange = {
     fileName: string;
@@ -6,7 +6,7 @@ export type MoveSequenceKeyframeChange = {
     fieldKey: string;
     fromFrame: number;
     toFrame: number;
-    schema: SequenceSchema;
+    schema: InteractivitySchema;
 };
 export type MoveEffectKeyframeChange = MoveSequenceKeyframeChange & {
     effectIndex: number;

package/dist/components/Timeline/call-update-keyframe-settings.d.ts

@@ -1,12 +1,12 @@
 import { type KeyframeSettings } from '@remotion/studio-shared';
-import type { SequencePropsSubscriptionKey, SequenceSchema } from 'remotion';
+import type { SequencePropsSubscriptionKey, InteractivitySchema } from 'remotion';
 import type { SetPropStatuses } from './save-sequence-prop';
 export declare const callUpdateSequenceKeyframeSettings: ({ fileName, nodePath, fieldKey, settings, schema, setPropStatuses, clientId, }: {
     fileName: string;
     nodePath: SequencePropsSubscriptionKey;
     fieldKey: string;
     settings: KeyframeSettings;
-    schema: SequenceSchema;
+    schema: InteractivitySchema;
     setPropStatuses: SetPropStatuses;
     clientId: string;
 }) => Promise<void>;
@@ -16,7 +16,7 @@ export declare const callUpdateEffectKeyframeSettings: ({ fileName, nodePath, ef
     effectIndex: number;
     fieldKey: string;
     settings: KeyframeSettings;
-    schema: SequenceSchema;
+    schema: InteractivitySchema;
     setPropStatuses: SetPropStatuses;
     clientId: string;
 }) => Promise<void>;

package/dist/components/Timeline/delete-selected-timeline-item.d.ts

@@ -1,7 +1,7 @@
 import type { OverrideIdToNodePaths, TSequence } from 'remotion';
 import type { ConfirmationDialogFunction } from '../ConfirmationDialog-types';
 import type { SetPropStatuses } from './save-sequence-prop';
-import type { TimelineSelection } from './TimelineSelection';
+import { type TimelineSelection } from './TimelineSelection';
 export declare const deleteSelectedTimelineItem: ({ selection, sequences, overrideIdsToNodePaths, setPropStatuses, clientId, confirm, }: {
     selection: TimelineSelection;
     sequences: TSequence[];
@@ -10,6 +10,7 @@ export declare const deleteSelectedTimelineItem: ({ selection, sequences, overri
     clientId: string;
     confirm: ConfirmationDialogFunction;
 }) => Promise<boolean> | null;
+export declare const getTimelineSelectionAfterDeletingItems: (selections: readonly TimelineSelection[]) => readonly TimelineSelection[];
 export declare const deleteSelectedTimelineItems: ({ selections, sequences, overrideIdsToNodePaths, setPropStatuses, clientId, confirm, }: {
     selections: readonly TimelineSelection[];
     sequences: TSequence[];

package/dist/components/Timeline/delete-selected-timeline-item.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteSelectedTimelineItems = exports.deleteSelectedTimelineItem = void 0;
+exports.deleteSelectedTimelineItems = exports.getTimelineSelectionAfterDeletingItems = exports.deleteSelectedTimelineItem = void 0;
 const call_api_1 = require("../call-api");
 const NotificationCenter_1 = require("../Notifications/NotificationCenter");
 const delete_selected_keyframe_1 = require("./delete-selected-keyframe");
+const TimelineSelection_1 = require("./TimelineSelection");
 const confirmDeletingDuplicatedSequences = (nodePathInfos, confirm) => {
     const duplicatedNodePathInfos = nodePathInfos.filter((nodePathInfo) => nodePathInfo.numberOfSequencesWithThisNodePath > 1);
     if (duplicatedNodePathInfos.length === 0) {
@@ -136,6 +137,31 @@ const isSequenceRowSelection = (selection) => selection.type === 'sequence';
 const isSequenceEffectSelection = (selection) => selection.type === 'sequence-effect';
 const isSequenceAllEffectsSelection = (selection) => selection.type === 'sequence-all-effects';
 const isKeyframeSelection = (selection) => selection.type === 'keyframe';
+const getSequenceSelectionAfterDeletingEffect = (selection) => {
+    if (selection.type !== 'sequence-effect' &&
+        selection.type !== 'sequence-all-effects') {
+        return null;
+    }
+    return {
+        type: 'sequence',
+        nodePathInfo: {
+            ...selection.nodePathInfo,
+            auxiliaryKeys: [],
+        },
+    };
+};
+const getTimelineSelectionAfterDeletingItems = (selections) => {
+    const nextSelections = new Map();
+    for (const selection of selections) {
+        const nextSelection = getSequenceSelectionAfterDeletingEffect(selection);
+        if (!nextSelection) {
+            return [];
+        }
+        nextSelections.set((0, TimelineSelection_1.getTimelineSelectionKey)(nextSelection), nextSelection);
+    }
+    return Array.from(nextSelections.values());
+};
+exports.getTimelineSelectionAfterDeletingItems = getTimelineSelectionAfterDeletingItems;
 const areSelectionsOnlyOfType = (selections, type) => selections.every((selection) => selection.type === type);
 const assertTimelineSelectionsHaveSameType = (selections) => {
     const firstSelection = selections[0];

package/dist/components/Timeline/find-track-for-node-path-info.js

@@ -6,8 +6,8 @@ const calculate_timeline_1 = require("../../helpers/calculate-timeline");
 const findTrackForNodePathInfo = ({ sequences, overrideIdsToNodePaths, nodePathInfo, }) => {
     const tracks = (0, calculate_timeline_1.calculateTimeline)({ sequences, overrideIdsToNodePaths });
     return tracks.find((candidate) => candidate.nodePathInfo !== null &&
-        (0, studio_shared_1.stringifySequenceSubscriptionKey)(candidate.nodePathInfo.sequenceSubscriptionKey) ===
-            (0, studio_shared_1.stringifySequenceSubscriptionKey)(nodePathInfo.sequenceSubscriptionKey) &&
+        (0, studio_shared_1.stringifySequenceExpandedRowKey)(candidate.nodePathInfo.sequenceSubscriptionKey) ===
+            (0, studio_shared_1.stringifySequenceExpandedRowKey)(nodePathInfo.sequenceSubscriptionKey) &&
         candidate.nodePathInfo.index === nodePathInfo.index);
 };
 exports.findTrackForNodePathInfo = findTrackForNodePathInfo;

package/dist/components/Timeline/get-node-keyframes.d.ts

@@ -12,3 +12,10 @@ export declare const getNodeKeyframes: ({ node, nodePath, propStatuses, keyframe
     frame: number;
     value: unknown;
 }[];
+export declare const getNodeHasKeyframes: ({ node, nodePath, propStatuses, getDragOverrides, getEffectDragOverrides, }: {
+    node: TimelineTreeNode;
+    nodePath: SequencePropsSubscriptionKey;
+    propStatuses: PropStatuses;
+    getDragOverrides: GetDragOverrides;
+    getEffectDragOverrides: GetEffectDragOverrides;
+}) => boolean;

package/dist/components/Timeline/get-node-keyframes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeKeyframes = void 0;
+exports.getNodeHasKeyframes = exports.getNodeKeyframes = void 0;
 const remotion_1 = require("remotion");
 const get_timeline_keyframes_1 = require("./get-timeline-keyframes");
 const hasOverride = (overrides, key) => Object.prototype.hasOwnProperty.call(overrides, key);
@@ -54,3 +54,28 @@ const getNodeKeyframes = ({ node, nodePath, propStatuses, keyframeDisplayOffset,
     });
 };
 exports.getNodeKeyframes = getNodeKeyframes;
+const getNodeHasKeyframes = ({ node, nodePath, propStatuses, getDragOverrides, getEffectDragOverrides, }) => {
+    var _a, _b, _c, _d, _e, _f;
+    if (node.kind !== 'field' || node.field === null) {
+        return false;
+    }
+    if (node.field.kind === 'sequence-field') {
+        const dragOverrides = getDragOverrides(nodePath);
+        if (((_a = dragOverrides[node.field.key]) === null || _a === void 0 ? void 0 : _a.type) === 'keyframed') {
+            return true;
+        }
+        return (((_c = (_b = remotion_1.Internals.getPropStatusesCtx(propStatuses, nodePath)) === null || _b === void 0 ? void 0 : _b[node.field.key]) === null || _c === void 0 ? void 0 : _c.status) === 'keyframed');
+    }
+    const effectDragOverrides = getEffectDragOverrides(nodePath, node.field.effectIndex);
+    if (((_d = effectDragOverrides[node.field.key]) === null || _d === void 0 ? void 0 : _d.type) === 'keyframed') {
+        return true;
+    }
+    const effectStatus = remotion_1.Internals.getEffectPropStatusesCtx({
+        propStatuses,
+        nodePath,
+        effectIndex: node.field.effectIndex,
+    });
+    return (effectStatus.type === 'can-update-effect' &&
+        ((_f = (_e = effectStatus.props) === null || _e === void 0 ? void 0 : _e[node.field.key]) === null || _f === void 0 ? void 0 : _f.status) === 'keyframed');
+};
+exports.getNodeHasKeyframes = getNodeHasKeyframes;

package/dist/components/Timeline/parse-keyframe-field-from-node-path.js

@@ -6,7 +6,7 @@ const parseKeyframeFieldFromNodePath = (auxiliaryKeys) => {
     if (auxiliaryKeys[0] === 'controls' && auxiliaryKeys.length >= 2) {
         return {
             type: 'sequence',
-            fieldKey: auxiliaryKeys[1],
+            fieldKey: auxiliaryKeys.slice(1).join('.'),
         };
     }
     // Effect field: ['effects', effectIndex, fieldKey]
@@ -18,7 +18,7 @@ const parseKeyframeFieldFromNodePath = (auxiliaryKeys) => {
         return {
             type: 'effect',
             effectIndex,
-            fieldKey: auxiliaryKeys[2],
+            fieldKey: auxiliaryKeys.slice(2).join('.'),
         };
     }
     return null;

package/dist/components/Timeline/reset-selected-timeline-props.d.ts

@@ -1,4 +1,4 @@
-import type { OverrideIdToNodePaths, PropStatuses, SequencePropsSubscriptionKey, SequenceSchema, TSequence } from 'remotion';
+import type { OverrideIdToNodePaths, PropStatuses, SequencePropsSubscriptionKey, InteractivitySchema, TSequence } from 'remotion';
 import type { SetPropStatuses } from './save-sequence-prop';
 import type { TimelineSelection } from './TimelineSelection';
 type SequencePropResetTarget = {
@@ -8,7 +8,7 @@ type SequencePropResetTarget = {
     readonly fieldKey: string;
     readonly value: unknown;
     readonly defaultValue: string | null;
-    readonly schema: SequenceSchema;
+    readonly schema: InteractivitySchema;
 };
 type EffectPropResetTarget = {
     readonly type: 'effect-prop';
@@ -18,7 +18,7 @@ type EffectPropResetTarget = {
     readonly fieldKey: string;
     readonly value: unknown;
     readonly defaultValue: string | null;
-    readonly schema: SequenceSchema;
+    readonly schema: InteractivitySchema;
 };
 type TimelinePropResetTarget = SequencePropResetTarget | EffectPropResetTarget;
 export declare const getTimelinePropResetTargets: ({ selections, sequences, overrideIdsToNodePaths, propStatuses, }: {

package/dist/components/Timeline/reset-selected-timeline-props.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resetSelectedTimelineProps = exports.getTimelinePropResetTargets = void 0;
+const studio_shared_1 = require("@remotion/studio-shared");
 const remotion_1 = require("remotion");
 const find_track_for_node_path_info_1 = require("./find-track-for-node-path-info");
 const save_effect_prop_1 = require("./save-effect-prop");
@@ -23,9 +24,12 @@ const isResettablePropStatus = ({ propStatus, defaultValue, }) => {
     if (defaultValue === undefined) {
         return false;
     }
-    if (propStatus.status === 'keyframed' || propStatus.status === 'computed') {
+    if (propStatus.status === 'keyframed') {
         return true;
     }
+    if (propStatus.status === 'computed') {
+        return false;
+    }
     return isNonDefaultCodeValue({
         propStatus: propStatus.codeValue,
         defaultValue,
@@ -34,9 +38,11 @@ const isResettablePropStatus = ({ propStatus, defaultValue, }) => {
 const getDefaultValue = (fieldSchema) => fieldSchema.default !== undefined
     ? JSON.stringify(fieldSchema.default)
     : null;
+const getActiveFieldSchema = ({ schema, key, resolveValue, }) => {
+    return remotion_1.Internals.flattenActiveSchema(schema, resolveValue)[key];
+};
 const getTimelinePropResetTargets = ({ selections, sequences, overrideIdsToNodePaths, propStatuses, }) => {
     var _a;
-    var _b;
     const propSelections = selections.filter(isPropResetSelection);
     if (propSelections.length === 0) {
         return null;
@@ -52,7 +58,7 @@ const getTimelinePropResetTargets = ({ selections, sequences, overrideIdsToNodeP
             overrideIdsToNodePaths,
             nodePathInfo: selection.nodePathInfo,
         });
-        const sequence = (_b = track === null || track === void 0 ? void 0 : track.sequence) !== null && _b !== void 0 ? _b : null;
+        const sequence = (_a = track === null || track === void 0 ? void 0 : track.sequence) !== null && _a !== void 0 ? _a : null;
         if (!sequence) {
             continue;
         }
@@ -61,11 +67,23 @@ const getTimelinePropResetTargets = ({ selections, sequences, overrideIdsToNodeP
             if (!sequence.controls) {
                 continue;
             }
-            const sequenceFieldSchema = sequence.controls.schema[selection.key];
-            const sequencePropStatus = (_a = remotion_1.Internals.getPropStatusesCtx(propStatuses, nodePath)) === null || _a === void 0 ? void 0 : _a[selection.key];
+            const sequencePropStatus = remotion_1.Internals.getPropStatusesCtx(propStatuses, nodePath);
+            const { merged: sequenceValuesDotNotation } = remotion_1.Internals.computeEffectiveSchemaValuesDotNotation({
+                schema: sequence.controls.schema,
+                currentValue: sequence.controls.currentRuntimeValueDotNotation,
+                overrideValues: {},
+                propStatus: sequencePropStatus,
+                frame: null,
+            });
+            const sequenceFieldSchema = getActiveFieldSchema({
+                schema: sequence.controls.schema,
+                key: selection.key,
+                resolveValue: (key) => sequenceValuesDotNotation[key],
+            });
+            const selectedPropStatus = sequencePropStatus === null || sequencePropStatus === void 0 ? void 0 : sequencePropStatus[selection.key];
             if (!isVisibleFieldSchema(sequenceFieldSchema) ||
                 !isResettablePropStatus({
-                    propStatus: sequencePropStatus,
+                    propStatus: selectedPropStatus,
                     defaultValue: sequenceFieldSchema.default,
                 })) {
                 continue;
@@ -82,7 +100,16 @@ const getTimelinePropResetTargets = ({ selections, sequences, overrideIdsToNodeP
             continue;
         }
         const effect = sequence.effects[selection.i];
-        const fieldSchema = effect === null || effect === void 0 ? void 0 : effect.schema[selection.key];
+        const field = effect
+            ? (0, studio_shared_1.getEffectFieldsToShow)({
+                effect,
+                effectIndex: selection.i,
+                nodePath,
+                propStatuses,
+                getEffectDragOverrides: () => ({}),
+            }).find((candidate) => candidate.key === selection.key)
+            : null;
+        const fieldSchema = field === null || field === void 0 ? void 0 : field.fieldSchema;
         const effectStatus = remotion_1.Internals.getEffectPropStatusesCtx({
             propStatuses,
             nodePath,

package/dist/components/Timeline/save-effect-prop.d.ts

@@ -1,5 +1,5 @@
 import { type EffectClipboardParam } from '@remotion/studio-shared';
-import type { SequencePropsSubscriptionKey, SequenceSchema } from 'remotion';
+import type { SequencePropsSubscriptionKey, InteractivitySchema } from 'remotion';
 import type { SetPropStatuses } from './save-sequence-prop';
 type SaveEffectPropBase = {
     fileName: string;
@@ -7,7 +7,7 @@ type SaveEffectPropBase = {
     effectIndex: number;
     fieldKey: string;
     defaultValue: string | null;
-    schema: SequenceSchema;
+    schema: InteractivitySchema;
     setPropStatuses: SetPropStatuses;
     clientId: string;
 };

package/dist/components/Timeline/save-sequence-prop.d.ts

@@ -1,4 +1,4 @@
-import type { CanUpdateSequencePropsResponse, SequencePropsSubscriptionKey, SequenceSchema } from 'remotion';
+import type { CanUpdateSequencePropsResponse, SequencePropsSubscriptionKey, InteractivitySchema } from 'remotion';
 export type SetPropStatuses = (nodePath: SequencePropsSubscriptionKey, values: (prev: CanUpdateSequencePropsResponse) => CanUpdateSequencePropsResponse) => void;
 export type SaveSequencePropChange = {
     fileName: string;
@@ -6,7 +6,7 @@ export type SaveSequencePropChange = {
     fieldKey: string;
     value: unknown;
     defaultValue: string | null;
-    schema: SequenceSchema;
+    schema: InteractivitySchema;
 };
 type SaveSequencePropsOptions = {
     changes: SaveSequencePropChange[];

package/dist/components/Timeline/sequence-props-subscription-store.d.ts

@@ -1,4 +1,4 @@
-import type { SequenceNodePath, SequenceSchema } from 'remotion';
+import type { SequenceNodePath, InteractivitySchema } from 'remotion';
 import { callApi } from '../call-api';
 type SubscribeResult = Awaited<ReturnType<typeof callApi<'/api/subscribe-to-sequence-props'>>>;
 type ApplyResult = (result: SubscribeResult) => void;
@@ -6,9 +6,9 @@ export declare const acquireSequencePropsSubscription: ({ fileName, line, column
     fileName: string;
     line: number;
     column: number;
-    schema: SequenceSchema;
+    schema: InteractivitySchema;
     componentIdentity: string | null;
-    effects: SequenceSchema[];
+    effects: InteractivitySchema[];
     nodePath: SequenceNodePath | null;
     clientId: string;
     applyOnce: ApplyResult;

package/dist/components/Timeline/timeline-expanded-filter.d.ts

@@ -0,0 +1,12 @@
+import type { SequenceNodePathInfo } from '../../helpers/get-timeline-sequence-sort-key';
+import type { TimelineTreeNode } from '../../helpers/timeline-layout';
+import type { TimelineSelection } from './TimelineSelection';
+export declare const filterTimelineExpandedTree: ({ nodes, shouldShowNode, }: {
+    readonly nodes: readonly TimelineTreeNode[];
+    readonly shouldShowNode: (node: TimelineTreeNode) => boolean;
+}) => TimelineTreeNode[];
+export declare const getSelectedTimelineExpandedRowKeys: (selectedItems: readonly TimelineSelection[]) => ReadonlySet<string>;
+export declare const isTimelineExpandedNodeSelected: ({ nodePathInfo, selectedRowKeys, }: {
+    readonly nodePathInfo: SequenceNodePathInfo;
+    readonly selectedRowKeys: ReadonlySet<string>;
+}) => boolean;

package/dist/components/Timeline/timeline-expanded-filter.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isTimelineExpandedNodeSelected = exports.getSelectedTimelineExpandedRowKeys = exports.filterTimelineExpandedTree = void 0;
+const timeline_node_path_key_1 = require("../../helpers/timeline-node-path-key");
+const filterTimelineExpandedTree = ({ nodes, shouldShowNode, }) => {
+    const out = [];
+    for (const node of nodes) {
+        if (node.kind === 'field') {
+            if (shouldShowNode(node)) {
+                out.push(node);
+            }
+            continue;
+        }
+        const children = (0, exports.filterTimelineExpandedTree)({
+            nodes: node.children,
+            shouldShowNode,
+        });
+        if (children.length > 0 || shouldShowNode(node)) {
+            out.push({
+                ...node,
+                children,
+            });
+        }
+    }
+    return out;
+};
+exports.filterTimelineExpandedTree = filterTimelineExpandedTree;
+const getSelectedTimelineExpandedRowKeys = (selectedItems) => {
+    return new Set(selectedItems.flatMap((item) => {
+        if (item.type === 'guide') {
+            return [];
+        }
+        return [(0, timeline_node_path_key_1.timelineNodePathInfoToKey)(item.nodePathInfo)];
+    }));
+};
+exports.getSelectedTimelineExpandedRowKeys = getSelectedTimelineExpandedRowKeys;
+const isTimelineExpandedNodeSelected = ({ nodePathInfo, selectedRowKeys, }) => selectedRowKeys.has((0, timeline_node_path_key_1.timelineNodePathInfoToKey)(nodePathInfo));
+exports.isTimelineExpandedNodeSelected = isTimelineExpandedNodeSelected;

package/dist/components/Timeline/timeline-field-display-utils.d.ts

@@ -0,0 +1,5 @@
+import type { InteractivitySchemaField } from 'remotion';
+export declare const formatTimelineFieldValueForDisplay: ({ fieldSchema, value, }: {
+    readonly fieldSchema: InteractivitySchemaField | undefined;
+    readonly value: unknown;
+}) => string;