@saas-ui/forms 2.5.1 → 2.5.2

package/src/default-fields.tsx

@@ -31,11 +31,9 @@ import {
   NativeSelectProps,
   SelectButtonProps,
   SelectListProps,
-  SelectOption,
 } from './select'
 
 import { createField } from './create-field'
-import { FieldOption, FieldOptions } from './types'
 
 export interface InputFieldProps extends InputProps {
   type?: string

package/src/field.tsx

@@ -5,6 +5,7 @@ import { FocusableElement } from '@chakra-ui/utils'
 import { useField } from './fields-context'
 import { FieldProps } from './types'
 import { useFieldProps } from './form-context'
+import { InputField } from './default-fields'
 
 export interface Option {
   value: string
@@ -36,7 +37,7 @@ export const Field = React.forwardRef(
   ) => {
     const { type = defaultInputType, name } = props
     const overrides = useFieldProps(name)
-    const InputComponent = useField(overrides?.type || type)
+    const InputComponent = useField(overrides?.type || type, InputField)
 
     return <InputComponent ref={ref} {...props} {...overrides} />
   }

package/src/fields-context.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { defaultFieldTypes, InputField } from './default-fields'
-import { GetBaseField } from './types'
+import type { GetBaseField } from './types'
 
 export interface FieldsContextValue {
   fields: Record<string, React.FC<any>>
@@ -10,14 +10,11 @@ export interface FieldsContextValue {
 const FieldsContext = React.createContext<FieldsContextValue | null>(null)
 
 export const FieldsProvider: React.FC<{
-  value: Partial<FieldsContextValue>
+  value: FieldsContextValue
   children: React.ReactNode
 }> = (props) => {
-  const fields = { ...defaultFieldTypes, ...props.value.fields }
   return (
-    <FieldsContext.Provider
-      value={{ fields, getBaseField: props.value.getBaseField }}
-    >
+    <FieldsContext.Provider value={props.value}>
       {props.children}
     </FieldsContext.Provider>
   )
@@ -27,7 +24,10 @@ export const useFieldsContext = () => {
   return React.useContext(FieldsContext)
 }
 
-export const useField = (type: string): React.FC<any> => {
+export const useField = (
+  type: string,
+  fallback: React.FC<any>
+): React.FC<any> => {
   const context = React.useContext(FieldsContext)
-  return context?.fields?.[type] || InputField
+  return context?.fields?.[type] || fallback
 }

package/src/form-context.tsx

@@ -6,7 +6,7 @@ import {
   FieldValues,
 } from 'react-hook-form'
 import { FieldResolver } from './field-resolver'
-import { BaseFieldProps, FieldProps } from './types'
+import type { BaseFieldProps } from './types'
 
 export type FormContextValue<
   TFieldValues extends FieldValues = FieldValues,

package/src/types.ts

@@ -1,13 +1,13 @@
-import { FormControlProps } from '@chakra-ui/react'
-import { MaybeRenderProp } from '@chakra-ui/react-utils'
-import { FieldPath, FieldValues, RegisterOptions } from 'react-hook-form'
-import { DefaultFields } from './default-fields'
-import { FormProps, FormRenderContext } from './form'
-import { SubmitButtonProps } from './submit-button'
-import { ObjectFieldProps } from './object-field'
-import { ArrayFieldProps } from './array-field'
-import { StepFormRenderContext, UseStepFormProps } from './use-step-form'
-import { StepsOptions } from './step-form'
+import type { FormControlProps } from '@chakra-ui/react'
+import type { MaybeRenderProp } from '@chakra-ui/react-utils'
+import type { FieldPath, FieldValues, RegisterOptions } from 'react-hook-form'
+import type { DefaultFields } from './default-fields'
+import type { FormProps, FormRenderContext } from './form'
+import type { SubmitButtonProps } from './submit-button'
+import type { ObjectFieldProps } from './object-field'
+import type { ArrayFieldProps } from './array-field'
+import type { StepFormRenderContext, UseStepFormProps } from './use-step-form'
+import type { StepsOptions } from './step-form'
 
 export type FieldOption = { label?: string; value: string }
 export type FieldOptions<TOption extends FieldOption = FieldOption> =