@dartech/arsenal-ui 1.4.41 → 1.4.42

package/index.js

@@ -35,7 +35,7 @@ import { langs } from '@uiw/codemirror-extensions-langs';
 import { abcdef } from '@uiw/codemirror-theme-abcdef';
 import Switch from '@mui/material/Switch';
 import { DatePicker } from '@mui/x-date-pickers/DatePicker';
-import { format, parse, isMatch, isValid } from 'date-fns';
+import { format, parse, isValid, isMatch } from 'date-fns';
 import { DateTimePicker } from '@mui/x-date-pickers/DateTimePicker';
 import { TimePicker } from '@mui/x-date-pickers/TimePicker';
 import Chip from '@mui/material/Chip';
@@ -257,6 +257,7 @@ const defaultDefinitionObjectValue = {
   properties: {}
 };
 const DEFAULT_REQUIRED_ERROR_TEXT = 'Please, fill this field';
+const DEFAULT_DATE_VALIDATION_ERROR_TEXT = 'Incorrect date format';
 
 /**
  * Material UI `TextField` controlled component. Used with react-hook-form
@@ -648,8 +649,7 @@ const ControlCheckbox = _a => {
         onChange: customOnChange ? customOnChange : onChange,
         name: name,
         inputRef: ref,
-        disabled: disabled,
-        defaultChecked: checked
+        disabled: disabled
       }, checkboxProps)),
       label: label
     }), !hideErrorMessage && (error === null || error === void 0 ? void 0 : error.message) && jsx(FormHelperText, Object.assign({
@@ -2231,10 +2231,18 @@ const ControlDate = _a => {
       format: format$1 = DATE_DEFAULT_FORMAT,
       hideErrorMessage = false,
       textFieldProps = {},
-      requiredErrorText = ''
+      requiredErrorText = '',
+      validate,
+      validateErrorText
     } = _a,
-    datePickerProps = __rest(_a, ["control", "name", "required", "label", "placeholder", "format", "hideErrorMessage", "textFieldProps", "requiredErrorText"]);
+    datePickerProps = __rest(_a, ["control", "name", "required", "label", "placeholder", "format", "hideErrorMessage", "textFieldProps", "requiredErrorText", "validate", "validateErrorText"]);
   const [localFormat, setLocalFormat] = useState(DATE_DEFAULT_FORMAT);
+  const defaultValidate = val => {
+    if (val === '' || isMatch(val, localFormat)) {
+      return true;
+    }
+    return validateErrorText ? validateErrorText : DEFAULT_DATE_VALIDATION_ERROR_TEXT;
+  };
   const {
     field,
     fieldState: {
@@ -2245,12 +2253,7 @@ const ControlDate = _a => {
     name,
     rules: {
       required: required ? requiredErrorText || DEFAULT_REQUIRED_ERROR_TEXT : false,
-      validate: val => {
-        if (val === '' || isMatch(val, localFormat)) {
-          return true;
-        }
-        return 'Incorrect date format';
-      }
+      validate: validate ? validate : defaultValidate
     }
   });
   const handleChange = useCallback(date => {
@@ -2312,10 +2315,18 @@ const ControlDateTime = _a => {
       format: format$1 = DATE_TIME_DEFAULT_FORMAT,
       hideErrorMessage = false,
       textFieldProps,
-      requiredErrorText = ''
+      requiredErrorText = '',
+      validate,
+      validateErrorText
     } = _a,
-    dateTimePickerProps = __rest(_a, ["control", "name", "required", "label", "format", "hideErrorMessage", "textFieldProps", "requiredErrorText"]);
+    dateTimePickerProps = __rest(_a, ["control", "name", "required", "label", "format", "hideErrorMessage", "textFieldProps", "requiredErrorText", "validate", "validateErrorText"]);
   const [localFormat, setLocalFormat] = useState();
+  const defaultValidate = val => {
+    if (val === '' || isMatch(val, localFormat)) {
+      return true;
+    }
+    return validateErrorText ? validateErrorText : DEFAULT_DATE_VALIDATION_ERROR_TEXT;
+  };
   const {
     field,
     fieldState: {
@@ -2326,12 +2337,7 @@ const ControlDateTime = _a => {
     name,
     rules: {
       required: required ? requiredErrorText || DEFAULT_REQUIRED_ERROR_TEXT : false,
-      validate: val => {
-        if (isMatch(val, localFormat)) {
-          return true;
-        }
-        return 'Incorrect date format';
-      }
+      validate: validate ? validate : defaultValidate
     }
   });
   const handleChange = useCallback(date => {
@@ -8034,4 +8040,4 @@ const Breadcrumbs = ({
   }));
 };
 
-export { AlertDialog, BackButton, Breadcrumbs, ContentLayout, ControlAceEditor, ControlArrayInput, ControlAutocomplete, ControlCheckbox, ControlDate, ControlDateTime, ControlDebouncedInput, ControlInput, ControlNumberInput, ControlPeriodInput, ControlPhoneInput, ControlQueryAutocomplete, ControlRadio, ControlSelect, ControlSwitch, ControlTime, CopyButton, CreateDefinition, CreatePropertiesList, CreatePropertiesListContext, CreatePropertyFormFields, DATE_DEFAULT_FORMAT, DATE_TIME_DEFAULT_FORMAT, DEFAULT_ERROR_TEXT, DEFAULT_REQUIRED_ERROR_TEXT, DefinitionFiller, DefinitionValueView, InfoItem, JsonModalView, JsonPathPicker, JsonView, Loader, MenuIcon, MultiplePropertyFiller, PropertyFiller, PropertyType, PropertyValueField, RoundingMode, RouteTabs, Sidebar, SimpleTable, Status, StepperView, TIME_DEFAULT_FORMAT, TabPanel, Table, TableAction, TableActionCell, ViewPropertiesList, ViewProperty, capitalize, deepParseJson, defaultDefinitionArrayValue, defaultDefinitionObjectValue, digitsOnly, floatsOnly, formatDefinitionData, formatTableRowValue, getDemPropertyDateFormat, getEntityStarterValue, getJsonStringValue, getMultiplePropertyFillOptions, getSinglePropertyFillOptions, isDateType, isExpression, isPropertyValueEmpty, numberFormat, propertiesArrayToObject, propertiesObjectToArray, removeArrayItem, safeParseJson, sortArrayOfObjects, theme, useDebounce, useToggle, validateJson };
+export { AlertDialog, BackButton, Breadcrumbs, ContentLayout, ControlAceEditor, ControlArrayInput, ControlAutocomplete, ControlCheckbox, ControlDate, ControlDateTime, ControlDebouncedInput, ControlInput, ControlNumberInput, ControlPeriodInput, ControlPhoneInput, ControlQueryAutocomplete, ControlRadio, ControlSelect, ControlSwitch, ControlTime, CopyButton, CreateDefinition, CreatePropertiesList, CreatePropertiesListContext, CreatePropertyFormFields, DATE_DEFAULT_FORMAT, DATE_TIME_DEFAULT_FORMAT, DEFAULT_DATE_VALIDATION_ERROR_TEXT, DEFAULT_ERROR_TEXT, DEFAULT_REQUIRED_ERROR_TEXT, DefinitionFiller, DefinitionValueView, InfoItem, JsonModalView, JsonPathPicker, JsonView, Loader, MenuIcon, MultiplePropertyFiller, PropertyFiller, PropertyType, PropertyValueField, RoundingMode, RouteTabs, Sidebar, SimpleTable, Status, StepperView, TIME_DEFAULT_FORMAT, TabPanel, Table, TableAction, TableActionCell, ViewPropertiesList, ViewProperty, capitalize, deepParseJson, defaultDefinitionArrayValue, defaultDefinitionObjectValue, digitsOnly, floatsOnly, formatDefinitionData, formatTableRowValue, getDemPropertyDateFormat, getEntityStarterValue, getJsonStringValue, getMultiplePropertyFillOptions, getSinglePropertyFillOptions, isDateType, isExpression, isPropertyValueEmpty, numberFormat, propertiesArrayToObject, propertiesObjectToArray, removeArrayItem, safeParseJson, sortArrayOfObjects, theme, useDebounce, useToggle, validateJson };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dartech/arsenal-ui",
-  "version": "1.4.41",
+  "version": "1.4.42",
   "author": "DAR",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/src/consts/index.d.ts

@@ -11,3 +11,4 @@ export declare const defaultDefinitionObjectValue: {
     properties: {};
 };
 export declare const DEFAULT_REQUIRED_ERROR_TEXT = "Please, fill this field";
+export declare const DEFAULT_DATE_VALIDATION_ERROR_TEXT = "Incorrect date format";

package/src/lib/Forms/ControlDate.d.ts

@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 import { TextFieldProps } from '@mui/material/TextField';
 import { DatePickerProps } from '@mui/x-date-pickers/DatePicker';
-import { Control } from 'react-hook-form';
+import { Control, Validate } from 'react-hook-form';
 type ControlDateProps = Partial<DatePickerProps<unknown, unknown>> & {
     /**
      * React Hook Form `control`
@@ -18,6 +18,8 @@ type ControlDateProps = Partial<DatePickerProps<unknown, unknown>> & {
     hideErrorMessage?: boolean;
     textFieldProps?: TextFieldProps;
     requiredErrorText?: string;
+    validate?: Validate<any, any>;
+    validateErrorText?: string;
 };
-export declare const ControlDate: ({ control, name, required, label, placeholder, format, hideErrorMessage, textFieldProps, requiredErrorText, ...datePickerProps }: ControlDateProps) => JSX.Element;
+export declare const ControlDate: ({ control, name, required, label, placeholder, format, hideErrorMessage, textFieldProps, requiredErrorText, validate, validateErrorText, ...datePickerProps }: ControlDateProps) => JSX.Element;
 export default ControlDate;

package/src/lib/Forms/ControlDateTime.d.ts

@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 import { TextFieldProps } from '@mui/material/TextField';
 import { DateTimePickerProps } from '@mui/x-date-pickers/DateTimePicker';
-import { Control } from 'react-hook-form';
+import { Control, Validate } from 'react-hook-form';
 type dateTimePickerProps = Partial<DateTimePickerProps<unknown, unknown>> & {
     /**
      * React Hook Form `control`
@@ -17,6 +17,8 @@ type dateTimePickerProps = Partial<DateTimePickerProps<unknown, unknown>> & {
     hideErrorMessage?: boolean;
     textFieldProps?: TextFieldProps;
     requiredErrorText?: string;
+    validate?: Validate<any, any>;
+    validateErrorText?: string;
 };
-export declare const ControlDateTime: ({ control, name, required, label, format, hideErrorMessage, textFieldProps, requiredErrorText, ...dateTimePickerProps }: dateTimePickerProps) => JSX.Element;
+export declare const ControlDateTime: ({ control, name, required, label, format, hideErrorMessage, textFieldProps, requiredErrorText, validate, validateErrorText, ...dateTimePickerProps }: dateTimePickerProps) => JSX.Element;
 export default ControlDateTime;