@terraware/web-components 2.3.71-rc.1 → 2.3.71-rc.3

package/components/table/EnhancedTableToolbar.d.ts

@@ -1,8 +1,11 @@
 import { TopBarButton } from '.';
+import { EnhancedTopBarSelectionConfig } from './EnhancedTableToolbarV2';
 interface EnhancedTableToolbarProps {
+    isAllSelected?: boolean;
     numSelected: number;
-    renderNumSelectedText?: (numSelected: number) => string | JSX.Element;
+    renderNumSelectedText?: (numSelected: number) => string;
     topBarButtons?: (TopBarButton | JSX.Element)[];
+    topBarSelectionConfig?: EnhancedTopBarSelectionConfig;
 }
 export default function EnhancedTableToolbar(props: EnhancedTableToolbarProps): JSX.Element | null;
 export {};

package/components/table/EnhancedTableToolbar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EnhancedTableToolbar.d.ts","sourceRoot":"","sources":["../../../src/components/table/EnhancedTableToolbar.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAkB,YAAY,EAAE,MAAM,GAAG,CAAC;AAiBjD,UAAU,yBAAyB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;IACtE,aAAa,CAAC,EAAE,CAAC,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;CAChD;AAED,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,GAAG,CAAC,OAAO,GAAG,IAAI,CA6BjG"}
+{"version":3,"file":"EnhancedTableToolbar.d.ts","sourceRoot":"","sources":["../../../src/components/table/EnhancedTableToolbar.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAkB,YAAY,EAAE,MAAM,GAAG,CAAC;AAGjD,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AAkBzE,UAAU,yBAAyB;IACjC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;IACxD,aAAa,CAAC,EAAE,CAAC,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;IAC/C,qBAAqB,CAAC,EAAE,6BAA6B,CAAC;CACvD;AAED,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,GAAG,CAAC,OAAO,GAAG,IAAI,CAyDjG"}

package/components/table/EnhancedTableToolbar.js

@@ -1,15 +1,16 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = EnhancedTableToolbar;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _material = require("@mui/material");
+var _styles = require("@mui/styles");
 var _ = require(".");
 var _Button = _interopRequireDefault(require("../Button/Button"));
-var _styles = require("@mui/styles");
 var _Tooltip = _interopRequireDefault(require("../Tooltip/Tooltip"));
 var styles = (0, _styles.makeStyles)(function (theme) {
   return {
@@ -21,14 +22,40 @@ var styles = (0, _styles.makeStyles)(function (theme) {
     },
     buttonSpacing: {
       marginLeft: theme.spacing(1)
+    },
+    selectLink: {
+      color: theme.palette.TwClrTxtBrand,
+      cursor: 'pointer'
     }
   };
 });
 function EnhancedTableToolbar(props) {
-  var numSelected = props.numSelected,
+  var isAllSelected = props.isAllSelected,
+    numSelected = props.numSelected,
     renderNumSelectedText = props.renderNumSelectedText,
-    topBarButtons = props.topBarButtons;
+    topBarButtons = props.topBarButtons,
+    topBarSelectionConfig = props.topBarSelectionConfig;
   var classes = styles();
+  var topBarSelection = (0, _react.useMemo)(function () {
+    if (!renderNumSelectedText) {
+      return null;
+    }
+    if (!topBarSelectionConfig) {
+      return renderNumSelectedText(numSelected);
+    }
+    var handleSelectAll = topBarSelectionConfig.handleSelectAll,
+      handleSelectNone = topBarSelectionConfig.handleSelectNone,
+      renderSelectAllText = topBarSelectionConfig.renderSelectAllText,
+      renderSelectNoneText = topBarSelectionConfig.renderSelectNoneText,
+      renderEnhancedNumSelectedText = topBarSelectionConfig.renderEnhancedNumSelectedText;
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderEnhancedNumSelectedText ? renderEnhancedNumSelectedText() : renderNumSelectedText(numSelected), ' ', !isAllSelected && handleSelectAll && renderSelectAllText && /*#__PURE__*/_react.default.createElement(_material.Link, {
+      className: classes.selectLink,
+      onClick: handleSelectAll
+    }, renderSelectAllText()), isAllSelected && handleSelectNone && renderSelectNoneText && /*#__PURE__*/_react.default.createElement(_material.Link, {
+      className: classes.selectLink,
+      onClick: handleSelectNone
+    }, renderSelectNoneText()));
+  }, [renderNumSelectedText, topBarSelectionConfig, numSelected]);
   return renderNumSelectedText && numSelected > 0 ? /*#__PURE__*/_react.default.createElement(_material.Toolbar, {
     className: classes.toolbar
   }, /*#__PURE__*/_react.default.createElement(_material.Typography, {
@@ -36,7 +63,7 @@ function EnhancedTableToolbar(props) {
     variant: "subtitle1",
     component: "div",
     className: classes.flexText
-  }, renderNumSelectedText(numSelected)), topBarButtons === null || topBarButtons === void 0 ? void 0 : topBarButtons.map(function (tbButton, index) {
+  }, topBarSelection), topBarButtons === null || topBarButtons === void 0 ? void 0 : topBarButtons.map(function (tbButton, index) {
     return (0, _.isTopBarButton)(tbButton) ? /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
       title: tbButton.tooltipTitle,
       key: index

package/components/table/EnhancedTableToolbarV2.d.ts

@@ -0,0 +1,20 @@
+import { TopBarButton, EnhancedTopBarSelectionProps } from './index';
+export interface EnhancedTopBarSelectionConfig {
+    handleSelectAll?: () => void;
+    handleSelectNone?: () => void;
+    renderEnhancedNumSelectedText?: () => string;
+    renderSelectAllText?: () => string;
+    renderSelectNoneText?: () => string;
+}
+type DecoratedEnhancedTopBarSelectionConfig = Omit<EnhancedTopBarSelectionConfig, 'renderEnhancedNumSelectedText' | 'renderSelectAllText' | 'renderSelectNoneText'> & EnhancedTopBarSelectionProps;
+interface EnhancedTableToolbarV2Props {
+    selectedRowsCount: number;
+    pagesCount: number;
+    renderNumSelectedText?: (selectedCount: number) => string;
+    rowsCount: number;
+    topBarButtons?: (TopBarButton | JSX.Element)[];
+    topBarSelectionConfig?: DecoratedEnhancedTopBarSelectionConfig;
+}
+declare const EnhancedTableToolbarV2: ({ selectedRowsCount, pagesCount, renderNumSelectedText, rowsCount, topBarButtons, topBarSelectionConfig, }: EnhancedTableToolbarV2Props) => JSX.Element;
+export default EnhancedTableToolbarV2;
+//# sourceMappingURL=EnhancedTableToolbarV2.d.ts.map

package/components/table/EnhancedTableToolbarV2.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EnhancedTableToolbarV2.d.ts","sourceRoot":"","sources":["../../../src/components/table/EnhancedTableToolbarV2.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAC;AAErE,MAAM,WAAW,6BAA6B;IAC5C,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9B,6BAA6B,CAAC,EAAE,MAAM,MAAM,CAAC;IAC7C,mBAAmB,CAAC,EAAE,MAAM,MAAM,CAAC;IACnC,oBAAoB,CAAC,EAAE,MAAM,MAAM,CAAC;CACrC;AAED,KAAK,sCAAsC,GAAG,IAAI,CAChD,6BAA6B,EAC7B,+BAA+B,GAAG,qBAAqB,GAAG,sBAAsB,CACjF,GACC,4BAA4B,CAAC;AAE/B,UAAU,2BAA2B;IACnC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1D,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,CAAC,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;IAC/C,qBAAqB,CAAC,EAAE,sCAAsC,CAAC;CAChE;AAED,QAAA,MAAM,sBAAsB,+GAOzB,2BAA2B,gBA4B7B,CAAC;AAEF,eAAe,sBAAsB,CAAC"}

package/components/table/EnhancedTableToolbarV2.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
+var _react = _interopRequireWildcard(require("react"));
+var _EnhancedTableToolbar = _interopRequireDefault(require("./EnhancedTableToolbar"));
+var EnhancedTableToolbarV2 = function EnhancedTableToolbarV2(_ref) {
+  var selectedRowsCount = _ref.selectedRowsCount,
+    pagesCount = _ref.pagesCount,
+    renderNumSelectedText = _ref.renderNumSelectedText,
+    rowsCount = _ref.rowsCount,
+    topBarButtons = _ref.topBarButtons,
+    topBarSelectionConfig = _ref.topBarSelectionConfig;
+  var _topBarSelectionConfig = (0, _react.useMemo)(function () {
+    if (!topBarSelectionConfig) {
+      return topBarSelectionConfig;
+    }
+    var _renderEnhancedNumSelectedText = topBarSelectionConfig.renderEnhancedNumSelectedText,
+      _renderSelectAllText = topBarSelectionConfig.renderSelectAllText;
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, topBarSelectionConfig), {}, {
+      renderEnhancedNumSelectedText: function renderEnhancedNumSelectedText() {
+        return _renderEnhancedNumSelectedText && _renderEnhancedNumSelectedText(selectedRowsCount || 0, pagesCount) || '';
+      },
+      renderSelectAllText: function renderSelectAllText() {
+        return _renderSelectAllText && _renderSelectAllText(rowsCount) || '';
+      }
+    });
+  }, [topBarSelectionConfig, selectedRowsCount, rowsCount, pagesCount]);
+  if (topBarSelectionConfig) {
+    return /*#__PURE__*/_react.default.createElement(_EnhancedTableToolbar.default, {
+      numSelected: selectedRowsCount,
+      topBarButtons: topBarButtons,
+      topBarSelectionConfig: _topBarSelectionConfig,
+      isAllSelected: rowsCount === selectedRowsCount,
+      renderNumSelectedText: renderNumSelectedText
+    });
+  }
+  return /*#__PURE__*/_react.default.createElement(_EnhancedTableToolbar.default, {
+    numSelected: selectedRowsCount,
+    renderNumSelectedText: renderNumSelectedText,
+    topBarButtons: topBarButtons
+  });
+};
+var _default = EnhancedTableToolbarV2;
+exports.default = _default;

package/components/table/index.d.ts

@@ -11,12 +11,17 @@ export interface HeadCell {
     tooltipTitle?: TooltipProps['title'];
 }
 export interface LocalizationProps {
-    renderNumSelectedText?: (numSelected: number) => string | JSX.Element;
+    renderNumSelectedText?: (numSelected: number) => string;
     renderPaginationText?: (from: number, to: number, total: number) => string;
     booleanFalseText: string;
     booleanTrueText: string;
     editText: string;
 }
+export type EnhancedTopBarSelectionProps = {
+    renderEnhancedNumSelectedText?: (selectedCount: number, pagesCount: number) => string;
+    renderSelectAllText?: (rowsCount: number) => string;
+    renderSelectNoneText?: () => string;
+};
 export interface Props<T> extends LocalizationProps {
     id?: string;
     orderBy: string;
@@ -42,6 +47,7 @@ export interface Props<T> extends LocalizationProps {
     reloadData?: () => void;
     stickyHeader?: boolean;
     hideHeader?: boolean;
+    enhancedTopBarSelectionConfig?: EnhancedTopBarSelectionProps;
 }
 export type TopBarButton = {
     buttonText?: string;
@@ -52,6 +58,6 @@ export type TopBarButton = {
     tooltipTitle?: TooltipProps['title'];
 };
 export declare const isTopBarButton: (input: unknown) => input is TopBarButton;
-export default function EnhancedTable<T extends TableRowType>({ id, columns, rows, order: _order, orderBy: _orderBy, Renderer, onSelect, DetailsRenderer, sortComparator, sortHandler, isInactive, isPresorted, onReorderEnd, isClickable, emptyTableMessage, showCheckbox, showTopBar, topBarButtons, selectedRows, setSelectedRows, controlledOnSelect, reloadData, stickyHeader, hideHeader, booleanFalseText, booleanTrueText, editText, renderNumSelectedText, renderPaginationText, }: Props<T>): JSX.Element;
+export default function EnhancedTable<T extends TableRowType>({ id, columns, rows, order: _order, orderBy: _orderBy, Renderer, onSelect, DetailsRenderer, sortComparator, sortHandler, isInactive, isPresorted, onReorderEnd, isClickable, emptyTableMessage, showCheckbox, showTopBar, topBarButtons, selectedRows, setSelectedRows, controlledOnSelect, reloadData, stickyHeader, hideHeader, booleanFalseText, booleanTrueText, editText, renderNumSelectedText, renderPaginationText, enhancedTopBarSelectionConfig, }: Props<T>): JSX.Element;
 export declare function tableSort<T>(ignore: boolean, array: T[], comparator: (a: T, b: T) => number): T[];
 //# sourceMappingURL=index.d.ts.map

package/components/table/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/table/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/table/index.tsx"],"names":[],"mappings":"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"}

package/components/table/index.js

@@ -13,7 +13,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _material = require("@mui/material");
 var _react = _interopRequireWildcard(require("react"));
-var _EnhancedTableToolbar = _interopRequireDefault(require("./EnhancedTableToolbar"));
+var _EnhancedTableToolbarV = _interopRequireDefault(require("./EnhancedTableToolbarV2"));
 var _sort = require("./sort");
 var _TableCellRenderer = _interopRequireDefault(require("./TableCellRenderer"));
 var _TableHeader = _interopRequireDefault(require("./TableHeader"));
@@ -48,6 +48,9 @@ var tableStyles = (0, _styles.makeStyles)(function (theme) {
     }
   };
 });
+
+// Only the text related props need to be passed in by the implementer, and extra data is passed to the caller
+
 var isTopBarButton = function isTopBarButton(input) {
   var castInput = input;
   return !!(castInput.buttonType && castInput.onButtonClick);
@@ -86,7 +89,8 @@ function EnhancedTable(_ref) {
     booleanTrueText = _ref.booleanTrueText,
     editText = _ref.editText,
     renderNumSelectedText = _ref.renderNumSelectedText,
-    renderPaginationText = _ref.renderPaginationText;
+    renderPaginationText = _ref.renderPaginationText,
+    enhancedTopBarSelectionConfig = _ref.enhancedTopBarSelectionConfig;
   var classes = tableStyles();
   var theme = (0, _material.useTheme)();
   var _React$useState = _react.default.useState(_order),
@@ -257,10 +261,21 @@ function EnhancedTable(_ref) {
       }
     }
   }
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, showTopBar && /*#__PURE__*/_react.default.createElement(_EnhancedTableToolbar.default, {
-    numSelected: selectedRows ? selectedRows.length : 0,
+  var pagesCount = Math.ceil(rows.length / maxItemsPerPage);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, showTopBar && /*#__PURE__*/_react.default.createElement(_EnhancedTableToolbarV.default, {
+    selectedRowsCount: (selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) || 0,
+    pagesCount: pagesCount,
     renderNumSelectedText: renderNumSelectedText,
-    topBarButtons: topBarButtons
+    rowsCount: rows.length,
+    topBarButtons: topBarButtons,
+    topBarSelectionConfig: enhancedTopBarSelectionConfig ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enhancedTopBarSelectionConfig), {}, {
+      handleSelectAll: function handleSelectAll() {
+        return setSelectedRows && setSelectedRows(rows);
+      },
+      handleSelectNone: function handleSelectNone() {
+        return setSelectedRows && setSelectedRows([]);
+      }
+    }) : undefined
   }), /*#__PURE__*/_react.default.createElement(_material.TableContainer, {
     id: id,
     sx: {
@@ -357,7 +372,7 @@ function EnhancedTable(_ref) {
     paddingRight: "24px",
     fontSize: "14px"
   }, renderPaginationText(0, 0, 0)), /*#__PURE__*/_react.default.createElement(_material.Pagination, {
-    count: Math.ceil(rows.length / maxItemsPerPage),
+    count: pagesCount,
     page: itemsToSkip / maxItemsPerPage + 1,
     shape: "rounded",
     onChange: handleChangePage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terraware/web-components",
-  "version": "2.3.71-rc.1",
+  "version": "2.3.71-rc.3",
   "author": "Terraformation Inc.",
   "license": "Apache-2.0",
   "repository": {

package/stories/Table.stories.d.ts

@@ -20,4 +20,8 @@ export declare const ShowTopBar: import("@storybook/types").AnnotatedStoryFn<imp
     name: string;
     lastname: string;
 }>>;
+export declare const ShowTopBarV2: import("@storybook/types").AnnotatedStoryFn<import("@storybook/react/dist/types-0a347bb9").R, TableProps<{
+    name: string;
+    lastname: string;
+}>>;
 //# sourceMappingURL=Table.stories.d.ts.map

package/stories/Table.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Table.stories.d.ts","sourceRoot":"","sources":["../../src/stories/Table.stories.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,KAAK,IAAI,UAAU,EAAE,MAAM,2BAA2B,CAAC;;;;;AAYvE,wBAGE;AAmDF,eAAO,MAAM,OAAO;UAtCqB,MAAM;cAAY,MAAM;GAsCzB,CAAC;AACzC,eAAO,MAAM,UAAU;UAvCkB,MAAM;cAAY,MAAM;GAuCtB,CAAC;AAC5C,eAAO,MAAM,SAAS;UAxCmB,MAAM;cAAY,MAAM;GAwCvB,CAAC;AAC3C,eAAO,MAAM,UAAU;UAzCkB,MAAM;cAAY,MAAM;GAyCtB,CAAC"}
+{"version":3,"file":"Table.stories.d.ts","sourceRoot":"","sources":["../../src/stories/Table.stories.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAgC,KAAK,IAAI,UAAU,EAAE,MAAM,2BAA2B,CAAC;;;;;AAYrG,wBAGE;AAmDF,eAAO,MAAM,OAAO;UAtCqB,MAAM;cAAY,MAAM;GAsCzB,CAAC;AACzC,eAAO,MAAM,UAAU;UAvCkB,MAAM;cAAY,MAAM;GAuCtB,CAAC;AAC5C,eAAO,MAAM,SAAS;UAxCmB,MAAM;cAAY,MAAM;GAwCvB,CAAC;AAC3C,eAAO,MAAM,UAAU;UAzCkB,MAAM;cAAY,MAAM;GAyCtB,CAAC;AAC5C,eAAO,MAAM,YAAY;UA1CgB,MAAM;cAAY,MAAM;GA0CpB,CAAC"}