@remotion/cli 4.0.0-alpha8 → 4.0.0-alpha9

package/dist/editor/components/RenderModal/SchemaEditor/ZodNumberEditor.js

@@ -7,6 +7,7 @@ const layout_1 = require("../../layout");
 const InputDragger_1 = require("../../NewComposition/InputDragger");
 const ValidationMessage_1 = require("../../NewComposition/ValidationMessage");
 const layout_2 = require("../layout");
+const local_state_1 = require("./local-state");
 const SchemaLabel_1 = require("./SchemaLabel");
 const fullWidth = {
     width: '100%',
@@ -47,45 +48,25 @@ const getStep = (schema) => {
     }
     return multipleStep.value;
 };
-const ZodNumberEditor = ({ jsonPath, value, schema, setValue, onSave, compact, defaultValue, onRemove, showSaveButton, saving, }) => {
-    const [localValue, setLocalValue] = (0, react_1.useState)(() => {
-        return {
-            value: String(value),
-            zodValidation: schema.safeParse(value),
-        };
+const ZodNumberEditor = ({ jsonPath, value, schema, setValue, onSave, compact, defaultValue, onRemove, showSaveButton, saving, saveDisabledByParent, }) => {
+    const { localValue, onChange: setLocalValue } = (0, local_state_1.useLocalState)({
+        value,
+        schema,
+        setValue,
     });
-    const onChange = (0, react_1.useCallback)((newValue) => {
-        const safeParse = schema.safeParse(Number(newValue));
-        const newLocalState = {
-            value: newValue,
-            zodValidation: safeParse,
-        };
-        setLocalValue(newLocalState);
-        if (safeParse.success) {
-            setValue(() => Number(newValue));
-        }
-    }, [schema, setValue]);
-    const onValueChange = (0, react_1.useCallback)((newValue, forceApply) => {
-        const safeParse = schema.safeParse(newValue);
-        const newLocalState = {
-            value: String(newValue),
-            zodValidation: safeParse,
-        };
-        setLocalValue(newLocalState);
-        if (safeParse.success || forceApply) {
-            setValue(() => newValue);
-        }
-    }, [schema, setValue]);
     const onNumberChange = (0, react_1.useCallback)((newValue) => {
-        onValueChange(newValue, false);
-    }, [onValueChange]);
+        setLocalValue(() => newValue, false);
+    }, [setLocalValue]);
     const isDefault = value === defaultValue;
     const reset = (0, react_1.useCallback)(() => {
-        onValueChange(defaultValue, true);
-    }, [defaultValue, onValueChange]);
+        setLocalValue(() => defaultValue, true);
+    }, [defaultValue, setLocalValue]);
+    const onTextChange = (0, react_1.useCallback)((newValue) => {
+        setLocalValue(() => Number(newValue), false);
+    }, [setLocalValue]);
     const save = (0, react_1.useCallback)(() => {
-        onSave(() => value);
+        onSave(() => value, false);
     }, [onSave, value]);
-    return ((0, jsx_runtime_1.jsxs)("div", { style: compact ? layout_2.narrowOption : layout_2.optionRow, children: [(0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaLabel, { isDefaultValue: isDefault, jsonPath: jsonPath, onReset: reset, onSave: save, showSaveButton: showSaveButton, compact: compact, onRemove: onRemove, saving: saving }), (0, jsx_runtime_1.jsxs)("div", { style: fullWidth, children: [(0, jsx_runtime_1.jsx)(InputDragger_1.InputDragger, { type: 'number', value: localValue.value, style: fullWidth, status: localValue.zodValidation.success ? 'ok' : 'error', placeholder: jsonPath.join('.'), onTextChange: onChange, onValueChange: onNumberChange, min: getMinValue(schema), max: getMaxValue(schema), step: getStep(schema), rightAlign: false }), !localValue.zodValidation.success && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(layout_1.Spacing, { y: 1, block: true }), (0, jsx_runtime_1.jsx)(ValidationMessage_1.ValidationMessage, { align: "flex-start", message: localValue.zodValidation.error.format()._errors[0], type: "error" })] }))] })] }));
+    return ((0, jsx_runtime_1.jsxs)("div", { style: compact ? layout_2.narrowOption : layout_2.optionRow, children: [(0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaLabel, { isDefaultValue: isDefault, jsonPath: jsonPath, onReset: reset, onSave: save, showSaveButton: showSaveButton, compact: compact, onRemove: onRemove, saving: saving, valid: localValue.zodValidation.success, saveDisabledByParent: saveDisabledByParent }), (0, jsx_runtime_1.jsxs)("div", { style: fullWidth, children: [(0, jsx_runtime_1.jsx)(InputDragger_1.InputDragger, { type: 'number', value: localValue.value, style: fullWidth, status: localValue.zodValidation.success ? 'ok' : 'error', placeholder: jsonPath.join('.'), onTextChange: onTextChange, onValueChange: onNumberChange, min: getMinValue(schema), max: getMaxValue(schema), step: getStep(schema), rightAlign: false }), !localValue.zodValidation.success && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(layout_1.Spacing, { y: 1, block: true }), (0, jsx_runtime_1.jsx)(ValidationMessage_1.ValidationMessage, { align: "flex-start", message: localValue.zodValidation.error.format()._errors[0], type: "error" })] }))] })] }));
 };
 exports.ZodNumberEditor = ZodNumberEditor;

package/dist/editor/components/RenderModal/SchemaEditor/ZodObjectEditor.d.ts

@@ -1,15 +1,17 @@
 import React from 'react';
 import type { z } from 'zod';
 import type { JSONPath } from './zod-types';
+import type { UpdaterFunction } from './ZodSwitch';
 export declare const ZodObjectEditor: React.FC<{
     schema: z.ZodTypeAny;
     jsonPath: JSONPath;
-    value: unknown;
-    defaultValue: unknown;
-    setValue: (updater: (oldState: Record<string, unknown>) => Record<string, unknown>) => void;
+    value: Record<string, unknown>;
+    defaultValue: Record<string, unknown>;
+    setValue: UpdaterFunction<Record<string, unknown>>;
     compact: boolean;
-    onSave: (updater: (oldVal: Record<string, unknown>) => Record<string, unknown>) => void;
+    onSave: UpdaterFunction<Record<string, unknown>>;
     showSaveButton: boolean;
     onRemove: null | (() => void);
     saving: boolean;
+    saveDisabledByParent: boolean;
 }>;

package/dist/editor/components/RenderModal/SchemaEditor/ZodObjectEditor.js

@@ -6,6 +6,7 @@ const react_1 = require("react");
 const colors_1 = require("../../../helpers/colors");
 const get_zod_if_possible_1 = require("../../get-zod-if-possible");
 const layout_1 = require("../layout");
+const local_state_1 = require("./local-state");
 const SchemaLabel_1 = require("./SchemaLabel");
 const ZodSwitch_1 = require("./ZodSwitch");
 const container = {
@@ -18,12 +19,16 @@ const fieldset = {
     borderRadius: 4,
     borderColor: colors_1.INPUT_BORDER_COLOR_UNHOVERED,
 };
-// TODO: First validate locally
-const ZodObjectEditor = ({ schema, jsonPath, setValue, value, compact, defaultValue, onSave, showSaveButton, onRemove, saving, }) => {
+const ZodObjectEditor = ({ schema, jsonPath, setValue, value, compact, defaultValue, onSave, showSaveButton, onRemove, saving, saveDisabledByParent, }) => {
     const z = (0, get_zod_if_possible_1.useZodIfPossible)();
     if (!z) {
         throw new Error('expected zod');
     }
+    const { localValue, onChange } = (0, local_state_1.useLocalState)({
+        schema,
+        setValue,
+        value,
+    });
     const def = schema._def;
     const typeName = def.typeName;
     if (typeName !== z.ZodFirstPartyTypeKind.ZodObject) {
@@ -40,25 +45,27 @@ const ZodObjectEditor = ({ schema, jsonPath, setValue, value, compact, defaultVa
         }
         return { paddingTop };
     }, [isRoot, paddingTop]);
-    return ((0, jsx_runtime_1.jsx)("div", { style: style, children: (0, jsx_runtime_1.jsx)("div", { style: fullWidth, children: (0, jsx_runtime_1.jsxs)(Element, { style: fieldset, children: [isRoot ? null : ((0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaFieldsetLabel, { jsonPath: jsonPath, onRemove: onRemove })), (0, jsx_runtime_1.jsx)("div", { style: isRoot ? undefined : container, children: keys.map((key) => {
-                            var _a;
-                            return ((0, jsx_runtime_1.jsx)(ZodSwitch_1.ZodSwitch, { jsonPath: [...jsonPath, key], schema: shape[key], value: value[key], 
+    const onRes = (0, react_1.useCallback)(() => {
+        onChange(() => defaultValue, true);
+    }, [defaultValue, onChange]);
+    return ((0, jsx_runtime_1.jsx)("div", { style: style, children: (0, jsx_runtime_1.jsx)("div", { style: fullWidth, children: (0, jsx_runtime_1.jsxs)(Element, { style: fieldset, children: [isRoot ? null : ((0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaFieldsetLabel, { isDefaultValue: true, onReset: onRes, jsonPath: jsonPath, onRemove: onRemove })), (0, jsx_runtime_1.jsx)("div", { style: isRoot ? undefined : container, children: keys.map((key) => {
+                            return ((0, jsx_runtime_1.jsx)(ZodSwitch_1.ZodSwitch, { jsonPath: [...jsonPath, key], schema: shape[key], value: localValue.value[key], 
                                 // In case of null | {a: string, b: string} type, we need to fallback to the default value
-                                defaultValue: ((_a = defaultValue) !== null && _a !== void 0 ? _a : value)[key], setValue: (val) => {
+                                defaultValue: (defaultValue !== null && defaultValue !== void 0 ? defaultValue : value)[key], setValue: (val, forceApply) => {
                                     setValue((oldVal) => {
                                         return {
                                             ...oldVal,
                                             [key]: typeof val === 'function' ? val(oldVal[key]) : val,
                                         };
-                                    });
-                                }, onSave: (val) => {
+                                    }, forceApply);
+                                }, onSave: (val, forceApply) => {
                                     onSave((oldVal) => {
                                         return {
                                             ...oldVal,
                                             [key]: typeof val === 'function' ? val(oldVal[key]) : val,
                                         };
-                                    });
-                                }, onRemove: null, compact: compact, showSaveButton: showSaveButton, saving: saving }, key));
+                                    }, forceApply);
+                                }, onRemove: null, compact: compact, showSaveButton: showSaveButton, saving: saving, saveDisabledByParent: saveDisabledByParent }, key));
                         }) })] }) }) }));
 };
 exports.ZodObjectEditor = ZodObjectEditor;

package/dist/editor/components/RenderModal/SchemaEditor/ZodOptionalEditor.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import type { z } from 'zod';
 import type { JSONPath } from './zod-types';
+import type { UpdaterFunction } from './ZodSwitch';
 export declare const ZodOptionalEditor: React.FC<{
     showSaveButton: boolean;
     jsonPath: JSONPath;
@@ -8,8 +9,9 @@ export declare const ZodOptionalEditor: React.FC<{
     value: unknown;
     defaultValue: unknown;
     schema: z.ZodTypeAny;
-    setValue: (updater: (oldNum: unknown) => unknown) => void;
-    onSave: (updater: (oldNum: unknown) => unknown) => void;
+    setValue: UpdaterFunction<unknown>;
+    onSave: UpdaterFunction<unknown>;
     onRemove: null | (() => void);
     saving: boolean;
+    saveDisabledByParent: boolean;
 }>;

package/dist/editor/components/RenderModal/SchemaEditor/ZodOptionalEditor.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZodOptionalEditor = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const ZodOrNullishEditor_1 = require("./ZodOrNullishEditor");
-const ZodOptionalEditor = ({ jsonPath, compact, schema, setValue, onSave, defaultValue, value, showSaveButton, onRemove, saving, }) => {
+const ZodOptionalEditor = ({ jsonPath, compact, schema, setValue, onSave, defaultValue, value, showSaveButton, onRemove, saving, saveDisabledByParent, }) => {
     const { innerType } = schema._def;
-    return ((0, jsx_runtime_1.jsx)(ZodOrNullishEditor_1.ZodOrNullishEditor, { compact: compact, defaultValue: defaultValue, jsonPath: jsonPath, onRemove: onRemove, onSave: onSave, schema: innerType, setValue: setValue, showSaveButton: showSaveButton, value: value, nullishValue: undefined, saving: saving }));
+    return ((0, jsx_runtime_1.jsx)(ZodOrNullishEditor_1.ZodOrNullishEditor, { compact: compact, defaultValue: defaultValue, jsonPath: jsonPath, onRemove: onRemove, onSave: onSave, schema: innerType, setValue: setValue, showSaveButton: showSaveButton, value: value, nullishValue: undefined, saving: saving, saveDisabledByParent: saveDisabledByParent }));
 };
 exports.ZodOptionalEditor = ZodOptionalEditor;

package/dist/editor/components/RenderModal/SchemaEditor/ZodOrNullishEditor.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import type { z } from 'zod';
 import type { JSONPath } from './zod-types';
+import type { UpdaterFunction } from './ZodSwitch';
 export declare const ZodOrNullishEditor: React.FC<{
     showSaveButton: boolean;
     jsonPath: JSONPath;
@@ -8,9 +9,10 @@ export declare const ZodOrNullishEditor: React.FC<{
     value: unknown;
     defaultValue: unknown;
     schema: z.ZodTypeAny;
-    setValue: (updater: (oldState: unknown) => unknown) => void;
-    onSave: (updater: (oldNum: unknown) => unknown) => void;
+    setValue: UpdaterFunction<unknown>;
+    onSave: UpdaterFunction<unknown>;
     onRemove: null | (() => void);
     nullishValue: null | undefined;
     saving: boolean;
+    saveDisabledByParent: boolean;
 }>;

package/dist/editor/components/RenderModal/SchemaEditor/ZodOrNullishEditor.js

@@ -25,7 +25,7 @@ const checkBoxWrapper = {
     alignItems: 'center',
     marginTop: '5px',
 };
-const ZodOrNullishEditor = ({ jsonPath, compact, schema, setValue, onSave, defaultValue, value, showSaveButton, onRemove, nullishValue, saving, }) => {
+const ZodOrNullishEditor = ({ jsonPath, compact, schema, setValue, onSave, defaultValue, value, showSaveButton, onRemove, nullishValue, saving, saveDisabledByParent, }) => {
     const z = (0, get_zod_if_possible_1.useZodIfPossible)();
     if (!z) {
         throw new Error('expected zod');
@@ -51,7 +51,7 @@ const ZodOrNullishEditor = ({ jsonPath, compact, schema, setValue, onSave, defau
                 zodValidation: schema.safeParse(newValue),
             };
         });
-        setValue(updater);
+        setValue(updater, false);
     }, [nullishValue, schema, setValue]);
     const onCheckBoxChange = (0, react_1.useCallback)((e) => {
         const val = e.target.checked
@@ -65,7 +65,7 @@ const ZodOrNullishEditor = ({ jsonPath, compact, schema, setValue, onSave, defau
                 zodValidation: schema.safeParse(val),
             });
         }
-        onValueChange(() => val);
+        onValueChange(() => val, false);
     }, [
         localNonNullishValueValue,
         nullishValue,
@@ -75,11 +75,11 @@ const ZodOrNullishEditor = ({ jsonPath, compact, schema, setValue, onSave, defau
         zodTypes,
     ]);
     const reset = (0, react_1.useCallback)(() => {
-        onValueChange(() => defaultValue);
+        onValueChange(() => defaultValue, true);
     }, [defaultValue, onValueChange]);
     const save = (0, react_1.useCallback)(() => {
-        onSave(() => value);
+        onSave(() => value, false);
     }, [onSave, value]);
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [value === nullishValue ? ((0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaLabel, { isDefaultValue: value === defaultValue, jsonPath: jsonPath, onReset: reset, onSave: save, showSaveButton: showSaveButton, compact: compact, onRemove: onRemove, saving: saving })) : ((0, jsx_runtime_1.jsx)("div", { style: fullWidth, children: (0, jsx_runtime_1.jsx)(ZodSwitch_1.ZodSwitch, { value: value, setValue: onValueChange, jsonPath: jsonPath, schema: schema, compact: compact, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving }) })), (0, jsx_runtime_1.jsxs)("div", { style: checkBoxWrapper, children: [(0, jsx_runtime_1.jsx)(Checkbox_1.Checkbox, { checked: isChecked, onChange: onCheckBoxChange, disabled: false }), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 1 }), (0, jsx_runtime_1.jsx)("div", { style: labelStyle, children: String(nullishValue) })] })] }));
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [value === nullishValue ? ((0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaLabel, { isDefaultValue: value === defaultValue, jsonPath: jsonPath, onReset: reset, onSave: save, showSaveButton: showSaveButton, compact: compact, onRemove: onRemove, saving: saving, valid: localNonNullishValueValue.zodValidation.success, saveDisabledByParent: saveDisabledByParent })) : ((0, jsx_runtime_1.jsx)("div", { style: fullWidth, children: (0, jsx_runtime_1.jsx)(ZodSwitch_1.ZodSwitch, { value: value, setValue: onValueChange, jsonPath: jsonPath, schema: schema, compact: compact, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent }) })), (0, jsx_runtime_1.jsxs)("div", { style: checkBoxWrapper, children: [(0, jsx_runtime_1.jsx)(Checkbox_1.Checkbox, { checked: isChecked, onChange: onCheckBoxChange, disabled: false }), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 1 }), (0, jsx_runtime_1.jsx)("div", { style: labelStyle, children: String(nullishValue) })] })] }));
 };
 exports.ZodOrNullishEditor = ZodOrNullishEditor;

package/dist/editor/components/RenderModal/SchemaEditor/ZodStaticFileEditor.d.ts

@@ -13,4 +13,5 @@ export declare const ZodStaticFileEditor: React.FC<{
     showSaveButton: boolean;
     onRemove: null | (() => void);
     saving: boolean;
+    saveDisabledByParent: boolean;
 }>;

package/dist/editor/components/RenderModal/SchemaEditor/ZodStaticFileEditor.js

@@ -10,21 +10,20 @@ const layout_1 = require("../../layout");
 const ComboBox_1 = require("../../NewComposition/ComboBox");
 const ValidationMessage_1 = require("../../NewComposition/ValidationMessage");
 const layout_2 = require("../layout");
+const local_state_1 = require("./local-state");
 const SchemaLabel_1 = require("./SchemaLabel");
 const container = {
     width: '100%',
 };
-const ZodStaticFileEditor = ({ schema, jsonPath, compact, setValue: updateValue, defaultValue, value, onSave, showSaveButton, onRemove, saving, }) => {
+const ZodStaticFileEditor = ({ schema, jsonPath, compact, setValue, defaultValue, value, onSave, showSaveButton, onRemove, saving, saveDisabledByParent, }) => {
     const z = (0, get_zod_if_possible_1.useZodIfPossible)();
     if (!z) {
         throw new Error('expected zod');
     }
-    const [localValue, setLocalValue] = (0, react_1.useState)(() => {
-        return {
-            value,
-            zodValidation: schema.safeParse(value),
-            revision: 0,
-        };
+    const { localValue, onChange: setLocalValue } = (0, local_state_1.useLocalState)({
+        schema,
+        setValue,
+        value,
     });
     const def = schema._def;
     const typeName = def.typeName;
@@ -32,22 +31,9 @@ const ZodStaticFileEditor = ({ schema, jsonPath, compact, setValue: updateValue,
         throw new Error('expected enum');
     }
     const isRoot = jsonPath.length === 0;
-    const onChange = (0, react_1.useCallback)((updater, forceApply) => {
-        setLocalValue((oldLocalState) => {
-            const newValue = updater(oldLocalState.value);
-            const safeParse = schema.safeParse(newValue);
-            if (safeParse.success || forceApply) {
-                updateValue(updater);
-            }
-            return {
-                value: newValue,
-                zodValidation: safeParse,
-            };
-        });
-    }, [schema, updateValue]);
     const reset = (0, react_1.useCallback)(() => {
-        onChange(() => defaultValue, true);
-    }, [defaultValue, onChange]);
+        setLocalValue(() => defaultValue, true);
+    }, [defaultValue, setLocalValue]);
     const comboBoxValues = (0, react_1.useMemo)(() => {
         return (0, remotion_1.getStaticFiles)().map((option) => {
             return {
@@ -57,17 +43,17 @@ const ZodStaticFileEditor = ({ schema, jsonPath, compact, setValue: updateValue,
                 keyHint: null,
                 leftItem: option.src === value ? (0, jsx_runtime_1.jsx)(Checkmark_1.Checkmark, {}) : null,
                 onClick: (id) => {
-                    onChange(() => id, false);
+                    setLocalValue(() => id, false);
                 },
                 quickSwitcherLabel: null,
                 subMenu: null,
                 type: 'item',
             };
         });
-    }, [onChange, value]);
+    }, [setLocalValue, value]);
     const save = (0, react_1.useCallback)(() => {
         onSave(() => value);
     }, [onSave, value]);
-    return ((0, jsx_runtime_1.jsxs)("div", { style: compact ? layout_2.narrowOption : layout_2.optionRow, children: [(0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaLabel, { onSave: save, showSaveButton: showSaveButton, isDefaultValue: value === defaultValue, compact: compact, onReset: reset, jsonPath: jsonPath, onRemove: onRemove, saving: saving }), (0, jsx_runtime_1.jsx)("div", { style: isRoot ? undefined : container, children: (0, jsx_runtime_1.jsx)(ComboBox_1.Combobox, { values: comboBoxValues, selectedId: localValue.value, title: value }) }), !localValue.zodValidation.success && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 1 }), (0, jsx_runtime_1.jsx)(ValidationMessage_1.ValidationMessage, { align: "flex-start", message: localValue.zodValidation.error.format()._errors[0], type: "error" })] }))] }));
+    return ((0, jsx_runtime_1.jsxs)("div", { style: compact ? layout_2.narrowOption : layout_2.optionRow, children: [(0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaLabel, { onSave: save, showSaveButton: showSaveButton, isDefaultValue: localValue.value === defaultValue, compact: compact, onReset: reset, jsonPath: jsonPath, onRemove: onRemove, saving: saving, valid: localValue.zodValidation.success, saveDisabledByParent: saveDisabledByParent }), (0, jsx_runtime_1.jsx)("div", { style: isRoot ? undefined : container, children: (0, jsx_runtime_1.jsx)(ComboBox_1.Combobox, { values: comboBoxValues, selectedId: localValue.value, title: value }) }), !localValue.zodValidation.success && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 1 }), (0, jsx_runtime_1.jsx)(ValidationMessage_1.ValidationMessage, { align: "flex-start", message: localValue.zodValidation.error.format()._errors[0], type: "error" })] }))] }));
 };
 exports.ZodStaticFileEditor = ZodStaticFileEditor;

package/dist/editor/components/RenderModal/SchemaEditor/ZodStringEditor.d.ts

@@ -8,9 +8,10 @@ export declare const ZodStringEditor: React.FC<{
     value: string;
     defaultValue: string;
     setValue: UpdaterFunction<string>;
-    onSave: (updater: (oldNum: unknown) => string) => void;
+    onSave: UpdaterFunction<string>;
     onRemove: null | (() => void);
     compact: boolean;
     showSaveButton: boolean;
     saving: boolean;
+    saveDisabledByParent: boolean;
 }>;

package/dist/editor/components/RenderModal/SchemaEditor/ZodStringEditor.js

@@ -8,41 +8,30 @@ const layout_1 = require("../../layout");
 const RemInput_1 = require("../../NewComposition/RemInput");
 const ValidationMessage_1 = require("../../NewComposition/ValidationMessage");
 const layout_2 = require("../layout");
+const local_state_1 = require("./local-state");
 const SchemaLabel_1 = require("./SchemaLabel");
 const fullWidth = {
     width: '100%',
 };
-const ZodStringEditor = ({ jsonPath, value, setValue, showSaveButton, defaultValue, schema, compact, onSave, onRemove, saving, }) => {
+const ZodStringEditor = ({ jsonPath, value, setValue, showSaveButton, defaultValue, schema, compact, onSave, onRemove, saving, saveDisabledByParent, }) => {
     const z = (0, get_zod_if_possible_1.useZodIfPossible)();
     if (!z) {
         throw new Error('expected zod');
     }
-    const [localValue, setLocalValue] = (0, react_1.useState)(() => {
-        return {
-            value,
-            zodValidation: schema.safeParse(value),
-        };
+    const { localValue, onChange: setLocalValue } = (0, local_state_1.useLocalState)({
+        schema,
+        setValue,
+        value,
     });
-    const onValueChange = (0, react_1.useCallback)((newValue, forceApply) => {
-        const safeParse = schema.safeParse(newValue);
-        const newLocalState = {
-            value: newValue,
-            zodValidation: safeParse,
-        };
-        setLocalValue(newLocalState);
-        if (safeParse.success || forceApply) {
-            setValue(() => newValue);
-        }
-    }, [schema, setValue]);
     const onChange = (0, react_1.useCallback)((e) => {
-        onValueChange(e.target.value, false);
-    }, [onValueChange]);
+        setLocalValue(() => e.target.value, false);
+    }, [setLocalValue]);
     const reset = (0, react_1.useCallback)(() => {
-        onValueChange(defaultValue, true);
-    }, [defaultValue, onValueChange]);
+        setLocalValue(() => defaultValue, true);
+    }, [defaultValue, setLocalValue]);
     const save = (0, react_1.useCallback)(() => {
-        onSave(() => value);
+        onSave(() => value, false);
     }, [onSave, value]);
-    return ((0, jsx_runtime_1.jsxs)("div", { style: compact ? layout_2.narrowOption : layout_2.optionRow, children: [(0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaLabel, { compact: compact, isDefaultValue: value === defaultValue, jsonPath: jsonPath, onReset: reset, onSave: save, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving }), (0, jsx_runtime_1.jsxs)("div", { style: fullWidth, children: [(0, jsx_runtime_1.jsx)(RemInput_1.RemotionInput, { value: localValue.value, status: localValue.zodValidation.success ? 'ok' : 'error', placeholder: jsonPath.join('.'), onChange: onChange, rightAlign: false }), !localValue.zodValidation.success && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(layout_1.Spacing, { y: 1, block: true }), (0, jsx_runtime_1.jsx)(ValidationMessage_1.ValidationMessage, { align: "flex-start", message: localValue.zodValidation.error.format()._errors[0], type: "error" })] }))] })] }));
+    return ((0, jsx_runtime_1.jsxs)("div", { style: compact ? layout_2.narrowOption : layout_2.optionRow, children: [(0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaLabel, { compact: compact, isDefaultValue: localValue.value === defaultValue, jsonPath: jsonPath, onReset: reset, onSave: save, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, valid: localValue.zodValidation.success, saveDisabledByParent: saveDisabledByParent }), (0, jsx_runtime_1.jsxs)("div", { style: fullWidth, children: [(0, jsx_runtime_1.jsx)(RemInput_1.RemotionInput, { value: localValue.value, status: localValue.zodValidation ? 'ok' : 'error', placeholder: jsonPath.join('.'), onChange: onChange, rightAlign: false }), !localValue.zodValidation.success && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(layout_1.Spacing, { y: 1, block: true }), (0, jsx_runtime_1.jsx)(ValidationMessage_1.ValidationMessage, { align: "flex-start", message: localValue.zodValidation.error.format()._errors[0], type: "error" })] }))] })] }));
 };
 exports.ZodStringEditor = ZodStringEditor;

package/dist/editor/components/RenderModal/SchemaEditor/ZodSwitch.d.ts

@@ -1,16 +1,17 @@
 import React from 'react';
 import type { z } from 'zod';
 import type { JSONPath } from './zod-types';
-export declare type UpdaterFunction<T> = (updater: (oldValue: T) => T) => void;
+export declare type UpdaterFunction<T> = (updater: (oldValue: T) => T, forceApply: boolean) => void;
 export declare const ZodSwitch: React.FC<{
     schema: z.ZodTypeAny;
     jsonPath: JSONPath;
     value: unknown;
     defaultValue: unknown;
     setValue: UpdaterFunction<unknown>;
-    onSave: (newValue: (oldVal: unknown) => unknown) => void;
+    onSave: UpdaterFunction<unknown>;
     compact: boolean;
     showSaveButton: boolean;
     onRemove: null | (() => void);
     saving: boolean;
+    saveDisabledByParent: boolean;
 }>;

package/dist/editor/components/RenderModal/SchemaEditor/ZodSwitch.js

@@ -17,7 +17,7 @@ const ZodOptionalEditor_1 = require("./ZodOptionalEditor");
 const ZodStaticFileEditor_1 = require("./ZodStaticFileEditor");
 const ZodStringEditor_1 = require("./ZodStringEditor");
 const ZodUnionEditor_1 = require("./ZodUnionEditor");
-const ZodSwitch = ({ schema, jsonPath, compact, value, setValue, defaultValue, onSave, showSaveButton, onRemove, saving, }) => {
+const ZodSwitch = ({ schema, jsonPath, compact, value, setValue, defaultValue, onSave, showSaveButton, onRemove, saving, saveDisabledByParent, }) => {
     const def = schema._def;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const typeName = def.typeName;
@@ -28,22 +28,22 @@ const ZodSwitch = ({ schema, jsonPath, compact, value, setValue, defaultValue, o
     const zodTypes = (0, get_zod_if_possible_1.useZodTypesIfPossible)();
     // TODO: (Maybe?) enable saving of inserted input props by cmd+s /ctrl + s (also for JSON view)
     if (typeName === z.ZodFirstPartyTypeKind.ZodObject) {
-        return ((0, jsx_runtime_1.jsx)(ZodObjectEditor_1.ZodObjectEditor, { setValue: setValue, value: value, defaultValue: defaultValue, jsonPath: jsonPath, schema: schema, compact: compact, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving }));
+        return ((0, jsx_runtime_1.jsx)(ZodObjectEditor_1.ZodObjectEditor, { setValue: setValue, value: value, defaultValue: defaultValue, jsonPath: jsonPath, schema: schema, compact: compact, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent }));
     }
     if (typeName === z.ZodFirstPartyTypeKind.ZodString) {
         if (value.startsWith(window.remotion_staticBase)) {
-            return ((0, jsx_runtime_1.jsx)(ZodStaticFileEditor_1.ZodStaticFileEditor, { setValue: setValue, value: value, jsonPath: jsonPath, schema: schema, compact: compact, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving }));
+            return ((0, jsx_runtime_1.jsx)(ZodStaticFileEditor_1.ZodStaticFileEditor, { setValue: setValue, value: value, jsonPath: jsonPath, schema: schema, compact: compact, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent }));
         }
-        return ((0, jsx_runtime_1.jsx)(ZodStringEditor_1.ZodStringEditor, { value: value, setValue: setValue, jsonPath: jsonPath, schema: schema, compact: compact, onSave: onSave, defaultValue: defaultValue, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving }));
+        return ((0, jsx_runtime_1.jsx)(ZodStringEditor_1.ZodStringEditor, { value: value, setValue: setValue, jsonPath: jsonPath, schema: schema, compact: compact, onSave: onSave, defaultValue: defaultValue, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent }));
     }
     if (typeName === z.ZodFirstPartyTypeKind.ZodDate) {
-        return ((0, jsx_runtime_1.jsx)(ZodDateEditor_1.ZodDateEditor, { value: value, setValue: setValue, jsonPath: jsonPath, schema: schema, compact: compact, onSave: onSave, defaultValue: defaultValue, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving }));
+        return ((0, jsx_runtime_1.jsx)(ZodDateEditor_1.ZodDateEditor, { value: value, setValue: setValue, jsonPath: jsonPath, schema: schema, compact: compact, onSave: onSave, defaultValue: defaultValue, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent }));
     }
     if (typeName === z.ZodFirstPartyTypeKind.ZodNumber) {
-        return ((0, jsx_runtime_1.jsx)(ZodNumberEditor_1.ZodNumberEditor, { value: value, setValue: setValue, jsonPath: jsonPath, schema: schema, compact: compact, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving }));
+        return ((0, jsx_runtime_1.jsx)(ZodNumberEditor_1.ZodNumberEditor, { value: value, setValue: setValue, jsonPath: jsonPath, schema: schema, compact: compact, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent }));
     }
     if (typeName === z.ZodFirstPartyTypeKind.ZodBoolean) {
-        return ((0, jsx_runtime_1.jsx)(ZodBooleanEditor_1.ZodBooleanEditor, { value: value, setValue: setValue, jsonPath: jsonPath, compact: compact, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving }));
+        return ((0, jsx_runtime_1.jsx)(ZodBooleanEditor_1.ZodBooleanEditor, { value: value, setValue: setValue, jsonPath: jsonPath, compact: compact, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent }));
     }
     if (typeName === z.ZodFirstPartyTypeKind.ZodUndefined) {
         return ((0, jsx_runtime_1.jsx)(ZodNonEditableValue_1.ZonNonEditableValue, { compact: compact, jsonPath: jsonPath, showSaveButton: showSaveButton, label: 'undefined', saving: saving }));
@@ -61,7 +61,7 @@ const ZodSwitch = ({ schema, jsonPath, compact, value, setValue, defaultValue, o
         return ((0, jsx_runtime_1.jsx)(ZodNonEditableValue_1.ZonNonEditableValue, { compact: compact, jsonPath: jsonPath, showSaveButton: showSaveButton, label: 'unknown (not editable)', saving: saving }));
     }
     if (typeName === z.ZodFirstPartyTypeKind.ZodArray) {
-        return ((0, jsx_runtime_1.jsx)(ZodArrayEditor_1.ZodArrayEditor, { setValue: setValue, value: value, jsonPath: jsonPath, schema: schema, compact: compact, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving }));
+        return ((0, jsx_runtime_1.jsx)(ZodArrayEditor_1.ZodArrayEditor, { setValue: setValue, value: value, jsonPath: jsonPath, schema: schema, compact: compact, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent }));
     }
     if (typeName === z.ZodFirstPartyTypeKind.ZodEnum) {
         return ((0, jsx_runtime_1.jsx)(ZodEnumEditor_1.ZodEnumEditor, { setValue: setValue, value: value, jsonPath: jsonPath, schema: schema, compact: compact, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving }));
@@ -70,18 +70,18 @@ const ZodSwitch = ({ schema, jsonPath, compact, value, setValue, defaultValue, o
         if (zodTypes &&
             schema._def.description ===
                 zodTypes.ZodZypesInternals.REMOTION_COLOR_BRAND) {
-            return ((0, jsx_runtime_1.jsx)(ZodColorEditor_1.ZodColorEditor, { value: value, setValue: setValue, jsonPath: jsonPath, schema: schema, compact: compact, onSave: onSave, defaultValue: defaultValue, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving }));
+            return ((0, jsx_runtime_1.jsx)(ZodColorEditor_1.ZodColorEditor, { value: value, setValue: setValue, jsonPath: jsonPath, schema: schema, compact: compact, onSave: onSave, defaultValue: defaultValue, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent }));
         }
         return ((0, jsx_runtime_1.jsx)(ZodEffectEditor_1.ZodEffectEditor, { value: value, setValue: setValue, jsonPath: jsonPath, schema: schema, compact: compact, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving }));
     }
     if (typeName === z.ZodFirstPartyTypeKind.ZodUnion) {
-        return ((0, jsx_runtime_1.jsx)(ZodUnionEditor_1.ZodUnionEditor, { schema: schema, showSaveButton: showSaveButton, jsonPath: jsonPath, compact: compact, value: value, defaultValue: defaultValue, setValue: setValue, onSave: onSave, onRemove: onRemove, saving: saving }));
+        return ((0, jsx_runtime_1.jsx)(ZodUnionEditor_1.ZodUnionEditor, { schema: schema, showSaveButton: showSaveButton, jsonPath: jsonPath, compact: compact, value: value, defaultValue: defaultValue, setValue: setValue, onSave: onSave, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent }));
     }
     if (typeName === z.ZodFirstPartyTypeKind.ZodOptional) {
-        return ((0, jsx_runtime_1.jsx)(ZodOptionalEditor_1.ZodOptionalEditor, { compact: compact, jsonPath: jsonPath, showSaveButton: showSaveButton, defaultValue: defaultValue, value: value, setValue: setValue, onSave: onSave, onRemove: onRemove, schema: schema, saving: saving }));
+        return ((0, jsx_runtime_1.jsx)(ZodOptionalEditor_1.ZodOptionalEditor, { compact: compact, jsonPath: jsonPath, showSaveButton: showSaveButton, defaultValue: defaultValue, value: value, setValue: setValue, onSave: onSave, onRemove: onRemove, schema: schema, saving: saving, saveDisabledByParent: saveDisabledByParent }));
     }
     if (typeName === z.ZodFirstPartyTypeKind.ZodNullable) {
-        return ((0, jsx_runtime_1.jsx)(ZodNullableEditor_1.ZodNullableEditor, { compact: compact, jsonPath: jsonPath, showSaveButton: showSaveButton, defaultValue: defaultValue, value: value, setValue: setValue, onSave: onSave, onRemove: onRemove, schema: schema, saving: saving }));
+        return ((0, jsx_runtime_1.jsx)(ZodNullableEditor_1.ZodNullableEditor, { compact: compact, jsonPath: jsonPath, showSaveButton: showSaveButton, defaultValue: defaultValue, value: value, setValue: setValue, onSave: onSave, onRemove: onRemove, schema: schema, saving: saving, saveDisabledByParent: saveDisabledByParent }));
     }
     return ((0, jsx_runtime_1.jsx)(ZodNonEditableValue_1.ZonNonEditableValue, { compact: compact, jsonPath: jsonPath, showSaveButton: showSaveButton, label: `${typeName} (not editable)`, saving: saving }));
 };

package/dist/editor/components/RenderModal/SchemaEditor/ZodUnionEditor.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import type { z } from 'zod';
 import type { JSONPath } from './zod-types';
+import type { UpdaterFunction } from './ZodSwitch';
 export declare const ZodUnionEditor: React.FC<{
     showSaveButton: boolean;
     jsonPath: JSONPath;
@@ -8,8 +9,9 @@ export declare const ZodUnionEditor: React.FC<{
     value: unknown;
     defaultValue: unknown;
     schema: z.ZodTypeAny;
-    setValue: (updater: (oldState: unknown) => unknown) => void;
-    onSave: (updater: (oldNum: unknown) => unknown) => void;
+    setValue: UpdaterFunction<unknown>;
+    onSave: UpdaterFunction<unknown>;
     onRemove: null | (() => void);
     saving: boolean;
+    saveDisabledByParent: boolean;
 }>;

package/dist/editor/components/RenderModal/SchemaEditor/ZodUnionEditor.js

@@ -24,7 +24,7 @@ const findNull = (value, zodType) => {
         otherSchemaIsAlsoNullish,
     };
 };
-const ZodUnionEditor = ({ jsonPath, compact, schema, setValue, onSave, defaultValue, value, showSaveButton, onRemove, saving, }) => {
+const ZodUnionEditor = ({ jsonPath, compact, schema, setValue, onSave, defaultValue, value, showSaveButton, onRemove, saving, saveDisabledByParent, }) => {
     const { options } = schema._def;
     const z = (0, get_zod_if_possible_1.useZodIfPossible)();
     if (!z) {
@@ -44,6 +44,6 @@ const ZodUnionEditor = ({ jsonPath, compact, schema, setValue, onSave, defaultVa
     if (otherSchemaIsAlsoNullish) {
         return ((0, jsx_runtime_1.jsx)(ZodNonEditableValue_1.ZonNonEditableValue, { jsonPath: jsonPath, label: 'Not editable - both union values are nullish', compact: compact, showSaveButton: showSaveButton, saving: saving }));
     }
-    return ((0, jsx_runtime_1.jsx)(ZodOrNullishEditor_1.ZodOrNullishEditor, { compact: compact, defaultValue: defaultValue, jsonPath: jsonPath, onRemove: onRemove, onSave: onSave, schema: otherSchema, setValue: setValue, showSaveButton: showSaveButton, value: value, nullishValue: nullishValue, saving: saving }));
+    return ((0, jsx_runtime_1.jsx)(ZodOrNullishEditor_1.ZodOrNullishEditor, { compact: compact, defaultValue: defaultValue, jsonPath: jsonPath, onRemove: onRemove, onSave: onSave, schema: otherSchema, setValue: setValue, showSaveButton: showSaveButton, value: value, nullishValue: nullishValue, saving: saving, saveDisabledByParent: saveDisabledByParent }));
 };
 exports.ZodUnionEditor = ZodUnionEditor;

package/dist/editor/components/RenderModal/SchemaEditor/local-state.d.ts

@@ -0,0 +1,16 @@
+import type { z } from 'zod';
+import type { UpdaterFunction } from './ZodSwitch';
+declare type LocalState<T> = {
+    value: T;
+    zodValidation: z.SafeParseReturnType<unknown, unknown>;
+    revision: number;
+};
+export declare const useLocalState: <T>({ value, schema, setValue, }: {
+    value: T;
+    schema: z.ZodTypeAny;
+    setValue: UpdaterFunction<T>;
+}) => {
+    localValue: LocalState<T>;
+    onChange: (updater: (oldV: T) => T, forceApply: boolean) => void;
+};
+export {};

package/dist/editor/components/RenderModal/SchemaEditor/local-state.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useLocalState = void 0;
+const react_1 = require("react");
+const useLocalState = ({ value, schema, setValue, }) => {
+    const [localValue, setLocalValue] = (0, react_1.useState)(() => {
+        return {
+            value,
+            zodValidation: schema.safeParse(value),
+            revision: 0,
+        };
+    });
+    const stateRef = (0, react_1.useRef)(localValue);
+    stateRef.current = localValue;
+    const onChange = (0, react_1.useCallback)((updater, forceApply) => {
+        const newValue = updater(stateRef.current.value);
+        const safeParse = schema.safeParse(newValue);
+        if (safeParse.success || forceApply) {
+            setValue(updater, forceApply);
+            setLocalValue((oldLocalState) => {
+                const newState = {
+                    revision: oldLocalState.revision + 1,
+                    value: newValue,
+                    zodValidation: safeParse,
+                };
+                stateRef.current = newState;
+                return newState;
+            });
+        }
+        else {
+            setLocalValue((oldLocalState) => {
+                const newState = {
+                    revision: oldLocalState.revision + 1,
+                    value: newValue,
+                    zodValidation: safeParse,
+                };
+                stateRef.current = newState;
+                return newState;
+            });
+        }
+    }, [schema, setValue]);
+    return { localValue, onChange };
+};
+exports.useLocalState = useLocalState;