@saas-ui/forms 2.1.3 → 2.2.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @saas-ui/forms
 
+## 2.2.1
+
+### Patch Changes
+
+- 1c64bfaf: Fixed issue where Zod or Yup schemas would not validate in FormDialog
+- Updated dependencies [4a3c9dc7]
+  - @saas-ui/core@2.1.3
+
+## 2.2.0
+
+### Minor Changes
+
+- 87fcdc2c: FormLayout no longer renders each child in a wrapper div
+
+### Patch Changes
+
+- 9ad407a7: Zod schema enum types now render a Select by default
+- 654ad186: Fixed issue where Field would not infer correct onChange handler
+- 87fcdc2c: Fixed issue where not all StepForm data would be passed to onSubmit
+- 9ad407a7: ZodForm now infers defaultValues from the schema
+- be52e785: Fixed issue where placeholder would not be passed to the NumberInputField
+
 ## 2.1.3
 
 ### Patch Changes

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as react_hook_form from 'react-hook-form';
 import { FieldValues, FieldPath, UseFieldArrayReturn, RegisterOptions, UseFormReturn as UseFormReturn$1, UseFormProps, WatchObserver, SubmitHandler, SubmitErrorHandler, ResolverOptions, ResolverResult, FormProviderProps as FormProviderProps$1 } from 'react-hook-form';
 export { BatchFieldArrayUpdate, ChangeHandler, Control, Controller, ControllerFieldState, ControllerProps, ControllerRenderProps, CriteriaMode, CustomElement, DeepMap, DeepPartial, DeepPartialSkipArrayKey, DefaultValues, DelayCallback, EmptyObject, ErrorOption, EventType, FieldArray, FieldArrayMethodProps, FieldArrayWithId, Field as FieldDef, FieldElement, FieldError, FieldErrors, FieldName, FieldNamesMarkedBoolean, FieldRefs, FieldValue, FieldValues, FormProviderProps, FormState, FormStateProxy, FormStateSubjectRef, GetIsDirty, InternalFieldErrors, InternalFieldName, InternalNameSet, IsAny, IsFlatObject, KeepStateOptions, LiteralUnion, Message, Mode, MultipleFieldErrors, Names, NativeFieldValue, NestedValue, NonUndefined, Noop, Primitive, ReadFormState, Ref, RefCallBack, RegisterOptions, Resolver, ResolverError, ResolverOptions, ResolverResult, ResolverSuccess, SetFieldValue, SetValueConfig, Subjects, SubmitErrorHandler, SubmitHandler, TriggerConfig, UnpackNestedValue, UseControllerProps, UseControllerReturn, UseFieldArrayProps, UseFieldArrayReturn, UseFormClearErrors, UseFormGetValues, UseFormHandleSubmit, UseFormProps, UseFormRegister, UseFormRegisterReturn, UseFormReset, UseFormResetField, UseFormReturn, UseFormSetError, UseFormSetFocus, UseFormSetValue, UseFormStateProps, UseFormStateReturn, UseFormTrigger, UseFormUnregister, UseFormWatch, UseWatchProps, Validate, ValidateResult, ValidationMode, ValidationRule, ValidationValue, ValidationValueMessage, WatchInternal, WatchObserver, appendErrors, useController, useFieldArray, useForm, useFormState, useWatch } from 'react-hook-form';
-import { NumberInputProps as NumberInputProps$1, InputProps, RadioProps, RadioGroupProps, SystemProps, StackDirection, MenuProps, ThemingProps, ButtonProps, MenuListProps, MenuItemOptionProps, SelectProps as SelectProps$1, TextareaProps, SwitchProps, CheckboxProps, UsePinInputProps, ResponsiveValue, FormLabelProps, SimpleGridProps, FormControlProps, HTMLChakraProps } from '@chakra-ui/react';
+import { NumberInputProps as NumberInputProps$1, NumberInputFieldProps as NumberInputFieldProps$1, InputProps, RadioProps, RadioGroupProps, SystemProps, StackDirection, MenuProps, ThemingProps, ButtonProps, MenuListProps, MenuItemOptionProps, SelectProps as SelectProps$1, TextareaProps, SwitchProps, CheckboxProps, UsePinInputProps, ResponsiveValue, FormLabelProps, SimpleGridProps, FormControlProps, HTMLChakraProps } from '@chakra-ui/react';
 import { UseStepperReturn, UseStepperProps, StepsProps, StepsItemProps } from '@saas-ui/core';
 import { FocusableElement } from '@chakra-ui/utils';
 import { MaybeRenderProp } from '@chakra-ui/react-utils';
@@ -23,6 +23,14 @@ interface NumberInputOptions {
      * Render a custom decrement icon.
      */
     decrementIcon?: React$1.ReactNode;
+    /**
+     * The placeholder text when no value is selected.
+     */
+    placeholder?: string;
+    /**
+     * Props to pass to the NumberInputField component.
+     */
+    fieldProps?: NumberInputFieldProps$1;
 }
 interface NumberInputProps extends NumberInputProps$1, NumberInputOptions {
 }
@@ -140,38 +148,42 @@ interface InputFieldProps extends InputProps {
     leftAddon?: React$1.ReactNode;
     rightAddon?: React$1.ReactNode;
 }
-declare const InputField: React$1.FC<InputFieldProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
+declare const InputField: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof InputFieldProps> & InputFieldProps>;
 interface NumberInputFieldProps extends NumberInputProps {
     type: 'number';
 }
-declare const NumberInputField: React$1.FC<NumberInputFieldProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-declare const PasswordInputField: React$1.FC<PasswordInputProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-declare const TextareaField: React$1.FC<TextareaProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-declare const SwitchField: React$1.FC<SwitchProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-declare const SelectField: React$1.FC<SelectProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-declare const CheckboxField: React$1.FC<CheckboxProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-declare const RadioField: React$1.FC<RadioInputProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-declare const NativeSelectField: React$1.FC<NativeSelectProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
+declare const NumberInputField: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof NumberInputFieldProps> & NumberInputFieldProps>;
+declare const PasswordInputField: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof PasswordInputProps> & PasswordInputProps>;
+declare const TextareaField: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof TextareaProps> & TextareaProps>;
+declare const SwitchField: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SwitchProps> & SwitchProps>;
+interface SelectFieldProps extends SelectProps {
+    buttonProps?: SelectButtonProps;
+    listProps?: SelectListProps;
+}
+declare const SelectField: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SelectFieldProps> & SelectFieldProps>;
+declare const CheckboxField: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof CheckboxProps> & CheckboxProps>;
+declare const RadioField: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof RadioInputProps> & RadioInputProps>;
+declare const NativeSelectField: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof NativeSelectProps> & NativeSelectProps>;
 interface PinFieldProps extends Omit<UsePinInputProps, 'type'> {
     pinLength?: number;
     pinType?: 'alphanumeric' | 'number';
     spacing?: SystemProps['margin'];
 }
-declare const PinField: React$1.FC<PinFieldProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
+declare const PinField: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof PinFieldProps> & PinFieldProps>;
 declare const defaultFieldTypes: {
-    text: React$1.FC<InputFieldProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-    email: React$1.FC<InputFieldProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-    url: React$1.FC<InputFieldProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-    phone: React$1.FC<InputFieldProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-    number: React$1.FC<NumberInputFieldProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-    password: React$1.FC<PasswordInputProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-    textarea: React$1.FC<TextareaProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-    switch: React$1.FC<SwitchProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-    select: React$1.FC<SelectProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-    checkbox: React$1.FC<CheckboxProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-    radio: React$1.FC<RadioInputProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-    pin: React$1.FC<PinFieldProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
-    'native-select': React$1.FC<NativeSelectProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
+    text: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof InputFieldProps> & InputFieldProps>;
+    email: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof InputFieldProps> & InputFieldProps>;
+    url: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof InputFieldProps> & InputFieldProps>;
+    phone: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof InputFieldProps> & InputFieldProps>;
+    number: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof NumberInputFieldProps> & NumberInputFieldProps>;
+    password: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof PasswordInputProps> & PasswordInputProps>;
+    textarea: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof TextareaProps> & TextareaProps>;
+    switch: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SwitchProps> & SwitchProps>;
+    select: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SelectFieldProps> & SelectFieldProps>;
+    checkbox: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof CheckboxProps> & CheckboxProps>;
+    radio: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof RadioInputProps> & RadioInputProps>;
+    pin: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof PinFieldProps> & PinFieldProps>;
+    'native-select': React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof NativeSelectProps> & NativeSelectProps>;
 };
 type DefaultFields = typeof defaultFieldTypes;
 
@@ -432,7 +444,7 @@ type Split<S extends string, D extends string> = string extends S ? string[] : S
 type MapPath<T extends string[]> = T extends [infer U, ...infer R] ? U extends string ? `${U extends `${number}` ? '$' : U}${R[0] extends string ? '.' : ''}${R extends string[] ? MapPath<R> : ''}` : '' : '';
 type TransformPath<T extends string> = MapPath<Split<T, '.'>>;
 type ArrayFieldPath<Name extends string> = Name extends string ? TransformPath<Name> : never;
-interface BaseFieldProps<TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> extends Omit<FormControlProps, 'label' | 'type'> {
+interface BaseFieldProps<TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> extends Omit<FormControlProps, 'label' | 'type' | 'onChange'> {
     /**
      * The field name
      */
@@ -728,10 +740,10 @@ type FormType<FieldDefs, ExtraProps = object, ExtraOverrides = object> = (<TSche
 };
 declare function createForm<FieldDefs>({ resolver, fieldResolver, fields, }?: CreateFormProps<FieldDefs>): FormType<FieldDefs, object, object>;
 
-interface DisplayFieldProps extends FormControlProps, Omit<FieldProps, 'type' | 'label'> {
+interface DisplayFieldProps extends Omit<FormControlProps, 'onChange'>, Omit<FieldProps, 'type' | 'label' | 'onChange'> {
 }
 /**
- *
+ * Display a field value.
  *
  * @see Docs https://saas-ui.dev/
  */
@@ -838,7 +850,7 @@ interface CreateFieldOptions {
  * @param options.isControlled Set this to true if this is a controlled field.
  * @param options.hideLabel Hide the field label, for example for the checkbox field.
  */
-declare const createField: <TProps extends object>(component: React$1.FC<TProps>, options?: CreateFieldOptions) => React$1.FC<TProps & BaseFieldProps<react_hook_form.FieldValues, string>>;
+declare const createField: <TProps extends object>(component: React$1.FC<TProps>, options?: CreateFieldOptions) => React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof TProps> & TProps>;
 
 /**
  * Form component.
@@ -854,4 +866,4 @@ declare const Form: FormType<unknown, object, object>;
  */
 declare const StepForm: StepFormType<unknown, object, object>;
 
-export { ArrayField, ArrayFieldAddButton, ArrayFieldButtonProps, ArrayFieldContainer, ArrayFieldContainerProps, ArrayFieldOptions, ArrayFieldProps, ArrayFieldProvider, ArrayFieldRemoveButton, ArrayFieldRow, ArrayFieldRowContainer, ArrayFieldRowFields, ArrayFieldRowFieldsProps, ArrayFieldRowProvider, ArrayFieldRows, ArrayFieldRowsProps, AutoFields, BaseField, BaseFieldProps, Form$1 as BaseForm, CheckboxField, CreateFieldOptions, CreateFormProps, CreateStepFormProps, DefaultFieldOverrides, DefaultFields, DisplayField, DisplayFieldProps, DisplayIf, DisplayIfProps, Field, FieldOptions, FieldProps, FieldResolver, FieldRules, FieldsProps, FieldsProvider, Form, FormComponent, FormLayout, FormLayoutProps, FormLegend, FormProps, FormProvider, FormRenderContext, FormStep, FormStepOptions, FormStepProps, FormStepSubmitHandler, FormStepper, FormStepperProps, FormType, FormValue, GetFieldResolver, InputField, InputFieldProps, InputRightButton, InputRightButtonProps, NativeSelect, NativeSelectField, NativeSelectProps, NextButton, NextButtonProps, NumberInputField, NumberInputFieldProps, ObjectField, ObjectFieldProps, ObjectSchema, Option, PasswordInput, PasswordInputField, PasswordInputProps, PinField, PinFieldProps, PrevButton, RadioField, RadioInput, RadioInputProps, RadioOption, RadioOptions, Select, SelectButton, SelectButtonProps, SelectField, SelectList, SelectListProps, SelectOption, SelectProps, StepForm, StepFormContext, StepFormProps, StepFormProvider, StepFormRenderContext, StepState, StepsOptions, SubmitButton, SubmitButtonProps, SwitchField, TextareaField, UseArrayFieldReturn, UseArrayFieldRowProps, UseArrayFieldRowReturn, UseFormStepProps, UseStepFormProps, UseStepFormReturn, WatchField, WatchFieldProps, WithFields, WithStepFields, createField, createForm, createStepForm, defaultFieldTypes, objectFieldResolver, useArrayField, useArrayFieldAddButton, useArrayFieldContext, useArrayFieldRemoveButton, useArrayFieldRow, useArrayFieldRowContext, useField, useFormContext, useFormStep, useStepForm, useStepFormContext };
+export { ArrayField, ArrayFieldAddButton, ArrayFieldButtonProps, ArrayFieldContainer, ArrayFieldContainerProps, ArrayFieldOptions, ArrayFieldProps, ArrayFieldProvider, ArrayFieldRemoveButton, ArrayFieldRow, ArrayFieldRowContainer, ArrayFieldRowFields, ArrayFieldRowFieldsProps, ArrayFieldRowProvider, ArrayFieldRows, ArrayFieldRowsProps, AutoFields, BaseField, BaseFieldProps, Form$1 as BaseForm, CheckboxField, CreateFieldOptions, CreateFormProps, CreateStepFormProps, DefaultFieldOverrides, DefaultFields, DisplayField, DisplayFieldProps, DisplayIf, DisplayIfProps, Field, FieldOptions, FieldProps, FieldResolver, FieldRules, FieldsProps, FieldsProvider, Form, FormComponent, FormLayout, FormLayoutProps, FormLegend, FormProps, FormProvider, FormRenderContext, FormStep, FormStepOptions, FormStepProps, FormStepSubmitHandler, FormStepper, FormStepperProps, FormType, FormValue, GetFieldResolver, InputField, InputFieldProps, InputRightButton, InputRightButtonProps, NativeSelect, NativeSelectField, NativeSelectProps, NextButton, NextButtonProps, NumberInputField, NumberInputFieldProps, ObjectField, ObjectFieldProps, ObjectSchema, Option, PasswordInput, PasswordInputField, PasswordInputProps, PinField, PinFieldProps, PrevButton, RadioField, RadioInput, RadioInputProps, RadioOption, RadioOptions, Select, SelectButton, SelectButtonProps, SelectField, SelectFieldProps, SelectList, SelectListProps, SelectOption, SelectProps, StepForm, StepFormContext, StepFormProps, StepFormProvider, StepFormRenderContext, StepState, StepsOptions, SubmitButton, SubmitButtonProps, SwitchField, TextareaField, UseArrayFieldReturn, UseArrayFieldRowProps, UseArrayFieldRowReturn, UseFormStepProps, UseStepFormProps, UseStepFormReturn, WatchField, WatchFieldProps, WithFields, WithStepFields, createField, createForm, createStepForm, defaultFieldTypes, objectFieldResolver, useArrayField, useArrayFieldAddButton, useArrayFieldContext, useArrayFieldRemoveButton, useArrayFieldRow, useArrayFieldRowContext, useField, useFormContext, useFormStep, useStepForm, useStepFormContext };

package/dist/index.js

@@ -172,10 +172,13 @@ var NumberInput = (0, import_react2.forwardRef)((props, ref) => {
     hideStepper,
     incrementIcon = /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_core.ChevronUpIcon, {}),
     decrementIcon = /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_core.ChevronDownIcon, {}),
+    placeholder,
+    fieldProps: _fieldProps,
     ...rest
   } = props;
+  const fieldProps = { placeholder, ..._fieldProps };
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_react2.NumberInput, { ...rest, ref, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_react2.NumberInputField, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_react2.NumberInputField, { ...fieldProps }),
     !hideStepper && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_react2.NumberInputStepper, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_react2.NumberIncrementStepper, { children: incrementIcon }),
       /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_react2.NumberDecrementStepper, { children: decrementIcon })
@@ -601,6 +604,7 @@ var withControlledInput = (InputComponent) => {
   return (0, import_react12.forwardRef)(
     ({ name, rules, ...inputProps }, ref) => {
       const { control } = useFormContext();
+      const onChange = inputProps.onChange;
       return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
         import_react_hook_form3.Controller,
         {
@@ -612,7 +616,7 @@ var withControlledInput = (InputComponent) => {
             {
               ...field,
               ...inputProps,
-              onChange: (0, import_utils4.callAllHandlers)(inputProps.onChange, field.onChange),
+              onChange: (0, import_utils4.callAllHandlers)(onChange, field.onChange),
               onBlur: (0, import_utils4.callAllHandlers)(inputProps.onBlur, field.onBlur),
               ref: (0, import_react12.useMergeRefs)(ref, _ref)
             }
@@ -627,12 +631,13 @@ var withUncontrolledInput = (InputComponent) => {
     ({ name, rules, ...inputProps }, ref) => {
       const { register } = useFormContext();
       const { ref: _ref, ...field } = register(name, rules);
+      const onChange = inputProps.onChange;
       return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
         InputComponent,
         {
           ...field,
           ...inputProps,
-          onChange: (0, import_utils4.callAllHandlers)(inputProps.onChange, field.onChange),
+          onChange: (0, import_utils4.callAllHandlers)(onChange, field.onChange),
           onBlur: (0, import_utils4.callAllHandlers)(inputProps.onBlur, field.onBlur),
           ref: (0, import_react12.useMergeRefs)(ref, _ref)
         }
@@ -691,9 +696,10 @@ var SwitchField = createField(
 );
 var SelectField = createField(
   (0, import_react13.forwardRef)((props, ref) => {
-    return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(Select, { ref, ...props, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(SelectButton, {}),
-      /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(SelectList, {})
+    const { buttonProps, listProps, ...rest } = props;
+    return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(Select, { ref, ...rest, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(SelectButton, { ...buttonProps }),
+      /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(SelectList, { ...listProps })
     ] });
   }),
   {
@@ -770,10 +776,9 @@ var Field = React6.forwardRef(
 );
 
 // src/fields.tsx
-var React10 = __toESM(require("react"));
+var React9 = __toESM(require("react"));
 
 // src/layout.tsx
-var React7 = __toESM(require("react"));
 var import_react15 = require("@chakra-ui/react");
 var import_utils5 = require("@chakra-ui/utils");
 var import_jsx_runtime14 = require("react/jsx-runtime");
@@ -796,24 +801,19 @@ var FormLayout = ({ children, ...props }) => {
     {
       ...gridProps,
       className: (0, import_utils5.cx)("sui-form__layout", props.className),
-      children: React7.Children.map(children, (child) => {
-        if (React7.isValidElement(child)) {
-          return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(FormLayoutItem, { children: child });
-        }
-        return child;
-      })
+      children
     }
   );
 };
 FormLayout.displayName = "FormLayout";
 
 // src/array-field.tsx
-var React9 = __toESM(require("react"));
+var React8 = __toESM(require("react"));
 var import_react16 = require("@chakra-ui/react");
 var import_icons2 = require("@saas-ui/core/icons");
 
 // src/use-array-field.tsx
-var React8 = __toESM(require("react"));
+var React7 = __toESM(require("react"));
 var import_react_hook_form4 = require("react-hook-form");
 var import_react_utils2 = require("@chakra-ui/react-utils");
 var [ArrayFieldProvider, useArrayFieldContext] = (0, import_react_utils2.createContext)({
@@ -846,7 +846,7 @@ var useArrayField = ({
 var useArrayFieldRow = ({ index }) => {
   const { clearErrors } = useFormContext();
   const { name, remove, fields } = useArrayFieldContext();
-  React8.useEffect(() => {
+  React7.useEffect(() => {
     clearErrors(name);
   }, []);
   return {
@@ -854,7 +854,7 @@ var useArrayFieldRow = ({ index }) => {
     isFirst: index === 0,
     isLast: index === fields.length - 1,
     name: `${name}.${index}`,
-    remove: React8.useCallback(() => {
+    remove: React7.useCallback(() => {
       clearErrors(name);
       remove(index);
     }, [index])
@@ -953,7 +953,7 @@ var ArrayFieldRows = ({
   return children(fields);
 };
 ArrayFieldRows.displayName = "ArrayFieldRows";
-var ArrayFieldContainer = React9.forwardRef(
+var ArrayFieldContainer = React8.forwardRef(
   ({
     name,
     defaultValue,
@@ -971,7 +971,7 @@ var ArrayFieldContainer = React9.forwardRef(
       min: min || (overrides == null ? void 0 : overrides.min),
       max: max || (overrides == null ? void 0 : overrides.max)
     });
-    React9.useImperativeHandle(ref, () => context, [ref, context]);
+    React8.useImperativeHandle(ref, () => context, [ref, context]);
     return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(ArrayFieldProvider, { value: context, children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(BaseField, { name, ...fieldProps, ...overrides, children }) });
   }
 );
@@ -1036,10 +1036,10 @@ var AutoFields = ({
   const context = useFormContext();
   const schema = schemaProp || context.schema;
   const fieldResolver = fieldResolverProp || context.fieldResolver;
-  const resolver = React10.useMemo(() => fieldResolver, [schema, fieldResolver]);
-  const fields = React10.useMemo(() => resolver == null ? void 0 : resolver.getFields(), [resolver]);
+  const resolver = React9.useMemo(() => fieldResolver, [schema, fieldResolver]);
+  const fields = React9.useMemo(() => resolver == null ? void 0 : resolver.getFields(), [resolver]);
   const form = useFormContext();
-  React10.useEffect(() => {
+  React9.useEffect(() => {
     var _a;
     if (focusFirstField && ((_a = fields == null ? void 0 : fields[0]) == null ? void 0 : _a.name)) {
       form.setFocus(fields[0].name);
@@ -1060,7 +1060,16 @@ var AutoFields = ({
       } else if (type === "object") {
         return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(ObjectField, { name, ...fieldProps, children: mapNestedFields2(resolver, name) }, name);
       }
-      return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(Field, { name, type, ...fieldProps }, name);
+      return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+        Field,
+        {
+          name,
+          type,
+          defaultValue,
+          ...fieldProps
+        },
+        name
+      );
     }
   ) });
 };
@@ -1124,13 +1133,13 @@ var DisplayIf = ({
 DisplayIf.displayName = "DisplayIf";
 
 // src/step-form.tsx
-var React12 = __toESM(require("react"));
+var React11 = __toESM(require("react"));
 var import_react19 = require("@chakra-ui/react");
 var import_utils9 = require("@chakra-ui/utils");
 var import_core4 = require("@saas-ui/core");
 
 // src/use-step-form.tsx
-var React11 = __toESM(require("react"));
+var React10 = __toESM(require("react"));
 var import_react_utils3 = require("@chakra-ui/react-utils");
 var import_core3 = require("@saas-ui/core");
 var [StepFormProvider, useStepFormContext] = (0, import_react_utils3.createContext)({
@@ -1138,18 +1147,29 @@ var [StepFormProvider, useStepFormContext] = (0, import_react_utils3.createConte
   errorMessage: "useStepFormContext: `context` is undefined. Seems you forgot to wrap step form components in `<StepForm />`"
 });
 function useStepForm(props) {
-  const { onChange, steps: stepsOptions, resolver, ...rest } = props;
+  const {
+    onChange,
+    steps: stepsOptions,
+    resolver,
+    fieldResolver,
+    ...rest
+  } = props;
   const stepper = (0, import_core3.useStepper)(rest);
-  const [options, setOptions] = React11.useState(stepsOptions);
+  const [options, setOptions] = React10.useState(stepsOptions);
   const { activeStep, isLastStep, nextStep } = stepper;
-  const [steps, updateSteps] = React11.useState({});
-  const onSubmitStep = React11.useCallback(
+  const [steps, updateSteps] = React10.useState({});
+  const mergedData = React10.useRef({});
+  const onSubmitStep = React10.useCallback(
     async (data) => {
       var _a, _b;
       try {
         const step = steps[activeStep];
+        mergedData.current = {
+          ...mergedData.current,
+          ...data
+        };
         if (isLastStep) {
-          await ((_a = props.onSubmit) == null ? void 0 : _a.call(props, data));
+          await ((_a = props.onSubmit) == null ? void 0 : _a.call(props, mergedData.current));
           updateStep({
             ...step,
             isCompleted: true
@@ -1162,9 +1182,9 @@ function useStepForm(props) {
       } catch (e) {
       }
     },
-    [steps, activeStep, isLastStep]
+    [steps, activeStep, isLastStep, mergedData]
   );
-  const getFormProps = React11.useCallback(() => {
+  const getFormProps = React10.useCallback(() => {
     const step = steps[activeStep];
     return {
       onSubmit: onSubmitStep,
@@ -1172,10 +1192,11 @@ function useStepForm(props) {
       resolver: (step == null ? void 0 : step.schema) ? (
         /* @todo fix resolver type */
         resolver == null ? void 0 : resolver(step.schema)
-      ) : void 0
+      ) : void 0,
+      fieldResolver: (step == null ? void 0 : step.schema) ? fieldResolver == null ? void 0 : fieldResolver(step.schema) : void 0
     };
-  }, [steps, onSubmitStep, activeStep]);
-  const updateStep = React11.useCallback(
+  }, [steps, onSubmitStep, activeStep, resolver, fieldResolver]);
+  const updateStep = React10.useCallback(
     (step) => {
       const stepOptions = options == null ? void 0 : options.find((s) => s.name === step.name);
       updateSteps((steps2) => {
@@ -1201,7 +1222,7 @@ function useFormStep(props) {
   const { name, schema, resolver, onSubmit } = props;
   const step = (0, import_core3.useStep)({ name });
   const { steps, updateStep } = useStepFormContext();
-  React11.useEffect(() => {
+  React10.useEffect(() => {
     updateStep({ name, schema, resolver, onSubmit });
   }, [name, schema]);
   return {
@@ -1224,8 +1245,8 @@ var FormStepper = (props) => {
     render,
     ...rest
   } = props;
-  const elements = React12.Children.map(children, (child) => {
-    if (React12.isValidElement(child) && (child == null ? void 0 : child.type) === FormStep) {
+  const elements = React11.Children.map(children, (child) => {
+    if (React11.isValidElement(child) && (child == null ? void 0 : child.type) === FormStep) {
       const { isCompleted } = useFormStep(child.props);
       return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
         import_core4.StepsItem,
@@ -1241,7 +1262,7 @@ var FormStepper = (props) => {
     }
     return child;
   });
-  const onChange = React12.useCallback((i) => {
+  const onChange = React11.useCallback((i) => {
     setIndex(i);
     onChangeProp == null ? void 0 : onChangeProp(i);
   }, []);
@@ -1338,7 +1359,7 @@ var WatchField = (props) => {
 };
 
 // src/form.tsx
-var React13 = __toESM(require("react"));
+var React12 = __toESM(require("react"));
 var import_react20 = require("@chakra-ui/react");
 var import_utils11 = require("@chakra-ui/utils");
 var import_react_hook_form8 = require("react-hook-form");
@@ -1384,8 +1405,8 @@ var Form = (0, import_react20.forwardRef)(
     };
     const methods = (0, import_react_hook_form8.useForm)(form);
     const { handleSubmit } = methods;
-    React13.useImperativeHandle(formRef, () => methods, [formRef, methods]);
-    React13.useEffect(() => {
+    React12.useImperativeHandle(formRef, () => methods, [formRef, methods]);
+    React12.useEffect(() => {
       let subscription;
       if (onChange) {
         subscription = methods.watch(onChange);
@@ -1438,13 +1459,18 @@ function createForm({
 } = {}) {
   const DefaultForm = (0, import_react21.forwardRef)(
     (props, ref) => {
-      const { schema, ...rest } = props;
+      const {
+        schema,
+        resolver: resolverProp,
+        fieldResolver: fieldResolverProp,
+        ...rest
+      } = props;
       return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(FieldsProvider, { value: fields || {}, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
         Form,
         {
           ref,
-          resolver: resolver == null ? void 0 : resolver(props.schema),
-          fieldResolver: fieldResolver == null ? void 0 : fieldResolver(schema),
+          resolver: resolverProp != null ? resolverProp : resolver == null ? void 0 : resolver(props.schema),
+          fieldResolver: fieldResolverProp != null ? fieldResolverProp : fieldResolver == null ? void 0 : fieldResolver(schema),
           ...rest
         }
       ) });