prom-pal-ui 1.2.3 → 1.2.5

package/build/types/ui/fields/form.d.ts

@@ -2,27 +2,32 @@ import { ReactNode } from "react";
 import { type ControllerProps, type FieldPath, type FieldValues, UseFormReturn } from "react-hook-form";
 import { z } from "zod";
 import { CommonPromComponentProps } from "../types";
+interface ExtendedFormMethods<T extends FieldValues = FieldValues> extends UseFormReturn<T> {
+    setServerError: (error: string) => void;
+    getServerError: () => string;
+}
 type PromFormRenderProps = {
     isValid: boolean;
-    serverError?: any;
+    serverError?: string;
     isSubmitting: boolean;
     errors: Record<string, any>;
-    form: UseFormReturn<z.infer<any>>;
+    form: ExtendedFormMethods<z.infer<any>>;
 };
 interface PromFromProps extends CommonPromComponentProps {
     children?: ReactNode;
     schema?: z.ZodObject<any>;
     defaultValues?: z.infer<any>;
-    form?: UseFormReturn<z.infer<any>>;
+    form?: ExtendedFormMethods<z.infer<any>>;
     onSubmit?: (data: z.infer<any>) => Promise<void>;
     render?: (props: PromFormRenderProps) => ReactNode;
 }
 declare const PromFrom: ({ schema, render, children, onSubmit, defaultValues, form: externalForm, }: PromFromProps) => import("react/jsx-runtime").JSX.Element;
 declare const usePromForm: <T extends FieldValues>() => {
-    form: UseFormReturn<T, any, T>;
+    form: ExtendedFormMethods<T>;
     errors: import("react-hook-form").FieldErrors<T>;
     isValid: boolean;
     isSubmitting: boolean;
+    serverError: string;
     reset: import("react-hook-form").UseFormReset<T>;
     watch: import("react-hook-form").UseFormWatch<T>;
     control: import("react-hook-form").Control<T, any, T>;
@@ -30,10 +35,10 @@ declare const usePromForm: <T extends FieldValues>() => {
     register: import("react-hook-form").UseFormRegister<T>;
     setValue: import("react-hook-form").UseFormSetValue<T>;
     getValues: import("react-hook-form").UseFormGetValues<T>;
+    setServerError: (error: string) => void;
     handleSubmit: import("react-hook-form").UseFormHandleSubmit<T, T>;
 };
-type PromFormFiledProps<TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> = ControllerProps<TFieldValues, TName>;
-declare const PromFormFiled: <TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>>({ ...props }: PromFormFiledProps<TFieldValues, TName>) => import("react/jsx-runtime").JSX.Element;
+declare const PromFormFiled: <TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>>({ ...props }: ControllerProps<TFieldValues, TName>) => import("react/jsx-runtime").JSX.Element;
 declare const PromMessage: () => import("react/jsx-runtime").JSX.Element;
 declare const useCreatePromForm: ({ schema, defaultValues, }: {
     schema: z.ZodObject<any>;

package/build/ui/cjs/index.js

@@ -23643,25 +23643,33 @@ var PromFrom = function (_a) {
         resolver: schema ? a(schema) : undefined,
         defaultValues: defaultValues,
     });
-    var form = externalForm || internalForm;
-    var _c = form.formState, errors = _c.errors, isSubmitting = _c.isSubmitting, isValid = _c.isValid;
-    var _d = React.useState(""), serverError = _d[0], setServerError = _d[1];
+    var _c = React.useState(""), serverError = _c[0], setServerError = _c[1];
+    var form = externalForm || tslib.__assign(tslib.__assign({}, internalForm), { setServerError: setServerError, getServerError: function () { return serverError; } });
+    var _d = form.formState, errors = _d.errors, isSubmitting = _d.isSubmitting, isValid = _d.isValid;
     var handleOnSubmit = function (data) { return tslib.__awaiter(void 0, void 0, void 0, function () {
         var error_1, errorMessage;
         return tslib.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, onSubmit(data)];
+                    setServerError("");
+                    _a.label = 1;
                 case 1:
-                    _a.sent();
-                    return [3 /*break*/, 3];
+                    _a.trys.push([1, 4, , 5]);
+                    if (!onSubmit) return [3 /*break*/, 3];
+                    return [4 /*yield*/, onSubmit(data)];
                 case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3: return [3 /*break*/, 5];
+                case 4:
                     error_1 = _a.sent();
                     errorMessage = "Произошла ошибка при отправке формы";
-                    setServerError(error_1 || errorMessage);
-                    throw error_1;
-                case 3: return [2 /*return*/];
+                    if (error_1 instanceof Error) {
+                        errorMessage = error_1.message;
+                    }
+                    setServerError(errorMessage);
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/];
             }
         });
     }); };
@@ -23673,17 +23681,25 @@ var PromFrom = function (_a) {
                     e.preventDefault();
                 }
             }, children: render
-                ? render({ form: form, errors: errors, isSubmitting: isSubmitting, isValid: isValid, serverError: serverError })
+                ? render({
+                    form: form,
+                    errors: errors,
+                    isSubmitting: isSubmitting,
+                    isValid: isValid,
+                    serverError: serverError,
+                })
                 : children }) })));
 };
 var usePromForm = function () {
+    var _a;
     var form = reactHookForm.useFormContext();
-    var _a = form.formState, errors = _a.errors, isSubmitting = _a.isSubmitting, isValid = _a.isValid;
+    var _b = form.formState, errors = _b.errors, isSubmitting = _b.isSubmitting, isValid = _b.isValid;
     return {
         form: form,
         errors: errors,
         isValid: isValid,
         isSubmitting: isSubmitting,
+        serverError: ((_a = form.getServerError) === null || _a === void 0 ? void 0 : _a.call(form)) || "",
         reset: form.reset,
         watch: form.watch,
         control: form.control,
@@ -23691,6 +23707,7 @@ var usePromForm = function () {
         register: form.register,
         setValue: form.setValue,
         getValues: form.getValues,
+        setServerError: form.setServerError,
         handleSubmit: form.handleSubmit,
     };
 };
@@ -23705,6 +23722,7 @@ var PromMessage = function () {
         console.log(errors);
         return jsxRuntimeExports.jsx("p", { children: "\u041E\u0448\u0438\u0431\u043A\u0430" });
     }
+    return null;
 };
 var useCreatePromForm = function (_a) {
     var schema = _a.schema, defaultValues = _a.defaultValues;

package/build/ui/esm/index.js

@@ -23623,25 +23623,33 @@ var PromFrom = function (_a) {
         resolver: schema ? a(schema) : undefined,
         defaultValues: defaultValues,
     });
-    var form = externalForm || internalForm;
-    var _c = form.formState, errors = _c.errors, isSubmitting = _c.isSubmitting, isValid = _c.isValid;
-    var _d = useState(""), serverError = _d[0], setServerError = _d[1];
+    var _c = useState(""), serverError = _c[0], setServerError = _c[1];
+    var form = externalForm || __assign(__assign({}, internalForm), { setServerError: setServerError, getServerError: function () { return serverError; } });
+    var _d = form.formState, errors = _d.errors, isSubmitting = _d.isSubmitting, isValid = _d.isValid;
     var handleOnSubmit = function (data) { return __awaiter(void 0, void 0, void 0, function () {
         var error_1, errorMessage;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, onSubmit(data)];
+                    setServerError("");
+                    _a.label = 1;
                 case 1:
-                    _a.sent();
-                    return [3 /*break*/, 3];
+                    _a.trys.push([1, 4, , 5]);
+                    if (!onSubmit) return [3 /*break*/, 3];
+                    return [4 /*yield*/, onSubmit(data)];
                 case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3: return [3 /*break*/, 5];
+                case 4:
                     error_1 = _a.sent();
                     errorMessage = "Произошла ошибка при отправке формы";
-                    setServerError(error_1 || errorMessage);
-                    throw error_1;
-                case 3: return [2 /*return*/];
+                    if (error_1 instanceof Error) {
+                        errorMessage = error_1.message;
+                    }
+                    setServerError(errorMessage);
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/];
             }
         });
     }); };
@@ -23653,17 +23661,25 @@ var PromFrom = function (_a) {
                     e.preventDefault();
                 }
             }, children: render
-                ? render({ form: form, errors: errors, isSubmitting: isSubmitting, isValid: isValid, serverError: serverError })
+                ? render({
+                    form: form,
+                    errors: errors,
+                    isSubmitting: isSubmitting,
+                    isValid: isValid,
+                    serverError: serverError,
+                })
                 : children }) })));
 };
 var usePromForm = function () {
+    var _a;
     var form = useFormContext();
-    var _a = form.formState, errors = _a.errors, isSubmitting = _a.isSubmitting, isValid = _a.isValid;
+    var _b = form.formState, errors = _b.errors, isSubmitting = _b.isSubmitting, isValid = _b.isValid;
     return {
         form: form,
         errors: errors,
         isValid: isValid,
         isSubmitting: isSubmitting,
+        serverError: ((_a = form.getServerError) === null || _a === void 0 ? void 0 : _a.call(form)) || "",
         reset: form.reset,
         watch: form.watch,
         control: form.control,
@@ -23671,6 +23687,7 @@ var usePromForm = function () {
         register: form.register,
         setValue: form.setValue,
         getValues: form.getValues,
+        setServerError: form.setServerError,
         handleSubmit: form.handleSubmit,
     };
 };
@@ -23685,6 +23702,7 @@ var PromMessage = function () {
         console.log(errors);
         return jsxRuntimeExports.jsx("p", { children: "\u041E\u0448\u0438\u0431\u043A\u0430" });
     }
+    return null;
 };
 var useCreatePromForm = function (_a) {
     var schema = _a.schema, defaultValues = _a.defaultValues;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prom-pal-ui",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "type": "module",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
@@ -12,12 +12,12 @@
     ".": {
       "import": "./build/ui/esm/index.js",
       "require": "./build/ui/cjs/index.js",
-      "types": "./build/ui/types/index.d.ts"
+      "types": "./build/types/index.d.ts"
     },
     "./function": {
-      "import": "./build/ui/esm/index.js",
-      "require": "./build/ui/cjs/index.js",
-      "types": "./build/ui/types/index.d.ts"
+      "import": "./build/function/esm/index.js",
+      "require": "./build/function/cjs/index.js",
+      "types": "./build/types/index.d.ts"
     }
   },
   "publishConfig": {