@remotion/studio 4.0.472 → 4.0.474

package/dist/components/Timeline/TimelineClipboardKeybindings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimelineClipboardKeybindings = exports.getSnapshotsFromSelection = exports.getPasteEffectsTarget = void 0;
+exports.TimelineClipboardKeybindings = exports.getPasteEffectPropTarget = exports.getEffectPropClipboardDataFromSelection = exports.getSnapshotsFromSelection = exports.getPasteEffectsTarget = void 0;
 const studio_shared_1 = require("@remotion/studio-shared");
 const react_1 = require("react");
 const remotion_1 = require("remotion");
@@ -8,6 +8,8 @@ const client_id_1 = require("../../helpers/client-id");
 const use_keybinding_1 = require("../../helpers/use-keybinding");
 const call_api_1 = require("../call-api");
 const NotificationCenter_1 = require("../Notifications/NotificationCenter");
+const find_track_for_node_path_info_1 = require("./find-track-for-node-path-info");
+const save_effect_prop_1 = require("./save-effect-prop");
 const TimelineSelection_1 = require("./TimelineSelection");
 const makeClipboardText = (payload) => JSON.stringify(payload);
 const makeTargetKey = (nodePath) => {
@@ -17,6 +19,10 @@ const makeTargetKey = (nodePath) => {
         sequenceKeys: nodePath.sequenceKeys,
     });
 };
+const isVisibleFieldSchema = (fieldSchema) => fieldSchema !== undefined && fieldSchema.type !== 'hidden';
+const getDefaultValue = (fieldSchema) => fieldSchema.default !== undefined
+    ? JSON.stringify(fieldSchema.default)
+    : null;
 const getTargetSequenceNodePathInfo = (selection) => {
     if (selection.type === 'sequence' ||
         selection.type === 'sequence-effect' ||
@@ -61,35 +67,45 @@ exports.getPasteEffectsTarget = getPasteEffectsTarget;
 const isClipboardInterpolationFunction = (value) => {
     return (0, studio_shared_1.isKeyframeInterpolationFunction)(value);
 };
+const effectPropStatusToClipboardParam = (prop) => {
+    if (prop.status === 'computed') {
+        return null;
+    }
+    if (prop.status === 'static') {
+        if (prop.codeValue === undefined) {
+            return null;
+        }
+        return {
+            type: 'static',
+            value: prop.codeValue,
+        };
+    }
+    if (!isClipboardInterpolationFunction(prop.interpolationFunction)) {
+        return null;
+    }
+    return {
+        type: 'keyframed',
+        interpolationFunction: prop.interpolationFunction,
+        keyframes: prop.keyframes,
+        easing: prop.easing,
+        clamping: prop.clamping,
+        ...(prop.posterize === undefined ? {} : { posterize: prop.posterize }),
+    };
+};
 const effectStatusToSnapshot = (effect) => {
     if (effect.importPath === null) {
         return null;
     }
     const params = {};
     for (const [key, prop] of Object.entries(effect.props)) {
-        if (prop.status === 'computed') {
-            return null;
-        }
-        if (prop.status === 'static') {
-            if (prop.codeValue !== undefined) {
-                params[key] = {
-                    type: 'static',
-                    value: prop.codeValue,
-                };
-            }
+        if (prop.status === 'static' && prop.codeValue === undefined) {
             continue;
         }
-        if (!isClipboardInterpolationFunction(prop.interpolationFunction)) {
+        const param = effectPropStatusToClipboardParam(prop);
+        if (param === null) {
             return null;
         }
-        params[key] = {
-            type: 'keyframed',
-            interpolationFunction: prop.interpolationFunction,
-            keyframes: prop.keyframes,
-            easing: prop.easing,
-            clamping: prop.clamping,
-            ...(prop.posterize === undefined ? {} : { posterize: prop.posterize }),
-        };
+        params[key] = param;
     }
     return {
         callee: effect.callee,
@@ -97,13 +113,13 @@ const effectStatusToSnapshot = (effect) => {
         params,
     };
 };
-const getSnapshotsFromSelection = ({ selection, codeValues, }) => {
+const getSnapshotsFromSelection = ({ selection, propStatuses, }) => {
     if (selection.type !== 'sequence-effect' &&
         selection.type !== 'sequence-all-effects') {
         return null;
     }
     const { sequenceSubscriptionKey } = selection.nodePathInfo;
-    const sequenceStatus = codeValues[remotion_1.Internals.makeSequencePropsSubscriptionKey(sequenceSubscriptionKey)];
+    const sequenceStatus = propStatuses[remotion_1.Internals.makeSequencePropsSubscriptionKey(sequenceSubscriptionKey)];
     if (!sequenceStatus || !sequenceStatus.canUpdate) {
         return null;
     }
@@ -127,12 +143,121 @@ const getSnapshotsFromSelection = ({ selection, codeValues, }) => {
     return snapshots;
 };
 exports.getSnapshotsFromSelection = getSnapshotsFromSelection;
+const getEffectPropClipboardDataFromSelection = ({ selection, propStatuses, }) => {
+    if (selection.type !== 'sequence-effect-prop') {
+        return null;
+    }
+    const sequenceStatus = propStatuses[remotion_1.Internals.makeSequencePropsSubscriptionKey(selection.nodePathInfo.sequenceSubscriptionKey)];
+    if (!sequenceStatus || !sequenceStatus.canUpdate) {
+        return null;
+    }
+    const effect = sequenceStatus.effects.find((item) => item.effectIndex === selection.i);
+    if (!(effect === null || effect === void 0 ? void 0 : effect.canUpdate) || effect.importPath === null) {
+        return null;
+    }
+    const prop = effect.props[selection.key];
+    if (!prop) {
+        return null;
+    }
+    const param = effectPropStatusToClipboardParam(prop);
+    if (param === null) {
+        return null;
+    }
+    return {
+        type: 'effect-prop',
+        version: 1,
+        remotionClipboard: 'effect-prop',
+        effect: {
+            callee: effect.callee,
+            importPath: effect.importPath,
+        },
+        key: selection.key,
+        param,
+    };
+};
+exports.getEffectPropClipboardDataFromSelection = getEffectPropClipboardDataFromSelection;
+const getPasteEffectPropTarget = ({ selectedItems, payload, propStatuses, sequences, overrideIdsToNodePaths, }) => {
+    var _a;
+    if (selectedItems.length === 0) {
+        return { type: 'none' };
+    }
+    if (selectedItems.length !== 1) {
+        return { type: 'multiple' };
+    }
+    const [selection] = selectedItems;
+    if (!selection) {
+        return { type: 'none' };
+    }
+    if (!selection.nodePathInfo.supportsEffects) {
+        return { type: 'unsupported' };
+    }
+    const target = selection.type === 'sequence-effect-prop'
+        ? {
+            effectIndex: selection.i,
+            fieldKey: selection.key,
+        }
+        : selection.type === 'sequence-effect'
+            ? {
+                effectIndex: selection.i,
+                fieldKey: payload.key,
+            }
+            : null;
+    if (target === null) {
+        return { type: 'none' };
+    }
+    if (selection.type === 'sequence-effect-prop' &&
+        selection.key !== payload.key) {
+        return { type: 'prop-mismatch' };
+    }
+    const track = (0, find_track_for_node_path_info_1.findTrackForNodePathInfo)({
+        sequences,
+        overrideIdsToNodePaths,
+        nodePathInfo: selection.nodePathInfo,
+    });
+    const sequence = (_a = track === null || track === void 0 ? void 0 : track.sequence) !== null && _a !== void 0 ? _a : null;
+    if (!sequence) {
+        return { type: 'none' };
+    }
+    const effect = sequence.effects[target.effectIndex];
+    const fieldSchema = effect === null || effect === void 0 ? void 0 : effect.schema[target.fieldKey];
+    if (!effect || !isVisibleFieldSchema(fieldSchema)) {
+        return { type: 'prop-mismatch' };
+    }
+    const sequenceStatus = propStatuses[remotion_1.Internals.makeSequencePropsSubscriptionKey(selection.nodePathInfo.sequenceSubscriptionKey)];
+    if (!(sequenceStatus === null || sequenceStatus === void 0 ? void 0 : sequenceStatus.canUpdate)) {
+        return { type: 'uncopyable' };
+    }
+    const effectStatus = sequenceStatus.effects.find((item) => item.effectIndex === target.effectIndex);
+    if (!(effectStatus === null || effectStatus === void 0 ? void 0 : effectStatus.canUpdate)) {
+        return { type: 'uncopyable' };
+    }
+    if (effectStatus.importPath !== payload.effect.importPath) {
+        return { type: 'effect-type-mismatch' };
+    }
+    const propStatus = effectStatus.props[target.fieldKey];
+    if (!propStatus || propStatus.status === 'computed') {
+        return { type: 'uncopyable' };
+    }
+    return {
+        type: 'valid',
+        fileName: selection.nodePathInfo.sequenceSubscriptionKey.absolutePath,
+        nodePath: selection.nodePathInfo.sequenceSubscriptionKey,
+        effectIndex: target.effectIndex,
+        fieldKey: target.fieldKey,
+        defaultValue: getDefaultValue(fieldSchema),
+        schema: effect.schema,
+    };
+};
+exports.getPasteEffectPropTarget = getPasteEffectPropTarget;
 const TimelineClipboardKeybindings = () => {
     const keybindings = (0, use_keybinding_1.useKeybinding)();
     const { previewServerState } = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx);
     const { canSelect } = (0, TimelineSelection_1.useTimelineSelection)();
     const currentSelection = (0, TimelineSelection_1.useCurrentTimelineSelectionStateAsRef)();
-    const { codeValues } = (0, react_1.useContext)(remotion_1.Internals.VisualModeCodeValuesContext);
+    const propStatusesRef = (0, react_1.useContext)(remotion_1.Internals.VisualModePropStatusesRefContext);
+    const { setPropStatuses } = (0, react_1.useContext)(remotion_1.Internals.VisualModeSettersContext);
+    const sequencesRef = (0, react_1.useContext)(remotion_1.Internals.SequenceManagerRefContext);
+    const { overrideIdToNodePathMappings } = (0, react_1.useContext)(remotion_1.Internals.OverrideIdsToNodePathsGettersContext);
     (0, react_1.useEffect)(() => {
         if (!canSelect || previewServerState.type !== 'connected') {
             return;
@@ -142,10 +267,37 @@ const TimelineClipboardKeybindings = () => {
             event: 'keydown',
             key: 'c',
             callback: (e) => {
+                var _a;
                 const { selectedItems } = currentSelection.current;
+                const propStatuses = propStatusesRef.current;
                 if (selectedItems.length === 0) {
                     return;
                 }
+                if (selectedItems.some((selection) => selection.type === 'sequence-effect-prop')) {
+                    e.preventDefault();
+                    if (selectedItems.length !== 1 ||
+                        ((_a = selectedItems[0]) === null || _a === void 0 ? void 0 : _a.type) !== 'sequence-effect-prop') {
+                        (0, NotificationCenter_1.showNotification)('Select one effect prop to copy its value', 3000);
+                        return;
+                    }
+                    const payload = (0, exports.getEffectPropClipboardDataFromSelection)({
+                        selection: selectedItems[0],
+                        propStatuses,
+                    });
+                    if (payload === null) {
+                        (0, NotificationCenter_1.showNotification)('Cannot copy effect prop because its value cannot be copied', 3000);
+                        return;
+                    }
+                    navigator.clipboard
+                        .writeText(makeClipboardText(payload))
+                        .then(() => {
+                        (0, NotificationCenter_1.showNotification)('Copied effect prop to clipboard', 1000);
+                    })
+                        .catch((err) => {
+                        (0, NotificationCenter_1.showNotification)(`Could not copy effect prop: ${err.message}`, 2000);
+                    });
+                    return;
+                }
                 const firstSelection = selectedItems[0];
                 const type = firstSelection ? getCopyType(firstSelection) : null;
                 if (type === null) {
@@ -159,7 +311,7 @@ const TimelineClipboardKeybindings = () => {
                 const snapshots = selectedItems.flatMap((selection) => {
                     const itemSnapshots = (0, exports.getSnapshotsFromSelection)({
                         selection,
-                        codeValues,
+                        propStatuses,
                     });
                     return itemSnapshots !== null && itemSnapshots !== void 0 ? itemSnapshots : [null];
                 });
@@ -201,6 +353,68 @@ const TimelineClipboardKeybindings = () => {
                 navigator.clipboard
                     .readText()
                     .then((text) => {
+                    const propStatuses = propStatusesRef.current;
+                    const sequences = sequencesRef.current;
+                    const effectPropResult = (0, studio_shared_1.parseEffectPropClipboardDataResult)(text);
+                    if (effectPropResult.status !== 'invalid') {
+                        e.preventDefault();
+                        if (effectPropResult.status === 'unsupported-version') {
+                            (0, NotificationCenter_1.showNotification)('Cannot paste effect prop copied from a different Remotion Studio version', 4000);
+                            return;
+                        }
+                        const effectPropTarget = (0, exports.getPasteEffectPropTarget)({
+                            selectedItems,
+                            payload: effectPropResult.data,
+                            propStatuses,
+                            sequences,
+                            overrideIdsToNodePaths: overrideIdToNodePathMappings,
+                        });
+                        if (effectPropTarget.type !== 'valid') {
+                            switch (effectPropTarget.type) {
+                                case 'multiple':
+                                    (0, NotificationCenter_1.showNotification)('Select one target effect prop or effect to paste onto', 3000);
+                                    return;
+                                case 'none':
+                                    (0, NotificationCenter_1.showNotification)('Select a matching effect prop or effect to paste onto', 3000);
+                                    return;
+                                case 'unsupported':
+                                    (0, NotificationCenter_1.showNotification)('This sequence does not support effects', 3000);
+                                    return;
+                                case 'effect-type-mismatch':
+                                    (0, NotificationCenter_1.showNotification)('Select an effect of the same type to paste this prop', 3000);
+                                    return;
+                                case 'prop-mismatch':
+                                    (0, NotificationCenter_1.showNotification)('Select the same effect prop, or an effect with that prop', 3000);
+                                    return;
+                                case 'uncopyable':
+                                    (0, NotificationCenter_1.showNotification)('Cannot paste onto an effect prop that cannot be updated', 3000);
+                                    return;
+                                default:
+                                    throw new Error(`Unexpected paste target: ${effectPropTarget}`);
+                            }
+                        }
+                        return (0, save_effect_prop_1.saveEffectProp)({
+                            fileName: effectPropTarget.fileName,
+                            nodePath: effectPropTarget.nodePath,
+                            effectIndex: effectPropTarget.effectIndex,
+                            fieldKey: effectPropTarget.fieldKey,
+                            ...(effectPropResult.data.param.type === 'static'
+                                ? {
+                                    type: 'value',
+                                    value: effectPropResult.data.param.value,
+                                }
+                                : {
+                                    type: 'effect-param',
+                                    effectParam: effectPropResult.data.param,
+                                }),
+                            defaultValue: effectPropTarget.defaultValue,
+                            schema: effectPropTarget.schema,
+                            setPropStatuses,
+                            clientId,
+                        }).then(() => {
+                            (0, NotificationCenter_1.showNotification)('Pasted effect prop', 2000);
+                        });
+                    }
                     const result = (0, studio_shared_1.parseEffectClipboardDataResult)(text);
                     if (result.status === 'invalid') {
                         return;
@@ -255,10 +469,13 @@ const TimelineClipboardKeybindings = () => {
         };
     }, [
         canSelect,
-        codeValues,
         currentSelection,
         keybindings,
+        overrideIdToNodePathMappings,
+        propStatusesRef,
         previewServerState,
+        sequencesRef,
+        setPropStatuses,
     ]);
     return null;
 };

package/dist/components/Timeline/TimelineDeleteKeybindings.js

@@ -5,6 +5,7 @@ const react_1 = require("react");
 const remotion_1 = require("remotion");
 const client_id_1 = require("../../helpers/client-id");
 const use_keybinding_1 = require("../../helpers/use-keybinding");
+const ConfirmationDialog_1 = require("../ConfirmationDialog");
 const delete_selected_timeline_item_1 = require("./delete-selected-timeline-item");
 const duplicate_selected_timeline_item_1 = require("./duplicate-selected-timeline-item");
 const reset_selected_timeline_props_1 = require("./reset-selected-timeline-props");
@@ -12,12 +13,13 @@ const TimelineSelection_1 = require("./TimelineSelection");
 const TimelineDeleteKeybindings = () => {
     const keybindings = (0, use_keybinding_1.useKeybinding)();
     const { previewServerState } = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx);
-    const { sequences } = (0, react_1.useContext)(remotion_1.Internals.SequenceManager);
+    const sequencesRef = (0, react_1.useContext)(remotion_1.Internals.SequenceManagerRefContext);
     const { overrideIdToNodePathMappings } = (0, react_1.useContext)(remotion_1.Internals.OverrideIdsToNodePathsGettersContext);
-    const { codeValues } = (0, react_1.useContext)(remotion_1.Internals.VisualModeCodeValuesContext);
-    const { setCodeValues } = (0, react_1.useContext)(remotion_1.Internals.VisualModeSettersContext);
+    const propStatusesRef = (0, react_1.useContext)(remotion_1.Internals.VisualModePropStatusesRefContext);
+    const { setPropStatuses } = (0, react_1.useContext)(remotion_1.Internals.VisualModeSettersContext);
     const { canSelect } = (0, TimelineSelection_1.useTimelineSelection)();
     const currentSelection = (0, TimelineSelection_1.useCurrentTimelineSelectionStateAsRef)();
+    const confirm = (0, ConfirmationDialog_1.useConfirmationDialog)();
     (0, react_1.useEffect)(() => {
         if (!canSelect || previewServerState.type !== 'connected') {
             return;
@@ -28,6 +30,8 @@ const TimelineDeleteKeybindings = () => {
             key: 'Backspace',
             callback: () => {
                 const { selectedItems, clearSelection } = currentSelection.current;
+                const sequences = sequencesRef.current;
+                const propStatuses = propStatusesRef.current;
                 if (selectedItems.length === 0) {
                     return;
                 }
@@ -35,8 +39,8 @@ const TimelineDeleteKeybindings = () => {
                     selections: selectedItems,
                     sequences,
                     overrideIdsToNodePaths: overrideIdToNodePathMappings,
-                    codeValues,
-                    setCodeValues,
+                    propStatuses,
+                    setPropStatuses,
                     clientId,
                 });
                 if (resetPromise !== null) {
@@ -47,14 +51,20 @@ const TimelineDeleteKeybindings = () => {
                     selections: selectedItems,
                     sequences,
                     overrideIdsToNodePaths: overrideIdToNodePathMappings,
-                    setCodeValues,
+                    setPropStatuses,
                     clientId,
+                    confirm,
                 });
                 if (deletePromise === null) {
                     return;
                 }
-                clearSelection();
-                deletePromise.catch(() => undefined);
+                deletePromise
+                    .then((deleted) => {
+                    if (deleted) {
+                        clearSelection();
+                    }
+                })
+                    .catch(() => undefined);
             },
             commandCtrlKey: false,
             preventDefault: true,
@@ -71,6 +81,7 @@ const TimelineDeleteKeybindings = () => {
                 }
                 const duplicatePromise = (0, duplicate_selected_timeline_item_1.duplicateSelectedTimelineItems)({
                     selections: selectedItems,
+                    confirm,
                 });
                 if (duplicatePromise === null) {
                     return;
@@ -88,13 +99,14 @@ const TimelineDeleteKeybindings = () => {
         };
     }, [
         canSelect,
-        codeValues,
+        confirm,
         currentSelection,
         keybindings,
         overrideIdToNodePathMappings,
+        propStatusesRef,
         previewServerState,
-        sequences,
-        setCodeValues,
+        sequencesRef,
+        setPropStatuses,
     ]);
     return null;
 };

package/dist/components/Timeline/TimelineEffectItem.js

@@ -68,15 +68,15 @@ const TimelineEffectItem = ({ label, nodePathInfo, effectIndex, effectSchema, do
     var _b;
     const { previewServerState } = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx);
     const previewConnected = previewServerState.type === 'connected';
-    const { codeValues } = (0, react_1.useContext)(remotion_1.Internals.VisualModeCodeValuesContext);
-    const { setCodeValues } = (0, react_1.useContext)(remotion_1.Internals.VisualModeSettersContext);
+    const { propStatuses } = (0, react_1.useContext)(remotion_1.Internals.VisualModePropStatusesContext);
+    const { setPropStatuses } = (0, react_1.useContext)(remotion_1.Internals.VisualModeSettersContext);
     const selection = (0, TimelineSelection_1.useTimelineRowSelection)(nodePathInfo);
     const [dropIndicator, setDropIndicator] = (0, react_1.useState)(null);
-    const effectStatus = (0, react_1.useMemo)(() => remotion_1.Internals.getEffectCodeValuesCtx({
-        codeValues,
+    const effectStatus = (0, react_1.useMemo)(() => remotion_1.Internals.getEffectPropStatusesCtx({
+        propStatuses,
         nodePath,
         effectIndex,
-    }), [codeValues, nodePath, effectIndex]);
+    }), [propStatuses, nodePath, effectIndex]);
     const disabledStatus = effectStatus.type === 'can-update-effect'
         ? ((_b = (_a = effectStatus.props) === null || _a === void 0 ? void 0 : _a.disabled) !== null && _b !== void 0 ? _b : null)
         : null;
@@ -178,6 +178,7 @@ const TimelineEffectItem = ({ label, nodePathInfo, effectIndex, effectSchema, do
             ? JSON.stringify(fieldSchema.default)
             : null;
         (0, save_effect_prop_1.saveEffectProp)({
+            type: 'value',
             fileName: validatedLocation.source,
             nodePath,
             effectIndex,
@@ -185,7 +186,7 @@ const TimelineEffectItem = ({ label, nodePathInfo, effectIndex, effectSchema, do
             value: newValue,
             defaultValue,
             schema: effectSchema,
-            setCodeValues,
+            setPropStatuses,
             clientId: previewServerState.clientId,
         });
     }, [
@@ -194,7 +195,7 @@ const TimelineEffectItem = ({ label, nodePathInfo, effectIndex, effectSchema, do
         effectSchema,
         nodePath,
         previewServerState,
-        setCodeValues,
+        setPropStatuses,
         validatedLocation.source,
     ]);
     const isExpanded = getIsExpanded(nodePathInfo);