@ultraviolet/form 4.0.0-beta.10 → 4.0.0-beta.12

package/dist/components/KeyValueField/index.cjs

@@ -5,7 +5,7 @@ const jsxRuntime = require("@emotion/react/jsx-runtime");
 const icons = require("@ultraviolet/icons");
 const ui = require("@ultraviolet/ui");
 const reactHookForm = require("react-hook-form");
-const index = require("../TextInputFieldV2/index.cjs");
+const index = require("../TextInputField/index.cjs");
 const KeyValueField = ({
   name,
   inputKey,

package/dist/components/KeyValueField/index.d.ts

@@ -1,15 +1,15 @@
 import { Button } from '@ultraviolet/ui';
 import type { ComponentProps } from 'react';
 import type { Control, FieldArrayPath, FieldValues } from 'react-hook-form';
-import { TextInputField as TextInputFieldV2 } from '../TextInputFieldV2';
+import { TextInputField } from '../TextInputField';
 type InputKeyProps = {
-    label: ComponentProps<typeof TextInputFieldV2>['label'];
-    required?: ComponentProps<typeof TextInputFieldV2>['required'];
-    regex?: ComponentProps<typeof TextInputFieldV2>['regex'];
+    label: ComponentProps<typeof TextInputField>['label'];
+    required?: ComponentProps<typeof TextInputField>['required'];
+    regex?: ComponentProps<typeof TextInputField>['regex'];
 };
 type InputValueProps = {
-    type?: ComponentProps<typeof TextInputFieldV2>['type'];
-    placeholder?: ComponentProps<typeof TextInputFieldV2>['placeholder'];
+    type?: ComponentProps<typeof TextInputField>['type'];
+    placeholder?: ComponentProps<typeof TextInputField>['placeholder'];
 } & InputKeyProps;
 type AddButtonProps = {
     name: ComponentProps<typeof Button>['children'];

package/dist/components/KeyValueField/index.js

@@ -3,7 +3,7 @@ import { jsxs, jsx } from "@emotion/react/jsx-runtime";
 import { DeleteIcon, PlusIcon } from "@ultraviolet/icons";
 import { Stack, Row, Button } from "@ultraviolet/ui";
 import { useFieldArray } from "react-hook-form";
-import { TextInputField } from "../TextInputFieldV2/index.js";
+import { TextInputField } from "../TextInputField/index.js";
 const KeyValueField = ({
   name,
   inputKey,

package/dist/components/NumberInputField/index.cjs

@@ -4,26 +4,22 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("@emotion/react/jsx-runtime");
 const ui = require("@ultraviolet/ui");
 const reactHookForm = require("react-hook-form");
+const isInteger = require("../../validators/isInteger.cjs");
 const index = require("../../providers/ErrorContext/index.cjs");
 const NumberInputField = ({
-  disabled,
-  maxValue,
-  minValue,
+  control,
+  max = Number.MAX_SAFE_INTEGER,
+  min = 0,
   name,
   onChange,
   onBlur,
-  onFocus,
-  onMaxCrossed,
-  onMinCrossed,
-  required,
-  size,
   step,
-  text,
-  className,
   label,
+  "aria-label": ariaLabel,
+  required,
   shouldUnregister = false,
   validate,
-  control
+  ...props
 }) => {
   const {
     getError
@@ -35,25 +31,29 @@ const NumberInputField = ({
     }
   } = reactHookForm.useController({
     name,
-    shouldUnregister,
     control,
+    shouldUnregister,
     rules: {
-      max: maxValue,
-      min: minValue,
+      max,
+      min,
       required,
-      validate
+      validate: {
+        ...validate,
+        isInteger: isInteger.isInteger(step)
+      }
     }
   });
-  return /* @__PURE__ */ jsxRuntime.jsx(ui.NumberInput, { name: field.name, value: field.value, disabled, onBlur: (event) => {
+  return /* @__PURE__ */ jsxRuntime.jsx(ui.NumberInput, { ...props, name: field.name, value: field.value, onBlur: (event) => {
     field.onBlur();
     onBlur?.(event);
-  }, onChange: (event) => {
-    field.onChange(event ?? null);
-    onChange?.(event);
-  }, onFocus, maxValue, minValue, onMinCrossed, onMaxCrossed, size, step, text, className, label, error: getError({
-    label: label ?? "",
-    max: maxValue,
-    min: minValue
-  }, error) });
+  }, onChange: (newValue) => {
+    field.onChange(newValue);
+    onChange?.(newValue);
+  }, max, min, step, label, error: getError({
+    label: label ?? ariaLabel ?? name,
+    max,
+    min,
+    isInteger: step
+  }, error), "aria-label": ariaLabel, required });
 };
 exports.NumberInputField = NumberInputField;

package/dist/components/NumberInputField/index.d.ts

@@ -1,13 +1,7 @@
 import { NumberInput } from '@ultraviolet/ui';
-import type { ComponentProps, FocusEventHandler } from 'react';
+import type { ComponentProps } from 'react';
 import type { FieldPath, FieldValues } from 'react-hook-form';
 import type { BaseFieldProps } from '../../types';
-type NumberInputValueFieldProps<TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>> = BaseFieldProps<TFieldValues, TFieldName> & Partial<Pick<ComponentProps<typeof NumberInput>, 'disabled' | 'maxValue' | 'minValue' | 'onMaxCrossed' | 'onMinCrossed' | 'size' | 'step' | 'text' | 'className'>> & {
-    onBlur?: FocusEventHandler<HTMLInputElement>;
-    onFocus?: FocusEventHandler<HTMLInputElement>;
-};
-/**
- * @deprecated This component is deprecated, use `NumberInputFieldV2` instead.
- */
-export declare const NumberInputField: <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>>({ disabled, maxValue, minValue, name, onChange, onBlur, onFocus, onMaxCrossed, onMinCrossed, required, size, step, text, className, label, shouldUnregister, validate, control, }: NumberInputValueFieldProps<TFieldValues, TFieldName>) => import("@emotion/react/jsx-runtime").JSX.Element;
+type NumberInputProps<TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>> = BaseFieldProps<TFieldValues, TFieldName> & Omit<ComponentProps<typeof NumberInput>, 'onChange'>;
+export declare const NumberInputField: <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>>({ control, max, min, name, onChange, onBlur, step, label, "aria-label": ariaLabel, required, shouldUnregister, validate, ...props }: NumberInputProps<TFieldValues, TFieldName>) => import("@emotion/react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/NumberInputField/index.js

@@ -2,26 +2,22 @@
 import { jsx } from "@emotion/react/jsx-runtime";
 import { NumberInput } from "@ultraviolet/ui";
 import { useController } from "react-hook-form";
+import { isInteger } from "../../validators/isInteger.js";
 import { useErrors } from "../../providers/ErrorContext/index.js";
 const NumberInputField = ({
-  disabled,
-  maxValue,
-  minValue,
+  control,
+  max = Number.MAX_SAFE_INTEGER,
+  min = 0,
   name,
   onChange,
   onBlur,
-  onFocus,
-  onMaxCrossed,
-  onMinCrossed,
-  required,
-  size,
   step,
-  text,
-  className,
   label,
+  "aria-label": ariaLabel,
+  required,
   shouldUnregister = false,
   validate,
-  control
+  ...props
 }) => {
   const {
     getError
@@ -33,26 +29,30 @@ const NumberInputField = ({
     }
   } = useController({
     name,
-    shouldUnregister,
     control,
+    shouldUnregister,
     rules: {
-      max: maxValue,
-      min: minValue,
+      max,
+      min,
       required,
-      validate
+      validate: {
+        ...validate,
+        isInteger: isInteger(step)
+      }
     }
   });
-  return /* @__PURE__ */ jsx(NumberInput, { name: field.name, value: field.value, disabled, onBlur: (event) => {
+  return /* @__PURE__ */ jsx(NumberInput, { ...props, name: field.name, value: field.value, onBlur: (event) => {
     field.onBlur();
     onBlur?.(event);
-  }, onChange: (event) => {
-    field.onChange(event ?? null);
-    onChange?.(event);
-  }, onFocus, maxValue, minValue, onMinCrossed, onMaxCrossed, size, step, text, className, label, error: getError({
-    label: label ?? "",
-    max: maxValue,
-    min: minValue
-  }, error) });
+  }, onChange: (newValue) => {
+    field.onChange(newValue);
+    onChange?.(newValue);
+  }, max, min, step, label, error: getError({
+    label: label ?? ariaLabel ?? name,
+    max,
+    min,
+    isInteger: step
+  }, error), "aria-label": ariaLabel, required });
 };
 export {
   NumberInputField

package/dist/components/SelectInputField/index.cjs

@@ -6,71 +6,19 @@ const ui = require("@ultraviolet/ui");
 const react = require("react");
 const reactHookForm = require("react-hook-form");
 const index = require("../../providers/ErrorContext/index.cjs");
-const identity = (x) => x;
 const SelectInputField = ({
-  animation,
-  animationDuration,
-  animationOnChange,
-  children,
-  className,
-  disabled,
-  // error: errorProp,
-  format: formatProp = identity,
-  // formatOnBlur,
-  id,
-  inputId,
-  isClearable,
-  isLoading,
-  isSearchable,
   label = "",
-  maxLength,
-  menuPortalTarget,
-  minLength,
-  multiple,
-  name,
   onBlur,
-  onChange,
-  onFocus,
-  options: optionsProp,
-  parse: parseProp = identity,
-  placeholder,
-  readOnly,
   required,
-  noTopLabel,
-  emptyState,
-  customStyle,
+  name,
+  "aria-label": ariaLabel,
   shouldUnregister = false,
-  "data-testid": dataTestId,
-  validate
+  control,
+  validate,
+  onChange,
+  multiselect,
+  ...props
 }) => {
-  const options = react.useMemo(() => optionsProp || react.Children.toArray(children).flat().filter(Boolean).map(({
-    props: {
-      children: labelChild,
-      ...option
-    }
-  }) => ({
-    ...option,
-    label: labelChild
-  })), [optionsProp, children]);
-  const parse = react.useMemo(() => multiple ? parseProp : (option) => parseProp(option?.value ?? null, name), [multiple, parseProp, name]);
-  const format = react.useCallback((val) => {
-    if (multiple) return formatProp(val, name);
-    const find = (opts, valueToFind) => opts?.find((option) => option.value === valueToFind);
-    let selected = "";
-    if (val && options) {
-      selected = find(options, val);
-      if (!selected) {
-        selected = options.map((curr) => find(curr.options, val)).filter(identity);
-        if (Array.isArray(selected) && selected.length === 0) {
-          selected = "";
-        }
-      }
-    }
-    return formatProp(selected, name);
-  }, [formatProp, multiple, name, options]);
-  const {
-    getError
-  } = index.useErrors();
   const {
     field,
     fieldState: {
@@ -78,25 +26,25 @@ const SelectInputField = ({
     }
   } = reactHookForm.useController({
     name,
+    control,
     shouldUnregister,
     rules: {
       required,
-      minLength: minLength || required ? 1 : void 0,
-      maxLength,
       validate
     }
   });
-  return /* @__PURE__ */ jsxRuntime.jsx(ui.SelectInput, { name: field.name, animation, animationDuration, animationOnChange, className, disabled, error: getError({
-    label,
-    minLength,
-    maxLength
-  }, error), id, inputId, isClearable, isLoading, isMulti: multiple, customStyle, isSearchable, menuPortalTarget, onBlur: (event) => {
+  const {
+    getError
+  } = index.useErrors();
+  const handleChange = react.useCallback((value) => {
+    onChange?.(value);
+    field.onChange(value);
+  }, [onChange, field]);
+  return /* @__PURE__ */ jsxRuntime.jsx(ui.SelectInput, { name: field.name, multiselect, required, onBlur: (event) => {
     field.onBlur();
     onBlur?.(event);
-  }, onChange: (event, action) => {
-    field.onChange(parse(event));
-    onChange?.(event, action);
-  }, onFocus, options, placeholder, readOnly, noTopLabel, required, value: format(field.value), emptyState, "data-testid": dataTestId, children });
+  }, value: field.value, error: getError({
+    label: label ?? ariaLabel ?? name
+  }, error), label, "aria-label": ariaLabel, onChange: handleChange, ...props });
 };
-SelectInputField.Option = ui.SelectInput.Option;
 exports.SelectInputField = SelectInputField;

package/dist/components/SelectInputField/index.d.ts

@@ -1,85 +1,7 @@
-import type { CSSObject, Theme, css } from '@emotion/react';
 import { SelectInput } from '@ultraviolet/ui';
-import type { ComponentProps, ForwardedRef, ReactNode } from 'react';
+import { type ComponentProps } from 'react';
 import type { FieldPath, FieldValues } from 'react-hook-form';
-import type { CommonProps, GroupBase, OptionProps, Props } from 'react-select';
-import type Select from 'react-select';
 import type { BaseFieldProps } from '../../types';
-export type SelectInputType = typeof SelectInput;
-type SelectOption = {
-    value: string;
-    label: ReactNode;
-    disabled?: boolean;
-    description?: string;
-    inlineDescription?: string;
-};
-type WithSelectProps = {
-    selectProps: SelectProps;
-};
-type SelectStyleProps = {
-    error?: string;
-    /**
-     * Custom styles of the SelectInput. See [React select documentation](https://react-select.com/styles)
-     */
-    customStyle: (state: SelectProps & WithSelectProps) => Record<string, CSSObject>;
-    animation?: string;
-    /**
-     * Time of the animation
-     */
-    animationDuration?: number;
-    /**
-     * Show/hide the label inside the component
-     */
-    noTopLabel?: boolean;
-    theme: Theme;
-};
-type StyledContainerProps = {
-    isDisabled?: boolean;
-    additionalStyles?: Parameters<typeof css>[0];
-};
-type SelectProps = StyledContainerProps & Omit<Props<SelectOption>, 'value'> & CommonProps<SelectOption, boolean, GroupBase<SelectOption>> & {
-    value?: string | SelectOption;
-    checked?: boolean;
-    error?: string;
-    labelId?: string;
-    required?: boolean;
-    time?: boolean;
-};
-type StateManagedSelect = typeof Select;
-type SelectInputProps = Partial<SelectProps & SelectStyleProps & Pick<ComponentProps<typeof SelectInput>, 'data-testid'> & {
-    /**
-     * Name of the animation
-     */
-    animation?: string;
-    /**
-     * Play the animation when the value change
-     */
-    animationOnChange?: boolean;
-    disabled?: boolean;
-    readOnly?: boolean;
-    innerRef?: ForwardedRef<StateManagedSelect>;
-    /**
-     * Custom components of the SelectInput. See [React select documentation](https://react-select.com/components)
-     */
-    customComponents?: SelectProps['components'];
-    children: ReactNode;
-    emptyState?: ComponentProps<Select>['noOptionsMessage'];
-}>;
-/**
- * @deprecated This component is deprecated, please use `SelectInputFieldV2` instead
- */
-export type SelectInputFieldProps<TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>> = Omit<BaseFieldProps<TFieldValues, TFieldName>, 'onChange'> & Partial<Pick<SelectInputProps, 'animation' | 'animationDuration' | 'animationOnChange' | 'children' | 'className' | 'disabled' | 'error' | 'id' | 'inputId' | 'isClearable' | 'isLoading' | 'isSearchable' | 'menuPortalTarget' | 'onBlur' | 'onChange' | 'onFocus' | 'options' | 'placeholder' | 'readOnly' | 'required' | 'value' | 'noTopLabel' | 'emptyState' | 'customStyle' | 'data-testid'>> & {
-    multiple?: boolean;
-    parse?: (value: unknown, name?: string) => unknown;
-    format?: (value: unknown, name: string) => unknown;
-    maxLength?: number;
-    minLength?: number;
-};
-/**
- * @deprecated use SelectInputFieldV2 component instead
- */
-export declare const SelectInputField: {
-    <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>>({ animation, animationDuration, animationOnChange, children, className, disabled, format: formatProp, id, inputId, isClearable, isLoading, isSearchable, label, maxLength, menuPortalTarget, minLength, multiple, name, onBlur, onChange, onFocus, options: optionsProp, parse: parseProp, placeholder, readOnly, required, noTopLabel, emptyState, customStyle, shouldUnregister, "data-testid": dataTestId, validate, }: SelectInputFieldProps<TFieldValues, TFieldName>): import("@emotion/react/jsx-runtime").JSX.Element;
-    Option: (props: Partial<OptionProps<import("@ultraviolet/ui").SelectOption> & import("@ultraviolet/ui").SelectOption>) => import("react").JSX.Element;
-};
+type SelectInputFieldProps<TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>> = BaseFieldProps<TFieldValues, TFieldName> & Omit<ComponentProps<typeof SelectInput>, 'value' | 'onChange'>;
+export declare const SelectInputField: <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>>({ label, onBlur, required, name, "aria-label": ariaLabel, shouldUnregister, control, validate, onChange, multiselect, ...props }: SelectInputFieldProps<TFieldValues, TFieldName>) => import("@emotion/react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/SelectInputField/index.js

@@ -1,74 +1,22 @@
 "use client";
 import { jsx } from "@emotion/react/jsx-runtime";
 import { SelectInput } from "@ultraviolet/ui";
-import { useMemo, Children, useCallback } from "react";
+import { useCallback } from "react";
 import { useController } from "react-hook-form";
 import { useErrors } from "../../providers/ErrorContext/index.js";
-const identity = (x) => x;
 const SelectInputField = ({
-  animation,
-  animationDuration,
-  animationOnChange,
-  children,
-  className,
-  disabled,
-  // error: errorProp,
-  format: formatProp = identity,
-  // formatOnBlur,
-  id,
-  inputId,
-  isClearable,
-  isLoading,
-  isSearchable,
   label = "",
-  maxLength,
-  menuPortalTarget,
-  minLength,
-  multiple,
-  name,
   onBlur,
-  onChange,
-  onFocus,
-  options: optionsProp,
-  parse: parseProp = identity,
-  placeholder,
-  readOnly,
   required,
-  noTopLabel,
-  emptyState,
-  customStyle,
+  name,
+  "aria-label": ariaLabel,
   shouldUnregister = false,
-  "data-testid": dataTestId,
-  validate
+  control,
+  validate,
+  onChange,
+  multiselect,
+  ...props
 }) => {
-  const options = useMemo(() => optionsProp || Children.toArray(children).flat().filter(Boolean).map(({
-    props: {
-      children: labelChild,
-      ...option
-    }
-  }) => ({
-    ...option,
-    label: labelChild
-  })), [optionsProp, children]);
-  const parse = useMemo(() => multiple ? parseProp : (option) => parseProp(option?.value ?? null, name), [multiple, parseProp, name]);
-  const format = useCallback((val) => {
-    if (multiple) return formatProp(val, name);
-    const find = (opts, valueToFind) => opts?.find((option) => option.value === valueToFind);
-    let selected = "";
-    if (val && options) {
-      selected = find(options, val);
-      if (!selected) {
-        selected = options.map((curr) => find(curr.options, val)).filter(identity);
-        if (Array.isArray(selected) && selected.length === 0) {
-          selected = "";
-        }
-      }
-    }
-    return formatProp(selected, name);
-  }, [formatProp, multiple, name, options]);
-  const {
-    getError
-  } = useErrors();
   const {
     field,
     fieldState: {
@@ -76,27 +24,27 @@ const SelectInputField = ({
     }
   } = useController({
     name,
+    control,
     shouldUnregister,
     rules: {
       required,
-      minLength: minLength || required ? 1 : void 0,
-      maxLength,
       validate
     }
   });
-  return /* @__PURE__ */ jsx(SelectInput, { name: field.name, animation, animationDuration, animationOnChange, className, disabled, error: getError({
-    label,
-    minLength,
-    maxLength
-  }, error), id, inputId, isClearable, isLoading, isMulti: multiple, customStyle, isSearchable, menuPortalTarget, onBlur: (event) => {
+  const {
+    getError
+  } = useErrors();
+  const handleChange = useCallback((value) => {
+    onChange?.(value);
+    field.onChange(value);
+  }, [onChange, field]);
+  return /* @__PURE__ */ jsx(SelectInput, { name: field.name, multiselect, required, onBlur: (event) => {
     field.onBlur();
     onBlur?.(event);
-  }, onChange: (event, action) => {
-    field.onChange(parse(event));
-    onChange?.(event, action);
-  }, onFocus, options, placeholder, readOnly, noTopLabel, required, value: format(field.value), emptyState, "data-testid": dataTestId, children });
+  }, value: field.value, error: getError({
+    label: label ?? ariaLabel ?? name
+  }, error), label, "aria-label": ariaLabel, onChange: handleChange, ...props });
 };
-SelectInputField.Option = SelectInput.Option;
 export {
   SelectInputField
 };

package/dist/components/SelectableCardOptionGroupField/index.d.ts

@@ -11,9 +11,9 @@ export declare const SelectableCardOptionGroupField: {
         value: string;
         className?: string;
         children?: import("react").ReactNode;
-        options: ComponentProps<typeof import("@ultraviolet/ui").SelectInputV2>["options"];
-        optionValue?: ComponentProps<typeof import("@ultraviolet/ui").SelectInputV2>["value"];
-        optionPlaceholder?: ComponentProps<typeof import("@ultraviolet/ui").SelectInputV2>["placeholder"];
+        options: ComponentProps<typeof import("@ultraviolet/ui").SelectInput>["options"];
+        optionValue?: ComponentProps<typeof import("@ultraviolet/ui").SelectInput>["value"];
+        optionPlaceholder?: ComponentProps<typeof import("@ultraviolet/ui").SelectInput>["placeholder"];
         image?: import("react").ReactNode;
         labelDescription?: ComponentProps<typeof import("@ultraviolet/ui").Label>["labelDescription"];
         id?: string;