From 1c53619eca8f32395e2d8b2c0508ac5ced5406c2 Mon Sep 17 00:00:00 2001
From: Chris Villa <chrisvilla@me.com>
Date: Fri, 31 Jan 2025 12:27:38 +0000
Subject: [PATCH] refactor: reorder FieldProps generics so TS can infer type

---
 packages/core/components/AutoField/index.tsx | 10 +++++-----
 packages/core/types/API/Overrides.ts         |  2 +-
 packages/core/types/Fields.ts                |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/core/components/AutoField/index.tsx b/packages/core/components/AutoField/index.tsx
index 54ab249060..687528cecf 100644
--- a/packages/core/components/AutoField/index.tsx
+++ b/packages/core/components/AutoField/index.tsx
@@ -103,8 +103,8 @@ export const FieldLabelInternal = ({
 };
 
 type FieldPropsInternalOptional<ValueType = any, F = Field<any>> = FieldProps<
-  ValueType,
-  F
+  F,
+  ValueType
 > & {
   Label?: React.FC<FieldLabelPropsInternal>;
   label?: string;
@@ -112,8 +112,8 @@ type FieldPropsInternalOptional<ValueType = any, F = Field<any>> = FieldProps<
 };
 
 export type FieldPropsInternal<ValueType = any, F = Field<any>> = FieldProps<
-  ValueType,
-  F
+  F,
+  ValueType
 > & {
   Label: React.FC<FieldLabelPropsInternal>;
   label?: string;
@@ -293,7 +293,7 @@ export function AutoFieldPrivate<
 export function AutoField<
   ValueType = any,
   FieldType extends FieldNoLabel<ValueType> = FieldNoLabel<ValueType>
->(props: FieldProps<ValueType, FieldType>) {
+>(props: FieldProps<FieldType, ValueType>) {
   const DefaultLabel = useMemo(() => {
     const DefaultLabel = (labelProps: any) => (
       <div
diff --git a/packages/core/types/API/Overrides.ts b/packages/core/types/API/Overrides.ts
index ae0b0d2604..ba2ed10d5c 100644
--- a/packages/core/types/API/Overrides.ts
+++ b/packages/core/types/API/Overrides.ts
@@ -57,7 +57,7 @@ export type Overrides = OverridesGeneric<{
 export type FieldRenderFunctions = Omit<
   {
     [Type in Field["type"]]: React.FunctionComponent<
-      FieldProps<any, Extract<Field, { type: Type }>> & {
+      FieldProps<Extract<Field, { type: Type }>, any> & {
         children: ReactNode;
         name: string;
       }
diff --git a/packages/core/types/Fields.ts b/packages/core/types/Fields.ts
index 2738d0c05b..f03f1d0dcc 100644
--- a/packages/core/types/Fields.ts
+++ b/packages/core/types/Fields.ts
@@ -132,7 +132,7 @@ export type Fields<
   >;
 };
 
-export type FieldProps<ValueType = any, F = Field<any>> = {
+export type FieldProps<F = Field<any>, ValueType = any> = {
   field: F;
   value: ValueType;
   id?: string;