🎥 Make videos programmatically with React
`@remotion/studio`: Skip saving unchanged props on blur
Jonny Burgeredc47103dc90
diff --git a/packages/studio/src/components/ColorPicker/ColorPickerPopup.tsx b/packages/studio/src/components/ColorPicker/ColorPickerPopup.tsxindex c08af8c1d9..1f8f89e67e 100644--- a/packages/studio/src/components/ColorPicker/ColorPickerPopup.tsx+++ b/packages/studio/src/components/ColorPicker/ColorPickerPopup.tsx@@ -177,6 +177,10 @@ const ChannelInput: React.FC<ChannelInputProps> = ({const clamped = Math.max(min, Math.min(max, parsed));setDraft(String(Math.round(clamped)));+ if (clamped === Math.round(value)) {+ return;+ }+onCommit(channel, clamped);}, [channel, draft, max, min, onCommit, value]);@@ -221,7 +225,12 @@ const HexInput: React.FC<{const onBlur = useCallback(() => {try {const parsed = parseAnyColor(draft);- onCommit(formatRgba(parsed));+ const next = formatRgba(parsed);+ if (next === formatRgba(parseAnyColor(value))) {+ return;+ }++ onCommit(next);} catch {setDraft(value);}diff --git a/packages/studio/src/components/RenderModal/SchemaEditor/ZodColorEditor.tsx b/packages/studio/src/components/RenderModal/SchemaEditor/ZodColorEditor.tsxindex 9fa50bf3cc..1970bf49fb 100644--- a/packages/studio/src/components/RenderModal/SchemaEditor/ZodColorEditor.tsx+++ b/packages/studio/src/components/RenderModal/SchemaEditor/ZodColorEditor.tsx@@ -1,4 +1,4 @@-import React, {useCallback, useMemo} from 'react';+import React, {useCallback, useMemo, useRef} from 'react';import {ColorPicker} from '../../ColorPicker/ColorPicker';import {Row, Spacing} from '../../layout';import {RemotionInput} from '../../NewComposition/RemInput';@@ -25,6 +25,7 @@ export const ZodColorEditor: React.FC<{readonly onRemove: null | (() => void);readonly mayPad: boolean;}> = ({jsonPath, value, setValue, schema, onRemove, mayPad}) => {+ const valueOnFocus = useRef(value);const localValue = useMemo(() => zodSafeParse(schema, value),[schema, value],@@ -52,8 +53,17 @@ export const ZodColorEditor: React.FC<{[setValue],);+ const onTextFocus: React.FocusEventHandler<HTMLInputElement> =+ useCallback(() => {+ valueOnFocus.current = value;+ }, [value]);+const onTextBlur: React.FocusEventHandler<HTMLInputElement> =useCallback(() => {+ if (valueOnFocus.current === value) {+ return;+ }+setValue(() => value, {shouldSave: true});}, [setValue, value]);@@ -86,6 +96,7 @@ export const ZodColorEditor: React.FC<{status={status}placeholder={jsonPath.join('.')}onChange={onTextChange}+ onFocus={onTextFocus}onBlur={onTextBlur}rightAlign={false}smalldiff --git a/packages/studio/src/components/RenderModal/SchemaEditor/ZodDateEditor.tsx b/packages/studio/src/components/RenderModal/SchemaEditor/ZodDateEditor.tsxindex bf14d47c01..fc929f9cf1 100644--- a/packages/studio/src/components/RenderModal/SchemaEditor/ZodDateEditor.tsx+++ b/packages/studio/src/components/RenderModal/SchemaEditor/ZodDateEditor.tsx@@ -1,4 +1,4 @@-import {useMemo} from 'react';+import {useMemo, useRef} from 'react';import React, {useCallback} from 'react';import {WHITE_ALPHA_30} from '../../../helpers/colors';import {Spacing} from '../../layout';@@ -61,6 +61,7 @@ export const ZodDateEditor: React.FC<{readonly onRemove: null | (() => void);readonly mayPad: boolean;}> = ({jsonPath, value, setValue, schema, onRemove, mayPad}) => {+ const valueOnFocus = useRef(value.getTime());const onChange: React.ChangeEventHandler<HTMLInputElement> = useCallback((e) => {// React does not support e.target.valueAsDate :(@@ -69,9 +70,17 @@ export const ZodDateEditor: React.FC<{[setValue],);+ const onFocus: React.FocusEventHandler<HTMLInputElement> = useCallback(() => {+ valueOnFocus.current = value.getTime();+ }, [value]);+const onBlur: React.FocusEventHandler<HTMLInputElement> = useCallback(() => {+ if (Object.is(valueOnFocus.current, value.getTime())) {+ return;+ }+setValue((v) => v, {shouldSave: true});- }, [setValue]);+ }, [setValue, value]);const zodValidation = useMemo(() => zodSafeParse(schema, value),@@ -95,6 +104,7 @@ export const ZodDateEditor: React.FC<{status={zodValidation.success ? 'ok' : 'error'}placeholder={jsonPath.join('.')}onChange={onChange}+ onFocus={onFocus}onBlur={onBlur}style={inputStyle}rightAlign={false}diff --git a/packages/studio/src/components/RenderModal/SchemaEditor/ZodNumberEditor.tsx b/packages/studio/src/components/RenderModal/SchemaEditor/ZodNumberEditor.tsxindex c5165c60b9..001cda9c91 100644--- a/packages/studio/src/components/RenderModal/SchemaEditor/ZodNumberEditor.tsx+++ b/packages/studio/src/components/RenderModal/SchemaEditor/ZodNumberEditor.tsx@@ -1,4 +1,4 @@-import {useMemo} from 'react';+import {useMemo, useRef} from 'react';import React, {useCallback} from 'react';import {InputDragger} from '../../NewComposition/InputDragger';import {Fieldset} from './Fieldset';@@ -29,6 +29,11 @@ export const ZodNumberEditor: React.FC<{readonly onRemove: null | (() => void);readonly mayPad: boolean;}> = ({jsonPath, value, schema, setValue, onRemove, mayPad}) => {+ const valueOnFocus = useRef(value);+ const onFocus: React.FocusEventHandler<HTMLInputElement> = useCallback(() => {+ valueOnFocus.current = value;+ }, [value]);+const onNumberChange = useCallback((newValue: number) => {setValue(() => newValue, {shouldSave: false});@@ -37,7 +42,11 @@ export const ZodNumberEditor: React.FC<{);const onNumberChangeEnd = useCallback(- (newValue: number) => {+ (newValue: number, source: 'input' | 'drag') => {+ if (source === 'input' && valueOnFocus.current === newValue) {+ return;+ }+setValue(() => newValue, {shouldSave: true});},[setValue],@@ -75,6 +84,7 @@ export const ZodNumberEditor: React.FC<{onTextChange={onTextChange}onValueChange={onNumberChange}onValueChangeEnd={onNumberChangeEnd}+ onFocus={onFocus}min={getZodNumberMinimum(schema)}max={getZodNumberMaximum(schema)}step={getZodNumberStep(schema)}diff --git a/packages/studio/src/components/RenderModal/SchemaEditor/ZodStringEditor.tsx b/packages/studio/src/components/RenderModal/SchemaEditor/ZodStringEditor.tsxindex 9bfe13afe7..41baa4f6c0 100644--- a/packages/studio/src/components/RenderModal/SchemaEditor/ZodStringEditor.tsx+++ b/packages/studio/src/components/RenderModal/SchemaEditor/ZodStringEditor.tsx@@ -1,4 +1,4 @@-import {useMemo} from 'react';+import {useMemo, useRef} from 'react';import React, {useCallback} from 'react';import {useZodIfPossible} from '../../get-zod-if-possible';import {RemotionInput} from '../../NewComposition/RemInput';@@ -25,6 +25,7 @@ export const ZodStringEditor: React.FC<{readonly onRemove: null | (() => void);readonly mayPad: boolean;}> = ({jsonPath, value, setValue, schema, onRemove, mayPad}) => {+ const valueOnFocus = useRef(value);const z = useZodIfPossible();if (!z) {throw new Error('expected zod');@@ -42,7 +43,15 @@ export const ZodStringEditor: React.FC<{[setValue],);+ const onFocus: React.FocusEventHandler<HTMLInputElement> = useCallback(() => {+ valueOnFocus.current = value;+ }, [value]);+const onBlur: React.FocusEventHandler<HTMLInputElement> = useCallback(() => {+ if (valueOnFocus.current === value) {+ return;+ }+setValue(() => value, {shouldSave: true});}, [setValue, value]);@@ -62,6 +71,7 @@ export const ZodStringEditor: React.FC<{status={zodValidation.success ? 'ok' : 'error'}placeholder={jsonPath.join('.')}onChange={onChange}+ onFocus={onFocus}onBlur={onBlur}rightAlign={false}name={jsonPath.join('.')}diff --git a/packages/studio/src/components/RenderModal/SchemaEditor/ZodTextareaEditor.tsx b/packages/studio/src/components/RenderModal/SchemaEditor/ZodTextareaEditor.tsxindex 6f2415fc13..28e25e16e1 100644--- a/packages/studio/src/components/RenderModal/SchemaEditor/ZodTextareaEditor.tsx+++ b/packages/studio/src/components/RenderModal/SchemaEditor/ZodTextareaEditor.tsx@@ -1,4 +1,4 @@-import React, {useCallback} from 'react';+import React, {useCallback, useRef} from 'react';import {useZodIfPossible,useZodTypesIfPossible,@@ -29,6 +29,7 @@ export const ZodTextareaEditor: React.FC<{readonly onRemove: null | (() => void);readonly mayPad: boolean;}> = ({jsonPath, value, setValue, schema, onRemove, mayPad}) => {+ const valueOnFocus = useRef(value);const z = useZodIfPossible();if (!z) {throw new Error('expected zod');@@ -46,8 +47,17 @@ export const ZodTextareaEditor: React.FC<{[setValue],);+ const onFocus: React.FocusEventHandler<HTMLTextAreaElement> =+ useCallback(() => {+ valueOnFocus.current = value;+ }, [value]);+const onBlur: React.FocusEventHandler<HTMLTextAreaElement> =useCallback(() => {+ if (valueOnFocus.current === value) {+ return;+ }+setValue(() => value, {shouldSave: true});}, [setValue, value]);@@ -69,6 +79,7 @@ export const ZodTextareaEditor: React.FC<{<div style={fullWidth}><RemTextareaonChange={onChange}+ onFocus={onFocus}onBlur={onBlur}value={value}status={zodValidation ? 'ok' : 'error'}