@povio/ui 3.3.0-rc.4 → 3.4.0-rc.1

package/dist/components/inputs/Input/TextInput/TextInput.js

@@ -1,5 +1,6 @@
 import { UIOverrides } from "../../../../config/uiOverrides.context.js";
 import { UIConfig } from "../../../../config/uiConfig.context.js";
+import { FieldController } from "../../shared/form.binding.js";
 import { FormField } from "../../FormField/FormField.js";
 import { inputBaseDefinition } from "../../shared/input.cva.js";
 import { TooltipWrapper } from "../../shared/TooltipWrapper.js";
@@ -13,7 +14,6 @@ import { useEffect, useRef, useState } from "react";
 import { Input } from "react-aria-components";
 import { useFocusVisible, useTextField } from "react-aria";
 import { mergeRefs } from "@react-aria/utils";
-import { Controller } from "react-hook-form";
 //#region src/components/inputs/Input/TextInput/TextInput.tsx
 var TextInputBase = (props) => {
 	const $ = c(84);
@@ -377,7 +377,7 @@ var TextInputInner = (t0) => {
 	return t3;
 };
 var TextInput = (t0) => {
-	const $ = c(21);
+	const $ = c(20);
 	let props;
 	let renderStaticInput;
 	if ($[0] !== t0) {
@@ -389,72 +389,70 @@ var TextInput = (t0) => {
 		props = $[1];
 		renderStaticInput = $[2];
 	}
-	if ("formControl" in props && props.formControl) {
-		let formControl;
+	if ("field" in props && props.field) {
+		let field;
 		let innerProps;
 		let ref;
 		if ($[3] !== props) {
-			({formControl, ref, ...innerProps} = props);
+			({field, ref, ...innerProps} = props);
 			$[3] = props;
-			$[4] = formControl;
+			$[4] = field;
 			$[5] = innerProps;
 			$[6] = ref;
 		} else {
-			formControl = $[4];
+			field = $[4];
 			innerProps = $[5];
 			ref = $[6];
 		}
-		const controlWithOptions = formControl.control;
 		let t1;
-		if ($[7] !== controlWithOptions._options?.disabled || $[8] !== innerProps || $[9] !== props.error || $[10] !== props.isDisabled || $[11] !== ref || $[12] !== renderStaticInput) {
+		if ($[7] !== innerProps || $[8] !== props.error || $[9] !== props.isDisabled || $[10] !== ref || $[11] !== renderStaticInput) {
 			t1 = (t2) => {
-				const { field, fieldState: t3 } = t2;
+				const { field: field_0, fieldState: t3 } = t2;
 				const { error, isDirty } = t3;
 				return /* @__PURE__ */ jsx(TextInputInner, {
 					...innerProps,
-					ref: mergeRefs(ref, field.ref),
-					value: field.value,
-					onChange: field.onChange,
-					onBlur: field.onBlur,
+					ref: mergeRefs(ref, field_0.ref),
+					value: field_0.value,
+					onChange: field_0.onChange,
+					onBlur: field_0.onBlur,
 					isDirty,
-					isDisabled: field.disabled || props.isDisabled,
-					isFormControlDisabled: !!controlWithOptions._options?.disabled,
+					isDisabled: field_0.disabled || props.isDisabled,
+					isFormControlDisabled: field_0.disabled,
 					error: props.error ?? error?.message,
 					renderStaticInput
 				});
 			};
-			$[7] = controlWithOptions._options?.disabled;
-			$[8] = innerProps;
-			$[9] = props.error;
-			$[10] = props.isDisabled;
-			$[11] = ref;
-			$[12] = renderStaticInput;
-			$[13] = t1;
-		} else t1 = $[13];
+			$[7] = innerProps;
+			$[8] = props.error;
+			$[9] = props.isDisabled;
+			$[10] = ref;
+			$[11] = renderStaticInput;
+			$[12] = t1;
+		} else t1 = $[12];
 		let t2;
-		if ($[14] !== formControl.control || $[15] !== formControl.name || $[16] !== t1) {
-			t2 = /* @__PURE__ */ jsx(Controller, {
-				control: formControl.control,
-				name: formControl.name,
+		if ($[13] !== field.form || $[14] !== field.name || $[15] !== t1) {
+			t2 = /* @__PURE__ */ jsx(FieldController, {
+				control: field.form,
+				name: field.name,
 				render: t1
 			});
-			$[14] = formControl.control;
-			$[15] = formControl.name;
-			$[16] = t1;
-			$[17] = t2;
-		} else t2 = $[17];
+			$[13] = field.form;
+			$[14] = field.name;
+			$[15] = t1;
+			$[16] = t2;
+		} else t2 = $[16];
 		return t2;
 	}
 	let t1;
-	if ($[18] !== props || $[19] !== renderStaticInput) {
+	if ($[17] !== props || $[18] !== renderStaticInput) {
 		t1 = /* @__PURE__ */ jsx(TextInputInner, {
 			...props,
 			renderStaticInput
 		});
-		$[18] = props;
-		$[19] = renderStaticInput;
-		$[20] = t1;
-	} else t1 = $[20];
+		$[17] = props;
+		$[18] = renderStaticInput;
+		$[19] = t1;
+	} else t1 = $[19];
 	return t1;
 };
 function _temp(input) {

package/dist/components/inputs/Inputs/Form.d.ts

@@ -1,8 +1,8 @@
 import { ReactNode } from 'react';
-import { SubmitErrorHandler, SubmitHandler, UseFormReturn } from 'react-hook-form';
 import { z } from 'zod';
 import { InputComponentProps, InputDefBaseProps } from './InputItem';
 import { AllowedComponentType, DefaultComponentType } from '../../../helpers/dynamicInputs';
+import { FormSubmitErrorHandler, FormSubmitHandler, UIForm } from '../../../hooks/useForm';
 type Capitalize<T extends string> = T extends `${infer First}${infer Rest}` ? `${Uppercase<First>}${Rest}` : T;
 type FieldProps<TProps = {}> = {
     label: string;
@@ -15,10 +15,10 @@ type FieldComponents<TSchema extends z.ZodObject<any>> = {
     [K in keyof Required<z.infer<TSchema>> as Capitalize<K & string>]: <T extends AllowedComponentType<TSchema["shape"][K]> | undefined = undefined>(props: FieldComponentProps<TSchema, K, T>) => ReactNode;
 };
 interface FormProps<TSchema extends z.ZodObject<any>, TSchemaType extends Record<string, any> = z.infer<TSchema>> {
-    form: UseFormReturn<TSchemaType>;
+    form: UIForm<TSchemaType>;
     schema: TSchema;
-    onSubmit: SubmitHandler<TSchemaType>;
-    onError?: SubmitErrorHandler<TSchemaType>;
+    onSubmit: FormSubmitHandler<TSchemaType>;
+    onError?: FormSubmitErrorHandler<TSchemaType>;
     className?: string;
     children: (components: FieldComponents<TSchema>) => ReactNode;
 }

package/dist/components/inputs/Inputs/InputItem.d.ts

@@ -1,34 +1,34 @@
 import { ComponentProps, JSXElementConstructor, ReactElement, ReactNode } from 'react';
-import { Control, UseFormReturn } from 'react-hook-form';
 import { z } from 'zod';
 import { Autocomplete } from '../Selection/Autocomplete/Autocomplete';
 import { Select } from '../Selection/Select/Select';
 import { HasRequiredProperty } from '../../../types/common';
+import { UIForm } from '../../../hooks/useForm';
 declare const componentRegistry: {
-    readonly toggle: <TFieldValues extends import('react-hook-form').FieldValues>(props: import('../Toggle/Toggle').ControlledToggleProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
-    readonly checkbox: <TFieldValues extends import('react-hook-form').FieldValues>(props: import('../Checkbox/Checkbox').ControlledCheckboxProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
-    readonly checkboxGroup: <TFieldValues extends import('react-hook-form').FieldValues>(props: import('../Checkbox/CheckboxGroup').ControlledCheckboxGroupProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
-    readonly numberInput: <TFieldValues extends import('react-hook-form').FieldValues>({ renderStaticInput, ...props }: import('../Input/NumberInput/NumberInput').ControlledNumberInputProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
-    readonly numberRangeInput: <TFieldValues extends import('react-hook-form').FieldValues>({ renderStaticInput, ...props }: import('../Input/NumberRangeInput/NumberRangeInput').ControlledNumberRangeInputProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
-    readonly slider: <TFieldValues extends import('react-hook-form').FieldValues, IsRange extends boolean = false>(props: import('../Slider/Slider').ControlledSliderProps<TFieldValues, IsRange>) => import("react/jsx-runtime").JSX.Element;
-    readonly textInput: <TFieldValues extends import('react-hook-form').FieldValues>({ renderStaticInput, ...props }: import('../Input/TextInput/TextInput').ControlledTextInputProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
-    readonly passwordInput: <TFieldValues extends import('react-hook-form').FieldValues>(props: import('../Input/PasswordInput/PasswordInput').ControlledPasswordInputProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
-    readonly textArea: <TFieldValues extends import('react-hook-form').FieldValues>(props: import('../Input/TextArea/TextArea').ControlledTextAreaProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
+    readonly toggle: <TFieldValues extends import('../shared/form.binding').FieldValues>(props: import('../Toggle/Toggle').ControlledToggleProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
+    readonly checkbox: <TFieldValues extends import('../shared/form.binding').FieldValues>(props: import('../Checkbox/Checkbox').ControlledCheckboxProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
+    readonly checkboxGroup: <TFieldValues extends import('../shared/form.binding').FieldValues>(props: import('../Checkbox/CheckboxGroup').ControlledCheckboxGroupProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
+    readonly numberInput: <TFieldValues extends import('../shared/form.binding').FieldValues>({ renderStaticInput, ...props }: import('../Input/NumberInput/NumberInput').ControlledNumberInputProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
+    readonly numberRangeInput: <TFieldValues extends import('../shared/form.binding').FieldValues>({ renderStaticInput, ...props }: import('../Input/NumberRangeInput/NumberRangeInput').ControlledNumberRangeInputProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
+    readonly slider: <TFieldValues extends import('../shared/form.binding').FieldValues, IsRange extends boolean = false>(props: import('../Slider/Slider').ControlledSliderProps<TFieldValues, IsRange>) => import("react/jsx-runtime").JSX.Element;
+    readonly textInput: <TFieldValues extends import('../shared/form.binding').FieldValues>({ renderStaticInput, ...props }: import('../Input/TextInput/TextInput').ControlledTextInputProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
+    readonly passwordInput: <TFieldValues extends import('../shared/form.binding').FieldValues>(props: import('../Input/PasswordInput/PasswordInput').ControlledPasswordInputProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
+    readonly textArea: <TFieldValues extends import('../shared/form.binding').FieldValues>(props: import('../Input/TextArea/TextArea').ControlledTextAreaProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
     readonly select: typeof Select;
-    readonly querySelect: <TFieldValues extends import('react-hook-form').FieldValues, TQueryFn extends import('../Selection/shared/querySelect.utils').QueryFn, TKey extends import('react-aria').Key = import('react-aria').Key, TInitialSelectItem = import('../../..').DefaultInitialSelectItem<TKey>>(props: import('../Selection/Select/QuerySelect').QuerySelectProps<TFieldValues, TQueryFn, TKey, TInitialSelectItem>) => import("react/jsx-runtime").JSX.Element;
+    readonly querySelect: <TFieldValues extends import('../shared/form.binding').FieldValues, TQueryFn extends import('../Selection/shared/querySelect.utils').QueryFn, TKey extends import('react-aria').Key = import('react-aria').Key, TInitialSelectItem = import('../../..').DefaultInitialSelectItem<TKey>>(props: import('../Selection/Select/QuerySelect').QuerySelectProps<TFieldValues, TQueryFn, TKey, TInitialSelectItem>) => import("react/jsx-runtime").JSX.Element;
     readonly autocomplete: typeof Autocomplete;
-    readonly queryAutocomplete: <TFieldValues extends import('react-hook-form').FieldValues, TSelectItem extends import('../../..').SelectItem<any>, TQueryFn extends import('../Selection/Autocomplete/queryAutocomplete.types').QueryFn>(props: import('../Selection/Autocomplete/queryAutocomplete.types').QueryAutocompleteProps<TFieldValues, TSelectItem, TQueryFn>) => import("react/jsx-runtime").JSX.Element;
-    readonly segment: <TFieldValues extends import('react-hook-form').FieldValues, TKey extends import('react-aria').Key = import('react-aria').Key>(props: import('../../..').ControlledSegmentProps<TFieldValues, TKey>) => import("react/jsx-runtime").JSX.Element;
-    readonly datePicker: <TFieldValues extends import('react-hook-form').FieldValues>({ fullIso, granularity, minValue, maxValue, renderStaticInput, ...props }: import('../DateTime/DatePicker/DatePicker').ControlledDatePickerProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
-    readonly dateTimePicker: <TFieldValues extends import('react-hook-form').FieldValues>({ fullIso, renderStaticInput, ...props }: import('../DateTime/DateTimePicker/DateTimePicker').ControlledDateTimePickerProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
-    readonly timePicker: <TFieldValues extends import('react-hook-form').FieldValues>({ renderStaticInput, ...props }: import('../DateTime/TimePicker/TimePicker').ControlledTimePickerProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
-    readonly dateRangePicker: <TFieldValues extends import('react-hook-form').FieldValues>({ fullIso, minValue, maxValue, renderStaticInput, ...props }: import('../DateTime/DateRangePicker/DateRangePicker').ControlledDateRangePickerProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
+    readonly queryAutocomplete: <TFieldValues extends import('../shared/form.binding').FieldValues, TSelectItem extends import('../../..').SelectItem<any>, TQueryFn extends import('../Selection/Autocomplete/queryAutocomplete.types').QueryFn>(props: import('../Selection/Autocomplete/queryAutocomplete.types').QueryAutocompleteProps<TFieldValues, TSelectItem, TQueryFn>) => import("react/jsx-runtime").JSX.Element;
+    readonly segment: <TFieldValues extends import('../shared/form.binding').FieldValues, TKey extends import('react-aria').Key = import('react-aria').Key>(props: import('../../..').ControlledSegmentProps<TFieldValues, TKey>) => import("react/jsx-runtime").JSX.Element;
+    readonly datePicker: <TFieldValues extends import('../shared/form.binding').FieldValues>({ fullIso, granularity, minValue, maxValue, renderStaticInput, ...props }: import('../DateTime/DatePicker/DatePicker').ControlledDatePickerProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
+    readonly dateTimePicker: <TFieldValues extends import('../shared/form.binding').FieldValues>({ fullIso, renderStaticInput, ...props }: import('../DateTime/DateTimePicker/DateTimePicker').ControlledDateTimePickerProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
+    readonly timePicker: <TFieldValues extends import('../shared/form.binding').FieldValues>({ renderStaticInput, ...props }: import('../DateTime/TimePicker/TimePicker').ControlledTimePickerProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
+    readonly dateRangePicker: <TFieldValues extends import('../shared/form.binding').FieldValues>({ fullIso, minValue, maxValue, renderStaticInput, ...props }: import('../DateTime/DateRangePicker/DateRangePicker').ControlledDateRangePickerProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;
     readonly unknown: null;
 };
 export type InputComponentRegistry = typeof componentRegistry;
 export type InputComponentType = keyof InputComponentRegistry;
 interface InputItemProps<TSchema extends z.ZodObject<any>, TSchemaType extends Record<string, any> = z.infer<TSchema>> {
-    form: UseFormReturn<TSchemaType>;
+    form: UIForm<TSchemaType>;
     inputDef: InputDef<TSchemaType>;
 }
 export type InputDef<TSchemaType extends Record<string, any>> = {
@@ -55,13 +55,13 @@ interface RenderBasedInputDef<TSchemaType extends Record<string, any>, K extends
     placeholder?: string;
     props?: never;
     inputWrapper?: never;
-    render: (formControl: {
-        control: Control<TSchemaType>;
+    render: (field: {
+        form: UIForm<TSchemaType>;
         name: K;
-    }, form: UseFormReturn<TSchemaType>) => ReactElement;
+    }, form: UIForm<TSchemaType>) => ReactElement;
 }
 export type InputWrapperType = (children: ReactNode, label: string) => ReactElement;
 export type InputComponentProps<T extends InputComponentType> = InputComponentRegistry[T] extends keyof React.JSX.IntrinsicElements | JSXElementConstructor<any> ? ComponentProps<InputComponentRegistry[T]> : null;
-export type InputDefBaseProps<TProps> = Omit<TProps, "formControl" | "label" | "placeholder" | "children">;
+export type InputDefBaseProps<TProps> = Omit<TProps, "field" | "label" | "placeholder" | "children">;
 export declare function InputItem<TSchema extends z.ZodObject<any>, TSchemaType extends Record<string, any> = z.infer<TSchema>>({ form, inputDef }: InputItemProps<TSchema, TSchemaType>): import("react/jsx-runtime").JSX.Element | null;
 export {};

package/dist/components/inputs/Inputs/InputItem.js

@@ -44,70 +44,69 @@ function InputItem(t0) {
 	const $ = c(18);
 	const { form, inputDef } = t0;
 	const { name, label, placeholder, props, inputWrapper, render, type } = inputDef;
-	const t1 = form.control;
-	let formControl;
-	let t2;
+	let field;
+	let t1;
 	if ($[0] !== form || $[1] !== name || $[2] !== render) {
-		t2 = Symbol.for("react.early_return_sentinel");
+		t1 = Symbol.for("react.early_return_sentinel");
 		bb0: {
-			formControl = {
-				control: t1,
+			field = {
+				form,
 				name
 			};
 			if (render) {
-				t2 = render(formControl, form);
+				t1 = render(field, form);
 				break bb0;
 			}
 		}
 		$[0] = form;
 		$[1] = name;
 		$[2] = render;
-		$[3] = formControl;
-		$[4] = t2;
+		$[3] = field;
+		$[4] = t1;
 	} else {
-		formControl = $[3];
-		t2 = $[4];
+		field = $[3];
+		t1 = $[4];
 	}
-	if (t2 !== Symbol.for("react.early_return_sentinel")) return t2;
+	if (t1 !== Symbol.for("react.early_return_sentinel")) return t1;
 	if (!type) return null;
 	const Component = componentRegistry[type];
 	const usesChildrenAsLabel = ["toggle", "checkbox"].includes(type);
-	let t3;
+	let t2;
 	if ($[5] !== props) {
-		t3 = props ?? {};
+		t2 = props ?? {};
 		$[5] = props;
-		$[6] = t3;
-	} else t3 = $[6];
-	const inputProps = t3;
-	const t4 = usesChildrenAsLabel ? void 0 : label;
-	const t5 = usesChildrenAsLabel ? label : void 0;
-	let t6;
-	if ($[7] !== Component || $[8] !== formControl || $[9] !== inputProps || $[10] !== placeholder || $[11] !== t4 || $[12] !== t5) {
-		t6 = /* @__PURE__ */ jsx(Component, {
+		$[6] = t2;
+	} else t2 = $[6];
+	const inputProps = t2;
+	const t3 = usesChildrenAsLabel ? void 0 : label;
+	const t4 = usesChildrenAsLabel ? label : void 0;
+	let t5;
+	if ($[7] !== Component || $[8] !== field || $[9] !== inputProps || $[10] !== placeholder || $[11] !== t3 || $[12] !== t4) {
+		t5 = /* @__PURE__ */ jsx(Component, {
 			...inputProps,
-			label: t4,
+			label: t3,
 			placeholder,
-			formControl,
-			children: t5
+			field,
+			children: t4
 		});
 		$[7] = Component;
-		$[8] = formControl;
+		$[8] = field;
 		$[9] = inputProps;
 		$[10] = placeholder;
-		$[11] = t4;
-		$[12] = t5;
-		$[13] = t6;
-	} else t6 = $[13];
-	const inputComponent = t6;
-	let t7;
+		$[11] = t3;
+		$[12] = t4;
+		$[13] = t5;
+	} else t5 = $[13];
+	const inputComponent = t5;
+	let t6;
 	if ($[14] !== inputComponent || $[15] !== inputWrapper || $[16] !== label) {
-		t7 = inputWrapper ? inputWrapper(inputComponent, label) : inputComponent;
+		t6 = inputWrapper ? inputWrapper(inputComponent, label) : inputComponent;
 		$[14] = inputComponent;
 		$[15] = inputWrapper;
 		$[16] = label;
-		$[17] = t7;
-	} else t7 = $[17];
-	return t7;
+		$[17] = t6;
+	} else t6 = $[17];
+	return t6;
 }
 //#endregion
 export { InputItem };

package/dist/components/inputs/Inputs/Inputs.d.ts

@@ -1,9 +1,9 @@
 import { ReactNode } from 'react';
-import { UseFormReturn } from 'react-hook-form';
 import { z } from 'zod';
+import { UIForm } from '../../../hooks/useForm';
 import { InputDef } from './InputItem';
 export interface InputsProps<TSchema extends z.ZodObject<any>, TSchemaType extends Record<string, any> = z.infer<TSchema>> {
-    form: UseFormReturn<TSchemaType>;
+    form: UIForm<TSchemaType>;
     inputDefs: Array<InputDef<TSchemaType>>;
     children?: (inputs: Record<keyof TSchemaType, ReactNode>) => ReactNode;
 }

package/dist/components/inputs/RadioGroup/RadioGroup.d.ts

@@ -1,6 +1,6 @@
 import { ReactElement, Ref } from 'react';
 import { RadioGroupProps as AriaRadioGroupProps } from 'react-aria-components';
-import { FieldValues } from 'react-hook-form';
+import { FieldValues } from '../shared/form.binding';
 import { FormFieldProps } from '../FormField/FormField';
 import { RadioVariantProps } from './radio.cva';
 import { ControlProps } from '../shared/form.types';
@@ -14,7 +14,6 @@ interface RadioGroupBaseProps extends Omit<FormFieldProps, "variant">, RadioVari
     isDirty?: boolean;
     inputClassName?: string;
     labelClassName?: string;
-    fireBlurOnChange?: boolean;
 }
 export interface RadioGroupProps extends RadioGroupBaseProps {
 }