@companix/formkit 0.0.7 → 0.0.10

package/dist/SchemeBuilder.d.ts

@@ -2,6 +2,5 @@ import { SchemeItems } from './core/types';
 export interface SchemeBuilderProps {
     scheme: SchemeItems.All[];
     path: string[];
-    className?: string;
 }
-export declare const SchemeBuilder: ({ scheme, path, className }: SchemeBuilderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const SchemeBuilder: ({ scheme, path }: SchemeBuilderProps) => import("react/jsx-runtime").JSX.Element;

package/dist/bundle.es.js

@@ -1,44 +1,44 @@
-import { jsx as b, Fragment as B, jsxs as P } from "react/jsx-runtime";
-import { createContext as T, useState as q, useContext as L, useEffect as D, useMemo as A, useCallback as S, useRef as N } from "react";
-import R from "fast-deep-equal";
-const j = T({}), M = (s) => {
-  const [, r] = q([]), o = L(j), e = o.getForm(s);
-  return D(() => {
-    const { unsubscribe: t } = o.subscribeToForm(s, () => {
+import { jsx as v, Fragment as j, jsxs as M } from "react/jsx-runtime";
+import { createContext as P, useState as R, useContext as q, useEffect as C, useMemo as A, useCallback as $, useRef as T } from "react";
+import L from "fast-deep-equal";
+const D = P({}), B = (n) => {
+  const [, r] = R([]), e = q(D), s = e.getForm(n);
+  return C(() => {
+    const { unsubscribe: t } = e.subscribeToForm(n, () => {
       r([]);
     });
     return () => {
       t();
     };
-  }, []), e?.value;
-}, _ = ({ canActivate: s, name: r, children: o }) => {
-  const e = M(r);
-  return s(e) ? /* @__PURE__ */ b(B, { children: o }) : null;
-}, z = ({ item: { Form: s }, name: r }) => {
-  const [, o] = q([]), e = L(j), { unregistry: t } = A(() => e.registry(r, () => {
-    o([]);
-  }), []), l = S(
+  }, []), s?.value;
+}, N = ({ canActivate: n, name: r, children: e }) => {
+  const s = B(r);
+  return n(s) ? /* @__PURE__ */ v(j, { children: e }) : null;
+}, _ = ({ item: { Form: n }, name: r }) => {
+  const [, e] = R([]), s = q(D), { unregistry: t } = A(() => s.registry(r, () => {
+    e([]);
+  }), []), l = $(
     (d) => {
       if (d && d.focus) {
-        const g = e.getForm(r);
-        g.focus = () => {
+        const m = s.getForm(r);
+        m.focus = () => {
           d.focus();
         };
       }
     },
     [r]
   );
-  D(() => () => {
+  C(() => () => {
     t();
   }, []);
-  const { value: y, error: F } = e.getForm(r);
-  return /* @__PURE__ */ b(
-    s,
+  const { value: h, error: F } = s.getForm(r);
+  return /* @__PURE__ */ v(
+    n,
     {
       field: {
-        value: y,
+        value: h,
         onChange: (d) => {
-          e.onChange(r, d);
+          s.onChange(r, d);
         },
         onBlur: () => {
         },
@@ -46,351 +46,352 @@ const j = T({}), M = (s) => {
       },
       isDirty: !1,
       error: F,
-      disabled: e.disabled
+      disabled: s.disabled
     }
   );
-}, G = ({ item: s, path: r }) => {
-  const { getController: o, items: e } = s, t = L(j), l = A(() => {
-    const i = {};
-    return e.forEach(({ name: f, getForm: x }) => {
-      i[f] = x(f, () => p(f));
-    }), i;
-  }, []), y = S(() => {
-    const i = [];
-    return e.forEach(({ name: f }) => {
-      t.getForm([...r, f].join(".")).value !== void 0 && i.push(f);
-    }), i;
-  }, []), F = A(() => y(), []), [d, g] = q(F);
-  D(() => {
-    const { unregistry: i } = t.registryExtraForm(
-      e.map(({ name: f }) => [...r, f].join(".")),
+}, z = ({ item: n, path: r }) => {
+  const { getController: e, items: s } = n, t = q(D), l = A(() => {
+    const a = {};
+    return s.forEach(({ name: g, getForm: o }) => {
+      a[g] = o(g, () => f(g));
+    }), a;
+  }, []), h = $(() => {
+    const a = [];
+    return s.forEach(({ name: g }) => {
+      t.getForm([...r, g].join(".")).value !== void 0 && a.push(g);
+    }), a;
+  }, []), F = A(() => h(), []), [d, m] = R(F);
+  C(() => {
+    const { unregistry: a } = t.registryExtraForm(
+      s.map(({ name: g }) => [...r, g].join(".")),
       () => {
-        g(y());
+        m(h());
       }
     );
     return () => {
-      i();
+      a();
     };
   }, []);
-  const v = S(
-    (i) => {
-      l[i] && !d.includes(i) && g((f) => [...f, i]);
+  const y = $(
+    (a) => {
+      l[a] && !d.includes(a) && m((g) => [...g, a]);
     },
     [d]
-  ), p = S((i) => {
-    g((f) => f.filter((x) => x !== i));
+  ), f = $((a) => {
+    m((g) => g.filter((o) => o !== a));
   }, []);
-  return /* @__PURE__ */ P(B, { children: [
-    d.map((i) => {
-      const f = l[i];
-      return /* @__PURE__ */ b(V, { path: r, scheme: [f] }, `param-form--${i}`);
+  return /* @__PURE__ */ M(j, { children: [
+    d.map((a) => {
+      const g = l[a];
+      return /* @__PURE__ */ v(V, { path: r, scheme: [g] }, `param-form--${a}`);
     }),
-    o(v, d)
+    e(y, d)
   ] });
-}, V = ({ scheme: s, path: r, className: o }) => /* @__PURE__ */ b("div", { className: o, children: s.map((e, t) => e.type === "layout" ? /* @__PURE__ */ b(e.Layout, { children: /* @__PURE__ */ b(V, { path: r, scheme: e.childs }) }, `layout-form--${t}-${r.length}`) : e.type === "context" ? /* @__PURE__ */ b(
+}, V = ({ scheme: n, path: r }) => /* @__PURE__ */ v(j, { children: n.map((e, s) => e.type === "layout" ? /* @__PURE__ */ v(e.Layout, { children: /* @__PURE__ */ v(V, { path: r, scheme: e.childs }) }, `layout-form--${s}-${r.length}`) : e.type === "context" ? /* @__PURE__ */ v(
   V,
   {
     path: [...r, e.context],
     scheme: e.childs
   },
-  `context-form--${t}-${e.context}-${r.length}`
-) : e.type === "condition" ? /* @__PURE__ */ b(
-  _,
+  `context-form--${s}-${e.context}-${r.length}`
+) : e.type === "condition" ? /* @__PURE__ */ v(
+  N,
   {
     name: e.depended,
     canActivate: e.canActivate,
-    children: /* @__PURE__ */ b(V, { path: r, scheme: e.childs })
+    children: /* @__PURE__ */ v(V, { path: r, scheme: e.childs })
   },
-  `condition--${t}-${e.depended}-${r.length}`
-) : e.type === "extra" ? /* @__PURE__ */ b(G, { path: r, item: e }, `partial-item--${t}-${r.length}`) : /* @__PURE__ */ b(
-  z,
+  `condition--${s}-${e.depended}-${r.length}`
+) : e.type === "extra" ? /* @__PURE__ */ v(z, { path: r, item: e }, `partial-item--${s}-${r.length}`) : /* @__PURE__ */ v(
+  _,
   {
     name: [...r, e.name].join("."),
     item: e
   },
-  `form-item--${t}-${e.name}-${r.length}`
-)) }), C = (s, r, o, e) => {
-  s.forEach((t) => {
-    if (t.type === "form" && e(t, [...r, t.name].join("."), o[t.name]), t.type === "context") {
-      C(t.childs, [...r, t.context], o[t.context] ?? {}, e);
+  `form-item--${s}-${e.name}-${r.length}`
+)) }), p = (n, r, e, s) => {
+  n.forEach((t) => {
+    if (t.type === "form" && s(t, [...r, t.name].join("."), e[t.name]), t.type === "context") {
+      p(t.childs, [...r, t.context], e[t.context] ?? {}, s);
       return;
     }
     if (t.type === "layout" || t.type === "condition") {
-      C(t.childs, r, o, e);
+      p(t.childs, r, e, s);
       return;
     }
-    t.type === "extra" && t.items.forEach(({ getForm: l, name: y }) => {
-      C([l(y, () => {
-      })], r, o, e);
+    t.type === "extra" && t.items.forEach(({ getForm: l, name: h }) => {
+      p([l(h, () => {
+      })], r, e, s);
     });
   });
-}, E = ({ scheme: s, values: r, path: o, forms: e }) => {
-  s.forEach((t) => {
+}, E = ({ scheme: n, values: r, path: e, forms: s }) => {
+  n.forEach((t) => {
     if (t.type === "form") {
-      const l = [...o, t.name].join(".");
-      e[l].value !== void 0 && (r[t.name] = e[l].value);
+      const l = [...e, t.name].join(".");
+      s[l].value !== void 0 && (r[t.name] = s[l].value);
     }
     if (t.type === "context") {
       r[t.context] = {}, E({
         scheme: t.childs,
-        path: [...o, t.context],
+        path: [...e, t.context],
         values: r[t.context],
-        forms: e
+        forms: s
       });
       return;
     }
     if (t.type === "layout") {
-      E({ scheme: t.childs, path: o, values: r, forms: e });
+      E({ scheme: t.childs, path: e, values: r, forms: s });
       return;
     }
     if (t.type === "condition") {
-      const l = e[t.depended]?.value;
+      const l = s[t.depended]?.value;
       if (t.canActivate(l)) {
-        E({ scheme: t.childs, path: o, values: r, forms: e });
+        E({ scheme: t.childs, path: e, values: r, forms: s });
         return;
       }
     }
-    t.type === "extra" && t.items.forEach(({ getForm: l, name: y }) => {
-      E({ scheme: [l(y, () => {
-      })], path: o, values: r, forms: e });
+    t.type === "extra" && t.items.forEach(({ getForm: l, name: h }) => {
+      E({ scheme: [l(h, () => {
+      })], path: e, values: r, forms: s });
     });
   });
-}, w = (s, r) => {
-  const o = {};
-  return E({ scheme: s, path: [], values: o, forms: r }), o;
-}, H = (s, r) => {
-  const { onSubmit: o, onEqual: e, disabled: t, onDirty: l, onFormDirty: y, onChangeEvent: F, defaultValues: d } = r;
-  let g = !1, v = !1, p = 0;
-  const i = {}, f = {
+}, w = (n, r) => {
+  const e = {};
+  return E({ scheme: n, path: [], values: e, forms: r }), e;
+}, G = (n, r) => {
+  const { onSubmit: e, onEqual: s, disabled: t, onDirty: l, onFormDirty: h, onChangeEvent: F, defaultValues: d } = r, m = { onSubmit: e }, y = {
+    isActive: !1,
+    isSubmitted: !1,
+    dirtyCount: 0
+  }, f = {}, a = {
     subscribers: [],
     names: {}
   };
-  C(s, [], d ?? {}, (n, c, u) => {
-    i[c] = {
+  p(n, [], d ?? {}, (o, u, i) => {
+    f[u] = {
       error: null,
       isDirty: !1,
-      value: u,
-      initValue: u ?? n.defaultValue,
-      defaultValue: n.defaultValue,
+      value: i,
+      initValue: i ?? o.defaultValue,
+      defaultValue: o.defaultValue,
       rerender: () => {
       },
       subscribers: [],
-      validate: n.validate
+      validate: o.validate
     };
   });
-  const x = (n, c) => {
-    l?.({ name: n, isDirty: c }), c && p === 0 && y?.(!0), !c && p === 1 && y?.(!1), p += c ? 1 : -1;
+  const g = (o, u) => {
+    l?.({ name: o, isDirty: u }), u && y.dirtyCount === 0 && h?.(!0), !u && y.dirtyCount === 1 && h?.(!1), y.dirtyCount += u ? 1 : -1;
   };
   return {
-    scheme: s,
+    submitRef: m,
+    scheme: n,
     disabled: t,
     activate() {
-      g = !0;
+      y.isActive = !0;
     },
     disactivate() {
-      g = !1;
+      y.isActive = !1;
     },
-    setError(n, c) {
-      const u = this.getForm(n);
-      u && (u.error = {
+    setError(o, u) {
+      const i = this.getForm(o);
+      i && (i.error = {
         error: !0,
-        messages: [c.message]
-      }, u.rerender());
+        messages: [u.message]
+      }, i.rerender());
     },
-    setFocus(n) {
-      const c = this.getForm(n);
-      c && c.focus && c.focus();
+    setFocus(o) {
+      const u = this.getForm(o);
+      u && u.focus && u.focus();
     },
-    setValue(n, c) {
-      const u = this.getForm(n);
-      u && u.value !== c && this.onChange(n, c);
+    setValue(o, u) {
+      const i = this.getForm(o);
+      i && i.value !== u && this.onChange(o, u);
     },
     getValues() {
-      return w(s, i);
+      return w(n, f);
     },
     async handleSubmit() {
       if (t)
         return;
-      v = !0;
-      let n = !1, c = !1;
-      for (const u in i) {
-        const a = i[u];
-        if (a.value !== void 0) {
-          const h = a.validate(a.value);
-          h && (c = !0, a.error = h, a.rerender(), !n && a.focus && (a.focus(), n = !0));
+      y.isSubmitted = !0;
+      let o = !1, u = !1;
+      for (const i in f) {
+        const c = f[i];
+        if (c.value !== void 0) {
+          const b = c.validate(c.value);
+          b && (u = !0, c.error = b, c.rerender(), !o && c.focus && (c.focus(), o = !0));
         }
       }
-      if (!c) {
-        if (p === 0) {
-          e?.();
+      if (!u) {
+        if (y.dirtyCount === 0) {
+          s?.();
           return;
         }
-        const u = w(s, i);
-        await o(u, {
-          setError: (a, h) => {
-            const m = this.getForm(a);
-            m.error = {
+        const i = w(n, f);
+        await m.onSubmit(i, {
+          setError: (c, b) => {
+            const x = this.getForm(c);
+            x.error = {
               error: !0,
-              messages: [h.message]
-            }, m.rerender();
+              messages: [b.message]
+            }, x.rerender();
           }
         });
       }
     },
-    reset(n) {
-      const c = [];
-      C(s, [], n, (u, a, h) => {
-        if (h === void 0 && i[a].value === void 0)
+    reset(o) {
+      const u = [];
+      p(n, [], o, (i, c, b) => {
+        if (b === void 0 && f[c].value === void 0)
           return;
-        if (f.names[a] && h === void 0) {
-          c.push(a), i[a].value = h;
+        if (a.names[c] && b === void 0) {
+          u.push(c), f[c].value = b;
           return;
         }
-        const m = h ?? u.defaultValue;
-        i[a].value !== m && (c.push(a), this.onChange(a, m));
-      }), c.some((u) => f.names[u]) && f.subscribers.forEach(({ callback: u }) => {
-        u();
+        const x = b ?? i.defaultValue;
+        f[c].value !== x && (u.push(c), this.onChange(c, x));
+      }), u.some((i) => a.names[i]) && a.subscribers.forEach(({ callback: i }) => {
+        i();
       });
     },
-    registry(n, c) {
-      return i[n].rerender = c, i[n].value === void 0 && (i[n].value = i[n].defaultValue), {
+    registry(o, u) {
+      return f[o].rerender = u, f[o].value === void 0 && (f[o].value = f[o].defaultValue), {
         unregistry() {
-          if (i[n].rerender = () => {
-          }, i[n].focus = void 0, g) {
-            i[n].value = void 0;
-            const u = !R(i[n].defaultValue, i[n].initValue);
-            i[n].isDirty !== u && x(n, u), i[n].isDirty = u;
+          if (f[o].rerender = () => {
+          }, f[o].focus = void 0, y.isActive) {
+            f[o].value = void 0;
+            const i = !L(f[o].defaultValue, f[o].initValue);
+            f[o].isDirty !== i && g(o, i), f[o].isDirty = i;
           }
         }
       };
     },
-    getForm(n) {
-      return i[n];
+    getForm(o) {
+      return f[o];
     },
-    subscribeToForm(n, c) {
-      const u = { callback: c }, a = this.getForm(n);
-      return a.subscribers.push(u), {
+    subscribeToForm(o, u) {
+      const i = { callback: u }, c = this.getForm(o);
+      return c.subscribers.push(i), {
         unsubscribe: () => {
-          a.subscribers = a.subscribers.filter((h) => h !== u);
+          c.subscribers = c.subscribers.filter((b) => b !== i);
         }
       };
     },
-    registryExtraForm(n, c) {
-      const u = { callback: c };
-      return n.forEach((a) => {
-        f.names[a] = !0;
-      }), f.subscribers.push(u), {
+    registryExtraForm(o, u) {
+      const i = { callback: u };
+      return o.forEach((c) => {
+        a.names[c] = !0;
+      }), a.subscribers.push(i), {
         unregistry() {
-          f.subscribers = f.subscribers.filter((a) => a !== u);
+          a.subscribers = a.subscribers.filter((c) => c !== i);
         }
       };
     },
-    onChange(n, c) {
-      const u = this.getForm(n), a = !R(c, u.initValue);
-      u.isDirty !== a && x(n, a), u.isDirty = a, F?.({ name: n, value: c }), (u.error || v) && (u.error = u.validate(c) || null), u.value = c, u.rerender(), u.subscribers.forEach(({ callback: h }) => {
-        h();
+    onChange(o, u) {
+      const i = this.getForm(o), c = !L(u, i.initValue);
+      i.isDirty !== c && g(o, c), i.isDirty = c, F?.({ name: o, value: u }), (i.error || y.isSubmitted) && (i.error = i.validate(u) || null), i.value = u, i.rerender(), i.subscribers.forEach(({ callback: b }) => {
+        b();
       });
     }
   };
-}, Q = (s, r) => {
-  const o = N(null);
-  o.current === null && (o.current = H(s, r));
-  const e = o.current;
-  return {
-    useValue: (t) => M(t),
+}, O = (n, r) => {
+  const e = T(null);
+  e.current === null && (e.current = G(n, r));
+  const s = e.current;
+  return C(() => {
+    e.current && (e.current.submitRef.onSubmit = r.onSubmit);
+  }, [r.onSubmit]), {
+    manager: s,
+    useValue: (t) => B(t),
     reset: (t) => {
-      e.reset(t);
+      s.reset(t);
     },
     setFocus: (t) => {
-      e.setFocus(t);
+      s.setFocus(t);
     },
     setError: (t, l) => {
-      e.setError(t, l);
+      s.setError(t, l);
     },
     setValue: (t, l) => {
-      e.setValue(t, l);
+      s.setValue(t, l);
     },
-    getValues: () => e.getValues(),
+    getValues: () => s.getValues(),
     handleSubmit: async () => {
-      await e.handleSubmit();
-    },
-    manager: e
+      await s.handleSubmit();
+    }
   };
-}, U = ({ manager: s, className: r }) => (A(() => {
-  s.activate();
-}, []), D(() => () => {
-  s.disactivate();
-}, []), /* @__PURE__ */ b(j.Provider, { value: s, children: /* @__PURE__ */ b(V, { className: r, scheme: s.scheme, path: [] }) })), $ = (s) => {
+}, Q = ({ manager: n }) => (A(() => {
+  n.activate();
+}, []), C(() => () => {
+  n.disactivate();
+}, []), /* @__PURE__ */ v(D.Provider, { value: n, children: /* @__PURE__ */ v(V, { scheme: n.scheme, path: [] }) })), S = (n) => {
   try {
-    s();
+    n();
   } catch (r) {
     return r && typeof r == "string" ? {
       error: !0,
       messages: [r]
-    } : r instanceof Array && r.every((o) => o && typeof o == "string") ? {
+    } : r instanceof Array && r.every((e) => e && typeof e == "string") ? {
       error: !0,
       messages: r
     } : {
       error: !0
     };
   }
-}, W = (s) => (r, o) => {
-  const e = s.getRequireCheck(o), { $rules: t = {}, ...l } = o, { validate: y, required: F } = t;
+}, U = (n) => (r, e) => {
+  const s = n.getRequireCheck(e), { $rules: t = {}, ...l } = e, { validate: h, required: F } = t;
   return {
     type: "form",
     name: r,
-    defaultValue: s.defaultValue,
-    Form: s.getForm(l),
+    defaultValue: n.defaultValue,
+    Form: n.getForm(l),
     validate: (d) => {
       if (F) {
-        const g = $(() => e(d));
-        if (g)
-          return g;
-        if (y) {
-          const v = $(() => y(d));
-          if (v)
-            return v;
+        const m = S(() => s(d));
+        if (m)
+          return m;
+        if (h) {
+          const y = S(() => h(d));
+          if (y)
+            return y;
         }
         return;
       }
-      if (y && !$(() => e(d))) {
-        const v = $(() => y(d));
-        if (v)
-          return v;
+      if (h && !S(() => s(d))) {
+        const y = S(() => h(d));
+        if (y)
+          return y;
       }
     }
   };
-}, X = (s) => (r) => (...o) => ({
+}, W = (n) => (r) => (...e) => ({
   type: "layout",
-  Layout: s(r),
-  childs: o
-}), Y = ({
-  getItems: s,
+  Layout: n(r),
+  childs: e
+}), X = ({
+  getItems: n,
   getController: r
 }) => ({
   type: "extra",
-  items: s((o) => (e) => ({
-    type: "registry",
-    name: o,
-    getForm: e
-  })),
+  items: n((e) => (s) => ({ type: "registry", name: e, getForm: s })),
   getController: r
-}), Z = (s) => (...r) => ({
+}), Y = (n) => (...r) => ({
   type: "context",
-  context: s,
+  context: n,
   childs: r
-}), k = (s, r) => (...o) => ({
+}), Z = (n, r) => (...e) => ({
   type: "condition",
-  depended: s,
+  depended: n,
   canActivate: r.canActivate,
-  childs: o
+  childs: e
 });
 export {
-  k as Condition,
-  Z as Context,
-  U as FormLayout,
-  Y as createExtraForm,
-  W as createForm,
-  X as createLayout,
-  Q as useForm
+  Z as Condition,
+  Y as Context,
+  Q as FormLayout,
+  X as createExtraForm,
+  U as createForm,
+  W as createLayout,
+  O as useForm
 };

package/dist/context.d.ts

@@ -1,2 +1,2 @@
 import { FormManager } from './manager/manager';
-export declare const FormContext: import('react').Context<FormManager<any, any>>;
+export declare const FormContext: import('react').Context<FormManager<any, any, any>>;

package/dist/manager/manager.d.ts

@@ -1,6 +1,6 @@
 import { DeepPartial, FieldValues } from '../types';
 import { FieldError, SchemeItems } from '../core/types';
-import { MainOptions, SetError } from '../useForm';
+import { MainOptions, SetError, SubmitCallbacls } from '../useForm';
 interface FormItem {
     isDirty: boolean;
     error: FieldError | null;
@@ -17,7 +17,10 @@ interface FormItem {
 export interface Forms {
     [name: string]: FormItem;
 }
-export interface FormManager<FlattenValues, ClonedValues> {
+export interface FormManager<Values, FlattenValues, ClonedValues> {
+    submitRef: {
+        onSubmit: (values: Values, callbacks: SubmitCallbacls<FlattenValues>) => void;
+    };
     scheme: SchemeItems.All[];
     disabled?: boolean;
     activate: () => void;
@@ -40,5 +43,5 @@ export interface FormManager<FlattenValues, ClonedValues> {
     reset: (v: DeepPartial<ClonedValues>) => void;
     getValues: () => DeepPartial<ClonedValues>;
 }
-export declare const createFormManager: <Values extends FieldValues, Flatten, Cloned>(scheme: SchemeItems.All[], opts: MainOptions<Values, Flatten, Cloned>) => FormManager<Flatten, Cloned>;
+export declare const createFormManager: <Values extends FieldValues, Flatten, Cloned>(scheme: SchemeItems.All[], options: MainOptions<Values, Flatten, Cloned>) => FormManager<Values, Flatten, Cloned>;
 export {};

package/dist/useForm.d.ts

@@ -20,6 +20,9 @@ export type DirtyEvent<T> = Required<{
 export type SetError<V> = (name: keyof V, error: {
     message: string;
 }) => void;
+export interface SubmitCallbacls<FlattenValues> {
+    setError: SetError<FlattenValues>;
+}
 export interface MainOptions<Values extends FieldValues, FlattenValues, ClonedValues> {
     disabled?: boolean;
     defaultValues?: DeepPartial<ClonedValues>;
@@ -27,11 +30,10 @@ export interface MainOptions<Values extends FieldValues, FlattenValues, ClonedVa
     onDirty?: (event: DirtyEvent<FlattenValues>) => void;
     onChangeEvent?: (event: ChangeEvent<FlattenValues>) => void;
     onFormDirty?: (isDirty: boolean) => void;
-    onSubmit: (values: Values, { setError }: {
-        setError: SetError<FlattenValues>;
-    }) => Promise<void>;
+    onSubmit: (values: Values, callbacks: SubmitCallbacls<FlattenValues>) => Promise<void>;
 }
 declare const useDynamicForm: (scheme: SchemeItems.All[], opts: MainOptions<FieldValues, FieldValues, FieldValues>) => {
+    manager: FormManager<FieldValues, FieldValues, FieldValues>;
     useValue: <K extends string>(name: K) => any;
     reset: (values: {
         [x: string]: any;
@@ -45,9 +47,9 @@ declare const useDynamicForm: (scheme: SchemeItems.All[], opts: MainOptions<Fiel
         [x: string]: any;
     };
     handleSubmit: () => Promise<void>;
-    manager: FormManager<FieldValues, FieldValues>;
 };
 declare const useForm: <Items extends SchemeItems.All[], Values extends ExtractValues<Items[number]>, FlattenValues extends ExtractFlatValues<Items[number]>, Cloned extends Copy<Values>>(scheme: Items, opts: MainOptions<Values, FlattenValues, Cloned>) => {
+    manager: FormManager<Values, FlattenValues, Cloned>;
     useValue: <K extends keyof FlattenValues>(name: K) => FlattenValues[K];
     reset: (values: DeepPartial<Cloned>) => void;
     setFocus: (name: keyof FlattenValues) => void;
@@ -57,11 +59,9 @@ declare const useForm: <Items extends SchemeItems.All[], Values extends ExtractV
     setValue: <K extends keyof FlattenValues>(name: K, value: FlattenValues[K]) => void;
     getValues: () => DeepPartial<Cloned>;
     handleSubmit: () => Promise<void>;
-    manager: FormManager<FlattenValues, Cloned>;
 };
 interface Props {
-    className?: string;
-    manager: FormManager<any, any>;
+    manager: FormManager<any, any, any>;
 }
-export declare const FormLayout: ({ manager, className }: Props) => import("react/jsx-runtime").JSX.Element;
+export declare const FormLayout: ({ manager }: Props) => import("react/jsx-runtime").JSX.Element;
 export { useForm, useDynamicForm };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@companix/formkit",
-  "version": "0.0.07",
+  "version": "0.0.10",
   "module": "./dist/bundle.es.js",
   "types": "./dist/index.d.ts",
   "type": "module",