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

package/dist/index.mjs

@@ -1,11 +1,10 @@
+import { KolInputText, KolInputPassword, KolInputEmail, KolInputNumber, KolInputRange, KolInputDate, KolInputColor, KolInputFile, KolTextarea, KolCombobox, KolSelect, KolSingleSelect, KolInputRadio, KolInputCheckbox } from '@public-ui/react-v19';
 import React from 'react';
 import { Controller } from 'react-hook-form';
-import { KolInputText, KolInputPassword, KolInputEmail, KolInputNumber, KolInputRange, KolInputDate, KolInputColor, KolInputFile, KolTextarea, KolCombobox, KolSelect, KolSingleSelect, KolInputRadio, KolInputCheckbox } from '@public-ui/react-v19';
 
 function withController(Component, valueProp) {
-  return React.forwardRef((props, ref) => {
-    const { name, control, rules, defaultValue, ...rest } = props;
-    const userEventHandlers = props._on || {};
+  const ControllerWrapper = React.forwardRef((props, ref) => {
+    const { name, control, rules, defaultValue, shouldUnregister, disabled, ...componentProps } = props;
     return /* @__PURE__ */ React.createElement(
       Controller,
       {
@@ -13,58 +12,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.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.createElement(Component, { ...mergedProps });
         }
       }
     );
   });
+  ControllerWrapper.displayName = `withController(${Component.displayName || Component.name || "Component"})`;
+  return ControllerWrapper;
 }
 const KolInputTextController = withController(KolInputText, "_value");
 const KolInputPasswordController = withController(KolInputPassword, "_value");
@@ -73,7 +66,7 @@ const KolInputNumberController = withController(KolInputNumber, "_value");
 const KolInputRangeController = withController(KolInputRange, "_value");
 const KolInputDateController = withController(KolInputDate, "_value");
 const KolInputColorController = withController(KolInputColor, "_value");
-const KolInputFileController = withController(KolInputFile, void 0);
+const KolInputFileController = withController(KolInputFile);
 const KolTextareaController = withController(KolTextarea, "_value");
 const KolComboboxController = withController(KolCombobox, "_value");
 const KolSelectController = withController(KolSelect, "_value");
@@ -81,4 +74,4 @@ const KolSingleSelectController = withController(KolSingleSelect, "_value");
 const KolInputRadioController = withController(KolInputRadio, "_value");
 const KolInputCheckboxController = withController(KolInputCheckbox, "_checked");
 
-export { KolComboboxController, KolInputCheckboxController, KolInputColorController, KolInputDateController, KolInputEmailController, KolInputFileController, KolInputNumberController, KolInputPasswordController, KolInputRadioController, KolInputRangeController, KolInputTextController, KolSelectController, KolSingleSelectController, KolTextareaController, withController };
+export { KolComboboxController, KolInputCheckboxController, KolInputColorController, KolInputDateController, KolInputEmailController, KolInputFileController, KolInputNumberController, KolInputPasswordController, KolInputRadioController, KolInputRangeController, KolInputTextController, KolSelectController, KolSingleSelectController, KolTextareaController };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@public-ui/react-hook-form-adapter",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.10",
   "license": "EUPL-1.2",
   "homepage": "https://public-ui.github.io",
   "repository": {
@@ -46,24 +46,25 @@
     "react-hook-form"
   ],
   "devDependencies": {
-    "@types/react": "18.3.24",
-    "@types/react-dom": "18.3.7",
+    "@types/react": "19.2.7",
+    "@types/react-dom": "19.2.3",
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",
     "eslint": "8.57.1",
-    "prettier": "3.6.2",
-    "react": "19.1.1",
-    "react-dom": "19.1.1",
+    "prettier": "3.7.4",
+    "prettier-plugin-organize-imports": "4.3.0",
+    "react": "19.2.0",
+    "react-dom": "19.2.3",
     "react-hook-form": "7.63.0",
-    "typescript": "5.9.2",
+    "typescript": "5.9.3",
     "unbuild": "3.6.1",
-    "@public-ui/components": "4.0.0-alpha.1",
-    "@public-ui/react-v19": "4.0.0-alpha.1"
+    "@public-ui/components": "4.0.0-alpha.10",
+    "@public-ui/react-v19": "4.0.0-alpha.10"
   },
   "peerDependencies": {
     "react": "^19",
     "react-hook-form": "^7",
-    "@public-ui/react-v19": "4.0.0-alpha.1"
+    "@public-ui/react-v19": "4.0.0-alpha.10"
   },
   "sideEffects": false,
   "type": "module",
@@ -83,8 +84,8 @@
   "scripts": {
     "build": "unbuild",
     "format": "prettier --check src",
-    "-lint": "pnpm lint:eslint && pnpm lint:tsc",
-    "-lint:eslint": "eslint src",
-    "-lint:tsc": "tsc --noemit"
+    "lint": "pnpm lint:eslint && pnpm lint:tsc",
+    "lint:eslint": "eslint src",
+    "lint:tsc": "tsc --noemit"
   }
 }