@dartech/arsenal-ui 1.4.38 → 1.4.40

package/index.js

@@ -709,6 +709,17 @@ const ControlRadio = ({
     if (typeof option === 'string') return option;
     return labelKey ? option[labelKey] : option.label;
   }, [labelKey]);
+  const setChecked = useCallback(optionValue => {
+    if (typeof optionValue === 'string') return optionValue === fieldProps.value;
+    return optionValue === (typeof fieldProps.value === 'string' ? fieldProps.value === 'true' : fieldProps.value);
+  }, [fieldProps.value]);
+  const localOnChange = useCallback(e => {
+    if (e.target.value === 'true' || e.target.value === 'false') {
+      onChange(e.target.value === 'true');
+    } else {
+      onChange(e);
+    }
+  }, [onChange]);
   return jsxs(FormControl, Object.assign({
     disabled: disabled,
     error: !!error
@@ -720,11 +731,13 @@ const ControlRadio = ({
     })), jsx(RadioGroup, Object.assign({}, fieldProps, {
       row: row,
       "aria-labelledby": "radio-buttons-group",
-      onChange: customOnChange ? customOnChange : onChange
+      onChange: customOnChange ? customOnChange : localOnChange
     }, {
       children: _values.map((item, i) => jsx(FormControlLabel, {
         value: getValue(item),
-        control: jsx(Radio, Object.assign({}, radioProps)),
+        control: jsx(Radio, Object.assign({}, radioProps, {
+          checked: setChecked(getValue(item))
+        })),
         label: getLabel(item)
       }, i))
     })), !hideErrorMessage && (error === null || error === void 0 ? void 0 : error.message) && jsx(FormHelperText, Object.assign({
@@ -870,11 +883,15 @@ const ControlAutocomplete = _a => {
             children: "*"
           })]
         }) : label,
+        InputLabelProps: {
+          shrink: !!(autocompleteProps === null || autocompleteProps === void 0 ? void 0 : autocompleteProps.placeholder)
+        },
         sx: {
           '.MuiInputLabel-root span': {
             color: '#D6331F'
           }
         },
+        placeholder: autocompleteProps === null || autocompleteProps === void 0 ? void 0 : autocompleteProps.placeholder,
         error: !!error,
         inputRef: ref,
         helperText: !hideErrorMessage && (error === null || error === void 0 ? void 0 : error.message),
@@ -1044,6 +1061,9 @@ function ControlQueryAutocomplete(_a) {
           children: "*"
         })]
       }) : label,
+      InputLabelProps: {
+        shrink: true
+      },
       sx: {
         '.MuiInputLabel-root span': {
           color: '#D6331F'
@@ -2026,6 +2046,11 @@ const getSinglePropertyFillOptions = ({
   return options;
 };
 
+const DEFAULT_ERROR_TEXT = {
+  required: DEFAULT_REQUIRED_ERROR_TEXT,
+  notValidNumber: 'Not valid number',
+  notValidInteger: 'Not valid integer'
+};
 const ControlNumberInput = _a => {
   var _b, _c;
   var {
@@ -2040,22 +2065,25 @@ const ControlNumberInput = _a => {
       onChange: customOnChange,
       decimal = false,
       valueAsNumber = true,
-      requiredErrorText = '',
-      useFormattedInputValue = false
+      useFormattedInputValue = false,
+      errorText
     } = _a,
-    textFieldProps = __rest(_a, ["control", "validate", "name", "label", "required", "defaultValue", "disabled", "hideErrorMessage", "onChange", "decimal", "valueAsNumber", "requiredErrorText", "useFormattedInputValue"]);
+    textFieldProps = __rest(_a, ["control", "validate", "name", "label", "required", "defaultValue", "disabled", "hideErrorMessage", "onChange", "decimal", "valueAsNumber", "useFormattedInputValue", "errorText"]);
+  const textError = useMemo(() => {
+    return errorText || DEFAULT_ERROR_TEXT;
+  }, [errorText]);
   const _d = useController({
       name,
       control,
       defaultValue,
       rules: {
-        required: required ? requiredErrorText || DEFAULT_REQUIRED_ERROR_TEXT : false,
+        required: required ? textError.required : false,
         validate: val => {
           if (val === null || val === 0) return true;
           if (decimal && !floatsOnly.test(val) || /^-*0+$/.test(val)) {
-            return 'Not valid number';
+            return textError.notValidNumber;
           } else if (!decimal && !digitsOnly.test(val)) {
-            return 'Not valid integer';
+            return textError.notValidInteger;
           }
           return validate ? typeof validate === 'function' ? validate(val) : true : true;
         }
@@ -2236,38 +2264,33 @@ const ControlDate = _a => {
       console.error(e);
     }
   }, [format$1]);
-  return jsx(DatePicker, Object.assign({}, field, {
-    label: required ? jsxs(Fragment, {
-      children: [label, " ", jsx("span", {
-        children: "*"
-      })]
-    }) : label
-  }, localFormat ? {
-    inputFormat: localFormat
-  } : {}, {
-    value: localFormat ? parse(field.value, localFormat, new Date()) : field.value,
-    onChange: handleChange,
-    components: {
-      OpenPickerIcon: DateIconComponent$1
-    }
-  }, datePickerProps, {
-    renderInput: params => jsx(TextField, Object.assign({}, params, {
-      fullWidth: true,
-      size: "small",
-      sx: {
-        '.MuiInputLabel-root span': {
-          color: '#D6331F'
-        }
-      },
-      variant: "outlined",
-      name: name,
-      error: !!error,
-      helperText: !hideErrorMessage && (error === null || error === void 0 ? void 0 : error.message),
-      FormHelperTextProps: {
-        variant: 'standard'
+  return jsxs(Fragment, {
+    children: [jsx(FormLabel, Object.assign({
+      required: required
+    }, {
+      children: label
+    })), jsx(DatePicker, Object.assign({}, field, localFormat ? {
+      inputFormat: localFormat
+    } : {}, {
+      value: localFormat ? parse(field.value, localFormat, new Date()) : field.value,
+      onChange: handleChange,
+      components: {
+        OpenPickerIcon: DateIconComponent$1
       }
-    }, textFieldProps))
-  }));
+    }, datePickerProps, {
+      renderInput: params => jsx(TextField, Object.assign({}, params, {
+        fullWidth: true,
+        size: "small",
+        variant: "outlined",
+        name: name,
+        error: !!error,
+        helperText: !hideErrorMessage && (error === null || error === void 0 ? void 0 : error.message),
+        FormHelperTextProps: {
+          variant: 'standard'
+        }
+      }, textFieldProps))
+    }))]
+  });
 };
 
 const DateIconComponent = () => {
@@ -7086,6 +7109,10 @@ const inputThemeOptions = {
     },
     MuiFormLabel: {
       styleOverrides: {
+        root: {
+          fontSize: 14,
+          fontWeight: 500
+        },
         asterisk: {
           color: '#D6331F',
           '&$error': {
@@ -8003,4 +8030,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_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_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.38",
+  "version": "1.4.40",
   "author": "DAR",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

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

@@ -2,6 +2,16 @@ import type { ReactNode } from 'react';
 import { TextFieldProps } from '@mui/material/TextField';
 import { Control } from 'react-hook-form';
 import { ValidateFunc } from '../../interfaces';
+export interface ErrorText {
+    required: string;
+    notValidNumber: string;
+    notValidInteger: string;
+}
+export declare const DEFAULT_ERROR_TEXT: {
+    required: string;
+    notValidNumber: string;
+    notValidInteger: string;
+};
 type Props = TextFieldProps & {
     /**
      * React Hook Form control `name` propery
@@ -54,9 +64,9 @@ type Props = TextFieldProps & {
      */
     useFormattedInputValue?: boolean;
     /**
-     * Set required error text
+     * Set error text
      */
-    requiredErrorText?: string;
+    errorText?: ErrorText;
 };
-export declare const ControlNumberInput: ({ control, validate, name, label, required, defaultValue, disabled, hideErrorMessage, onChange: customOnChange, decimal, valueAsNumber, requiredErrorText, useFormattedInputValue, ...textFieldProps }: Props) => JSX.Element;
+export declare const ControlNumberInput: ({ control, validate, name, label, required, defaultValue, disabled, hideErrorMessage, onChange: customOnChange, decimal, valueAsNumber, useFormattedInputValue, errorText, ...textFieldProps }: Props) => JSX.Element;
 export default ControlNumberInput;

package/src/theme/inputThemeOptions.d.ts

@@ -105,6 +105,10 @@ declare const inputThemeOptions: {
         };
         MuiFormLabel: {
             styleOverrides: {
+                root: {
+                    fontSize: number;
+                    fontWeight: number;
+                };
                 asterisk: {
                     color: string;
                     '&$error': {