@dartech/arsenal-ui 1.4.56 → 1.4.58

package/index.js

@@ -2261,10 +2261,15 @@ const propertiesArrayToObject = (properties, isGlobalParameter) => {
       resultProperty['isViewableInList'] = property.isViewableInList;
     }
     if (uiSettings) {
-      try {
-        resultProperty.uiSettings = JSON.parse(uiSettings);
-      } catch (e) {
-        console.log(e);
+      if (typeof uiSettings === 'string') {
+        try {
+          resultProperty.uiSettings = JSON.parse(uiSettings);
+        } catch (e) {
+          console.log(e);
+          resultProperty.uiSettings = uiSettings;
+        }
+      } else {
+        resultProperty.uiSettings = uiSettings;
       }
     } else {
       resultProperty.uiSettings = null;
@@ -2312,13 +2317,13 @@ function propertiesObjectToArray(properties, fields) {
         propObj.defaultValue = '';
       }
     }
-    if (propObj['uiSettings']) {
-      try {
-        propObj.uiSettings = JSON.stringify(propObj.uiSettings, null, 2);
-      } catch (error) {
-        propObj.uiSettings = '';
-      }
-    }
+    // if (propObj['uiSettings']) {
+    //   try {
+    //     propObj.uiSettings = JSON.stringify(propObj.uiSettings, null, 2);
+    //   } catch (error) {
+    //     propObj.uiSettings = '';
+    //   }
+    // }
     if (propObj['isMultiple']) {
       if ('defaultValues' in propObj) {
         propObj['defaultValue'] = propObj.defaultValues;
@@ -2734,7 +2739,7 @@ const ControlDate = _a => {
         OpenPickerIcon: DateIconComponent$1
       }
     }, datePickerProps, {
-      renderInput: params => jsx(TextField, Object.assign({}, params, {
+      renderInput: props => jsx(TextField, Object.assign({}, props, {
         fullWidth: true,
         size: "small",
         variant: "outlined",
@@ -2744,7 +2749,7 @@ const ControlDate = _a => {
         FormHelperTextProps: {
           variant: 'standard'
         },
-        inputProps: Object.assign(Object.assign({}, params.inputProps), {
+        inputProps: Object.assign(Object.assign({}, props.inputProps), {
           placeholder: placeholder
         })
       }, textFieldProps))
@@ -2839,54 +2844,58 @@ const ControlDateTime = _a => {
   }));
 };
 
-const ControlTime = ({
-  control,
-  name,
-  required,
-  label,
-  format: _format = TIME_DEFAULT_FORMAT,
-  hideErrorMessage: _hideErrorMessage = false,
-  requiredErrorText: _requiredErrorText = ''
-}) => {
-  const _a = useController({
+const ControlTime = _a => {
+  var {
+      control,
+      name,
+      required,
+      label,
+      textFieldProps = {},
+      format: format$1 = TIME_DEFAULT_FORMAT,
+      hideErrorMessage = false,
+      requiredErrorText = '',
+      placeholder
+    } = _a,
+    timePickerProps = __rest(_a, ["control", "name", "required", "label", "textFieldProps", "format", "hideErrorMessage", "requiredErrorText", "placeholder"]);
+  const _b = useController({
       control,
       name,
       rules: {
-        required: required ? _requiredErrorText || DEFAULT_REQUIRED_ERROR_TEXT : false,
+        required: required ? requiredErrorText || DEFAULT_REQUIRED_ERROR_TEXT : false,
         validate: val => {
-          if (isMatch(val, _format)) {
+          if (isMatch(val, format$1)) {
             return true;
           }
           return 'Incorrect date format';
         }
       }
     }),
-    _b = _a.field,
+    _c = _b.field,
     {
       onChange,
       ref,
       value
-    } = _b,
-    fieldProps = __rest(_b, ["onChange", "ref", "value"]),
+    } = _c,
+    fieldProps = __rest(_c, ["onChange", "ref", "value"]),
     {
       fieldState: {
         error
       }
-    } = _a;
+    } = _b;
   const [fieldValue, setFieldValue] = useState(null);
   const handleChange = date => {
     setFieldValue(date);
-    onChange(isValid(date) ? format(date, _format) : date);
+    onChange(isValid(date) ? format(date, format$1) : date);
   };
   useEffect(() => {
-    if (value && _format) {
-      let parsedValue = parse(value, _format, new Date());
+    if (value && format$1) {
+      let parsedValue = parse(value, format$1, new Date());
       if (!isValid(parsedValue)) {
         parsedValue = parse(value, 'HH:mm:ss.SSS', new Date());
       }
       setFieldValue(parsedValue);
     }
-  }, [value, _format]);
+  }, [value, format$1]);
   return jsx(TimePicker, Object.assign({}, fieldProps, {
     mask: "",
     inputRef: ref,
@@ -2897,8 +2906,9 @@ const ControlTime = ({
     }) : label,
     ampm: false,
     value: fieldValue,
-    inputFormat: _format,
-    onChange: handleChange,
+    inputFormat: format$1,
+    onChange: handleChange
+  }, timePickerProps, {
     renderInput: props => jsx(TextField, Object.assign({}, props, {
       fullWidth: true,
       size: "small",
@@ -2907,10 +2917,13 @@ const ControlTime = ({
           color: '#D6331F'
         }
       },
+      inputProps: Object.assign(Object.assign({}, props.inputProps), {
+        placeholder: placeholder
+      }),
       variant: "outlined",
       name: name,
       error: !!error,
-      helperText: !_hideErrorMessage && (error === null || error === void 0 ? void 0 : error.message),
+      helperText: !hideErrorMessage && (error === null || error === void 0 ? void 0 : error.message),
       FormHelperTextProps: {
         variant: 'standard'
       }

package/package.json

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

package/src/interfaces/definition.d.ts

@@ -47,7 +47,7 @@ export interface UiSettings {
     behaviorJson: {
         showDependOn?: string;
         hideDependOn?: string;
-        copyValueFrom?: string;
+        dynamicEntity: boolean;
     };
 }
 export interface Property {

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

@@ -1,6 +1,8 @@
+import { TextFieldProps } from '@mui/material/TextField';
+import { TimePickerProps } from '@mui/x-date-pickers/TimePicker';
 import { ReactNode } from 'react';
 import { Control } from 'react-hook-form';
-type Props = {
+type Props = Partial<TimePickerProps<unknown, unknown>> & {
     /**
      * React Hook Form `control`
      */
@@ -10,10 +12,12 @@ type Props = {
      */
     required?: boolean;
     name: string;
+    placeholder?: string;
+    textFieldProps?: TextFieldProps;
     label?: ReactNode;
     format?: string;
     hideErrorMessage?: boolean;
     requiredErrorText?: string;
 };
-export declare const ControlTime: ({ control, name, required, label, format, hideErrorMessage, requiredErrorText, }: Props) => JSX.Element;
+export declare const ControlTime: ({ control, name, required, label, textFieldProps, format, hideErrorMessage, requiredErrorText, placeholder, ...timePickerProps }: Props) => JSX.Element;
 export default ControlTime;