@saas-ui/forms 2.3.6 → 2.3.8

package/dist/yup/index.d.ts

@@ -2,13 +2,11 @@ import * as _chakra_ui_button_dist_button from '@chakra-ui/button/dist/button';
 import * as _saas_ui_modals from '@saas-ui/modals';
 import { BaseModalProps } from '@saas-ui/modals';
 import * as _chakra_ui_checkbox_dist_checkbox from '@chakra-ui/checkbox/dist/checkbox';
-import * as _chakra_ui_switch_dist_switch from '@chakra-ui/switch/dist/switch';
-import * as _chakra_ui_textarea_dist_textarea from '@chakra-ui/textarea/dist/textarea';
 import * as react_hook_form from 'react-hook-form';
 import { FieldValues, FieldPath, RegisterOptions, SubmitHandler, UseFieldArrayReturn, UseFormReturn, UseFormProps, WatchObserver, SubmitErrorHandler } from 'react-hook-form';
 import * as React$1 from 'react';
 import React$1__default from 'react';
-import { InputProps, RadioGroupProps, SelectProps as SelectProps$1, UsePinInputProps, SystemProps, ButtonProps, ResponsiveValue, FormControlProps, HTMLChakraProps, NumberInputProps as NumberInputProps$1, StackDirection, MenuProps, ThemingProps, MenuListProps, NumberInputFieldProps as NumberInputFieldProps$1, MenuItemOptionProps, RadioProps, TextareaProps, SwitchProps, CheckboxProps } from '@chakra-ui/react';
+import { InputProps, RadioGroupProps, SelectProps as SelectProps$1, TextareaProps, SwitchProps, UsePinInputProps, SystemProps, ButtonProps, ResponsiveValue, FormControlProps, HTMLChakraProps, NumberInputProps as NumberInputProps$1, StackDirection, MenuProps, ThemingProps, MenuListProps, NumberInputFieldProps as NumberInputFieldProps$1, MenuItemOptionProps, RadioProps, CheckboxProps } from '@chakra-ui/react';
 import { UseStepperProps, UseStepperReturn } from '@saas-ui/core';
 import { FocusableElement } from '@chakra-ui/utils';
 import { MaybeRenderProp } from '@chakra-ui/react-utils';
@@ -139,6 +137,10 @@ interface InputFieldProps extends InputProps {
 interface NumberInputFieldProps extends NumberInputProps {
     type: 'number';
 }
+interface TextareaFieldProps extends TextareaProps {
+}
+interface SwitchFieldProps extends SwitchProps {
+}
 interface SelectFieldProps extends SelectProps {
     buttonProps?: SelectButtonProps;
     listProps?: SelectListProps;
@@ -155,8 +157,8 @@ declare const defaultFieldTypes: {
     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>;
+    textarea: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof TextareaFieldProps> & TextareaFieldProps>;
+    switch: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SwitchFieldProps> & SwitchFieldProps>;
     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>;
@@ -594,9 +596,9 @@ declare const StepForm: (<TSteps extends {
         type?: "password" | undefined;
     } & Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof PasswordInputProps> & PasswordInputProps, keyof BaseFieldProps<TFieldValues_1, TName>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>) | ({
         type?: "textarea" | undefined;
-    } & Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof _chakra_ui_textarea_dist_textarea.TextareaProps> & _chakra_ui_textarea_dist_textarea.TextareaProps, keyof BaseFieldProps<TFieldValues_1, TName>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>) | ({
+    } & Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof TextareaFieldProps> & TextareaFieldProps, keyof BaseFieldProps<TFieldValues_1, TName>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>) | ({
         type?: "switch" | undefined;
-    } & Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof _chakra_ui_switch_dist_switch.SwitchProps> & _chakra_ui_switch_dist_switch.SwitchProps, keyof BaseFieldProps<TFieldValues_1, TName>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>) | ({
+    } & Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SwitchFieldProps> & SwitchFieldProps, keyof BaseFieldProps<TFieldValues_1, TName>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>) | ({
         type?: "select" | undefined;
     } & Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SelectFieldProps> & SelectFieldProps, keyof BaseFieldProps<TFieldValues_1, TName>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>) | ({
         type?: "checkbox" | undefined;
@@ -621,9 +623,9 @@ declare const StepForm: (<TSteps extends {
         type?: "password" | undefined;
     } & Omit<Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof PasswordInputProps> & PasswordInputProps, keyof BaseFieldProps<TFieldValues_2, TName_1>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>, "name">) | ({
         type?: "textarea" | undefined;
-    } & Omit<Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof _chakra_ui_textarea_dist_textarea.TextareaProps> & _chakra_ui_textarea_dist_textarea.TextareaProps, keyof BaseFieldProps<TFieldValues_2, TName_1>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>, "name">) | ({
+    } & Omit<Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof TextareaFieldProps> & TextareaFieldProps, keyof BaseFieldProps<TFieldValues_2, TName_1>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>, "name">) | ({
         type?: "switch" | undefined;
-    } & Omit<Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof _chakra_ui_switch_dist_switch.SwitchProps> & _chakra_ui_switch_dist_switch.SwitchProps, keyof BaseFieldProps<TFieldValues_2, TName_1>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>, "name">) | ({
+    } & Omit<Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SwitchFieldProps> & SwitchFieldProps, keyof BaseFieldProps<TFieldValues_2, TName_1>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>, "name">) | ({
         type?: "select" | undefined;
     } & Omit<Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SelectFieldProps> & SelectFieldProps, keyof BaseFieldProps<TFieldValues_2, TName_1>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>, "name">) | ({
         type?: "checkbox" | undefined;

package/dist/zod/index.d.ts

@@ -2,13 +2,11 @@ import * as _chakra_ui_button_dist_button from '@chakra-ui/button/dist/button';
 import * as _saas_ui_modals from '@saas-ui/modals';
 import { BaseModalProps } from '@saas-ui/modals';
 import * as _chakra_ui_checkbox_dist_checkbox from '@chakra-ui/checkbox/dist/checkbox';
-import * as _chakra_ui_switch_dist_switch from '@chakra-ui/switch/dist/switch';
-import * as _chakra_ui_textarea_dist_textarea from '@chakra-ui/textarea/dist/textarea';
 import * as react_hook_form from 'react-hook-form';
 import { FieldValues, FieldPath, RegisterOptions, SubmitHandler, UseFieldArrayReturn, UseFormReturn, UseFormProps, WatchObserver, SubmitErrorHandler } from 'react-hook-form';
 import * as React$1 from 'react';
 import React$1__default from 'react';
-import { InputProps, RadioGroupProps, SelectProps as SelectProps$1, UsePinInputProps, SystemProps, ButtonProps, ResponsiveValue, FormControlProps, HTMLChakraProps, NumberInputProps as NumberInputProps$1, StackDirection, MenuProps, ThemingProps, MenuListProps, NumberInputFieldProps as NumberInputFieldProps$1, MenuItemOptionProps, RadioProps, TextareaProps, SwitchProps, CheckboxProps } from '@chakra-ui/react';
+import { InputProps, RadioGroupProps, SelectProps as SelectProps$1, TextareaProps, SwitchProps, UsePinInputProps, SystemProps, ButtonProps, ResponsiveValue, FormControlProps, HTMLChakraProps, NumberInputProps as NumberInputProps$1, StackDirection, MenuProps, ThemingProps, MenuListProps, NumberInputFieldProps as NumberInputFieldProps$1, MenuItemOptionProps, RadioProps, CheckboxProps } from '@chakra-ui/react';
 import { UseStepperProps, UseStepperReturn } from '@saas-ui/core';
 import { FocusableElement } from '@chakra-ui/utils';
 import { MaybeRenderProp } from '@chakra-ui/react-utils';
@@ -139,6 +137,10 @@ interface InputFieldProps extends InputProps {
 interface NumberInputFieldProps extends NumberInputProps {
     type: 'number';
 }
+interface TextareaFieldProps extends TextareaProps {
+}
+interface SwitchFieldProps extends SwitchProps {
+}
 interface SelectFieldProps extends SelectProps {
     buttonProps?: SelectButtonProps;
     listProps?: SelectListProps;
@@ -155,8 +157,8 @@ declare const defaultFieldTypes: {
     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>;
+    textarea: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof TextareaFieldProps> & TextareaFieldProps>;
+    switch: React$1.FC<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SwitchFieldProps> & SwitchFieldProps>;
     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>;
@@ -618,9 +620,9 @@ declare const StepForm: (<TSteps extends {
         type?: "password" | undefined;
     } & Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof PasswordInputProps> & PasswordInputProps, keyof BaseFieldProps<TFieldValues_1, TName>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>) | ({
         type?: "textarea" | undefined;
-    } & Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof _chakra_ui_textarea_dist_textarea.TextareaProps> & _chakra_ui_textarea_dist_textarea.TextareaProps, keyof BaseFieldProps<TFieldValues_1, TName>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>) | ({
+    } & Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof TextareaFieldProps> & TextareaFieldProps, keyof BaseFieldProps<TFieldValues_1, TName>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>) | ({
         type?: "switch" | undefined;
-    } & Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof _chakra_ui_switch_dist_switch.SwitchProps> & _chakra_ui_switch_dist_switch.SwitchProps, keyof BaseFieldProps<TFieldValues_1, TName>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>) | ({
+    } & Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SwitchFieldProps> & SwitchFieldProps, keyof BaseFieldProps<TFieldValues_1, TName>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>) | ({
         type?: "select" | undefined;
     } & Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SelectFieldProps> & SelectFieldProps, keyof BaseFieldProps<TFieldValues_1, TName>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>) | ({
         type?: "checkbox" | undefined;
@@ -645,9 +647,9 @@ declare const StepForm: (<TSteps extends {
         type?: "password" | undefined;
     } & Omit<Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof PasswordInputProps> & PasswordInputProps, keyof BaseFieldProps<TFieldValues_2, TName_1>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>, "name">) | ({
         type?: "textarea" | undefined;
-    } & Omit<Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof _chakra_ui_textarea_dist_textarea.TextareaProps> & _chakra_ui_textarea_dist_textarea.TextareaProps, keyof BaseFieldProps<TFieldValues_2, TName_1>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>, "name">) | ({
+    } & Omit<Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof TextareaFieldProps> & TextareaFieldProps, keyof BaseFieldProps<TFieldValues_2, TName_1>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>, "name">) | ({
         type?: "switch" | undefined;
-    } & Omit<Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof _chakra_ui_switch_dist_switch.SwitchProps> & _chakra_ui_switch_dist_switch.SwitchProps, keyof BaseFieldProps<TFieldValues_2, TName_1>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>, "name">) | ({
+    } & Omit<Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SwitchFieldProps> & SwitchFieldProps, keyof BaseFieldProps<TFieldValues_2, TName_1>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>, "name">) | ({
         type?: "select" | undefined;
     } & Omit<Omit<Omit<BaseFieldProps<react_hook_form.FieldValues, string>, keyof SelectFieldProps> & SelectFieldProps, keyof BaseFieldProps<TFieldValues_2, TName_1>> & BaseFieldProps<TFieldValues, react_hook_form.Path<TFieldValues>>, "name">) | ({
         type?: "checkbox" | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saas-ui/forms",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "description": "Fully functional forms for Chakra UI.",
   "source": "src/index.ts",
   "exports": {
@@ -104,7 +104,7 @@
     "@chakra-ui/react-utils": "^2.0.12",
     "@chakra-ui/utils": "^2.0.15",
     "@hookform/resolvers": "^3.3.1",
-    "@saas-ui/core": "2.3.1",
+    "@saas-ui/core": "2.3.3",
     "react-hook-form": "^7.46.1"
   },
   "peerDependencies": {

package/src/default-fields.tsx

@@ -34,8 +34,6 @@ import {
 } from './select'
 
 import { createField } from './create-field'
-import { ObjectField } from './object-field'
-import { ArrayField } from './array-field'
 
 export interface InputFieldProps extends InputProps {
   type?: string
@@ -74,9 +72,13 @@ export const PasswordInputField = createField<PasswordInputProps>(
   forwardRef((props, ref) => <PasswordInput ref={ref} {...props} />)
 )
 
-export const TextareaField = createField<TextareaProps>(Textarea)
+export interface TextareaFieldProps extends TextareaProps {}
 
-export const SwitchField = createField<SwitchProps>(
+export const TextareaField = createField<TextareaFieldProps>(Textarea)
+
+export interface SwitchFieldProps extends SwitchProps {}
+
+export const SwitchField = createField<SwitchFieldProps>(
   forwardRef(({ type, value, ...rest }, ref) => {
     return <Switch isChecked={!!value} {...rest} ref={ref} />
   }),
@@ -105,7 +107,9 @@ export const SelectField = createField<SelectFieldProps>(
   }
 )
 
-export const CheckboxField = createField<CheckboxProps>(
+export type CheckboxFieldProps = CheckboxProps
+
+export const CheckboxField = createField<CheckboxFieldProps>(
   forwardRef(({ label, type, ...props }, ref) => {
     return (
       <Checkbox ref={ref} {...props}>
@@ -118,14 +122,21 @@ export const CheckboxField = createField<CheckboxProps>(
   }
 )
 
-export const RadioField = createField<RadioInputProps>(RadioInput, {
-  isControlled: true,
-})
+export type RadioFieldProps = RadioInputProps
 
-export const NativeSelectField = createField<NativeSelectProps>(NativeSelect, {
+export const RadioField = createField<RadioFieldProps>(RadioInput, {
   isControlled: true,
 })
 
+export type NativeSelectFieldProps = NativeSelectProps
+
+export const NativeSelectField = createField<NativeSelectFieldProps>(
+  NativeSelect,
+  {
+    isControlled: true,
+  }
+)
+
 export interface PinFieldProps extends Omit<UsePinInputProps, 'type'> {
   pinLength?: number
   pinType?: 'alphanumeric' | 'number'

package/src/form-context.tsx

@@ -11,7 +11,7 @@ import { BaseFieldProps, FieldProps } from './types'
 export type FormContextValue<
   TFieldValues extends FieldValues = FieldValues,
   TContext = any,
-  TSchema = any
+  TSchema = any,
 > = {
   fieldResolver?: FieldResolver
   schema?: TSchema
@@ -23,7 +23,7 @@ export type FormContextValue<
 export type FormProviderProps<
   TFieldValues extends FieldValues = FieldValues,
   TContext = any,
-  TSchema = any
+  TSchema = any,
 > = HookFormProviderProps<TFieldValues, TContext> & {
   fieldResolver?: FieldResolver
   schema?: TSchema
@@ -37,15 +37,11 @@ const FormContext = React.createContext<FormContextValue | null>(null)
 export const useFormContext = <
   TFieldValues extends FieldValues = FieldValues,
   TContext = any,
-  TSchema = any
+  TSchema = any,
 >() => {
   const context = React.useContext(FormContext)
   const hookContext = useHookFormContext()
 
-  if (!context) {
-    throw new Error('FormProvider must be used within a Form component')
-  }
-
   return {
     ...hookContext,
     ...context,
@@ -63,13 +59,13 @@ export const useFieldProps = <TFieldValues extends FieldValues = FieldValues>(
 export type UseFormReturn<
   TFieldValues extends FieldValues = FieldValues,
   TContext = any,
-  TSchema = any
+  TSchema = any,
 > = ReturnType<typeof useFormContext>
 
 export const FormProvider = <
   TFieldValues extends FieldValues = FieldValues,
   TContext = any,
-  TSchema = any
+  TSchema = any,
 >(
   props: FormProviderProps<TFieldValues, TContext, TSchema>
 ) => {

package/src/index.ts

@@ -1,35 +1,51 @@
-export {
-  DisplayField,
-  type DisplayFieldProps,
-  FormValue,
-} from './display-field'
-export { Field, type FieldRules, type Option } from './field'
-export { AutoFields, type FieldsProps } from './fields'
+// Exporting from './display-field'
+export { DisplayField } from './display-field'
+export type { DisplayFieldProps } from './display-field'
+export { FormValue } from './display-field'
+
+// Exporting from './field'
+export { Field } from './field'
+export type { FieldRules, Option } from './field'
+
+// Exporting from './fields'
+export { AutoFields } from './fields'
+export type { FieldsProps } from './fields'
+
+// Exporting from './fields-context'
 export { FieldsProvider, useField } from './fields-context'
-export { FormLayout, type FormLayoutProps } from './layout'
-export { SubmitButton, type SubmitButtonProps } from './submit-button'
+
+// Exporting from './layout'
+export { FormLayout } from './layout'
+export type { FormLayoutProps } from './layout'
+
+// Exporting from './submit-button'
+export { SubmitButton } from './submit-button'
+export type { SubmitButtonProps } from './submit-button'
+
+// Exporting from './array-field'
 export {
   ArrayField,
   ArrayFieldAddButton,
-  type ArrayFieldButtonProps,
   ArrayFieldContainer,
-  type ArrayFieldContainerProps,
-  type ArrayFieldProps,
   ArrayFieldRemoveButton,
   ArrayFieldRow,
   ArrayFieldRowContainer,
   ArrayFieldRowFields,
-  type ArrayFieldRowFieldsProps,
   ArrayFieldRows,
-  type ArrayFieldRowsProps,
 } from './array-field'
+
+export type {
+  ArrayFieldButtonProps,
+  ArrayFieldContainerProps,
+  ArrayFieldProps,
+  ArrayFieldRowFieldsProps,
+  ArrayFieldRowsProps,
+} from './array-field'
+
+// Exporting from './use-array-field'
 export {
-  type ArrayFieldOptions,
   ArrayFieldProvider,
   ArrayFieldRowProvider,
-  type UseArrayFieldReturn,
-  type UseArrayFieldRowProps,
-  type UseArrayFieldRowReturn,
   useArrayField,
   useArrayFieldAddButton,
   useArrayFieldContext,
@@ -37,65 +53,96 @@ export {
   useArrayFieldRow,
   useArrayFieldRowContext,
 } from './use-array-field'
-export { FormLegend, ObjectField, type ObjectFieldProps } from './object-field'
-export { DisplayIf, type DisplayIfProps } from './display-if'
-export {
-  FormStep,
-  type FormStepOptions,
-  type FormStepProps,
-  FormStepper,
-  type FormStepperProps,
-  NextButton,
-  type NextButtonProps,
-  PrevButton,
-  type StepFormProps,
-  type StepsOptions,
+
+export type {
+  ArrayFieldOptions,
+  UseArrayFieldReturn,
+  UseArrayFieldRowProps,
+  UseArrayFieldRowReturn,
+} from './use-array-field'
+
+// Exporting from './object-field'
+export { FormLegend, ObjectField } from './object-field'
+export type { ObjectFieldProps } from './object-field'
+
+// Exporting from './display-if'
+export { DisplayIf } from './display-if'
+export type { DisplayIfProps } from './display-if'
+
+// Exporting from './step-form'
+export { FormStep, FormStepper, NextButton, PrevButton } from './step-form'
+
+export type {
+  FormStepOptions,
+  FormStepProps,
+  FormStepperProps,
+  NextButtonProps,
+  StepFormProps,
+  StepsOptions,
 } from './step-form'
+
+// Exporting from './use-step-form'
 export {
-  type FormStepSubmitHandler,
-  type StepFormContext,
   StepFormProvider,
-  type StepFormRenderContext,
-  type StepState,
-  type UseFormStepProps,
-  type UseStepFormProps,
-  type UseStepFormReturn,
   useFormStep,
   useStepForm,
   useStepFormContext,
 } from './use-step-form'
-export {
-  type FieldResolver,
-  type GetFieldResolver,
-  type ObjectSchema,
-  objectFieldResolver,
+
+export type {
+  FormStepSubmitHandler,
+  StepFormContext,
+  StepFormRenderContext,
+  StepState,
+  UseFormStepProps,
+  UseStepFormProps,
+  UseStepFormReturn,
+} from './use-step-form'
+
+// Exporting from './field-resolver'
+export { objectFieldResolver } from './field-resolver'
+export type {
+  FieldResolver,
+  GetFieldResolver,
+  ObjectSchema,
 } from './field-resolver'
-export { WatchField, type WatchFieldProps } from './watch-field'
-export {
-  InputRightButton,
-  type InputRightButtonProps,
-} from './input-right-button'
+
+// Exporting from './watch-field'
+export { WatchField } from './watch-field'
+export type { WatchFieldProps } from './watch-field'
+
+// Exporting from './input-right-button'
+export { InputRightButton } from './input-right-button'
+export type { InputRightButtonProps } from './input-right-button'
+
+// Exporting from './select'
 export {
   NativeSelect,
-  type NativeSelectProps,
   Select,
   SelectButton,
-  type SelectButtonProps,
   SelectList,
-  type SelectListProps,
   SelectOption,
-  type SelectProps,
 } from './select'
-export { PasswordInput, type PasswordInputProps } from './password-input'
-export {
-  RadioInput,
-  type RadioInputProps,
-  type RadioOption,
-  type RadioOptions,
-} from './radio'
 
+export type {
+  NativeSelectProps,
+  SelectButtonProps,
+  SelectListProps,
+  SelectProps,
+} from './select'
+
+// Exporting from './password-input'
+export { PasswordInput } from './password-input'
+export type { PasswordInputProps } from './password-input'
+
+// Exporting from './radio'
+export { RadioInput } from './radio'
+export type { RadioInputProps, RadioOption, RadioOptions } from './radio'
+
+// Exporting BaseField from './base-field'
 export { BaseField } from './base-field'
 
+// Exporting from './default-fields'
 export {
   CheckboxField,
   InputField,
@@ -108,13 +155,22 @@ export {
   SwitchField,
   TextareaField,
   defaultFieldTypes,
-  type DefaultFields,
-  type InputFieldProps,
-  type NumberInputFieldProps,
-  type PinFieldProps,
-  type SelectFieldProps,
 } from './default-fields'
 
+export type {
+  DefaultFields,
+  InputFieldProps,
+  NumberInputFieldProps,
+  PinFieldProps,
+  SelectFieldProps,
+  SwitchFieldProps,
+  TextareaFieldProps,
+  CheckboxFieldProps,
+  NativeSelectFieldProps,
+  RadioFieldProps,
+} from './default-fields'
+
+// Exporting types from './types'
 export type {
   FieldProps,
   WithFields,
@@ -124,14 +180,25 @@ export type {
   WithStepFields,
 } from './types'
 
-export { createForm, type CreateFormProps, type FormType } from './create-form'
-export { createField, type CreateFieldOptions } from './create-field'
+// Exporting from './create-form'
+export { createForm } from './create-form'
+export type { CreateFormProps, FormType } from './create-form'
+
+// Exporting from './create-field'
+export { createField } from './create-field'
+export type { CreateFieldOptions } from './create-field'
 
+// Exporting from './form'
 export { Form as BaseForm } from './form'
 export type { FormProps, FormRenderContext, FormComponent } from './form'
 
+// Exporting from './form-context'
 export { FormProvider, useFormContext } from './form-context'
 
+export { createStepForm } from './create-step-form'
+export type { CreateStepFormProps } from './create-step-form'
+
+// Import and export Form and StepForm
 import { createForm } from './create-form'
 import { createStepForm } from './create-step-form'
 
@@ -142,8 +209,6 @@ import { createStepForm } from './create-step-form'
  */
 export const Form = createForm()
 
-export { createStepForm, type CreateStepFormProps } from './create-step-form'
-
 /**
  * Multi-step form component.
  *

package/src/select/select.tsx

@@ -109,7 +109,6 @@ export const SelectButton = forwardRef<SelectButtonProps, 'button'>(
       <Button
         {...buttonProps}
         sx={buttonStyles}
-        id={id || buttonProps.id}
         {...rest}
         onFocus={onFocus}
         onBlur={onBlur}