@dartech/arsenal-ui 1.4.10 → 1.4.12

package/index.js

@@ -2306,23 +2306,29 @@ const ControlArrayInput = ({
   required,
   defaultValue: _defaultValue = null
 }) => {
-  var _a, _b, _c;
+  var _a, _b;
   const [localValue, setLoacalValue] = useState('');
   const [error, setError] = useState(null);
-  const {
-    field: {
+  const _c = useController({
+      control,
+      name,
+      defaultValue: _defaultValue,
+      rules: {
+        required: required && DEFAULT_REQUIRED_ERROR_TEXT
+      }
+    }),
+    _d = _c.field,
+    {
       onChange,
       value: values
-    },
-    // fieldState: { error },
-    formState: {
-      errors
-    }
-  } = useController({
-    control,
-    name,
-    defaultValue: _defaultValue
-  });
+    } = _d,
+    fieldData = __rest(_d, ["onChange", "value"]),
+    {
+      // fieldState: { error },
+      formState: {
+        errors
+      }
+    } = _c;
   const handleInputChange = useCallback(e => {
     const {
       value
@@ -2330,15 +2336,16 @@ const ControlArrayInput = ({
     setLoacalValue(value);
   }, []);
   const handleAdd = useCallback(() => {
-    var _a;
     setError(null);
-    if (localValue && !((_a = errors[name]) === null || _a === void 0 ? void 0 : _a.message) && !(Array.isArray(values) && values.includes(localValue))) {
+    if (localValue &&
+    // !errors[name]?.message &&
+    !(Array.isArray(values) && values.includes(localValue))) {
       onChange([...(values !== null && values !== void 0 ? values : []), localValue]);
       setLoacalValue('');
     } else if (Array.isArray(values) && values.includes(localValue)) {
       setError('This value already exists');
     }
-  }, [localValue, errors, name, onChange, values]);
+  }, [localValue, onChange, values]);
   const handleDelete = useCallback(value => {
     onChange(values.filter(code => code !== value));
   }, [values, onChange]);
@@ -2376,9 +2383,10 @@ const ControlArrayInput = ({
       }, index))
     })), jsx("input", Object.assign({
       type: "hidden"
-    }, control.register(name, {
-      required: required && 'Please, add a value'
-    }))), jsx(TextField, {
+    }, control.register(name), {
+      onChange: onChange,
+      value: values
+    }, fieldData)), jsx(TextField, {
       fullWidth: true,
       variant: "outlined",
       size: "small",
@@ -2392,8 +2400,7 @@ const ControlArrayInput = ({
       InputProps: {
         endAdornment: jsx(IconButton, Object.assign({
           size: "small",
-          onClick: handleAdd,
-          disabled: !!((_c = errors[name]) === null || _c === void 0 ? void 0 : _c.message)
+          onClick: handleAdd
         }, {
           children: jsx(SvgIcon, {
             children: jsx("path", {
@@ -3026,6 +3033,7 @@ function TableInner({
   pagination = true,
   loading = false,
   onRowClick,
+  emptyDataText,
   verticalAlign = 'middle'
 }, ref) {
   const {
@@ -3079,7 +3087,7 @@ function TableInner({
           })
         })
       }), jsx(TableBody, {
-        children: rows.map((row, index) => jsx(TableRow, Object.assign({
+        children: rows.length ? rows.map((row, index) => jsx(TableRow, Object.assign({
           hover: true,
           onClick: onRowClick ? () => onRowClick(row) : row.onClick,
           sx: {
@@ -3094,7 +3102,18 @@ function TableInner({
           }, {
             children: column.renderCell ? column.renderCell(row, index) : row[column.id]
           }), idx))
-        }), index))
+        }), index)) : jsx(TableRow, Object.assign({
+          sx: {
+            verticalAlign
+          }
+        }, {
+          children: jsx(TableCell, Object.assign({
+            align: "center",
+            colSpan: columns.length
+          }, {
+            children: emptyDataText !== null && emptyDataText !== void 0 ? emptyDataText : 'Нет данных'
+          }))
+        }))
       }), pagination || children ? jsx(TableFooter, {
         children: jsxs(TableRow, {
           children: [children && jsx(TableCell, Object.assign({
@@ -3106,7 +3125,7 @@ function TableInner({
             }
           }, {
             children: children
-          })), pagination && rows.length && jsx(MuiTablePagination, {
+          })), pagination && !!rows.length ? jsx(MuiTablePagination, {
             rowsPerPageOptions: [5, 10, 25],
             count: totalCount,
             rowsPerPage: +size,
@@ -3116,7 +3135,7 @@ function TableInner({
             },
             onPageChange: (_, page) => onPageChange(page),
             onRowsPerPageChange: event => onSizeChange(+event.target.value)
-          })]
+          }) : null]
         })
       }) : null]
     }))]

package/package.json

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

package/src/lib/Table/SimpleTable/SimpleTable.d.ts

@@ -9,8 +9,9 @@ interface Props<T> {
     onRowClick?: (row: Row<T>) => void;
     children?: ReactNode;
     verticalAlign?: 'top' | 'middle' | 'bottom' | 'sub' | 'baseline';
+    emptyDataText?: string;
 }
-declare function TableInner<T>({ columns, rows, totalCount, children, pagination, loading, onRowClick, verticalAlign }: Props<T>, ref: ForwardedRef<HTMLTableElement>): JSX.Element;
+declare function TableInner<T>({ columns, rows, totalCount, children, pagination, loading, onRowClick, emptyDataText, verticalAlign }: Props<T>, ref: ForwardedRef<HTMLTableElement>): JSX.Element;
 export declare const SimpleTable: <T>(props: Props<T> & {
     ref?: ForwardedRef<HTMLTableElement>;
 }) => ReturnType<typeof TableInner>;