@remotion/studio 4.0.471 → 4.0.473

package/dist/components/Timeline/TimelineEffectPropItem.js

@@ -6,8 +6,10 @@ const studio_shared_1 = require("@remotion/studio-shared");
 const react_1 = require("react");
 const remotion_1 = require("remotion");
 const client_id_1 = require("../../helpers/client-id");
+const modals_1 = require("../../state/modals");
 const call_api_1 = require("../call-api");
 const ContextMenu_1 = require("../ContextMenu");
+const call_add_keyframe_1 = require("./call-add-keyframe");
 const get_timeline_keyframes_1 = require("./get-timeline-keyframes");
 const save_effect_prop_1 = require("./save-effect-prop");
 const save_prop_queue_1 = require("./save-prop-queue");
@@ -21,6 +23,23 @@ const TimelineRowChrome_1 = require("./TimelineRowChrome");
 const TimelineSchemaField_1 = require("./TimelineSchemaField");
 const TimelineSelection_1 = require("./TimelineSelection");
 const fieldRowBase = {};
+const isKeyframedStatus = (status) => {
+    return status.status === 'keyframed';
+};
+const isResettableStatus = ({ status, defaultValue, }) => {
+    var _a;
+    if (defaultValue === undefined) {
+        return false;
+    }
+    if (status.status === 'keyframed') {
+        return true;
+    }
+    if (status.status === 'computed') {
+        return false;
+    }
+    const effectiveCodeValue = (_a = status.codeValue) !== null && _a !== void 0 ? _a : defaultValue;
+    return JSON.stringify(effectiveCodeValue) !== JSON.stringify(defaultValue);
+};
 const Value = ({ field, nodePath, validatedLocation, keyframeDisplayOffset }) => {
     var _a;
     var _b;
@@ -39,9 +58,25 @@ const Value = ({ field, nodePath, validatedLocation, keyframeDisplayOffset }) =>
     const propStatus = effectStatus.type === 'can-update-effect'
         ? ((_b = (_a = effectStatus.props) === null || _a === void 0 ? void 0 : _a[field.key]) !== null && _b !== void 0 ? _b : null)
         : null;
+    const timelinePosition = remotion_1.Internals.Timeline.useTimelinePosition();
+    const jsxFrame = timelinePosition - keyframeDisplayOffset;
     const onDragValueChange = (0, react_1.useCallback)((value) => {
-        setEffectDragOverrides(nodePath, field.effectIndex, field.key, value);
-    }, [setEffectDragOverrides, nodePath, field.effectIndex, field.key]);
+        const nextDragOverrideValue = propStatus !== null && isKeyframedStatus(propStatus)
+            ? remotion_1.Internals.makeKeyframedDragOverride({
+                status: propStatus,
+                frame: jsxFrame,
+                value,
+            })
+            : remotion_1.Internals.makeStaticDragOverride(value);
+        setEffectDragOverrides(nodePath, field.effectIndex, field.key, nextDragOverrideValue);
+    }, [
+        field.effectIndex,
+        field.key,
+        jsxFrame,
+        nodePath,
+        propStatus,
+        setEffectDragOverrides,
+    ]);
     const onDragEnd = (0, react_1.useCallback)(() => {
         clearEffectDragOverrides(nodePath, field.effectIndex);
     }, [clearEffectDragOverrides, nodePath, field.effectIndex]);
@@ -56,7 +91,7 @@ const Value = ({ field, nodePath, validatedLocation, keyframeDisplayOffset }) =>
         if (!propStatus) {
             return Promise.reject(new Error('Cannot save'));
         }
-        if (!propStatus.canUpdate) {
+        if (propStatus.status !== 'static') {
             return Promise.reject(new Error('Cannot save'));
         }
         if (!clientId) {
@@ -84,6 +119,7 @@ const Value = ({ field, nodePath, validatedLocation, keyframeDisplayOffset }) =>
                 schema: field.effectSchema,
             }),
             apiCall: () => (0, call_api_1.callApi)('/api/save-effect-props', {
+                type: 'value',
                 fileName: validatedLocation.source,
                 sequenceNodePath: nodePath,
                 effectIndex: field.effectIndex,
@@ -106,6 +142,36 @@ const Value = ({ field, nodePath, validatedLocation, keyframeDisplayOffset }) =>
         setCodeValues,
         validatedLocation,
     ]);
+    const onSaveKeyframed = (0, react_1.useCallback)((value, sourceFrame) => {
+        if (!validatedLocation) {
+            return Promise.reject(new Error('Cannot save'));
+        }
+        if (!clientId) {
+            return Promise.reject(new Error('Not connected to studio server'));
+        }
+        return (0, call_add_keyframe_1.callAddEffectKeyframe)({
+            fileName: validatedLocation.source,
+            nodePath,
+            effectIndex: field.effectIndex,
+            fieldKey: field.key,
+            sourceFrame,
+            value,
+            schema: field.effectSchema,
+            setCodeValues,
+            clientId,
+        });
+    }, [
+        clientId,
+        field.effectIndex,
+        field.effectSchema,
+        field.key,
+        nodePath,
+        setCodeValues,
+        validatedLocation,
+    ]);
+    if (field.fieldSchema.type === 'scale') {
+        throw new Error(`Effects do not support scale fields: ${field.key}`);
+    }
     if (effectStatus.type === 'cannot-update-effect') {
         if (effectStatus.reason === 'computed') {
             return jsx_runtime_1.jsx(TimelineSchemaField_1.UnsupportedStatus, { label: "computed" });
@@ -127,27 +193,29 @@ const Value = ({ field, nodePath, validatedLocation, keyframeDisplayOffset }) =>
         }
         throw new Error(`Unsupported effect status: ${effectStatus.reason}`);
     }
-    if (propStatus === null || !propStatus.canUpdate) {
-        if ((propStatus === null || propStatus === void 0 ? void 0 : propStatus.reason) === 'keyframed') {
-            return (jsx_runtime_1.jsx(TimelineKeyframedValue_1.TimelineKeyframedValue, { field: field, propStatus: propStatus, keyframeDisplayOffset: keyframeDisplayOffset }));
-        }
-        if ((propStatus === null || propStatus === void 0 ? void 0 : propStatus.reason) === 'computed') {
-            return jsx_runtime_1.jsx(TimelineSchemaField_1.UnsupportedStatus, { label: (0, get_timeline_keyframes_1.getComputedStatusLabel)(propStatus) });
-        }
+    if (propStatus === null) {
         return null;
     }
+    if (isKeyframedStatus(propStatus)) {
+        return (jsx_runtime_1.jsx(TimelineKeyframedValue_1.TimelineKeyframedValue, { field: field, propStatus: propStatus, keyframeDisplayOffset: keyframeDisplayOffset, dragOverrideValue: dragOverrideValue, onSave: onSaveKeyframed, onDragValueChange: onDragValueChange, onDragEnd: onDragEnd, scaleLockNodePath: nodePath }));
+    }
+    if (propStatus.status === 'computed') {
+        return jsx_runtime_1.jsx(TimelineSchemaField_1.UnsupportedStatus, { label: (0, get_timeline_keyframes_1.getComputedStatusLabel)(propStatus) });
+    }
     const effectiveValue = remotion_1.Internals.getEffectiveVisualModeValue({
         codeValue: propStatus,
         dragOverrideValue,
         defaultValue: field.fieldSchema.default,
+        frame: jsxFrame,
         shouldResortToDefaultValueIfUndefined: true,
     });
-    return (jsx_runtime_1.jsx(TimelineSchemaField_1.TimelineFieldValue, { field: field, propStatus: propStatus, onSave: onSave, onDragValueChange: onDragValueChange, onDragEnd: onDragEnd, effectiveValue: effectiveValue }));
+    return (jsx_runtime_1.jsx(TimelineSchemaField_1.TimelineFieldValue, { field: field, propStatus: propStatus, onSave: onSave, onDragValueChange: onDragValueChange, onDragEnd: onDragEnd, effectiveValue: effectiveValue, scaleLockNodePath: null }));
 };
 const TimelineEffectPropItem = ({ field, validatedLocation, rowDepth, nodePath, nodePathInfo, keyframeDisplayOffset, }) => {
     var _a;
     var _b, _c;
     const { previewServerState } = (0, react_1.useContext)(client_id_1.StudioServerConnectionCtx);
+    const { setSelectedModal } = (0, react_1.useContext)(modals_1.ModalsContext);
     const { setCodeValues } = (0, react_1.useContext)(remotion_1.Internals.VisualModeSettersContext);
     const { codeValues } = (0, react_1.useContext)(remotion_1.Internals.VisualModeCodeValuesContext);
     const { getEffectDragOverrides } = (0, react_1.useContext)(remotion_1.Internals.VisualModeDragOverridesContext);
@@ -174,29 +242,35 @@ const TimelineEffectPropItem = ({ field, validatedLocation, rowDepth, nodePath,
         (0, TimelineKeyframeControls_1.shouldShowTimelineKeyframeControls)({
             propStatus,
             selected: selection.selected,
+            keyframable: (0, studio_shared_1.isSchemaFieldKeyframable)({
+                schema: field.effectSchema,
+                key: field.key,
+            }),
         }) ? (jsx_runtime_1.jsx(TimelineKeyframeControls_1.TimelineKeyframeControls, { fieldKey: field.key, propStatus: propStatus, nodePath: nodePath, fileName: validatedLocation.source, keyframeDisplayOffset: keyframeDisplayOffset, defaultValue: field.fieldSchema.default, dragOverrideValue: dragOverrideValue, schema: field.effectSchema, effectIndex: field.effectIndex })) : null;
-    const isNonDefault = (0, react_1.useMemo)(() => {
-        var _a;
-        if (!propStatus || !propStatus.canUpdate) {
+    const canResetToDefault = (0, react_1.useMemo)(() => {
+        if (!propStatus || propStatus.status === 'computed') {
             return false;
         }
-        const effectiveCodeValue = (_a = propStatus.codeValue) !== null && _a !== void 0 ? _a : field.fieldSchema.default;
-        return (JSON.stringify(effectiveCodeValue) !==
-            JSON.stringify(field.fieldSchema.default));
+        return isResettableStatus({
+            status: propStatus,
+            defaultValue: field.fieldSchema.default,
+        });
     }, [field.fieldSchema.default, propStatus]);
     const canPerformReset = previewServerState.type === 'connected' &&
         propStatus !== null &&
-        propStatus.canUpdate;
+        propStatus.status !== 'computed';
+    const canShowReset = canPerformReset && field.fieldSchema.default !== undefined;
     const onReset = (0, react_1.useCallback)(() => {
-        if (!canPerformReset ||
-            previewServerState.type !== 'connected' ||
-            !isNonDefault) {
+        if (!canShowReset ||
+            !canResetToDefault ||
+            previewServerState.type !== 'connected') {
             return;
         }
         const defaultValue = field.fieldSchema.default !== undefined
             ? JSON.stringify(field.fieldSchema.default)
             : null;
         (0, save_effect_prop_1.saveEffectProp)({
+            type: 'value',
             fileName: validatedLocation.source,
             nodePath,
             effectIndex: field.effectIndex,
@@ -208,33 +282,79 @@ const TimelineEffectPropItem = ({ field, validatedLocation, rowDepth, nodePath,
             clientId: previewServerState.clientId,
         });
     }, [
-        canPerformReset,
+        canResetToDefault,
+        canShowReset,
         field.effectIndex,
         field.effectSchema,
         field.fieldSchema.default,
         field.key,
-        isNonDefault,
         nodePath,
         previewServerState,
         setCodeValues,
         validatedLocation.source,
     ]);
+    const onOpenKeyframeSettings = (0, react_1.useCallback)(() => {
+        var _a;
+        if (propStatus === null || !isKeyframedStatus(propStatus)) {
+            return;
+        }
+        setSelectedModal({
+            type: 'keyframe-settings',
+            fileName: validatedLocation.source,
+            nodePath,
+            fieldKey: field.key,
+            fieldLabel: (_a = field.description) !== null && _a !== void 0 ? _a : field.key,
+            status: propStatus,
+            schema: field.effectSchema,
+            effectIndex: field.effectIndex,
+        });
+    }, [
+        field.description,
+        field.effectIndex,
+        field.effectSchema,
+        field.key,
+        nodePath,
+        propStatus,
+        setSelectedModal,
+        validatedLocation.source,
+    ]);
     const contextMenuValues = (0, react_1.useMemo)(() => {
-        return [
+        const values = [
             {
                 type: 'item',
                 id: 'reset-effect-field',
                 keyHint: null,
                 label: 'Reset',
                 leftItem: null,
-                disabled: !canPerformReset,
+                disabled: !canShowReset,
                 onClick: onReset,
                 quickSwitcherLabel: null,
                 subMenu: null,
                 value: 'reset-effect-field',
             },
         ];
-    }, [canPerformReset, onReset]);
+        if (propStatus !== null && isKeyframedStatus(propStatus)) {
+            values.push({
+                type: 'item',
+                id: 'keyframe-settings-effect-field',
+                keyHint: null,
+                label: 'Keyframe settings...',
+                leftItem: null,
+                disabled: previewServerState.type !== 'connected',
+                onClick: onOpenKeyframeSettings,
+                quickSwitcherLabel: null,
+                subMenu: null,
+                value: 'keyframe-settings-effect-field',
+            });
+        }
+        return values;
+    }, [
+        canShowReset,
+        onOpenKeyframeSettings,
+        onReset,
+        previewServerState,
+        propStatus,
+    ]);
     const row = (jsx_runtime_1.jsxs(TimelineRowChrome_1.TimelineRowChrome, { depth: rowDepth, eye: jsx_runtime_1.jsx(TimelineLayerEye_1.TimelineLayerEyeSpacer, {}), keyframeControls: keyframeControls, arrow: jsx_runtime_1.jsx(TimelineExpandArrowButton_1.TimelineExpandArrowSpacer, {}), style: style, selected: selection.selected, selectable: selection.selectable, onSelect: selection.onSelect, showSelectedBackground: true, containsSelection: false, outerHeight: null, children: [
             jsx_runtime_1.jsx(TimelineFieldLabel_1.TimelineFieldLabel, { rowDepth: rowDepth, selected: selection.selected, label: (_c = field.description) !== null && _c !== void 0 ? _c : field.key }), jsx_runtime_1.jsx("div", { style: timeline_field_row_layout_1.timelineFieldValueColumnStyle, children: jsx_runtime_1.jsx(Value, { field: field, nodePath: nodePath, validatedLocation: validatedLocation, keyframeDisplayOffset: keyframeDisplayOffset }) })
         ] }));

package/dist/components/Timeline/TimelineEnumField.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
-import type { CanUpdateSequencePropStatus } from 'remotion';
+import type { CanUpdateSequencePropStatusStatic } from 'remotion';
 import type { SchemaFieldInfo, TimelineFieldOnDragValueChange, TimelineFieldOnSave } from '../../helpers/timeline-layout';
 export declare const TimelineEnumField: React.FC<{
     readonly field: SchemaFieldInfo;
-    readonly propStatus: CanUpdateSequencePropStatus;
+    readonly propStatus: CanUpdateSequencePropStatusStatic;
     readonly effectiveValue: unknown;
     readonly onSave: TimelineFieldOnSave;
     readonly onDragValueChange: TimelineFieldOnDragValueChange;

package/dist/components/Timeline/TimelineEnumField.js

@@ -15,7 +15,7 @@ const TimelineEnumField = ({ field, propStatus, effectiveValue, onSave, onDragVa
     const variantKeys = Object.keys(fieldSchema.variants);
     const current = String(effectiveValue !== null && effectiveValue !== void 0 ? effectiveValue : fieldSchema.default);
     const onSelect = (0, react_1.useCallback)((newValue) => {
-        if (!propStatus.canUpdate || newValue === propStatus.codeValue) {
+        if (newValue === propStatus.codeValue) {
             return;
         }
         onDragValueChange(newValue);
@@ -34,9 +34,9 @@ const TimelineEnumField = ({ field, propStatus, effectiveValue, onSave, onDragVa
             leftItem: null,
             subMenu: null,
             quickSwitcherLabel: null,
-            disabled: !propStatus.canUpdate,
+            disabled: false,
         }));
-    }, [variantKeys, onSelect, propStatus]);
+    }, [variantKeys, onSelect]);
     return (jsx_runtime_1.jsx(ComboBox_1.Combobox, { small: true, title: field.key, selectedId: current, values: items, style: comboboxStyle }));
 };
 exports.TimelineEnumField = TimelineEnumField;

package/dist/components/Timeline/TimelineKeyframeControls.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
-import type { CanUpdateSequencePropStatus, SequencePropsSubscriptionKey, SequenceSchema } from 'remotion';
-export declare const shouldShowTimelineKeyframeControls: ({ propStatus, selected, }: {
+import type { CanUpdateSequencePropStatus, DragOverrideValue, SequencePropsSubscriptionKey, SequenceSchema } from 'remotion';
+export declare const shouldShowTimelineKeyframeControls: ({ propStatus, selected, keyframable, }: {
     propStatus: CanUpdateSequencePropStatus | null;
     selected: boolean;
+    keyframable: boolean;
 }) => boolean;
 export declare const TimelineKeyframeControls: React.FC<{
     readonly fieldKey: string;
@@ -11,7 +12,7 @@ export declare const TimelineKeyframeControls: React.FC<{
     readonly fileName: string;
     readonly keyframeDisplayOffset: number;
     readonly defaultValue: unknown;
-    readonly dragOverrideValue: unknown | undefined;
+    readonly dragOverrideValue: DragOverrideValue | undefined;
     readonly schema: SequenceSchema;
     readonly effectIndex: number | null;
 }>;

package/dist/components/Timeline/TimelineKeyframeControls.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimelineKeyframeControls = exports.shouldShowTimelineKeyframeControls = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const studio_shared_1 = require("@remotion/studio-shared");
 const react_1 = require("react");
 const remotion_1 = require("remotion");
 const client_id_1 = require("../../helpers/client-id");
@@ -10,6 +11,7 @@ const call_add_keyframe_1 = require("./call-add-keyframe");
 const call_delete_keyframe_1 = require("./call-delete-keyframe");
 const get_keyframe_navigation_1 = require("./get-keyframe-navigation");
 const get_timeline_keyframes_1 = require("./get-timeline-keyframes");
+const TimelineKeyframeDiamondIcon_1 = require("./TimelineKeyframeDiamondIcon");
 const TimelineSelection_1 = require("./TimelineSelection");
 const controlsContainerStyle = {
     alignItems: 'center',
@@ -26,53 +28,54 @@ const navButtonStyle = {
     cursor: 'pointer',
     display: 'flex',
     flexShrink: 0,
-    height: 12,
+    height: 14,
     justifyContent: 'center',
     lineHeight: 1,
     outline: 'none',
     padding: 0,
     userSelect: 'none',
-    width: 12,
+    width: 14,
+};
+const isKeyframedStatus = (status) => {
+    return status.status === 'keyframed';
 };
 const diamondButtonStyle = {
     ...navButtonStyle,
     background: 'none',
 };
-const diamondIconStyle = {
-    borderRadius: 1,
-    boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.4)',
-    height: 7,
-    transform: 'rotate(45deg)',
-    width: 7,
-};
 const svgStyle = { display: 'block' };
 const getCurrentKeyframeValue = ({ propStatus, jsxFrame, defaultValue, dragOverrideValue, }) => {
-    if (propStatus.canUpdate) {
+    if (isKeyframedStatus(propStatus)) {
         return remotion_1.Internals.getEffectiveVisualModeValue({
             codeValue: propStatus,
             dragOverrideValue,
+            frame: jsxFrame,
             defaultValue,
             shouldResortToDefaultValueIfUndefined: true,
         });
     }
-    if (propStatus.reason === 'keyframed') {
-        return remotion_1.Internals.interpolateKeyframedStatus({
+    if (propStatus.status === 'static') {
+        return remotion_1.Internals.getEffectiveVisualModeValue({
+            codeValue: propStatus,
+            dragOverrideValue,
             frame: jsxFrame,
-            status: propStatus,
+            defaultValue,
+            shouldResortToDefaultValueIfUndefined: true,
         });
     }
     return null;
 };
-const shouldShowTimelineKeyframeControls = ({ propStatus, selected, }) => {
+const shouldShowTimelineKeyframeControls = ({ propStatus, selected, keyframable, }) => {
     if (propStatus === null) {
         return false;
     }
+    if (!keyframable && !isKeyframedStatus(propStatus)) {
+        return false;
+    }
     if (selected) {
         return true;
     }
-    return (TimelineSelection_1.SELECTION_ENABLED &&
-        !propStatus.canUpdate &&
-        propStatus.reason === 'keyframed');
+    return TimelineSelection_1.SELECTION_ENABLED && isKeyframedStatus(propStatus);
 };
 exports.shouldShowTimelineKeyframeControls = shouldShowTimelineKeyframeControls;
 const TimelineKeyframeControls = ({ fieldKey, propStatus, nodePath, fileName, keyframeDisplayOffset, defaultValue, dragOverrideValue, schema, effectIndex, }) => {
@@ -87,14 +90,26 @@ const TimelineKeyframeControls = ({ fieldKey, propStatus, nodePath, fileName, ke
     const jsxFrame = timelinePosition - keyframeDisplayOffset;
     const keyframes = (0, react_1.useMemo)(() => (0, get_timeline_keyframes_1.getTimelineKeyframes)(propStatus, keyframeDisplayOffset), [propStatus, keyframeDisplayOffset]);
     const hasKeyframeAtCurrentFrame = (0, react_1.useMemo)(() => {
-        if (propStatus.canUpdate || propStatus.reason === 'computed') {
+        if (!isKeyframedStatus(propStatus)) {
             return false;
         }
         return (0, get_keyframe_navigation_1.hasKeyframeAtSourceFrame)(propStatus.keyframes, jsxFrame);
     }, [jsxFrame, propStatus]);
-    const previousDisplayFrame = (0, react_1.useMemo)(() => (0, get_keyframe_navigation_1.getPreviousKeyframeDisplayFrame)(keyframes, timelinePosition), [keyframes, timelinePosition]);
-    const nextDisplayFrame = (0, react_1.useMemo)(() => (0, get_keyframe_navigation_1.getNextKeyframeDisplayFrame)(keyframes, timelinePosition), [keyframes, timelinePosition]);
-    const canToggleKeyframe = propStatus.canUpdate || propStatus.reason === 'keyframed';
+    const currentKeyframeValue = (0, react_1.useMemo)(() => getCurrentKeyframeValue({
+        propStatus,
+        jsxFrame,
+        defaultValue,
+        dragOverrideValue,
+    }), [defaultValue, dragOverrideValue, jsxFrame, propStatus]);
+    const previousDisplayFrame = (0, react_1.useMemo)(() => (0, get_keyframe_navigation_1.getPreviousKeyframeDisplayFrame)(keyframes, timelinePosition, videoConfig.durationInFrames), [keyframes, timelinePosition, videoConfig.durationInFrames]);
+    const nextDisplayFrame = (0, react_1.useMemo)(() => (0, get_keyframe_navigation_1.getNextKeyframeDisplayFrame)(keyframes, timelinePosition, videoConfig.durationInFrames), [keyframes, timelinePosition, videoConfig.durationInFrames]);
+    const keyframable = (0, studio_shared_1.isSchemaFieldKeyframable)({
+        schema,
+        key: fieldKey,
+    });
+    const canAddKeyframe = keyframable;
+    const canToggleKeyframe = propStatus.status !== 'computed' &&
+        (hasKeyframeAtCurrentFrame || canAddKeyframe);
     const seekToDisplayFrame = (0, react_1.useCallback)((frame) => {
         setFrame((current) => {
             const next = { ...current, [videoConfig.id]: frame };
@@ -119,9 +134,7 @@ const TimelineKeyframeControls = ({ fieldKey, propStatus, nodePath, fileName, ke
         if (!clientId || !canToggleKeyframe) {
             return;
         }
-        if (hasKeyframeAtCurrentFrame &&
-            !propStatus.canUpdate &&
-            propStatus.reason === 'keyframed') {
+        if (hasKeyframeAtCurrentFrame && isKeyframedStatus(propStatus)) {
             if (effectIndex === null) {
                 await (0, call_delete_keyframe_1.callDeleteSequenceKeyframe)({
                     fileName,
@@ -146,12 +159,7 @@ const TimelineKeyframeControls = ({ fieldKey, propStatus, nodePath, fileName, ke
             });
             return;
         }
-        const value = getCurrentKeyframeValue({
-            propStatus,
-            jsxFrame,
-            defaultValue,
-            dragOverrideValue,
-        });
+        const value = currentKeyframeValue;
         if (value === null) {
             return;
         }
@@ -182,12 +190,11 @@ const TimelineKeyframeControls = ({ fieldKey, propStatus, nodePath, fileName, ke
     }, [
         canToggleKeyframe,
         clientId,
-        defaultValue,
-        dragOverrideValue,
         effectIndex,
         fieldKey,
         fileName,
         hasKeyframeAtCurrentFrame,
+        currentKeyframeValue,
         jsxFrame,
         nodePath,
         propStatus,
@@ -211,12 +218,9 @@ const TimelineKeyframeControls = ({ fieldKey, propStatus, nodePath, fileName, ke
         cursor: canToggleKeyframe && clientId ? 'pointer' : 'default',
         opacity: canToggleKeyframe && clientId ? 1 : 0.35,
     }), [canToggleKeyframe, clientId]);
-    const diamondIcon = (0, react_1.useMemo)(() => ({
-        ...diamondIconStyle,
-        backgroundColor: hasKeyframeAtCurrentFrame ? colors_1.BLUE : colors_1.LIGHT_TEXT,
-    }), [hasKeyframeAtCurrentFrame]);
+    const diamondColor = hasKeyframeAtCurrentFrame ? colors_1.BLUE : colors_1.LIGHT_TEXT;
     return (jsx_runtime_1.jsxs("div", { style: controlsContainerStyle, children: [
-            jsx_runtime_1.jsx("button", { type: "button", style: previousStyle, disabled: previousDisabled, onPointerDown: previousDisabled ? undefined : onPrevious, "aria-label": "Go to previous keyframe", title: "Previous keyframe", children: jsx_runtime_1.jsx("svg", { width: "14", height: "14", viewBox: "0 0 10 10", style: svgStyle, children: jsx_runtime_1.jsx("path", { d: "M7 1.5L3 5L7 8.5Z", fill: "#ccc" }) }) }), jsx_runtime_1.jsx("button", { type: "button", style: diamondStyle, disabled: !canToggleKeyframe || !clientId, onPointerDown: canToggleKeyframe && clientId ? onToggleKeyframe : undefined, "aria-label": hasKeyframeAtCurrentFrame ? 'Remove keyframe' : 'Add keyframe', title: hasKeyframeAtCurrentFrame ? 'Remove keyframe' : 'Add keyframe', children: jsx_runtime_1.jsx("span", { style: diamondIcon }) }), jsx_runtime_1.jsx("button", { type: "button", style: nextStyle, disabled: nextDisabled, onPointerDown: nextDisabled ? undefined : onNext, "aria-label": "Go to next keyframe", title: "Next keyframe", children: jsx_runtime_1.jsx("svg", { width: "14", height: "14", viewBox: "0 0 10 10", style: svgStyle, children: jsx_runtime_1.jsx("path", { d: "M3 1.5L7 5L3 8.5Z", fill: "#ccc" }) }) })
+            jsx_runtime_1.jsx("button", { type: "button", style: previousStyle, disabled: previousDisabled, onPointerDown: previousDisabled ? undefined : onPrevious, "aria-label": "Go to previous keyframe", title: "Previous keyframe", children: jsx_runtime_1.jsx("svg", { width: "14", height: "14", viewBox: "0 0 10 10", style: svgStyle, children: jsx_runtime_1.jsx("path", { d: "M7 1.5L3 5L7 8.5Z", fill: "#ccc" }) }) }), jsx_runtime_1.jsx("button", { type: "button", style: diamondStyle, disabled: !canToggleKeyframe || !clientId, onPointerDown: canToggleKeyframe && clientId ? onToggleKeyframe : undefined, "aria-label": hasKeyframeAtCurrentFrame ? 'Remove keyframe' : 'Add keyframe', title: hasKeyframeAtCurrentFrame ? 'Remove keyframe' : 'Add keyframe', children: jsx_runtime_1.jsx(TimelineKeyframeDiamondIcon_1.TimelineKeyframeDiamondIcon, { color: diamondColor, size: 12 }) }), jsx_runtime_1.jsx("button", { type: "button", style: nextStyle, disabled: nextDisabled, onPointerDown: nextDisabled ? undefined : onNext, "aria-label": "Go to next keyframe", title: "Next keyframe", children: jsx_runtime_1.jsx("svg", { width: "14", height: "14", viewBox: "0 0 10 10", style: svgStyle, children: jsx_runtime_1.jsx("path", { d: "M3 1.5L7 5L3 8.5Z", fill: "#ccc" }) }) })
         ] }));
 };
 exports.TimelineKeyframeControls = TimelineKeyframeControls;

package/dist/components/Timeline/TimelineKeyframeDiamond.js

@@ -40,49 +40,52 @@ const remotion_1 = require("remotion");
 const colors_1 = require("../../helpers/colors");
 const get_left_of_timeline_slider_1 = require("../../helpers/get-left-of-timeline-slider");
 const timeline_layout_1 = require("../../helpers/timeline-layout");
+const TimelineKeyframeDiamondIcon_1 = require("./TimelineKeyframeDiamondIcon");
+const TimelineKeyframeDragState_1 = require("./TimelineKeyframeDragState");
 const TimelineSelection_1 = require("./TimelineSelection");
 const TimelineWidthProvider_1 = require("./TimelineWidthProvider");
+const use_timeline_keyframe_drag_1 = require("./use-timeline-keyframe-drag");
+const diamondSize = 12;
 const diamondBase = {
+    alignItems: 'center',
+    background: 'none',
+    border: 'none',
+    display: 'flex',
+    height: diamondSize,
+    justifyContent: 'center',
+    padding: 0,
     position: 'absolute',
-    width: 8,
-    height: 8,
-    backgroundColor: colors_1.LIGHT_TEXT,
-    borderRadius: 1,
-    boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.4)',
+    width: diamondSize,
 };
 const TimelineKeyframeDiamondUnmemoized = ({ frame, rowHeight, nodePathInfo }) => {
     const videoConfig = (0, remotion_1.useVideoConfig)();
     const timelineWidth = (0, react_1.useContext)(TimelineWidthProvider_1.TimelineWidthContext);
     const { selected, onSelect, selectable } = (0, TimelineSelection_1.useTimelineKeyframeSelection)(nodePathInfo, frame);
+    const { isKeyframeDragging } = (0, TimelineKeyframeDragState_1.useTimelineKeyframeDragState)();
+    const visuallySelected = selected || isKeyframeDragging({ nodePathInfo, frame });
     const style = (0, react_1.useMemo)(() => {
         if (timelineWidth === null) {
             return null;
         }
         return {
             ...diamondBase,
-            backgroundColor: colors_1.LIGHT_TEXT,
-            outline: selected ? '2px solid ' + colors_1.BLUE : 'none',
-            border: 'none',
             cursor: 'pointer',
             left: (0, get_left_of_timeline_slider_1.getXPositionOfItemInTimelineImperatively)(frame, videoConfig.durationInFrames, timelineWidth) - timeline_layout_1.TIMELINE_PADDING,
-            padding: 0,
             pointerEvents: 'auto',
             top: rowHeight / 2,
-            transform: 'translate(-50%, -50%) rotate(45deg)',
+            transform: 'translate(-50%, -50%)',
         };
-    }, [frame, rowHeight, selected, timelineWidth, videoConfig.durationInFrames]);
-    const onPointerDown = (0, react_1.useCallback)((e) => {
-        if (e.button === 0) {
-            e.stopPropagation();
-            onSelect({
-                shiftKey: e.shiftKey,
-                toggleKey: e.metaKey || e.ctrlKey,
-            });
-        }
-    }, [onSelect]);
+    }, [frame, rowHeight, timelineWidth, videoConfig.durationInFrames]);
+    const onPointerDown = (0, use_timeline_keyframe_drag_1.useTimelineKeyframeDrag)({
+        frame,
+        nodePathInfo,
+        onSelect,
+        selectable,
+        selected,
+    });
     if (style === null) {
         return null;
     }
-    return (jsx_runtime_1.jsx("button", { type: "button", style: style, title: `Keyframe at frame ${frame}`, "aria-label": `Select keyframe at frame ${frame}`, onPointerDown: selectable ? onPointerDown : undefined }));
+    return (jsx_runtime_1.jsx("button", { type: "button", style: style, title: `Keyframe at frame ${frame}`, "aria-label": `Select keyframe at frame ${frame}`, onPointerDown: selectable ? onPointerDown : undefined, children: jsx_runtime_1.jsx(TimelineKeyframeDiamondIcon_1.TimelineKeyframeDiamondIcon, { color: colors_1.LIGHT_TEXT, selected: visuallySelected, size: diamondSize }) }));
 };
 exports.TimelineKeyframeDiamond = react_1.default.memo(TimelineKeyframeDiamondUnmemoized);

package/dist/components/Timeline/TimelineKeyframeDiamondIcon.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+export declare const TimelineKeyframeDiamondIcon: React.FC<{
+    readonly color: string;
+    readonly selected?: boolean;
+    readonly size: number;
+}>;

package/dist/components/Timeline/TimelineKeyframeDiamondIcon.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TimelineKeyframeDiamondIcon = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const colors_1 = require("../../helpers/colors");
+const svgStyle = {
+    display: 'block',
+    overflow: 'visible',
+};
+const TimelineKeyframeDiamondIcon = ({ color, selected = false, size }) => {
+    return (jsx_runtime_1.jsxs("svg", { width: size, height: size, viewBox: "0 0 12 12", style: svgStyle, "aria-hidden": "true", focusable: "false", children: [selected ? (jsx_runtime_1.jsx("polygon", { points: "6 0.75 11.25 6 6 11.25 0.75 6", fill: "none", stroke: colors_1.BLUE, strokeWidth: "1.5", strokeLinejoin: "round" })) : null, jsx_runtime_1.jsx("polygon", { points: "6 1.5 10.5 6 6 10.5 1.5 6", fill: color, stroke: "rgba(0, 0, 0, 0.4)", strokeWidth: "1", strokeLinejoin: "round" })
+        ] }));
+};
+exports.TimelineKeyframeDiamondIcon = TimelineKeyframeDiamondIcon;

package/dist/components/Timeline/TimelineKeyframeDragState.d.ts

@@ -0,0 +1,17 @@
+import React from 'react';
+import type { SequenceNodePathInfo } from '../../helpers/get-timeline-sequence-sort-key';
+export type TimelineDraggedKeyframe = {
+    readonly nodePathInfo: SequenceNodePathInfo;
+    readonly frame: number;
+};
+export declare const getTimelineKeyframeDragKey: ({ nodePathInfo, frame, }: TimelineDraggedKeyframe) => string;
+type TimelineKeyframeDragStateContextValue = {
+    readonly clearDraggedKeyframes: () => void;
+    readonly isKeyframeDragging: (keyframe: TimelineDraggedKeyframe) => boolean;
+    readonly setDraggedKeyframes: (keyframes: readonly TimelineDraggedKeyframe[]) => void;
+};
+export declare const TimelineKeyframeDragStateProvider: React.FC<{
+    readonly children: React.ReactNode;
+}>;
+export declare const useTimelineKeyframeDragState: () => TimelineKeyframeDragStateContextValue;
+export {};