@uxf/form 1.0.0-beta.156 → 1.0.0-beta.158

package/date-picker-input/date-picker-input.d.ts

@@ -1,14 +1,11 @@
 /// <reference types="react" />
 import { DatePickerInputProps as UIDatePickerInputProps } from "@uxf/ui/date-picker-input";
 import { FieldValues, UseControllerProps } from "react-hook-form";
-import { FormControlProps } from "@uxf/ui/types";
-type OnChangeHandler = FormControlProps<Date | null>["onChange"];
 export type DatePickerInputProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UIDatePickerInputProps, "isInvalid" | "max" | "min" | "pattern" | "step" | "name" | "onChange" | "value"> & {
-    onChange?: OnChangeHandler;
+    onChange?: UIDatePickerInputProps["onChange"];
     requiredMessage?: string;
 };
 export declare function DatePickerInput<FormData extends FieldValues>(props: DatePickerInputProps<FormData>): JSX.Element;
 export declare namespace DatePickerInput {
     var displayName: string;
 }
-export {};

package/date-picker-input/date-picker-input.js

@@ -1,15 +1,42 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatePickerInput = void 0;
 const date_picker_input_1 = require("@uxf/ui/date-picker-input");
-const dayjs_1 = __importDefault(require("dayjs"));
+const dayjs_1 = __importStar(require("dayjs"));
 const react_1 = __importDefault(require("react"));
 const react_hook_form_1 = require("react-hook-form");
+const date_picker_input_2 = require("@uxf/ui/date-picker-input/date-picker-input");
+const customParseFormat_1 = __importDefault(require("dayjs/plugin/customParseFormat"));
+(0, dayjs_1.extend)(customParseFormat_1.default);
+const OUTPUT_DATE_FORMAT = "YYYY-MM-DD";
 function DatePickerInput(props) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     const { field, fieldState } = (0, react_hook_form_1.useController)({
         control: props.control,
         defaultValue: props.defaultValue,
@@ -17,6 +44,19 @@ function DatePickerInput(props) {
         rules: {
             required: props.isRequired ? props.requiredMessage || "Toto pole je povinné" : undefined,
             ...((_a = props.rules) !== null && _a !== void 0 ? _a : {}),
+            validate: {
+                validDate: (value) => {
+                    if (!value) {
+                        return;
+                    }
+                    if (!(0, dayjs_1.default)(value, OUTPUT_DATE_FORMAT, true).isValid()) {
+                        return "Datum musí být ve formátu D. M. YYYY.";
+                    }
+                },
+                ...(typeof ((_b = props.rules) === null || _b === void 0 ? void 0 : _b.validate) === "function"
+                    ? { custom: props.rules.validate }
+                    : (_d = (_c = props.rules) === null || _c === void 0 ? void 0 : _c.validate) !== null && _d !== void 0 ? _d : {}),
+            },
         },
         shouldUnregister: props.shouldUnregister,
     });
@@ -27,10 +67,17 @@ function DatePickerInput(props) {
     };
     const onChange = (value, event) => {
         var _a;
-        field.onChange(value ? (0, dayjs_1.default)(value).format("YYYY-MM-DD") : null);
+        if (value && (0, dayjs_1.default)(value, date_picker_input_2.ALLOWED_DATE_FORMAT, true).isValid()) {
+            field.onChange((0, dayjs_1.default)(value, date_picker_input_2.ALLOWED_DATE_FORMAT, true).format(OUTPUT_DATE_FORMAT));
+        }
+        else {
+            field.onChange(value);
+        }
         (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, value, event);
     };
-    return (react_1.default.createElement(date_picker_input_1.DatePickerInput, { className: props.className, form: props.form, helperText: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : props.helperText, hiddenLabel: props.hiddenLabel, id: props.id, isClearable: props.isClearable, isDisabled: props.isDisabled, isInvalid: !!fieldState.error, isReadOnly: props.isReadOnly, isRequired: props.isRequired, label: props.label, leftAddon: props.leftAddon, leftElement: props.leftElement, name: field.name, onBlur: onBlur, onChange: onChange, onFocus: props.onFocus, placeholder: props.placeholder, ref: field.ref, rightAddon: props.rightAddon, rightElement: props.rightElement, size: props.size, value: field.value, variant: props.variant }));
+    const parsedDate = (0, dayjs_1.default)(field.value, OUTPUT_DATE_FORMAT, true);
+    const value = field.value ? (parsedDate.isValid() ? parsedDate.format(date_picker_input_2.DISPLAY_DATE_FORMAT) : field.value) : null;
+    return (react_1.default.createElement(date_picker_input_1.DatePickerInput, { className: props.className, form: props.form, helperText: (_f = (_e = fieldState.error) === null || _e === void 0 ? void 0 : _e.message) !== null && _f !== void 0 ? _f : props.helperText, hiddenLabel: props.hiddenLabel, id: props.id, isClearable: props.isClearable, isDisabled: props.isDisabled, isInvalid: !!fieldState.error, isReadOnly: props.isReadOnly, isRequired: props.isRequired, label: props.label, leftAddon: props.leftAddon, leftElement: props.leftElement, name: field.name, onBlur: onBlur, onChange: onChange, onFocus: props.onFocus, placeholder: props.placeholder, popoverPlacement: props.popoverPlacement, popoverStrategy: props.popoverStrategy, ref: field.ref, rightAddon: props.rightAddon, rightElement: props.rightElement, size: props.size, triggerElement: props.triggerElement, value: value, variant: props.variant }));
 }
 exports.DatePickerInput = DatePickerInput;
 DatePickerInput.displayName = "UxfFormDatePickerInput";

package/date-picker-input/date-picker-input.stories.js

@@ -14,7 +14,7 @@ exports.default = {
 };
 function Default() {
     const storyFormDatePickers = (control) => (react_1.default.createElement("div", { className: "space-y-4" },
-        react_1.default.createElement(date_picker_input_1.DatePickerInput, { label: "Default date picker", name: "default", control: control, isClearable: true }),
+        react_1.default.createElement(date_picker_input_1.DatePickerInput, { label: "Default date picker", name: "default", control: control, isClearable: true, isRequired: true }),
         react_1.default.createElement(button_1.Button, { type: "submit" }, "Submit")));
     return (react_1.default.createElement(form_1.Form, null, ({ control }) => (react_1.default.createElement("div", { className: "flex flex-col lg:flex-row" },
         react_1.default.createElement("div", { className: "light space-y-2 p-20 lg:w-1/2" }, storyFormDatePickers(control)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/form",
-  "version": "1.0.0-beta.156",
+  "version": "1.0.0-beta.158",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -13,7 +13,7 @@
   "author": "UX Fans s.r.o",
   "license": "MIT",
   "dependencies": {
-    "@uxf/ui": "^1.0.0-beta.156",
+    "@uxf/ui": "^1.0.0-beta.158",
     "react-hook-form": "^7.43.9",
     "coordinate-parser": "^1.0.7"
   }

package/time-picker-input/time-picker-input.d.ts

@@ -1,16 +1,12 @@
 /// <reference types="react" />
 import { TimePickerInputProps as UITimePickerInputProps } from "@uxf/ui/time-picker-input";
 import { FieldValues, UseControllerProps } from "react-hook-form";
-import { TimeType } from "@uxf/datepicker/hooks/use-time-picker";
-import { FormControlProps } from "@uxf/ui/types";
-type OnChangeHandler = FormControlProps<TimeType | null>["onChange"];
+import { DatePickerInputProps as UIDatePickerInputProps } from "@uxf/ui/date-picker-input";
 export type TimePickerInputProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UITimePickerInputProps, "isInvalid" | "max" | "min" | "pattern" | "step" | "name" | "onChange" | "value"> & {
-    onChange?: OnChangeHandler;
+    onChange?: UIDatePickerInputProps["onChange"];
     requiredMessage?: string;
-    stringValue?: boolean;
 };
 export declare function TimePickerInput<FormData extends FieldValues>(props: TimePickerInputProps<FormData>): JSX.Element;
 export declare namespace TimePickerInput {
     var displayName: string;
 }
-export {};

package/time-picker-input/time-picker-input.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,9 +30,13 @@ exports.TimePickerInput = void 0;
 const time_picker_input_1 = require("@uxf/ui/time-picker-input");
 const react_hook_form_1 = require("react-hook-form");
 const react_1 = __importDefault(require("react"));
-const dayjs_1 = __importDefault(require("dayjs"));
+const dayjs_1 = __importStar(require("dayjs"));
+const time_picker_input_2 = require("@uxf/ui/time-picker-input/time-picker-input");
+const customParseFormat_1 = __importDefault(require("dayjs/plugin/customParseFormat"));
+(0, dayjs_1.extend)(customParseFormat_1.default);
+const OUTPUT_TIME_FORMAT = "HH:mm:ss";
 function TimePickerInput(props) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     const { field, fieldState } = (0, react_hook_form_1.useController)({
         control: props.control,
         defaultValue: props.defaultValue,
@@ -17,6 +44,19 @@ function TimePickerInput(props) {
         rules: {
             required: props.isRequired ? props.requiredMessage || "Toto pole je povinné" : undefined,
             ...((_a = props.rules) !== null && _a !== void 0 ? _a : {}),
+            validate: {
+                validTime: (value) => {
+                    if (!value) {
+                        return;
+                    }
+                    if (!(0, dayjs_1.default)(value, OUTPUT_TIME_FORMAT, true).isValid()) {
+                        return "Čas musí být ve formátu H:mm.";
+                    }
+                },
+                ...(typeof ((_b = props.rules) === null || _b === void 0 ? void 0 : _b.validate) === "function"
+                    ? { custom: props.rules.validate }
+                    : (_d = (_c = props.rules) === null || _c === void 0 ? void 0 : _c.validate) !== null && _d !== void 0 ? _d : {}),
+            },
         },
         shouldUnregister: props.shouldUnregister,
     });
@@ -27,20 +67,17 @@ function TimePickerInput(props) {
     };
     const onChange = (value, event) => {
         var _a;
-        if (props.stringValue && value !== null) {
-            field.onChange((0, dayjs_1.default)().set("hour", value.hour).set("minute", value.minute).set("second", 0).format("HH:mm:ss"));
+        if (value && (0, dayjs_1.default)(value, time_picker_input_2.ALLOWED_TIME_FORMAT, true).isValid()) {
+            field.onChange((0, dayjs_1.default)(value, time_picker_input_2.ALLOWED_TIME_FORMAT, true).format(OUTPUT_TIME_FORMAT));
         }
         else {
             field.onChange(value);
         }
         (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, value, event);
     };
-    const value = props.stringValue
-        ? field.value
-            ? { hour: (0, dayjs_1.default)(field.value, "HH:mm:ss").hour(), minute: (0, dayjs_1.default)(field.value, "HH:mm:ss").minute() }
-            : undefined
-        : field.value;
-    return (react_1.default.createElement(time_picker_input_1.TimePickerInput, { className: props.className, form: props.form, helperText: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : props.helperText, hiddenLabel: props.hiddenLabel, id: props.id, isClearable: props.isClearable, isDisabled: props.isDisabled, isInvalid: !!fieldState.error, isReadOnly: props.isReadOnly, isRequired: props.isRequired, label: props.label, leftAddon: props.leftAddon, leftElement: props.leftElement, name: field.name, onBlur: onBlur, onChange: onChange, onFocus: props.onFocus, placeholder: props.placeholder, ref: field.ref, rightAddon: props.rightAddon, rightElement: props.rightElement, size: props.size, value: value !== null && value !== void 0 ? value : null, variant: props.variant }));
+    const parsedTime = (0, dayjs_1.default)(field.value, OUTPUT_TIME_FORMAT, true);
+    const value = field.value ? (parsedTime.isValid() ? parsedTime.format(time_picker_input_2.DISPLAY_TIME_FORMAT) : field.value) : null;
+    return (react_1.default.createElement(time_picker_input_1.TimePickerInput, { className: props.className, form: props.form, helperText: (_f = (_e = fieldState.error) === null || _e === void 0 ? void 0 : _e.message) !== null && _f !== void 0 ? _f : props.helperText, hiddenLabel: props.hiddenLabel, id: props.id, isClearable: props.isClearable, isDisabled: props.isDisabled, isInvalid: !!fieldState.error, isReadOnly: props.isReadOnly, isRequired: props.isRequired, label: props.label, leftAddon: props.leftAddon, leftElement: props.leftElement, name: field.name, onBlur: onBlur, onChange: onChange, onFocus: props.onFocus, placeholder: props.placeholder, popoverPlacement: props.popoverPlacement, popoverStrategy: props.popoverStrategy, ref: field.ref, rightAddon: props.rightAddon, rightElement: props.rightElement, size: props.size, triggerElement: props.triggerElement, value: value !== null && value !== void 0 ? value : null, variant: props.variant }));
 }
 exports.TimePickerInput = TimePickerInput;
 TimePickerInput.displayName = "UxfFormTimePickerInput";

package/time-picker-input/time-picker-input.stories.js

@@ -15,7 +15,6 @@ exports.default = {
 function Default() {
     const storyFormDatePickers = (control) => (react_1.default.createElement("div", { className: "space-y-4" },
         react_1.default.createElement(time_picker_input_1.TimePickerInput, { label: "Default time picker", name: "default", control: control, isClearable: true }),
-        react_1.default.createElement(time_picker_input_1.TimePickerInput, { label: "String time picker", name: "string", control: control, stringValue: true }),
         react_1.default.createElement(button_1.Button, { type: "submit" }, "Submit")));
     return (react_1.default.createElement(form_1.Form, null, ({ control }) => (react_1.default.createElement("div", { className: "flex flex-col lg:flex-row" },
         react_1.default.createElement("div", { className: "light space-y-2 p-20 lg:w-1/2" }, storyFormDatePickers(control)),