Merge pull request #158 from binary-butterfly/improve-context-type

Improve withFormifly type
binary-butterfly · Mar 11, 2024 · 1b1c4d0 · 1b1c4d0
2 parents 318d40a + b5e875c
commit 1b1c4d0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "formifly",
-  "version": "2.8.5",
+  "version": "2.8.6",
   "description": "React form handling as light as a butterfly",
   "main": "dist/formifly.umd.js",
   "module": "dist/formifly.js",

diff --git a/src/js/components/meta/withFormifly.tsx b/src/js/components/meta/withFormifly.tsx
@@ -2,12 +2,15 @@ import React from 'react';
 import {FormiflyContextType, useFormiflyContext} from './FormiflyContext';
 import ObjectValidator from '../../classes/ObjectValidator';
 
-const withFormifly = <T extends ObjectValidator<any>>(
-    WrappedComponent: React.ComponentType<FormiflyContextType<T>>
-): (props: React.PropsWithChildren<any>) => JSX.Element => {
-    return function WithFormiflyInner(props) {
+export interface WithFormiflyProps extends FormiflyContextType<ObjectValidator<any>> {
+}
+
+const withFormifly = <T extends WithFormiflyProps = WithFormiflyProps>(
+    WrappedComponent: React.ComponentType<T>,
+): (props: Omit<T, keyof WithFormiflyProps>) => React.JSX.Element => {
+    return function WithFormiflyInner(props: Omit<T, keyof WithFormiflyProps>) {
         const context = useFormiflyContext();
-        return <WrappedComponent {...props} {...context}/>;
+        return <WrappedComponent {...props as T} {...context}/>;
     };
 };