fix(data): update Form types in createRouteAction.tsx

solidjs · Jul 13, 2023 · 3d3a591 · 3d3a591
1 parent 8cfe543
commit 3d3a591
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/packages/start/data/createRouteAction.tsx b/packages/start/data/createRouteAction.tsx
@@ -27,14 +27,14 @@ export type RouteAction<T, U> = [
     retry: () => void;
   },
   ((vars: T) => Promise<U>) & {
-    Form: T extends FormData ? ParentComponent<FormProps> : never;
+    Form: ParentComponent<FormProps | T>;
     url: string;
   }
 ];
 export type RouteMultiAction<T, U> = [
   Submission<T, U>[] & { pending: Submission<T, U>[] },
   ((vars: T) => Promise<U>) & {
-    Form: T extends FormData ? ParentComponent<FormProps> : never;
+    Form: ParentComponent<FormProps | T>;
     url: string;
   }
 ];
@@ -71,7 +71,7 @@ export function createRouteAction<T, U = void>(
         if (reqId === count) {
           if (data instanceof Response) {
             await handleResponse(data, navigate, options);
-          } else await handleRefetch(data as any[], options);
+          } else await handleRefetch(data as unknown as any[], options);
           if (!data || isRedirectResponse(data)) setInput(undefined);
           else setResult({ data });
         }
@@ -103,7 +103,7 @@ export function createRouteAction<T, U = void>(
         {props.children}
       </FormImpl>
     );
-  }) as T extends FormData ? ParentComponent<FormProps> : never;
+  }) as ParentComponent<FormProps | T>;
 
   return [
     {
@@ -187,7 +187,7 @@ export function createRouteMultiAction<T, U = void>(
         if (data instanceof Response) {
           await handleResponse(data, navigate, options);
           data = data.body;
-        } else await handleRefetch(data as any[], options);
+        } else await handleRefetch(data as unknown as any[], options);
         data ? setResult({ data }) : submission.clear();
 
         return data;
@@ -224,7 +224,7 @@ export function createRouteMultiAction<T, U = void>(
         {props.children}
       </FormImpl>
     );
-  }) as T extends FormData ? ParentComponent<FormProps> : never;
+  }) as ParentComponent<FormProps | T>;
 
   return [
     new Proxy<Submission<T, U>[] & { pending: Submission<T, U>[] }>([] as any, {