@remotion/studio-shared 4.0.475 → 4.0.476

package/dist/index.d.ts

@@ -33,7 +33,7 @@ export { EnumPath, stringifyDefaultProps } from './stringify-default-props';
 export type { VisualControlChange } from './codemods';
 export { optimisticAddEffectKeyframe, optimisticAddSequenceKeyframe, } from './optimistic-add-keyframe';
 export { optimisticDeleteEffectKeyframe, optimisticDeleteEffectKeyframes, optimisticDeleteSequenceKeyframe, optimisticDeleteSequenceKeyframes, } from './optimistic-delete-keyframe';
-export { canMoveKeyframesWithoutCollisions, optimisticMoveEffectKeyframes, optimisticMoveSequenceKeyframes, type OptimisticKeyframeMove, } from './optimistic-move-keyframe';
+export { canMoveKeyframesWithoutCollisions, moveKeyframesInPropStatus, optimisticMoveEffectKeyframes, optimisticMoveSequenceKeyframes, type OptimisticKeyframeMove, } from './optimistic-move-keyframe';
 export { optimisticUpdateForEffectPropStatuses } from './optimistic-update-for-effect-prop-statuses';
 export { optimisticUpdateForPropStatuses } from './optimistic-update-for-prop-statuses';
 export { optimisticUpdateEffectKeyframeSettings, optimisticUpdateSequenceKeyframeSettings, } from './optimistic-update-keyframe-settings';

package/dist/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.optimisticDeleteEffectKeyframe = exports.optimisticAddSequenceKeyframe = exports.optimisticAddEffectKeyframe = exports.stringifyDefaultProps = exports.parseSfxDragData = exports.SFX_DRAG_MIME_TYPE = exports.getFieldsToShow = exports.getEffectFieldsToShow = exports.SCHEMA_FIELD_ROW_HEIGHT = exports.getRequiredPackageForInsertableElement = exports.getRequiredPackageForEffectImportPath = exports.packages = exports.installableMap = exports.extraPackages = exports.descriptions = exports.apiDocs = exports.DEFAULT_TIMELINE_TRACKS = exports.keyframeInterpolationFunctions = exports.isSequenceFieldSchemaKeyframable = exports.isSchemaFieldKeyframable = exports.isKeyframeInterpolationFunction = exports.getKeyframeInterpolationFunctionForSchemaField = exports.getKeyframeInterpolationFunction = exports.hotMiddlewareOptions = exports.getProjectName = exports.getLocationFromBuildError = exports.getDefaultOutLocation = exports.getAllSchemaKeys = exports.formatBytes = exports.parseEffectDragData = exports.EFFECT_DRAG_MIME_TYPE = exports.parseEffectPropClipboardDataResult = exports.parseEffectPropClipboardData = exports.parseEffectClipboardDataResult = exports.parseEffectClipboardData = exports.isImageFileType = exports.detectFileType = exports.KEYFRAME_EASING_PRESETS = exports.DEFAULT_BUFFER_STATE_DELAY_IN_MILLISECONDS = exports.parseComponentDragData = exports.makeComponentDragData = exports.isComponentImportPath = exports.isComponentIdentifier = exports.areComponentProps = exports.COMPONENT_DRAG_MIME_TYPE = exports.parseAssetDragData = exports.makeAssetDragData = exports.ASSET_DRAG_MIME_TYPE = exports.stripAnsi = exports.splitAnsi = void 0;
-exports.isUrl = exports.stringifySequenceSubscriptionKey = exports.stringifySequenceExpandedRowKey = exports.optimisticUpdateSequenceKeyframeSettings = exports.optimisticUpdateEffectKeyframeSettings = exports.optimisticUpdateForPropStatuses = exports.optimisticUpdateForEffectPropStatuses = exports.optimisticMoveSequenceKeyframes = exports.optimisticMoveEffectKeyframes = exports.canMoveKeyframesWithoutCollisions = exports.optimisticDeleteSequenceKeyframes = exports.optimisticDeleteSequenceKeyframe = exports.optimisticDeleteEffectKeyframes = void 0;
+exports.isUrl = exports.stringifySequenceSubscriptionKey = exports.stringifySequenceExpandedRowKey = exports.optimisticUpdateSequenceKeyframeSettings = exports.optimisticUpdateEffectKeyframeSettings = exports.optimisticUpdateForPropStatuses = exports.optimisticUpdateForEffectPropStatuses = exports.optimisticMoveSequenceKeyframes = exports.optimisticMoveEffectKeyframes = exports.moveKeyframesInPropStatus = exports.canMoveKeyframesWithoutCollisions = exports.optimisticDeleteSequenceKeyframes = exports.optimisticDeleteSequenceKeyframe = exports.optimisticDeleteEffectKeyframes = void 0;
 const ansi_1 = require("./ansi");
 Object.defineProperty(exports, "splitAnsi", { enumerable: true, get: function () { return ansi_1.splitAnsi; } });
 Object.defineProperty(exports, "stripAnsi", { enumerable: true, get: function () { return ansi_1.stripAnsi; } });
@@ -95,6 +95,7 @@ Object.defineProperty(exports, "optimisticDeleteSequenceKeyframe", { enumerable:
 Object.defineProperty(exports, "optimisticDeleteSequenceKeyframes", { enumerable: true, get: function () { return optimistic_delete_keyframe_1.optimisticDeleteSequenceKeyframes; } });
 const optimistic_move_keyframe_1 = require("./optimistic-move-keyframe");
 Object.defineProperty(exports, "canMoveKeyframesWithoutCollisions", { enumerable: true, get: function () { return optimistic_move_keyframe_1.canMoveKeyframesWithoutCollisions; } });
+Object.defineProperty(exports, "moveKeyframesInPropStatus", { enumerable: true, get: function () { return optimistic_move_keyframe_1.moveKeyframesInPropStatus; } });
 Object.defineProperty(exports, "optimisticMoveEffectKeyframes", { enumerable: true, get: function () { return optimistic_move_keyframe_1.optimisticMoveEffectKeyframes; } });
 Object.defineProperty(exports, "optimisticMoveSequenceKeyframes", { enumerable: true, get: function () { return optimistic_move_keyframe_1.optimisticMoveSequenceKeyframes; } });
 const optimistic_update_for_effect_prop_statuses_1 = require("./optimistic-update-for-effect-prop-statuses");

package/dist/optimistic-move-keyframe.d.ts

@@ -11,6 +11,13 @@ export declare const canMoveKeyframesWithoutCollisions: ({ status, moves, }: {
         toFrame: number;
     }[];
 }) => boolean;
+export declare const moveKeyframesInPropStatus: ({ status, moves, }: {
+    status: CanUpdateSequencePropStatus;
+    moves: readonly {
+        fromFrame: number;
+        toFrame: number;
+    }[];
+}) => CanUpdateSequencePropStatus;
 export declare const optimisticMoveSequenceKeyframes: ({ previous, keyframes, }: {
     previous: CanUpdateSequencePropsResponse;
     keyframes: readonly OptimisticKeyframeMove[];

package/dist/optimistic-move-keyframe.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optimisticMoveEffectKeyframes = exports.optimisticMoveSequenceKeyframes = exports.canMoveKeyframesWithoutCollisions = void 0;
+exports.optimisticMoveEffectKeyframes = exports.optimisticMoveSequenceKeyframes = exports.moveKeyframesInPropStatus = exports.canMoveKeyframesWithoutCollisions = void 0;
 const getMoveMap = (moves) => {
     const moveMap = new Map();
     for (const move of moves) {
@@ -14,62 +14,86 @@ const getMoveMap = (moves) => {
     }
     return moveMap;
 };
-const canMoveKeyframesWithoutCollisions = ({ status, moves, }) => {
-    var _a;
+const getMovedKeyframes = ({ status, moves, }) => {
     if (status.status !== 'keyframed') {
-        return false;
+        return null;
     }
     const moveMap = getMoveMap(moves);
     if (moveMap === null) {
-        return false;
+        return null;
     }
     if (moveMap.size === 0) {
-        return true;
+        return { keyframes: status.keyframes, removedKeyframeIndexes: [] };
     }
     const frames = new Set(status.keyframes.map((keyframe) => keyframe.frame));
     for (const fromFrame of moveMap.keys()) {
         if (!frames.has(fromFrame)) {
-            return false;
+            return null;
         }
     }
+    const movedFromFrames = new Set(moveMap.keys());
+    const movedToFrames = new Set(moveMap.values());
+    const removedKeyframeIndexes = [];
+    const nextKeyframes = status.keyframes.flatMap((keyframe, index) => {
+        const movedFrame = moveMap.get(keyframe.frame);
+        if (movedFrame !== undefined) {
+            return [{ ...keyframe, frame: movedFrame }];
+        }
+        if (movedToFrames.has(keyframe.frame) &&
+            !movedFromFrames.has(keyframe.frame)) {
+            removedKeyframeIndexes.push(index);
+            return [];
+        }
+        return [keyframe];
+    });
     const nextFrames = new Set();
-    for (const keyframe of status.keyframes) {
-        const frame = (_a = moveMap.get(keyframe.frame)) !== null && _a !== void 0 ? _a : keyframe.frame;
-        if (nextFrames.has(frame)) {
-            return false;
+    for (const keyframe of nextKeyframes) {
+        if (nextFrames.has(keyframe.frame)) {
+            return null;
+        }
+        nextFrames.add(keyframe.frame);
+    }
+    return {
+        keyframes: nextKeyframes.sort((a, b) => a.frame - b.frame),
+        removedKeyframeIndexes,
+    };
+};
+const removeEasingForRemovedKeyframes = ({ easing, removedKeyframeIndexes, }) => {
+    const nextEasing = [...easing];
+    for (const removedKeyframeIndex of [...removedKeyframeIndexes].sort((a, b) => b - a)) {
+        if (nextEasing.length === 0) {
+            break;
         }
-        nextFrames.add(frame);
+        const easingIndexToRemove = removedKeyframeIndex === 0 ? 0 : removedKeyframeIndex - 1;
+        nextEasing.splice(easingIndexToRemove, 1);
     }
-    return true;
+    return nextEasing;
+};
+const canMoveKeyframesWithoutCollisions = ({ status, moves, }) => {
+    return getMovedKeyframes({ status, moves }) !== null;
 };
 exports.canMoveKeyframesWithoutCollisions = canMoveKeyframesWithoutCollisions;
 const moveKeyframesInPropStatus = ({ status, moves, }) => {
     if (status.status !== 'keyframed') {
         return status;
     }
-    if (!(0, exports.canMoveKeyframesWithoutCollisions)({ status, moves })) {
-        return status;
-    }
-    const moveMap = getMoveMap(moves);
-    if (moveMap === null) {
-        return status;
-    }
-    if (moveMap.size === 0) {
+    const moved = getMovedKeyframes({ status, moves });
+    if (moved === null ||
+        (moved.removedKeyframeIndexes.length === 0 &&
+            moved.keyframes === status.keyframes)) {
         return status;
     }
+    const easing = removeEasingForRemovedKeyframes({
+        easing: status.easing,
+        removedKeyframeIndexes: moved.removedKeyframeIndexes,
+    });
     return {
         ...status,
-        keyframes: status.keyframes
-            .map((keyframe) => {
-            var _a;
-            return ({
-                ...keyframe,
-                frame: (_a = moveMap.get(keyframe.frame)) !== null && _a !== void 0 ? _a : keyframe.frame,
-            });
-        })
-            .sort((a, b) => a.frame - b.frame),
+        keyframes: moved.keyframes,
+        easing,
     };
 };
+exports.moveKeyframesInPropStatus = moveKeyframesInPropStatus;
 const optimisticMoveSequenceKeyframes = ({ previous, keyframes, }) => {
     var _a;
     if (!previous.canUpdate) {
@@ -87,7 +111,7 @@ const optimisticMoveSequenceKeyframes = ({ previous, keyframes, }) => {
         if (!status) {
             continue;
         }
-        props[fieldKey] = moveKeyframesInPropStatus({ status, moves });
+        props[fieldKey] = (0, exports.moveKeyframesInPropStatus)({ status, moves });
     }
     return {
         ...previous,
@@ -127,7 +151,7 @@ const optimisticMoveEffectKeyframes = ({ previous, keyframes, }) => {
             if (!status) {
                 continue;
             }
-            props[fieldKey] = moveKeyframesInPropStatus({ status, moves });
+            props[fieldKey] = (0, exports.moveKeyframesInPropStatus)({ status, moves });
         }
         return {
             ...effect,

package/package.json

@@ -3,7 +3,7 @@
 		"url": "https://github.com/remotion-dev/remotion/tree/main/packages/studio-shared"
 	},
 	"name": "@remotion/studio-shared",
-	"version": "4.0.475",
+	"version": "4.0.476",
 	"description": "Internal package for shared objects between the Studio backend and frontend",
 	"main": "dist",
 	"scripts": {
@@ -20,11 +20,11 @@
 		"url": "https://github.com/remotion-dev/remotion/issues"
 	},
 	"dependencies": {
-		"remotion": "4.0.475"
+		"remotion": "4.0.476"
 	},
 	"devDependencies": {
-		"@remotion/renderer": "4.0.475",
-		"@remotion/eslint-config-internal": "4.0.475",
+		"@remotion/renderer": "4.0.476",
+		"@remotion/eslint-config-internal": "4.0.476",
 		"eslint": "9.19.0",
 		"@typescript/native-preview": "7.0.0-dev.20260217.1"
 	},