Applied PR comments.

vazco · Jan 10, 2023 · 5a0a795 · 5a0a795
1 parent 46c3ed2
commit 5a0a795
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 56 deletions.
diff --git a/packages/uniforms-antd/__tests__/_createContext.ts b/packages/uniforms-antd/__tests__/_createContext.ts
@@ -1,5 +1,5 @@
 import { SimpleSchemaDefinition } from 'simpl-schema';
-import { BaseForm, Context, UnknownObject, randomIds } from 'uniforms';
+import { Context, UnknownObject, randomIds, ChangedMap } from 'uniforms';
 
 import createSchema from './_createSchema';
 
@@ -9,11 +9,11 @@ export default function createContext<Model extends UnknownObject>(
   schema?: SimpleSchemaDefinition,
   context?: Partial<Context<Model>>,
   model = {} as Model,
-) {
+): { context: Context<Model> } {
   return {
     context: {
       changed: false,
-      changedMap: {},
+      changedMap: {} as ChangedMap<Model>,
       error: null,
       model,
       name: [],
@@ -33,7 +33,8 @@ export default function createContext<Model extends UnknownObject>(
         showInlineError: false,
         ...context?.state,
       },
-      formRef: {} as BaseForm<Model>,
-    } as Context<Model>,
+      // @ts-expect-error We don't have a true ref in tests.
+      formRef: null,
+    },
   };
 }
diff --git a/packages/uniforms-antd/src/AutoField.tsx b/packages/uniforms-antd/src/AutoField.tsx
@@ -1,5 +1,4 @@
 import invariant from 'invariant';
-import { ComponentType } from 'react';
 export { AutoFieldProps } from 'uniforms';
 import { createAutoField } from 'uniforms';
 
@@ -14,7 +13,7 @@ import TextField from './TextField';
 
 const AutoField = createAutoField(props => {
   if (props.component) {
-    return props.component as ComponentType<any>;
+    return props.component;
   }
 
   if (props.allowedValues) {

diff --git a/packages/uniforms-bootstrap3/__tests__/_createContext.ts b/packages/uniforms-bootstrap3/__tests__/_createContext.ts
@@ -1,5 +1,5 @@
 import { SimpleSchemaDefinition } from 'simpl-schema';
-import { BaseForm, Context, UnknownObject, randomIds } from 'uniforms';
+import { Context, UnknownObject, randomIds, ChangedMap } from 'uniforms';
 
 import createSchema from './_createSchema';
 
@@ -9,11 +9,11 @@ export default function createContext<Model extends UnknownObject>(
   schema?: SimpleSchemaDefinition,
   context?: Partial<Context<Model>>,
   model = {} as Model,
-) {
+): { context: Context<Model> } {
   return {
     context: {
       changed: false,
-      changedMap: {},
+      changedMap: {} as ChangedMap<Model>,
       error: null,
       model,
       name: [],
@@ -33,7 +33,8 @@ export default function createContext<Model extends UnknownObject>(
         showInlineError: false,
         ...context?.state,
       },
-      formRef: {} as BaseForm<Model>,
-    } as Context<Model>,
+      // @ts-expect-error We don't have a true ref in tests.
+      formRef: null,
+    },
   };
 }
diff --git a/packages/uniforms-bootstrap3/src/AutoField.tsx b/packages/uniforms-bootstrap3/src/AutoField.tsx
@@ -1,5 +1,4 @@
 import invariant from 'invariant';
-import { ComponentType } from 'react';
 export { AutoFieldProps } from 'uniforms';
 import { createAutoField } from 'uniforms';
 
@@ -14,7 +13,7 @@ import TextField from './TextField';
 
 const AutoField = createAutoField(props => {
   if (props.component) {
-    return props.component as ComponentType<any>;
+    return props.component;
   }
 
   if (props.allowedValues) {

diff --git a/packages/uniforms-bootstrap4/__tests__/_createContext.ts b/packages/uniforms-bootstrap4/__tests__/_createContext.ts
@@ -1,5 +1,5 @@
 import { SimpleSchemaDefinition } from 'simpl-schema';
-import { BaseForm, Context, UnknownObject, randomIds } from 'uniforms';
+import { Context, UnknownObject, randomIds, ChangedMap } from 'uniforms';
 
 import createSchema from './_createSchema';
 
@@ -9,11 +9,11 @@ export default function createContext<Model extends UnknownObject>(
   schema?: SimpleSchemaDefinition,
   context?: Partial<Context<Model>>,
   model = {} as Model,
-) {
+): { context: Context<Model> } {
   return {
     context: {
       changed: false,
-      changedMap: {},
+      changedMap: {} as ChangedMap<Model>,
       error: null,
       model,
       name: [],
@@ -33,7 +33,8 @@ export default function createContext<Model extends UnknownObject>(
         showInlineError: false,
         ...context?.state,
       },
-      formRef: {} as BaseForm<Model>,
-    } as Context<Model>,
+      // @ts-expect-error We don't have a true ref in tests.
+      formRef: null,
+    },
   };
 }
diff --git a/packages/uniforms-bootstrap4/src/AutoField.tsx b/packages/uniforms-bootstrap4/src/AutoField.tsx
@@ -1,5 +1,4 @@
 import invariant from 'invariant';
-import { ComponentType } from 'react';
 export { AutoFieldProps } from 'uniforms';
 import { createAutoField } from 'uniforms';
 
@@ -14,7 +13,7 @@ import TextField from './TextField';
 
 const AutoField = createAutoField(props => {
   if (props.component) {
-    return props.component as ComponentType<any>;
+    return props.component;
   }
 
   if (props.allowedValues) {

diff --git a/packages/uniforms-bootstrap5/__tests__/_createContext.ts b/packages/uniforms-bootstrap5/__tests__/_createContext.ts
@@ -1,5 +1,5 @@
 import { SimpleSchemaDefinition } from 'simpl-schema';
-import { BaseForm, Context, UnknownObject, randomIds } from 'uniforms';
+import { Context, UnknownObject, randomIds, ChangedMap } from 'uniforms';
 
 import createSchema from './_createSchema';
 
@@ -9,11 +9,11 @@ export default function createContext<Model extends UnknownObject>(
   schema?: SimpleSchemaDefinition,
   context?: Partial<Context<Model>>,
   model = {} as Model,
-) {
+): { context: Context<Model> } {
   return {
     context: {
       changed: false,
-      changedMap: {},
+      changedMap: {} as ChangedMap<Model>,
       error: null,
       model,
       name: [],
@@ -33,7 +33,8 @@ export default function createContext<Model extends UnknownObject>(
         showInlineError: false,
         ...context?.state,
       },
-      formRef: {} as BaseForm<Model>,
-    } as Context<Model>,
+      // @ts-expect-error We don't have a true ref in tests.
+      formRef: null,
+    },
   };
 }
diff --git a/packages/uniforms-bootstrap5/src/AutoField.tsx b/packages/uniforms-bootstrap5/src/AutoField.tsx
@@ -1,5 +1,4 @@
 import invariant from 'invariant';
-import { ComponentType } from 'react';
 export { AutoFieldProps } from 'uniforms';
 import { createAutoField } from 'uniforms';
 
@@ -14,7 +13,7 @@ import TextField from './TextField';
 
 const AutoField = createAutoField(props => {
   if (props.component) {
-    return props.component as ComponentType<any>;
+    return props.component;
   }
 
   if (props.allowedValues) {

diff --git a/packages/uniforms-material/__tests__/_createContext.ts b/packages/uniforms-material/__tests__/_createContext.ts
@@ -1,5 +1,5 @@
 import { SimpleSchemaDefinition } from 'simpl-schema';
-import { BaseForm, Context, UnknownObject, randomIds } from 'uniforms';
+import { Context, UnknownObject, randomIds, ChangedMap } from 'uniforms';
 
 import createSchema from './_createSchema';
 
@@ -9,11 +9,11 @@ export default function createContext<Model extends UnknownObject>(
   schema?: SimpleSchemaDefinition,
   context?: Partial<Context<Model>>,
   model = {} as Model,
-) {
+): { context: Context<Model> } {
   return {
     context: {
       changed: false,
-      changedMap: {},
+      changedMap: {} as ChangedMap<Model>,
       error: null,
       model,
       name: [],
@@ -33,7 +33,8 @@ export default function createContext<Model extends UnknownObject>(
         showInlineError: false,
         ...context?.state,
       },
-      formRef: {} as BaseForm<Model>,
-    } as Context<Model>,
+      // @ts-expect-error We don't have a true ref in tests.
+      formRef: null,
+    },
   };
 }
diff --git a/packages/uniforms-material/src/AutoField.tsx b/packages/uniforms-material/src/AutoField.tsx
@@ -1,5 +1,4 @@
 import invariant from 'invariant';
-import { ComponentType } from 'react';
 export { AutoFieldProps } from 'uniforms';
 import { createAutoField } from 'uniforms';
 
@@ -14,7 +13,7 @@ import TextField from './TextField';
 
 const AutoField = createAutoField(props => {
   if (props.component) {
-    return props.component as ComponentType<any>;
+    return props.component;
   }
 
   if (props.allowedValues) {

diff --git a/packages/uniforms-mui/__tests__/_createContext.ts b/packages/uniforms-mui/__tests__/_createContext.ts
@@ -1,5 +1,5 @@
 import { SimpleSchemaDefinition } from 'simpl-schema';
-import { BaseForm, Context, UnknownObject, randomIds } from 'uniforms';
+import { Context, UnknownObject, randomIds, ChangedMap } from 'uniforms';
 
 import createSchema from './_createSchema';
 
@@ -9,11 +9,11 @@ export default function createContext<Model extends UnknownObject>(
   schema?: SimpleSchemaDefinition,
   context?: Partial<Context<Model>>,
   model = {} as Model,
-) {
+): { context: Context<Model> } {
   return {
     context: {
       changed: false,
-      changedMap: {},
+      changedMap: {} as ChangedMap<Model>,
       error: null,
       model,
       name: [],
@@ -33,7 +33,8 @@ export default function createContext<Model extends UnknownObject>(
         showInlineError: false,
         ...context?.state,
       },
-      formRef: {} as BaseForm<Model>,
-    } as Context<Model>,
+      // @ts-expect-error We don't have a true ref in tests.
+      formRef: null,
+    },
   };
 }
diff --git a/packages/uniforms-mui/src/AutoField.tsx b/packages/uniforms-mui/src/AutoField.tsx
@@ -1,5 +1,4 @@
 import invariant from 'invariant';
-import { ComponentType } from 'react';
 export { AutoFieldProps } from 'uniforms';
 import { createAutoField } from 'uniforms';
 
@@ -14,7 +13,7 @@ import TextField from './TextField';
 
 const AutoField = createAutoField(props => {
   if (props.component) {
-    return props.component as ComponentType<any>;
+    return props.component;
   }
 
   if (props.allowedValues) {

diff --git a/packages/uniforms-semantic/__tests__/_createContext.ts b/packages/uniforms-semantic/__tests__/_createContext.ts
@@ -1,5 +1,5 @@
 import { SimpleSchemaDefinition } from 'simpl-schema';
-import { BaseForm, Context, UnknownObject, randomIds } from 'uniforms';
+import { Context, UnknownObject, randomIds, ChangedMap } from 'uniforms';
 
 import createSchema from './_createSchema';
 
@@ -9,11 +9,11 @@ export default function createContext<Model extends UnknownObject>(
   schema?: SimpleSchemaDefinition,
   context?: Partial<Context<Model>>,
   model = {} as Model,
-) {
+): { context: Context<Model> } {
   return {
     context: {
       changed: false,
-      changedMap: {},
+      changedMap: {} as ChangedMap<Model>,
       error: null,
       model,
       name: [],
@@ -33,7 +33,8 @@ export default function createContext<Model extends UnknownObject>(
         showInlineError: false,
         ...context?.state,
       },
-      formRef: {} as BaseForm<Model>,
-    } as Context<Model>,
+      // @ts-expect-error We don't have a true ref in tests.
+      formRef: null,
+    },
   };
 }
diff --git a/packages/uniforms-semantic/src/AutoField.tsx b/packages/uniforms-semantic/src/AutoField.tsx
@@ -1,5 +1,4 @@
 import invariant from 'invariant';
-import { ComponentType } from 'react';
 export { AutoFieldProps } from 'uniforms';
 import { createAutoField } from 'uniforms';
 
@@ -14,7 +13,7 @@ import TextField from './TextField';
 
 const AutoField = createAutoField(props => {
   if (props.component) {
-    return props.component as ComponentType<any>;
+    return props.component;
   }
 
   if (props.allowedValues) {

diff --git a/packages/uniforms-unstyled/__tests__/_createContext.ts b/packages/uniforms-unstyled/__tests__/_createContext.ts
@@ -1,5 +1,5 @@
 import { SimpleSchemaDefinition } from 'simpl-schema';
-import { BaseForm, Context, UnknownObject, randomIds } from 'uniforms';
+import { Context, UnknownObject, randomIds, ChangedMap } from 'uniforms';
 
 import createSchema from './_createSchema';
 
@@ -9,11 +9,11 @@ export default function createContext<Model extends UnknownObject>(
   schema?: SimpleSchemaDefinition,
   context?: Partial<Context<Model>>,
   model = {} as Model,
-) {
+): { context: Context<Model> } {
   return {
     context: {
       changed: false,
-      changedMap: {},
+      changedMap: {} as ChangedMap<Model>,
       error: null,
       model,
       name: [],
@@ -33,7 +33,8 @@ export default function createContext<Model extends UnknownObject>(
         showInlineError: false,
         ...context?.state,
       },
-      formRef: {} as BaseForm<Model>,
-    } as Context<Model>,
+      // @ts-expect-error We don't have a true ref in tests.
+      formRef: null,
+    },
   };
 }
diff --git a/packages/uniforms-unstyled/src/AutoField.tsx b/packages/uniforms-unstyled/src/AutoField.tsx
@@ -1,5 +1,4 @@
 import invariant from 'invariant';
-import { ComponentType } from 'react';
 export { AutoFieldProps } from 'uniforms';
 import { createAutoField } from 'uniforms';
 
@@ -14,7 +13,7 @@ import TextField from './TextField';
 
 const AutoField = createAutoField(props => {
   if (props.component) {
-    return props.component as ComponentType<any>;
+    return props.component;
   }
 
   if (props.allowedValues) {