Merge branch 'master' into remove_enzyme

vazco · Jul 26, 2024 · a935644 · a935644
2 parents 6f55f05 + e2c77bf
commit a935644
Show file tree

Hide file tree

Showing 17 changed files with 145 additions and 92 deletions.
diff --git a/packages/uniforms-antd/src/LongTextField.tsx b/packages/uniforms-antd/src/LongTextField.tsx
@@ -17,7 +17,11 @@ function LongText({ rows = 5, ...props }: LongTextFieldProps) {
     <TextArea
       disabled={props.disabled}
       name={props.name}
-      onChange={event => props.onChange(event.target.value)}
+      onChange={event =>
+        props.onChange(
+          event.target.value === '' ? undefined : event.target.value,
+        )
+      }
       placeholder={props.placeholder}
       readOnly={props.readOnly}
       ref={props.inputRef}

diff --git a/packages/uniforms-antd/src/TextField.tsx b/packages/uniforms-antd/src/TextField.tsx
@@ -16,7 +16,11 @@ function Text(props: TextFieldProps) {
     <Input
       disabled={props.disabled}
       name={props.name}
-      onChange={event => props.onChange(event.target.value)}
+      onChange={event =>
+        props.onChange(
+          event.target.value === '' ? undefined : event.target.value,
+        )
+      }
       placeholder={props.placeholder}
       readOnly={props.readOnly}
       ref={props.inputRef}

diff --git a/packages/uniforms-bootstrap4/src/LongTextField.tsx b/packages/uniforms-bootstrap4/src/LongTextField.tsx
@@ -21,7 +21,11 @@ function LongText(props: LongTextFieldProps) {
       disabled={props.disabled}
       id={props.id}
       name={props.name}
-      onChange={event => props.onChange(event.target.value)}
+      onChange={event =>
+        props.onChange(
+          event.target.value === '' ? undefined : event.target.value,
+        )
+      }
       placeholder={props.placeholder}
       readOnly={props.readOnly}
       ref={props.inputRef}

diff --git a/packages/uniforms-bootstrap4/src/TextField.tsx b/packages/uniforms-bootstrap4/src/TextField.tsx
@@ -23,7 +23,11 @@ function Text(props: TextFieldProps) {
       disabled={props.disabled}
       id={props.id}
       name={props.name}
-      onChange={event => props.onChange(event.target.value)}
+      onChange={event =>
+        props.onChange(
+          event.target.value === '' ? undefined : event.target.value,
+        )
+      }
       placeholder={props.placeholder}
       readOnly={props.readOnly}
       ref={props.inputRef}

diff --git a/packages/uniforms-bootstrap5/src/LongTextField.tsx b/packages/uniforms-bootstrap5/src/LongTextField.tsx
@@ -22,7 +22,11 @@ function LongText(props: LongTextFieldProps) {
       disabled={props.disabled}
       id={props.id}
       name={props.name}
-      onChange={event => props.onChange(event.target.value)}
+      onChange={event =>
+        props.onChange(
+          event.target.value === '' ? undefined : event.target.value,
+        )
+      }
       placeholder={props.placeholder}
       minLength={props.minLength}
       maxLength={props.maxLength}

diff --git a/packages/uniforms-bootstrap5/src/TextField.tsx b/packages/uniforms-bootstrap5/src/TextField.tsx
@@ -23,7 +23,11 @@ function Text(props: TextFieldProps) {
       disabled={props.disabled}
       id={props.id}
       name={props.name}
-      onChange={event => props.onChange(event.target.value)}
+      onChange={event =>
+        props.onChange(
+          event.target.value === '' ? undefined : event.target.value,
+        )
+      }
       placeholder={props.placeholder}
       minLength={props.minLength}
       maxLength={props.maxLength}

diff --git a/packages/uniforms-bridge-zod/src/ZodBridge.ts b/packages/uniforms-bridge-zod/src/ZodBridge.ts
@@ -132,7 +132,12 @@ export default class ZodBridge<T extends ZodRawShape> extends Bridge {
   }
 
   getInitialValue(name: string): unknown {
-    const field = this.getField(name);
+    let field = this.getField(name);
+
+    if (field instanceof ZodOptional) {
+      field = field.unwrap();
+    }
+
     if (field instanceof ZodArray) {
       const item = this.getInitialValue(joinName(name, '$'));
       if (item === undefined) {

diff --git a/packages/uniforms-mui/src/LongTextField.tsx b/packages/uniforms-mui/src/LongTextField.tsx
@@ -31,7 +31,10 @@ const LongText = ({
       margin="dense"
       multiline
       name={name}
-      onChange={event => disabled || onChange(event.target.value)}
+      onChange={event =>
+        disabled ||
+        onChange(event.target.value === '' ? undefined : event.target.value)
+      }
       placeholder={placeholder}
       ref={inputRef}
       type={type}

diff --git a/packages/uniforms-mui/src/TextField.tsx b/packages/uniforms-mui/src/TextField.tsx
@@ -32,7 +32,10 @@ function Text({
       label={label}
       margin="dense"
       name={name}
-      onChange={event => disabled || onChange(event.target.value)}
+      onChange={event =>
+        disabled ||
+        onChange(event.target.value === '' ? undefined : event.target.value)
+      }
       placeholder={placeholder}
       ref={inputRef}
       type={type}

diff --git a/packages/uniforms-semantic/src/LongTextField.tsx b/packages/uniforms-semantic/src/LongTextField.tsx
@@ -36,7 +36,9 @@ function LongText({
         disabled={disabled}
         id={id}
         name={name}
-        onChange={event => onChange(event.target.value)}
+        onChange={event =>
+          onChange(event.target.value === '' ? undefined : event.target.value)
+        }
         placeholder={placeholder}
         readOnly={readOnly}
         ref={inputRef}

diff --git a/packages/uniforms-semantic/src/TextField.tsx b/packages/uniforms-semantic/src/TextField.tsx
@@ -57,7 +57,9 @@ function Text({
           disabled={disabled}
           id={id}
           name={name}
-          onChange={event => onChange(event.target.value)}
+          onChange={event =>
+            onChange(event.target.value === '' ? undefined : event.target.value)
+          }
           placeholder={placeholder}
           readOnly={readOnly}
           ref={inputRef}

diff --git a/packages/uniforms-unstyled/src/LongTextField.tsx b/packages/uniforms-unstyled/src/LongTextField.tsx
@@ -27,7 +27,9 @@ function LongText({
         disabled={disabled}
         id={id}
         name={name}
-        onChange={event => onChange(event.target.value)}
+        onChange={event =>
+          onChange(event.target.value === '' ? undefined : event.target.value)
+        }
         placeholder={placeholder}
         readOnly={readOnly}
         ref={inputRef}

diff --git a/packages/uniforms-unstyled/src/TextField.tsx b/packages/uniforms-unstyled/src/TextField.tsx
@@ -30,7 +30,9 @@ function Text({
         disabled={disabled}
         id={id}
         name={name}
-        onChange={event => onChange(event.target.value)}
+        onChange={event =>
+          onChange(event.target.value === '' ? undefined : event.target.value)
+        }
         placeholder={placeholder}
         readOnly={readOnly}
         ref={inputRef}

diff --git a/packages/uniforms/__suites__/LongTextField.tsx b/packages/uniforms/__suites__/LongTextField.tsx
@@ -110,7 +110,7 @@ export function testLongTextField(
       schema: z.object({ x: z.string() }),
     });
     await userEvent.type(screen.getByRole('textbox'), '{Backspace}');
-    expect(onChange).toHaveBeenLastCalledWith('x', '');
+    expect(onChange).toHaveBeenLastCalledWith('x', undefined);
   });
 
   test('<LongTextField> - renders a label', () => {

diff --git a/packages/uniforms/__suites__/TextField.tsx b/packages/uniforms/__suites__/TextField.tsx
@@ -148,7 +148,7 @@ export function testTextField(
       schema: z.object({ x: z.string() }),
     });
     await userEvent.type(screen.getByRole('textbox'), '{Backspace}');
-    expect(onChange).toHaveBeenLastCalledWith('x', '');
+    expect(onChange).toHaveBeenLastCalledWith('x', undefined);
   });
 
   test('<TextField> - renders a label', () => {

diff --git a/website/components/Playground.tsx b/website/components/Playground.tsx
@@ -14,6 +14,10 @@ import styles from '../lib/styles';
 import { themes } from '../lib/universal';
 import { compress, parseQuery, updateQuery } from '../lib/utils';
 
+function replacer(key: string, value: any) {
+  return value === undefined ? 'undefined' : value;
+}
+
 export class Playground extends Component<any, any> {
   static getDerivedStateFromError(error: Error) {
     return { error };
@@ -116,7 +120,12 @@ const PlaygroundModelDebug = () => {
       <br />
       <br />
       <pre>
-        <code>{`const model = ${JSON.stringify(model, null, 2)};`}</code>
+        <code>
+          {`const model = ${JSON.stringify(model, replacer, 2)};`.replace(
+            /"undefined"/g,
+            'undefined',
+          )}
+        </code>
       </pre>
     </>
   );
@@ -198,7 +207,7 @@ class PlaygroundProps extends Component<any, any> {
       <PlaygroundWrap theme={theme}>
         <AutoForm
           autosave
-          autosaveDelay={100}
+          autosaveDelay={1000}
           model={value}
           onSubmit={onChange}
           schema={schema}