@public-ui/react-hook-form-adapter 4.0.0-alpha.0 → 4.0.0-alpha.10

package/README.md

@@ -18,18 +18,13 @@ import { useForm } from 'react-hook-form';
 import { KolInputTextController } from '@public-ui/react-hook-form-adapter';
 
 const MyForm = () => {
-        const { control, handleSubmit } = useForm({
-                defaultValues: { firstName: '' },
-        });
-        return (
-                <form onSubmit={handleSubmit(console.log)}>
-                        <KolInputTextController
-                                name="firstName"
-                                control={control}
-                                rules={{ required: 'Please enter your name' }}
-                                _label="First name"
-                        />
-                </form>
-        );
+	const { control, handleSubmit } = useForm({
+		defaultValues: { firstName: '' },
+	});
+	return (
+		<form onSubmit={handleSubmit(console.log)}>
+			<KolInputTextController name="firstName" control={control} rules={{ required: 'Please enter your name' }} _label="First name" />
+		</form>
+	);
 };
 ```

package/dist/index.cjs

@@ -1,17 +1,16 @@
 'use strict';
 
+const reactV19 = require('@public-ui/react-v19');
 const React = require('react');
 const reactHookForm = require('react-hook-form');
-const reactV19 = require('@public-ui/react-v19');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const React__default = /*#__PURE__*/_interopDefaultCompat(React);
 
 function withController(Component, valueProp) {
-  return React__default.forwardRef((props, ref) => {
-    const { name, control, rules, defaultValue, ...rest } = props;
-    const userEventHandlers = props._on || {};
+  const ControllerWrapper = React__default.forwardRef((props, ref) => {
+    const { name, control, rules, defaultValue, shouldUnregister, disabled, ...componentProps } = props;
     return /* @__PURE__ */ React__default.createElement(
       reactHookForm.Controller,
       {
@@ -19,58 +18,52 @@ function withController(Component, valueProp) {
         control,
         rules,
         defaultValue,
+        shouldUnregister,
+        disabled,
         render: ({ field, fieldState }) => {
-          const componentProps = {
-            ...rest,
+          const userHandlers = componentProps._on;
+          const mergedProps = {
+            ...componentProps,
+            ref: (element) => {
+              if (ref) {
+                if (typeof ref === "function") ref(element);
+                else ref.current = element;
+              }
+              if (element) field.ref(element);
+            },
             _name: name,
             _touched: fieldState.isTouched,
-            _disabled: props._disabled || field.disabled,
+            _disabled: componentProps._disabled || disabled || field.disabled,
             _msg: fieldState.error ? {
               _type: "error",
-              _description: typeof fieldState.error === "string" ? fieldState.error : fieldState.error?.message ?? ""
+              _description: fieldState.error.message || String(fieldState.error)
             } : void 0,
             _on: {
-              ...userEventHandlers,
-              onInput: (e, value) => {
+              ...userHandlers || {},
+              onInput: (event, value) => {
                 field.onChange(value);
-                if (userEventHandlers.onInput) {
-                  userEventHandlers.onInput(e, value);
-                }
+                userHandlers?.onInput?.(event, value);
               },
-              onChange: (e, value) => {
+              onChange: (event, value) => {
                 field.onChange(value);
-                if (userEventHandlers.onChange) {
-                  userEventHandlers.onChange(e, value);
-                }
+                userHandlers?.onChange?.(event, value);
               },
-              onBlur: (e) => {
+              onBlur: (event) => {
                 field.onBlur();
-                if (userEventHandlers.onBlur) {
-                  userEventHandlers.onBlur(e);
-                }
+                userHandlers?.onBlur?.(event);
               }
             }
           };
           if (valueProp) {
-            componentProps[valueProp] = field.value;
+            mergedProps[valueProp] = field.value;
           }
-          return /* @__PURE__ */ React__default.createElement(
-            Component,
-            {
-              ref: (e) => {
-                if (ref) {
-                  if (typeof ref === "function") ref(e);
-                  else ref.current = e;
-                }
-                if (e && field.ref) field.ref(e);
-              },
-              ...componentProps
-            }
-          );
+          return /* @__PURE__ */ React__default.createElement(Component, { ...mergedProps });
         }
       }
     );
   });
+  ControllerWrapper.displayName = `withController(${Component.displayName || Component.name || "Component"})`;
+  return ControllerWrapper;
 }
 const KolInputTextController = withController(reactV19.KolInputText, "_value");
 const KolInputPasswordController = withController(reactV19.KolInputPassword, "_value");
@@ -79,7 +72,7 @@ const KolInputNumberController = withController(reactV19.KolInputNumber, "_value
 const KolInputRangeController = withController(reactV19.KolInputRange, "_value");
 const KolInputDateController = withController(reactV19.KolInputDate, "_value");
 const KolInputColorController = withController(reactV19.KolInputColor, "_value");
-const KolInputFileController = withController(reactV19.KolInputFile, void 0);
+const KolInputFileController = withController(reactV19.KolInputFile);
 const KolTextareaController = withController(reactV19.KolTextarea, "_value");
 const KolComboboxController = withController(reactV19.KolCombobox, "_value");
 const KolSelectController = withController(reactV19.KolSelect, "_value");
@@ -101,4 +94,3 @@ exports.KolInputTextController = KolInputTextController;
 exports.KolSelectController = KolSelectController;
 exports.KolSingleSelectController = KolSingleSelectController;
 exports.KolTextareaController = KolTextareaController;
-exports.withController = withController;