@saas-ui/forms 2.3.12 → 2.4.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @saas-ui/forms
 
+## 2.4.0
+
+### Minor Changes
+
+- 73d09d9: Added support for leftAddon and rightAddon on number input types
+- efca417: Improved ObjectSchema type definitions to be more strict and inherit correct field type props
+
+### Patch Changes
+
+- Updated dependencies [4a95712]
+- Updated dependencies [4a95712]
+  - @saas-ui/core@2.4.0
+
 ## 2.3.12
 
 ### Patch Changes

package/dist/index.d.ts

@@ -12,7 +12,7 @@ import * as _chakra_ui_system_dist_system_types from '@chakra-ui/system/dist/sys
 
 interface NumberInputOptions {
     /**
-     * Hide the stepper.
+     * Hide the stepper. This will be true when `rightAddon` is provided.
      */
     hideStepper?: boolean;
     /**
@@ -31,6 +31,14 @@ interface NumberInputOptions {
      * Props to pass to the NumberInputField component.
      */
     fieldProps?: NumberInputFieldProps$1;
+    /**
+     * Either `InputLeftAddon` or `InputLeftElement`
+     */
+    leftAddon?: React$1.ReactNode;
+    /**
+     * Either `InputRightAddon` or `InputRightElement`
+     */
+    rightAddon?: React$1.ReactNode;
 }
 interface NumberInputProps extends NumberInputProps$1, NumberInputOptions {
 }
@@ -521,11 +529,19 @@ type FieldResolver = {
     getNestedFields(name: string): BaseFieldProps[];
 };
 type GetFieldResolver<TSchema = any> = (schema: TSchema) => FieldResolver;
-interface SchemaField extends BaseFieldProps {
-    items?: SchemaField[];
-    properties?: Record<string, SchemaField>;
-}
-type ObjectSchema = Record<string, SchemaField>;
+type FieldTypes<FieldDefs = DefaultFields> = ValueOf<{
+    [K in keyof FieldDefs]: FieldDefs[K] extends React.FC<infer Props> ? {
+        type?: K;
+    } & Omit<Props, 'name'> : never;
+}>;
+type SchemaField<FieldDefs = DefaultFields> = FieldTypes<FieldDefs> | (Omit<ObjectFieldProps, 'name' | 'children'> & {
+    type: 'object';
+    properties?: Record<string, SchemaField<FieldDefs>>;
+}) | (Omit<ArrayFieldProps, 'name' | 'children'> & {
+    type: 'array';
+    items?: SchemaField<FieldDefs>;
+});
+type ObjectSchema<FieldDefs = DefaultFields> = Record<string, SchemaField<FieldDefs>>;
 declare const objectFieldResolver: GetFieldResolver<ObjectSchema>;
 
 interface DisplayIfProps<TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> {

package/dist/index.js

@@ -164,22 +164,31 @@ var import_react13 = require("@chakra-ui/react");
 var import_react2 = require("@chakra-ui/react");
 var import_core = require("@saas-ui/core");
 var import_jsx_runtime3 = require("react/jsx-runtime");
+var Input = (0, import_react2.forwardRef)((props, ref) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_react2.NumberInputField, { ref, ...props }));
+Input.displayName = "NumberInputField";
+Input.id = "Input";
 var NumberInput = (0, import_react2.forwardRef)((props, ref) => {
   const {
     hideStepper = false,
     incrementIcon = /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_core.ChevronUpIcon, {}),
     decrementIcon = /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_core.ChevronDownIcon, {}),
+    leftAddon,
+    rightAddon,
     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, { ...fieldProps }),
-    !hideStepper && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_react2.NumberInputStepper, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_react2.InputGroup, { children: [
+      leftAddon,
+      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Input, { ...fieldProps }),
+      rightAddon
+    ] }),
+    !hideStepper && !rightAddon ? /* @__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 })
-    ] })
+    ] }) : null
   ] });
 });
 NumberInput.displayName = "NumberInput";
@@ -1334,7 +1343,8 @@ NextButton.displayName = "NextButton";
 
 // src/field-resolver.ts
 var import_utils10 = require("@chakra-ui/utils");
-var mapFields = (schema) => schema && Object.entries(schema).map(([name, { items, label, title, ...field }]) => {
+var mapFields = (schema) => schema && Object.entries(schema).map(([name, props]) => {
+  const { items, label, title, ...field } = props;
   return {
     ...field,
     name,