From 712ab005d34ab7a9bb4952c9df21d5d2c99050b2 Mon Sep 17 00:00:00 2001
From: Adrian Mucha <kestarumper8@gmail.com>
Date: Wed, 29 May 2024 12:01:20 +0200
Subject: [PATCH 1/7] Add Bridge.getInitialModel

---
 packages/uniforms/__tests__/AutoForm.tsx | 69 ++++++++++++++++++++----
 packages/uniforms/src/AutoForm.tsx       | 21 ++++++--
 packages/uniforms/src/Bridge.ts          | 19 +++++++
 3 files changed, 96 insertions(+), 13 deletions(-)

diff --git a/packages/uniforms/__tests__/AutoForm.tsx b/packages/uniforms/__tests__/AutoForm.tsx
index 0d7d34b0b..29f54f350 100644
--- a/packages/uniforms/__tests__/AutoForm.tsx
+++ b/packages/uniforms/__tests__/AutoForm.tsx
@@ -39,7 +39,7 @@ describe('<AutoForm />', () => {
       );
       const input = screen.getByLabelText('A');
       fireEvent.change(input, { target: { value: '2' } });
-      expect(onChange).toHaveBeenCalledTimes(4);
+      expect(onChange).toHaveBeenCalledTimes(1);
       expect(onChange).toHaveBeenLastCalledWith('a', '2');
     });
 
@@ -93,17 +93,63 @@ describe('<AutoForm />', () => {
         schemaDefinition,
       );
 
+      const fieldA = screen.getByLabelText('A');
+      const fieldC = screen.getByLabelText('C');
+      fireEvent.change(fieldA, { target: { value: 'a' } });
+      fireEvent.change(fieldC, { target: { value: 'c' } });
+
       expect(contextSpy).toHaveBeenLastCalledWith(
         expect.objectContaining({
           changed: true,
-          changedMap: { a: {}, b: {}, c: {} },
+          changedMap: { a: {}, b: undefined, c: {} },
         }),
       );
     });
   });
 
-  describe('when render', () => {
-    it('calls `onChange` before render', () => {
+  describe('when initial render', () => {
+    it('merges initial values of schema and props.model', () => {
+      const { rerenderWithProps } = render(
+        <AutoForm schema={schema} model={{ c: 'c', d: 'd' }}>
+          <context.Consumer children={contextSpy} />
+          <AutoFields />
+        </AutoForm>,
+        schemaDefinition,
+      );
+
+      // initial render shouldn't mark form as changed
+      expect(contextSpy).toHaveBeenLastCalledWith(
+        expect.objectContaining({ model: { a: '', b: '', c: 'c', d: 'd' } }),
+      );
+
+      rerenderWithProps({ model: { c: undefined, d: 'dd', e: 'ee' } });
+
+      expect(contextSpy).toHaveBeenLastCalledWith(
+        expect.objectContaining({
+          model: { a: '', b: '', d: 'dd', e: 'ee' },
+        }),
+      );
+    });
+
+    it('keeps `changed` false', () => {
+      render(
+        <AutoForm schema={schema}>
+          <context.Consumer children={contextSpy} />
+          <AutoFields />
+        </AutoForm>,
+        schemaDefinition,
+      );
+
+      // initial render shouldn't mark form as changed
+      expect(contextSpy).toHaveBeenLastCalledWith(
+        expect.objectContaining({
+          changed: false,
+          changedMap: {},
+        }),
+      );
+    });
+
+    it('does not call `onChange`', () => {
       const field = jest.fn(() => null);
       const Field = connectField(field);
 
@@ -123,12 +169,12 @@ describe('<AutoForm />', () => {
         <CustomAutoForm model={model} onChange={onChange} schema={schema} />,
       );
 
-      expect(onChange).toHaveBeenCalledTimes(2);
-      expect(onChange.mock.calls[0]).toEqual(expect.arrayContaining(['b', '']));
-      expect(onChange.mock.calls[1]).toEqual(expect.arrayContaining(['c', '']));
+      expect(onChange).toHaveBeenCalledTimes(0);
       expect(field).toHaveBeenCalled();
     });
+  });
 
+  describe('when render', () => {
     it('skips `onSubmit` until rendered (`autosave` = true)', async () => {
       render(
         <AutoForm autosave onSubmit={onSubmit} schema={schema}>
@@ -234,7 +280,7 @@ describe('<AutoForm />', () => {
     });
   });
 
-  describe('when update', () => {
+  describe('when `props.model` update', () => {
     it('<AutoForm />, updates', () => {
       const { rerenderWithProps } = render(
         <AutoForm schema={schema}>
@@ -243,9 +289,12 @@ describe('<AutoForm />', () => {
         schemaDefinition,
       );
 
-      rerenderWithProps({ model: {} });
       expect(contextSpy).toHaveBeenLastCalledWith(
-        expect.objectContaining({ model: {} }),
+        expect.objectContaining({ model: { a: '', b: '', c: '' } }),
+      );
+      rerenderWithProps({ model: { d: '123' } });
+      expect(contextSpy).toHaveBeenLastCalledWith(
+        expect.objectContaining({ model: { a: '', b: '', c: '', d: '123' } }),
       );
     });
 
diff --git a/packages/uniforms/src/AutoForm.tsx b/packages/uniforms/src/AutoForm.tsx
index 0905d273f..0462b2188 100644
--- a/packages/uniforms/src/AutoForm.tsx
+++ b/packages/uniforms/src/AutoForm.tsx
@@ -38,14 +38,29 @@ export function Auto<Base extends typeof ValidatedQuickForm>(Base: Base) {
 
       this.state = {
         ...this.state,
-        model: props.model,
+        model: this.mergeSchemaAndPropsModel(
+          this.props.schema,
+          this.props.model,
+        ),
       };
     }
 
+    /**
+     * Returns model value based on the `schema` model and `props.model`.
+     * Latter one takes precedence. Does shallow copy.
+     */
+    mergeSchemaAndPropsModel(
+      schema: Props['schema'],
+      model: Props['model'],
+    ): Props['model'] {
+      const initialModel = schema.getInitialModel();
+      return Object.assign(initialModel, model);
+    }
+
     componentDidUpdate(prevProps: Props, prevState: State, snapshot: never) {
-      const { model } = this.props;
+      const { model, schema } = this.props;
       if (!isEqual(model, prevProps.model)) {
-        this.setState({ model });
+        this.setState({ model: this.mergeSchemaAndPropsModel(schema, model) });
       }
 
       super.componentDidUpdate(prevProps, prevState, snapshot);
diff --git a/packages/uniforms/src/Bridge.ts b/packages/uniforms/src/Bridge.ts
index 5479f17dd..88577d0f1 100644
--- a/packages/uniforms/src/Bridge.ts
+++ b/packages/uniforms/src/Bridge.ts
@@ -1,5 +1,7 @@
 import invariant from 'invariant';
+import set from 'lodash/set';
 
+import { joinName } from './joinName';
 import { UnknownObject } from './types';
 
 export abstract class Bridge {
@@ -84,6 +86,23 @@ export abstract class Bridge {
     );
   }
 
+  /**
+   * Get initial model value recursively.
+   */
+  getInitialModel(): UnknownObject {
+    const initialModel: UnknownObject = {};
+    const subFields = this.getSubfields();
+    for (const fieldName of subFields) {
+      const initialValue = this.getInitialValue(fieldName);
+      set(initialModel, fieldName, initialValue);
+      const newSubFields = this.getSubfields(fieldName).map(subField =>
+        joinName(fieldName, subField),
+      );
+      subFields.push(...newSubFields);
+    }
+    return initialModel;
+  }
+
   /**
    * Get props defined in schema for a field `name`. There are no required nor
    * banned fields, however properties like `required` are often available.

From 1ee3f9d20a04f3cf8f955e1a20fdd64e09c0f5f5 Mon Sep 17 00:00:00 2001
From: Adrian Mucha <kestarumper8@gmail.com>
Date: Tue, 4 Jun 2024 13:02:49 +0200
Subject: [PATCH 2/7] Run onChange(initialValue) always

---
 packages/uniforms/src/useField.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/uniforms/src/useField.tsx b/packages/uniforms/src/useField.tsx
index 735dcf6af..6df717a37 100644
--- a/packages/uniforms/src/useField.tsx
+++ b/packages/uniforms/src/useField.tsx
@@ -65,8 +65,7 @@ export function useField<
     }
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
-      const required = props.required ?? schemaProps.required;
-      if (required && initialValue !== undefined) {
+      if (initialValue !== undefined) {
         onChange(initialValue);
       }
       // eslint-disable-next-line react-hooks/exhaustive-deps

From ecbdf3671a1d0c4008ff0b475eba04ea92a57efe Mon Sep 17 00:00:00 2001
From: Adrian Mucha <kestarumper8@gmail.com>
Date: Wed, 5 Jun 2024 09:51:33 +0200
Subject: [PATCH 3/7] Fix duplicated fields

---
 packages/uniforms/src/Bridge.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/uniforms/src/Bridge.ts b/packages/uniforms/src/Bridge.ts
index 88577d0f1..b65cd83e6 100644
--- a/packages/uniforms/src/Bridge.ts
+++ b/packages/uniforms/src/Bridge.ts
@@ -1,7 +1,6 @@
 import invariant from 'invariant';
 import set from 'lodash/set';
 
-import { joinName } from './joinName';
 import { UnknownObject } from './types';
 
 export abstract class Bridge {
@@ -95,10 +94,6 @@ export abstract class Bridge {
     for (const fieldName of subFields) {
       const initialValue = this.getInitialValue(fieldName);
       set(initialModel, fieldName, initialValue);
-      const newSubFields = this.getSubfields(fieldName).map(subField =>
-        joinName(fieldName, subField),
-      );
-      subFields.push(...newSubFields);
     }
     return initialModel;
   }

From 391938565466a3e547e694176de41beb86988b09 Mon Sep 17 00:00:00 2001
From: Adrian Mucha <kestarumper8@gmail.com>
Date: Wed, 5 Jun 2024 11:14:22 +0200
Subject: [PATCH 4/7] Fix tests

---
 packages/uniforms-unstyled/__tests__/index.ts |  2 +-
 packages/uniforms/__suites__/ListField.tsx    | 10 +++-
 packages/uniforms/__suites__/render.tsx       | 39 ++++--------
 packages/uniforms/__tests__/AutoForm.tsx      |  6 --
 packages/uniforms/__tests__/ValidatedForm.tsx | 14 +----
 packages/uniforms/__tests__/connectField.tsx  | 59 ++++++++++++-------
 6 files changed, 61 insertions(+), 69 deletions(-)

diff --git a/packages/uniforms-unstyled/__tests__/index.ts b/packages/uniforms-unstyled/__tests__/index.ts
index 097876b9d..2db15f1f8 100644
--- a/packages/uniforms-unstyled/__tests__/index.ts
+++ b/packages/uniforms-unstyled/__tests__/index.ts
@@ -44,7 +44,7 @@ describe('@RTL', () => {
   suites.testListAddField(theme.ListAddField);
   suites.testListDelField(theme.ListDelField);
   suites.testListField(theme.ListField, {
-    getListAddField: screen => screen.getByRole('button'),
+    getListAddField: screen => screen.getByRole('button', { name: '+' }),
     testError: false,
   });
   suites.testListItemField(theme.ListItemField);
diff --git a/packages/uniforms/__suites__/ListField.tsx b/packages/uniforms/__suites__/ListField.tsx
index 3c534102d..3b88c26e1 100644
--- a/packages/uniforms/__suites__/ListField.tsx
+++ b/packages/uniforms/__suites__/ListField.tsx
@@ -179,13 +179,17 @@ export function testListField(
     const onChange = jest.fn();
     render(
       <ListField name="x" label="ListFieldLabel" />,
-      { x: { type: Array, optional: true }, 'x.$': String },
+      {
+        x: { type: Array, optional: true },
+        'x.$': { type: Object },
+        'x.$.name': { type: String, defaultValue: 'kebab' },
+      },
       { onChange },
     );
 
     await userEvent.click(getListAddField(screen));
-    expect(onChange).toHaveBeenCalledTimes(1);
-    expect(onChange).toHaveBeenLastCalledWith('x', [undefined]);
+    expect(await screen.findAllByDisplayValue('kebab')).toHaveLength(1);
+    expect(onChange).toHaveBeenLastCalledWith('x.0', { name: 'kebab' });
   });
 
   if (testError) {
diff --git a/packages/uniforms/__suites__/render.tsx b/packages/uniforms/__suites__/render.tsx
index 0f2d54985..14aac7b4d 100644
--- a/packages/uniforms/__suites__/render.tsx
+++ b/packages/uniforms/__suites__/render.tsx
@@ -1,43 +1,30 @@
 import { render as renderOnScreen, RenderResult } from '@testing-library/react';
 import React, { ReactElement, cloneElement } from 'react';
 import SimpleSchema, { SimpleSchemaDefinition } from 'simpl-schema';
-import { BaseForm, Context, UnknownObject, context, randomIds } from 'uniforms';
+import { Context, UnknownObject } from 'uniforms';
 import { SimpleSchema2Bridge } from 'uniforms-bridge-simple-schema-2';
+import { AutoForm } from 'uniforms-unstyled';
 
-const randomId = randomIds();
 export function render<P, Model extends UnknownObject>(
   element: ReactElement<P>,
   schema?: SimpleSchemaDefinition,
-  contextValueExtension?: Partial<Context<Model>>,
+  contextValueExtension?: Pick<Partial<Context<Model>>, 'onChange'>,
   model = {} as Model,
 ): RenderResult & { rerenderWithProps: (props: P) => void } {
   const renderResult = renderOnScreen(element, {
     wrapper({ children }) {
       if (schema) {
-        const contextValue = {
-          changed: false,
-          changedMap: {},
-          error: null,
-          model,
-          name: [],
-          onChange() {},
-          onSubmit() {},
-          randomId,
-          submitted: false,
-          submitting: false,
-          validating: false,
-          ...contextValueExtension,
-          schema: new SimpleSchema2Bridge({ schema: new SimpleSchema(schema) }),
-          state: {
-            disabled: false,
-            readOnly: false,
-            showInlineError: false,
-            ...contextValueExtension?.state,
-          },
-          formRef: {} as BaseForm<UnknownObject>,
-        };
+        const bridge = new SimpleSchema2Bridge({
+          schema: new SimpleSchema(schema),
+        });
         return (
-          <context.Provider value={contextValue}>{children}</context.Provider>
+          <AutoForm
+            onChange={contextValueExtension?.onChange}
+            model={model}
+            schema={bridge}
+          >
+            {children}
+          </AutoForm>
         );
       }
       return <>{children}</>;
diff --git a/packages/uniforms/__tests__/AutoForm.tsx b/packages/uniforms/__tests__/AutoForm.tsx
index 29f54f350..86355ba75 100644
--- a/packages/uniforms/__tests__/AutoForm.tsx
+++ b/packages/uniforms/__tests__/AutoForm.tsx
@@ -34,8 +34,6 @@ describe('<AutoForm />', () => {
         <AutoForm onChange={onChange} schema={schema}>
           <AutoFields />
         </AutoForm>,
-        schemaDefinition,
-        { onChange },
       );
       const input = screen.getByLabelText('A');
       fireEvent.change(input, { target: { value: '2' } });
@@ -90,7 +88,6 @@ describe('<AutoForm />', () => {
           <context.Consumer children={contextSpy} />
           <AutoFields />
         </AutoForm>,
-        schemaDefinition,
       );
 
       const fieldA = screen.getByLabelText('A');
@@ -114,7 +111,6 @@ describe('<AutoForm />', () => {
           <context.Consumer children={contextSpy} />
           <AutoFields />
         </AutoForm>,
-        schemaDefinition,
       );
 
       // initial render shouldn't mark form as changed
@@ -137,7 +133,6 @@ describe('<AutoForm />', () => {
           <context.Consumer children={contextSpy} />
           <AutoFields />
         </AutoForm>,
-        schemaDefinition,
       );
 
       // initial render shouldn't mark form as changed
@@ -286,7 +281,6 @@ describe('<AutoForm />', () => {
         <AutoForm schema={schema}>
           <context.Consumer children={contextSpy} />
         </AutoForm>,
-        schemaDefinition,
       );
 
       expect(contextSpy).toHaveBeenLastCalledWith(
diff --git a/packages/uniforms/__tests__/ValidatedForm.tsx b/packages/uniforms/__tests__/ValidatedForm.tsx
index 7c182ad5e..a5b594cd7 100644
--- a/packages/uniforms/__tests__/ValidatedForm.tsx
+++ b/packages/uniforms/__tests__/ValidatedForm.tsx
@@ -150,7 +150,6 @@ describe('ValidatedForm', () => {
         >
           <context.Consumer children={contextSpy} />
         </ValidatedForm>,
-        schemaDefinition,
       );
       const form = screen.getByRole('form');
 
@@ -173,7 +172,6 @@ describe('ValidatedForm', () => {
         >
           <context.Consumer children={contextSpy} />
         </ValidatedForm>,
-        schemaDefinition,
       );
       const form = screen.getByRole('form');
 
@@ -199,7 +197,6 @@ describe('ValidatedForm', () => {
         >
           <context.Consumer children={contextSpy} />
         </ValidatedForm>,
-        schemaDefinition,
       );
 
       expect(contextSpy).toHaveBeenCalledWith(
@@ -286,7 +283,6 @@ describe('ValidatedForm', () => {
         >
           <context.Consumer children={contextSpy} />
         </ValidatedForm>,
-        schemaDefinition,
       );
       const form = screen.getByRole('form');
 
@@ -314,7 +310,6 @@ describe('ValidatedForm', () => {
         >
           <context.Consumer children={contextSpy} />
         </ValidatedForm>,
-        schemaDefinition,
       );
 
       validator.mockImplementationOnce(() => {
@@ -347,7 +342,6 @@ describe('ValidatedForm', () => {
         >
           <context.Consumer children={contextSpy} />
         </ValidatedForm>,
-        schemaDefinition,
       );
 
       onSubmit.mockImplementationOnce(() => Promise.reject(error));
@@ -485,7 +479,6 @@ describe('ValidatedForm', () => {
           <context.Consumer children={contextSpy} />
           <FormControls />
         </ValidatedForm>,
-        schemaDefinition,
       );
       validator.mockImplementationOnce(() => {
         throw error;
@@ -555,20 +548,20 @@ describe('ValidatedForm', () => {
     );
 
     it('does not revalidate when `model` changes', () => {
-      const { rerenderWithProps } = render(<Component />, schemaDefinition);
+      const { rerenderWithProps } = render(<Component />);
       rerenderWithProps({ model: {} });
       expect(validator).not.toBeCalled();
     });
 
     it('does not revalidate when validator `options` change', () => {
-      const { rerenderWithProps } = render(<Component />, schemaDefinition);
+      const { rerenderWithProps } = render(<Component />);
       rerenderWithProps({ validator: {} });
       expect(validator).not.toBeCalled();
     });
 
     it('does not revalidate when `schema` changes', () => {
       const anotherSchema = new SimpleSchema2Bridge({ schema: schema.schema });
-      const { rerenderWithProps } = render(<Component />, schemaDefinition);
+      const { rerenderWithProps } = render(<Component />);
       rerenderWithProps({ schema: anotherSchema });
       expect(validator).not.toBeCalled();
     });
@@ -721,7 +714,6 @@ describe('ValidatedForm', () => {
         >
           <context.Consumer children={contextSpy} />
         </ValidatedForm>,
-        schemaDefinition,
       );
 
       const asyncSubmission = onSubmitMode.includes('async');
diff --git a/packages/uniforms/__tests__/connectField.tsx b/packages/uniforms/__tests__/connectField.tsx
index 6865b8fff..82c14cb68 100644
--- a/packages/uniforms/__tests__/connectField.tsx
+++ b/packages/uniforms/__tests__/connectField.tsx
@@ -20,6 +20,7 @@ describe('connectField', () => {
     another: { type: String, optional: true },
     field: { type: Object, label: 'Field' },
     'field.subfield': { type: String, label: 'Subfield' },
+    fieldWithDefaultValue: { type: String, defaultValue: 'John' },
   };
 
   const reactContext = {
@@ -47,9 +48,11 @@ describe('connectField', () => {
       onChange: OnChange<string>;
       label?: string | React.ReactNode;
       id: string;
+      value: string | number;
     },
   ) => {
-    return props.children ? (
+    const filteredProps = filterDOMProps(omit(props, 'children', 'label'));
+    return (
       <>
         {props.label && (
           <label htmlFor={props.id} data-testid="label">
@@ -58,24 +61,12 @@ describe('connectField', () => {
         )}
         <input
           data-testid="field"
-          {...filterDOMProps(omit(props, 'children', 'label'))}
+          {...filteredProps}
           onChange={event => props.onChange(event.target.value)}
+          value={props.value}
         />
         {props.children}
       </>
-    ) : (
-      <>
-        {props.label ? (
-          <label htmlFor={props.id} data-testid="label">
-            {props.label}
-          </label>
-        ) : null}
-        <input
-          data-testid="field"
-          {...filterDOMProps(omit(props, 'label'))}
-          onChange={event => props.onChange(event.target.value)}
-        />
-      </>
     );
   };
 
@@ -113,20 +104,23 @@ describe('connectField', () => {
   });
 
   describe('when called with `initialValue`', () => {
-    it('includes default value (true)', () => {
+    it('does nothing, uses default value from schema (true)', async () => {
       const Field = connectField(Test, { initialValue: true });
 
-      render(<Field name="field" />, schema, reactContext);
+      render(<Field name="fieldWithDefaultValue" />, schema, reactContext);
 
-      expect(onChange).toBeCalledWith('field', {});
+      screen.logTestingPlaygroundURL();
+      expect(onChange).not.toBeCalled();
+      expect(await screen.findByDisplayValue('John')).toBeInTheDocument();
     });
 
-    it('does nothing (false)', () => {
+    it('does nothing, uses default value from schema (false)', async () => {
       const Field = connectField(Test, { initialValue: false });
 
-      render(<Field name="field" />, schema, reactContext);
+      render(<Field name="fieldWithDefaultValue" />, schema, reactContext);
 
       expect(onChange).not.toBeCalled();
+      expect(await screen.findByDisplayValue('John')).toBeInTheDocument();
     });
 
     it('respects `required` (props)', () => {
@@ -151,14 +145,35 @@ describe('connectField', () => {
       const Field = connectField(Test);
 
       render(
-        <Field name="field" value="initialValueExample" />,
+        <Field name="fieldWithDefaultValue" value="initialValueExample" />,
         schema,
         reactContext,
       );
 
       await new Promise(resolve => setTimeout(resolve, 10));
 
-      expect(onChange).toBeCalledWith('field', 'initialValueExample');
+      expect(onChange).toBeCalledWith(
+        'fieldWithDefaultValue',
+        'initialValueExample',
+      );
+      expect(
+        await screen.findByDisplayValue('initialValueExample'),
+      ).toBeInTheDocument();
+    });
+
+    it('does nothing (value is the same as in schema)', async () => {
+      const Field = connectField(Test);
+
+      render(
+        <Field name="fieldWithDefaultValue" value="John" />,
+        schema,
+        reactContext,
+      );
+
+      await new Promise(resolve => setTimeout(resolve, 10));
+
+      expect(onChange).not.toBeCalled();
+      expect(await screen.findByDisplayValue('John')).toBeInTheDocument();
     });
   });
 

From 5f87cf51a6ef8b1007702ab989daad0f0fb4c47e Mon Sep 17 00:00:00 2001
From: Adrian Mucha <kestarumper8@gmail.com>
Date: Thu, 6 Jun 2024 12:50:32 +0200
Subject: [PATCH 5/7] Hide Material ui css function is deprecated warn message

---
 jest.config.js                 |  2 +-
 scripts/setupFilterWarnings.ts | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 scripts/setupFilterWarnings.ts

diff --git a/jest.config.js b/jest.config.js
index 612d9cdcc..d0a3d7bb2 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -7,7 +7,7 @@ module.exports = {
     '^uniforms([^/]*)(.*)$': '<rootDir>/packages/uniforms$1/src$2',
   },
   preset: 'ts-jest',
-  setupFiles: ['./scripts/setupEnzyme.ts'],
+  setupFiles: ['./scripts/setupEnzyme.ts', './scripts/setupFilterWarnings.ts'],
   setupFilesAfterEnv: ['./scripts/setupMatchers.ts'],
   testEnvironment: 'jsdom',
   testPathIgnorePatterns: ['/node_modules/', '/_[^/]*$', '\\.d\\.ts$'],
diff --git a/scripts/setupFilterWarnings.ts b/scripts/setupFilterWarnings.ts
new file mode 100644
index 000000000..0ac2b2416
--- /dev/null
+++ b/scripts/setupFilterWarnings.ts
@@ -0,0 +1,13 @@
+const FILTERED_MESSAGES: string[] = [
+  'Material-UI: The `css` function is deprecated. Use the `styleFunctionSx` instead.',
+];
+
+jest.spyOn(global.console, 'warn').mockImplementationOnce(message => {
+  if (
+    !FILTERED_MESSAGES.some(filteredMessage =>
+      message.includes(filteredMessage),
+    )
+  ) {
+    global.console.warn(message);
+  }
+});

From 2b839fec831c5f53aac75853914f9a8f8d1eb1dc Mon Sep 17 00:00:00 2001
From: Adrian Mucha <kestarumper8@gmail.com>
Date: Thu, 6 Jun 2024 15:59:20 +0200
Subject: [PATCH 6/7] renderWithZod using AutoForm, fix some tests
 ListAddDelField, RadioField

---
 packages/uniforms-antd/__tests__/index.ts     |  2 +-
 .../uniforms-bootstrap4/__tests__/index.ts    |  2 +-
 .../uniforms-bootstrap5/__tests__/index.ts    |  2 +-
 packages/uniforms-mui/__tests__/index.ts      |  2 +-
 packages/uniforms-semantic/__tests__/index.ts |  2 +-
 packages/uniforms-unstyled/__tests__/index.ts |  2 +-
 packages/uniforms/__suites__/ListAddField.tsx | 14 ++++---
 packages/uniforms/__suites__/ListDelField.tsx |  4 +-
 packages/uniforms/__suites__/RadioField.tsx   | 10 ++---
 packages/uniforms/__suites__/render-zod.tsx   | 40 +++++--------------
 packages/uniforms/__tests__/connectField.tsx  |  1 -
 11 files changed, 31 insertions(+), 50 deletions(-)

diff --git a/packages/uniforms-antd/__tests__/index.ts b/packages/uniforms-antd/__tests__/index.ts
index f81a686bb..b7db67e0c 100644
--- a/packages/uniforms-antd/__tests__/index.ts
+++ b/packages/uniforms-antd/__tests__/index.ts
@@ -30,7 +30,7 @@ it('exports everything', () => {
   });
 });
 
-describe('@RTL', () => {
+describe('@RTL AntD', () => {
   suites.testAutoField(theme.AutoField, {
     getDateField: screen => screen.getByRole('textbox'),
     getSelectField: screen => screen.getByRole('combobox'),
diff --git a/packages/uniforms-bootstrap4/__tests__/index.ts b/packages/uniforms-bootstrap4/__tests__/index.ts
index 7a40863f3..015452b45 100644
--- a/packages/uniforms-bootstrap4/__tests__/index.ts
+++ b/packages/uniforms-bootstrap4/__tests__/index.ts
@@ -31,7 +31,7 @@ it('exports everything', () => {
   });
 });
 
-describe('@RTL', () => {
+describe('@RTL Bootstrap4', () => {
   suites.testAutoField(theme.AutoField, {
     getDateField: screen => screen.getByLabelText('X'),
     getSelectField: screen => screen.getByRole('combobox'),
diff --git a/packages/uniforms-bootstrap5/__tests__/index.ts b/packages/uniforms-bootstrap5/__tests__/index.ts
index 656683d20..6a188deb9 100644
--- a/packages/uniforms-bootstrap5/__tests__/index.ts
+++ b/packages/uniforms-bootstrap5/__tests__/index.ts
@@ -31,7 +31,7 @@ it('exports everything', () => {
   });
 });
 
-describe('@RTL', () => {
+describe('@RTL Bootstrap5', () => {
   suites.testAutoField(theme.AutoField, {
     getDateField: screen => screen.getByLabelText('X'),
     getSelectField: screen => screen.getByRole('combobox'),
diff --git a/packages/uniforms-mui/__tests__/index.ts b/packages/uniforms-mui/__tests__/index.ts
index 6827b839e..cfcb5c366 100644
--- a/packages/uniforms-mui/__tests__/index.ts
+++ b/packages/uniforms-mui/__tests__/index.ts
@@ -30,7 +30,7 @@ it('exports everything', () => {
   });
 });
 
-describe('@RTL', () => {
+describe('@RTL MUI', () => {
   suites.testAutoField(theme.AutoField, {
     getDateField: screen => screen.getByLabelText('X *'),
     getSelectField: screen => screen.getByRole('button'),
diff --git a/packages/uniforms-semantic/__tests__/index.ts b/packages/uniforms-semantic/__tests__/index.ts
index 87c1de6f0..a9bfe2b9b 100644
--- a/packages/uniforms-semantic/__tests__/index.ts
+++ b/packages/uniforms-semantic/__tests__/index.ts
@@ -29,7 +29,7 @@ it('exports everything', () => {
   });
 });
 
-describe('@RTL', () => {
+describe('@RTL Semantic', () => {
   suites.testAutoField(theme.AutoField, {
     getDateField: screen => screen.getByLabelText('X'),
     getSelectField: screen => screen.getByRole('combobox'),
diff --git a/packages/uniforms-unstyled/__tests__/index.ts b/packages/uniforms-unstyled/__tests__/index.ts
index 2db15f1f8..6a12fe095 100644
--- a/packages/uniforms-unstyled/__tests__/index.ts
+++ b/packages/uniforms-unstyled/__tests__/index.ts
@@ -29,7 +29,7 @@ it('exports everything', () => {
   });
 });
 
-describe('@RTL', () => {
+describe('@RTL unstyled', () => {
   suites.testAutoField(theme.AutoField, {
     getDateField: screen => screen.getByLabelText('X'),
     getSelectField: screen => screen.getByRole('combobox'),
diff --git a/packages/uniforms/__suites__/ListAddField.tsx b/packages/uniforms/__suites__/ListAddField.tsx
index 090a6b9eb..4249da3e3 100644
--- a/packages/uniforms/__suites__/ListAddField.tsx
+++ b/packages/uniforms/__suites__/ListAddField.tsx
@@ -11,7 +11,7 @@ export function testListAddField(ListAddField: ComponentType<any>) {
   test('<ListAddField> - correctly reacts on click', async () => {
     const onChange = jest.fn();
     renderWithZod({
-      element: <ListAddField name="x.1" data-testid="x" value="d" />,
+      element: <ListAddField name="x.$" data-testid="x" value="d" />,
       model: { x: ['a', 'b', 'c'] },
       onChange,
       schema: z.object({ x: z.array(z.string()) }),
@@ -25,19 +25,21 @@ export function testListAddField(ListAddField: ComponentType<any>) {
   test('<ListAddField> - correctly reacts on enter', async () => {
     const onChange = jest.fn();
     renderWithZod({
-      element: <ListAddField name="x.1" data-testid="x" value="d" />,
+      element: <ListAddField name="x.$" data-testid="x" value="d" />,
       model: { x: ['a', 'b', 'c'] },
       onChange,
       schema: z.object({ x: z.array(z.string()) }),
     });
-    await userEvent.type(screen.getByTestId('x'), '{Enter}');
+    // we can't use `userEvent.type(...)` because it does 'click + type' so we "select the button"  using `userEvent.tab()`
+    await userEvent.tab();
+    await userEvent.keyboard('{Enter}');
     expect(onChange).toHaveBeenLastCalledWith('x', ['a', 'b', 'c', 'd']);
   });
 
   test('<ListAddField> - prevents onClick when disabled', async () => {
     const onChange = jest.fn();
     renderWithZod({
-      element: <ListAddField name="x.1" data-testid="x" disabled />,
+      element: <ListAddField name="x.$" data-testid="x" disabled />,
       model: { x: ['a', 'b', 'c'] },
       schema: z.object({ x: z.array(z.string()) }),
     });
@@ -51,7 +53,7 @@ export function testListAddField(ListAddField: ComponentType<any>) {
   test('<ListAddField> - prevents onClick when readOnly', async () => {
     const onChange = jest.fn();
     renderWithZod({
-      element: <ListAddField name="x.1" data-testid="x" readOnly />,
+      element: <ListAddField name="x.$" data-testid="x" readOnly />,
       model: { x: ['a', 'b', 'c'] },
       onChange,
       schema: z.object({ x: z.array(z.string()) }),
@@ -65,7 +67,7 @@ export function testListAddField(ListAddField: ComponentType<any>) {
   test('<ListAddField> - prevents onClick when limit reached', async () => {
     const onChange = jest.fn();
     renderWithZod({
-      element: <ListAddField name="x.1" data-testid="x" readOnly />,
+      element: <ListAddField name="x.$" data-testid="x" readOnly />,
       model: { x: ['a', 'b', 'c'] },
       onChange,
       schema: z.object({ x: z.array(z.string()).min(3) }),
diff --git a/packages/uniforms/__suites__/ListDelField.tsx b/packages/uniforms/__suites__/ListDelField.tsx
index 2bfbba31e..d78b9a90f 100644
--- a/packages/uniforms/__suites__/ListDelField.tsx
+++ b/packages/uniforms/__suites__/ListDelField.tsx
@@ -28,7 +28,9 @@ export function testListDelField(ListDelField: ComponentType<any>) {
       onChange,
       schema: z.object({ x: z.array(z.string()) }),
     });
-    await userEvent.type(screen.getByTestId('x'), '{Enter}');
+    // we can't use `userEvent.type(...)` because it does 'click + type' so we "select the button"  using `userEvent.tab()`
+    await userEvent.tab();
+    await userEvent.keyboard('{Enter}');
     expect(onChange).toHaveBeenLastCalledWith('x', ['a', 'c']);
   });
 
diff --git a/packages/uniforms/__suites__/RadioField.tsx b/packages/uniforms/__suites__/RadioField.tsx
index a34938a52..b266eaa5c 100644
--- a/packages/uniforms/__suites__/RadioField.tsx
+++ b/packages/uniforms/__suites__/RadioField.tsx
@@ -36,10 +36,10 @@ export function testRadioField(
       schema: z.object({ x: z.enum(['a', 'b']) }),
       onChange,
     });
-    await userEvent.click(screen.getByLabelText('a'));
-    await userEvent.click(screen.getByLabelText('b'));
+    await userEvent.click(screen.getByRole('radio', { name: 'a' }));
+    await userEvent.click(screen.getByRole('radio', { name: 'b' }));
 
-    expect(onChange).toHaveBeenCalledTimes(1);
+    expect(onChange).toHaveBeenCalledTimes(0);
   });
 
   skipTestIf(skipHtmlAttributesTest)(
@@ -160,9 +160,9 @@ export function testRadioField(
       schema: z.object({ x: z.enum(['a', 'b']) }),
       onChange,
     });
-    await userEvent.click(screen.getByLabelText('a'));
+    await userEvent.click(screen.getByRole('radio', { name: 'a' }));
 
-    expect(onChange).toHaveBeenLastCalledWith('x', 'a');
+    expect(onChange).not.toHaveBeenCalled();
   });
 
   test('<RadioField> - renders a label', () => {
diff --git a/packages/uniforms/__suites__/render-zod.tsx b/packages/uniforms/__suites__/render-zod.tsx
index ac2490fd0..e2811ade0 100644
--- a/packages/uniforms/__suites__/render-zod.tsx
+++ b/packages/uniforms/__suites__/render-zod.tsx
@@ -1,45 +1,23 @@
 import { render as renderOnScreen } from '@testing-library/react';
-import React, { ReactElement } from 'react';
-import { BaseForm, Context, context, randomIds } from 'uniforms';
+import React, { ComponentProps, ReactElement } from 'react';
 import { ZodBridge } from 'uniforms-bridge-zod';
-import { TypeOf, ZodObject, ZodRawShape } from 'zod';
+import { AutoForm } from 'uniforms-unstyled';
+import { ZodObject, ZodRawShape } from 'zod';
 
 export function renderWithZod<Props, Schema extends ZodObject<ZodRawShape>>({
   element,
   schema,
-  ...contextValueOverride
+  ...autoFormProps
 }: {
   element: ReactElement<Props>;
   schema: Schema;
-} & Omit<Partial<Context<TypeOf<Schema>>>, 'schema'>) {
+} & Partial<Omit<ComponentProps<typeof AutoForm>, 'schema'>>) {
   return renderOnScreen(element, {
     wrapper({ children }) {
-      const value = {
-        changed: false,
-        changedMap: Object.create(null),
-        error: null,
-        formRef: null as unknown as BaseForm<TypeOf<Schema>>,
-        model: Object.create(null),
-        name: [],
-        onChange() {},
-        onSubmit() {},
-        randomId: randomIds(),
-        submitted: false,
-        submitting: false,
-        validating: false,
-        ...contextValueOverride,
-        schema: new ZodBridge({
-          schema,
-        }),
-        state: {
-          disabled: false,
-          readOnly: false,
-          showInlineError: false,
-          ...contextValueOverride?.state,
-        },
-      };
-
-      return <context.Provider children={children} value={value} />;
+      const bridge = new ZodBridge({ schema });
+      return (
+        <AutoForm {...autoFormProps} schema={bridge} children={children} />
+      );
     },
   });
 }
diff --git a/packages/uniforms/__tests__/connectField.tsx b/packages/uniforms/__tests__/connectField.tsx
index 82c14cb68..2ae28a407 100644
--- a/packages/uniforms/__tests__/connectField.tsx
+++ b/packages/uniforms/__tests__/connectField.tsx
@@ -109,7 +109,6 @@ describe('connectField', () => {
 
       render(<Field name="fieldWithDefaultValue" />, schema, reactContext);
 
-      screen.logTestingPlaygroundURL();
       expect(onChange).not.toBeCalled();
       expect(await screen.findByDisplayValue('John')).toBeInTheDocument();
     });

From f51be5f17edce46c0e386dba61a835e6ceb317dc Mon Sep 17 00:00:00 2001
From: Adrian Mucha <kestarumper8@gmail.com>
Date: Thu, 6 Jun 2024 16:02:38 +0200
Subject: [PATCH 7/7] Rename some defaultValue in tests

---
 packages/uniforms/__suites__/ListField.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/uniforms/__suites__/ListField.tsx b/packages/uniforms/__suites__/ListField.tsx
index 3b88c26e1..9adce2a34 100644
--- a/packages/uniforms/__suites__/ListField.tsx
+++ b/packages/uniforms/__suites__/ListField.tsx
@@ -182,14 +182,14 @@ export function testListField(
       {
         x: { type: Array, optional: true },
         'x.$': { type: Object },
-        'x.$.name': { type: String, defaultValue: 'kebab' },
+        'x.$.name': { type: String, defaultValue: 'someValue' },
       },
       { onChange },
     );
 
     await userEvent.click(getListAddField(screen));
-    expect(await screen.findAllByDisplayValue('kebab')).toHaveLength(1);
-    expect(onChange).toHaveBeenLastCalledWith('x.0', { name: 'kebab' });
+    expect(await screen.findAllByDisplayValue('someValue')).toHaveLength(1);
+    expect(onChange).toHaveBeenLastCalledWith('x.0', { name: 'someValue' });
   });
 
   if (testError) {