@bigbinary/neetoui 5.2.44 → 5.2.46

package/index.js

@@ -15755,6 +15755,8 @@ var Tooltip = function Tooltip(_ref) {
 };
 
 var _excluded$G = ["icon", "iconPosition", "iconSize", "label", "loading", "onClick", "to", "type", "style", "fullWidth", "className", "disabled", "size", "href", "tooltipProps", "children"];
+function ownKeys$n(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$m(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$n(Object(source), !0).forEach(function (key) { _defineProperty$7(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$n(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var BUTTON_STYLES = {
   primary: "primary",
   secondary: "secondary",
@@ -15829,9 +15831,8 @@ var Button = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
     }
   }
   var handleClick = function handleClick(e) {
-    if (!loading && !disabled) {
-      onClick(e);
-    }
+    if (loading || disabled) return;
+    onClick(e);
   };
   var Icon = typeof icon === "string" ? function () {
     return /*#__PURE__*/React__default.createElement("i", {
@@ -15842,8 +15843,6 @@ var Button = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
   return /*#__PURE__*/React__default.createElement(Tooltip, _extends$4({
     disabled: !tooltipProps
   }, tooltipProps), /*#__PURE__*/React__default.createElement(Parent, _extends$4({
-    disabled: disabled,
-    ref: ref,
     className: classnames$1("neeto-ui-btn", [className], {
       "neeto-ui-btn--style-primary": style === BUTTON_STYLES.primary,
       "neeto-ui-btn--style-secondary": style === BUTTON_STYLES.secondary,
@@ -15859,21 +15858,18 @@ var Button = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
       disabled: disabled
     }),
     onClick: handleClick
-  }, elementSpecificProps, otherProps), renderLabel && /*#__PURE__*/React__default.createElement("span", null, renderLabel), /*#__PURE__*/React__default.createElement(AnimatePresence, {
-    mode: "wait"
-  }, icon ? /* When Icon is present, animate between the icon and the spinner*/
-  loading ? /*#__PURE__*/React__default.createElement(Spinner$1, {
+  }, _objectSpread$m(_objectSpread$m({
+    disabled: disabled,
+    ref: ref
+  }, elementSpecificProps), otherProps)), renderLabel && /*#__PURE__*/React__default.createElement("span", null, renderLabel), icon ? loading ? /*#__PURE__*/React__default.createElement(Spinner$1, {
     "aria-hidden": "true",
     className: "neeto-ui-btn__spinner",
-    key: "1",
     size: 16
   }) : /*#__PURE__*/React__default.createElement(Icon, {
     "aria-hidden": "true",
     className: "neeto-ui-btn__icon",
-    key: "2",
     size: iconSize
-  }) : /* When Icon is not present, animate the margin from 0 to the needed value*/
-  loading && /*#__PURE__*/React__default.createElement(motion.div, {
+  }) : /*#__PURE__*/React__default.createElement(AnimatePresence, null, loading && /*#__PURE__*/React__default.createElement(motion.div, {
     animate: {
       width: "auto",
       scale: 1
@@ -33809,19 +33805,22 @@ var Table = function Table(_ref) {
     _useState6 = _slicedToArray$2(_useState5, 2),
     columns = _useState6[0],
     setColumns = _useState6[1];
-  var isPageChangeHandlerDefault = handlePageChange === noop$3;
+  var isDefaultPageChangeHandler = handlePageChange === noop$3;
+  var history = useHistory();
   var headerRef = useRef();
   var resizeObserver = useRef(new ResizeObserver(function (_ref2) {
     var _ref3 = _slicedToArray$2(_ref2, 1),
-      height = _ref3[0].contentRect.height;
-    return setContainerHeight(height);
+      entry = _ref3[0];
+    return setContainerHeight(entry.contentRect.height);
   }));
   var tableRef = useCallback(function (table) {
     if (!fixedHeight) return;
     var observer = resizeObserver.current;
     if (table !== null) {
       observer.observe(table === null || table === void 0 ? void 0 : table.parentNode);
-    } else if (observer) observer.disconnect();
+    } else if (observer) {
+      observer.disconnect();
+    }
   }, [resizeObserver.current, fixedHeight]);
   useTimeout(function () {
     var headerHeight = headerRef.current ? headerRef.current.offsetHeight : TABLE_DEFAULT_HEADER_HEIGHT;
@@ -33852,7 +33851,7 @@ var Table = function Table(_ref) {
       dataIndex: snakeToCamelCase((_queryParams$sort_by = queryParams.sort_by) !== null && _queryParams$sort_by !== void 0 ? _queryParams$sort_by : "")
     }, assoc("sortOrder", TABLE_SORT_ORDERS[queryParams.order_by]), columnData);
   };
-  var sortedColumns = isPageChangeHandlerDefault ? setSortFromURL(curatedColumnsData) : curatedColumnsData;
+  var sortedColumns = isDefaultPageChangeHandler ? setSortFromURL(curatedColumnsData) : curatedColumnsData;
   var locale = {
     emptyText: /*#__PURE__*/React__default.createElement(Typography, {
       style: "body2"
@@ -33862,87 +33861,78 @@ var Table = function Table(_ref) {
     return _objectSpread$6(_objectSpread$6({}, sortedColumn), {}, {
       onHeaderCell: function onHeaderCell(column) {
         var _sortedColumn$onHeade;
-        var col = (_sortedColumn$onHeade = sortedColumn.onHeaderCell) === null || _sortedColumn$onHeade === void 0 ? void 0 : _sortedColumn$onHeade.call(sortedColumn, column);
-        return _objectSpread$6(_objectSpread$6({}, col), {}, {
+        return _objectSpread$6(_objectSpread$6({}, (_sortedColumn$onHeade = sortedColumn.onHeaderCell) === null || _sortedColumn$onHeade === void 0 ? void 0 : _sortedColumn$onHeade.call(sortedColumn, column)), {}, {
           "data-text-align": column.align
         });
       }
     });
   });
-  var isPaginationVisible = otherProps.pagination !== false && rowData.length > defaultPageSize;
-  var rowSelectionProps = false;
-  if (rowSelection) {
-    rowSelectionProps = _objectSpread$6(_objectSpread$6({
-      type: "checkbox"
-    }, rowSelection), {}, {
-      onChange: function onChange(selectedRowKeys, selectedRows) {
-        return onRowSelect && onRowSelect(selectedRowKeys, selectedRows);
-      },
-      selectedRowKeys: selectedRowKeys
-    });
-  }
+  var rowSelectionProps = rowSelection ? _objectSpread$6(_objectSpread$6({
+    type: "checkbox"
+  }, rowSelection), {}, {
+    onChange: function onChange(selectedRowKeys, selectedRows) {
+      return onRowSelect && onRowSelect(selectedRowKeys, selectedRows);
+    },
+    selectedRowKeys: selectedRowKeys
+  }) : false;
   var reordableHeader = {
     header: {
       cell: enableColumnResize ? enableColumnReorder ? HeaderCell : ResizableHeaderCell : enableColumnReorder ? ReorderableHeaderCell : null
     }
   };
-  var componentOverrides = _objectSpread$6(_objectSpread$6({}, components), reordableHeader);
-  var calculateTableContainerHeight = function calculateTableContainerHeight() {
-    return containerHeight - headerHeight - (isPaginationVisible ? TABLE_PAGINATION_HEIGHT : 0);
-  };
-  var itemRender = function itemRender(_, type, originalElement) {
-    if (type === "prev") {
-      return /*#__PURE__*/React__default.createElement(Button, {
-        className: "",
-        icon: Left,
-        size: "small",
-        style: "text"
-      });
-    }
-    if (type === "next") {
-      return /*#__PURE__*/React__default.createElement(Button, {
-        className: "",
-        icon: Right,
-        size: "small",
-        style: "text"
-      });
-    }
-    if (type === "jump-prev") {
-      return /*#__PURE__*/React__default.createElement(Button, {
-        className: "",
-        icon: MenuHorizontal,
-        size: "small",
-        style: "text"
-      });
-    }
-    if (type === "jump-next") {
-      return /*#__PURE__*/React__default.createElement(Button, {
-        className: "",
-        icon: MenuHorizontal,
-        size: "small",
-        style: "text"
-      });
-    }
-    return originalElement;
-  };
   var calculateRowsPerPage = function calculateRowsPerPage() {
     var viewportHeight = window.innerHeight;
     var rowsPerPage = Math.floor((viewportHeight - TABLE_PAGINATION_HEIGHT) / TABLE_ROW_HEIGHT * 3);
     return Math.ceil(rowsPerPage / 10) * 10;
   };
+  var pageSize = shouldDynamicallyRenderRowSize ? calculateRowsPerPage() : paginationProps.pageSize || defaultPageSize;
+  var calculateTableContainerHeight = function calculateTableContainerHeight() {
+    var isPaginationVisible = otherProps.pagination !== false && rowData.length > pageSize;
+    return containerHeight - headerHeight - (isPaginationVisible ? TABLE_PAGINATION_HEIGHT : 0);
+  };
   var calculatePageSizeOptions = function calculatePageSizeOptions() {
-    var rowsPerPage = shouldDynamicallyRenderRowSize ? calculateRowsPerPage() : defaultPageSize;
     return dynamicArray(5, function (index) {
-      return (index + 1) * rowsPerPage;
+      return (index + 1) * pageSize;
     });
   };
+  var itemRender = function itemRender(_, type, originalElement) {
+    var commonProps = {
+      size: "small",
+      style: "text"
+    };
+    if (type === "prev") return /*#__PURE__*/React__default.createElement(Button, _extends$4({
+      icon: Left
+    }, commonProps));
+    if (type === "next") return /*#__PURE__*/React__default.createElement(Button, _extends$4({
+      icon: Right
+    }, commonProps));
+    if (type === "jump-prev" || type === "jump-next") {
+      return /*#__PURE__*/React__default.createElement(Button, _extends$4({
+        icon: MenuHorizontal
+      }, commonProps));
+    }
+    return originalElement;
+  };
+  useEffect(function () {
+    var shouldNavigateToLastPage = isEmpty(rowData) && !loading && currentPageNumber !== 1;
+    if (!shouldNavigateToLastPage) return;
+    var lastPage = Math.ceil(totalCount / pageSize);
+    var page = Math.max(1, lastPage);
+    var pathname = window.location.pathname;
+    isDefaultPageChangeHandler ? history.push(buildUrl(pathname, mergeLeft({
+      page: page
+    }, queryParams))) : handlePageChange(page, pageSize);
+  }, [rowData]);
+  useEffect(function () {
+    return setColumns(columnData);
+  }, [columnData]);
   var renderTable = function renderTable() {
     return /*#__PURE__*/React__default.createElement(_Table, _extends$4({
       bordered: bordered,
       loading: loading,
       locale: locale,
       columns: sortedColumnsWithAlignment,
-      components: componentOverrides,
+      components: _objectSpread$6(_objectSpread$6({}, components), reordableHeader),
       dataSource: rowData,
       ref: tableRef,
       rowKey: "id",
@@ -33954,7 +33944,7 @@ var Table = function Table(_ref) {
         showSizeChanger: false,
         total: totalCount !== null && totalCount !== void 0 ? totalCount : 0,
         current: currentPageNumber,
-        defaultPageSize: shouldDynamicallyRenderRowSize ? calculateRowsPerPage() : defaultPageSize,
+        defaultPageSize: pageSize,
         pageSizeOptions: calculatePageSizeOptions(),
         onChange: handlePageChange,
         itemRender: itemRender
@@ -33967,7 +33957,7 @@ var Table = function Table(_ref) {
         y: calculateTableContainerHeight()
       }, scroll),
       onChange: function onChange(pagination, _, sorter) {
-        isPageChangeHandlerDefault && handleTableChange(pagination, sorter);
+        isDefaultPageChangeHandler && handleTableChange(pagination, sorter);
       },
       onHeaderRow: function onHeaderRow() {
         return {
@@ -33987,13 +33977,7 @@ var Table = function Table(_ref) {
       }
     }, otherProps));
   };
-  useEffect(function () {
-    setColumns(columnData);
-  }, [columnData]);
-  if (enableColumnReorder) {
-    return /*#__PURE__*/React__default.createElement(ReactDragListView.DragColumn, dragProps, renderTable());
-  }
-  return renderTable();
+  return enableColumnReorder ? /*#__PURE__*/React__default.createElement(ReactDragListView.DragColumn, dragProps, renderTable()) : renderTable();
 };
 
 var _excluded$4 = ["size", "rows", "disabled", "required", "nakedTextarea", "helpText", "error", "label", "className", "maxLength", "unlimitedChars", "labelProps"];