@terraware/web-components 4.2.1 → 4.2.2-rc.1

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/EditableTable/index.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,GAAG,EAA6C,MAAM,OAAO,CAAC;AAEnF,OAAO,EAAiB,OAAO,EAAuB,MAAM,eAAe,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAEL,QAAQ,EACR,UAAU,EAGV,OAAO,EACP,iBAAiB,EACjB,gBAAgB,EAEjB,MAAM,sBAAsB,CAAC;AAI9B,MAAM,MAAM,gBAAgB,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI;IAChE,4DAA4D;IAC5D,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,4DAA4D;IAC5D,WAAW,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC3C,iCAAiC;IACjC,aAAa,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5D,4BAA4B;IAC5B,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE;QAC5B,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtB,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACpB,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QAC1B,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC;KACjC,KAAK,GAAG,CAAC,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,mBAAmB,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI;IACnE,EAAE,EAAE,MAAM,CAAC;IACX,yBAAyB;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,KAAK,CAAC;IAC1B,mDAAmD;IACnD,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,GAAG,CAAC;IACjC,oCAAoC;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iHAAiH;IACjH,aAAa,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,CAAC;IAC7D,uCAAuC;IACvC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,yCAAyC;IACzC,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACrC,2BAA2B;IAC3B,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;QAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;IACrF,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,cAAc,GAAG,OAAO,GAAG,YAAY,CAAC;IAC5E,8CAA8C;IAC9C,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,6BAA6B;IAC7B,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,iBAAiB,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC;IACnH,8BAA8B;IAC9B,SAAS,CAAC,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI;IAClE,+CAA+C;IAC/C,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kCAAkC;IAClC,OAAO,EAAE,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC;IACtC,yBAAyB;IACzB,IAAI,EAAE,KAAK,EAAE,CAAC;IACd,2FAA2F;IAC3F,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,iDAAiD;IACjD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,yDAAyD;IACzD,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wDAAwD;IACxD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,gDAAgD;IAChD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8DAA8D;IAC9D,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,wDAAwD;IACxD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,yEAAyE;IACzE,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oFAAoF;IACpF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mDAAmD;IACnD,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,yDAAyD;IACzD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,sDAAsD;IACtD,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,EAAE,CAAC;IACjD,mDAAmD;IACnD,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,qCAAqC;IACrC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;IAClC,6BAA6B;IAC7B,4BAA4B,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IAC3F,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,wDAAwD;IACxD,YAAY,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;CACjD,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EACvE,oBAAoB,EACpB,OAAO,EACP,IAAI,EACJ,qBAA4B,EAC5B,aAAqB,EACrB,oBAA4B,EAC5B,mBAA2B,EAC3B,aAAoB,EACpB,kBAA0B,EAC1B,mBAA2B,EAC3B,aAAqB,EACrB,UAAU,EACV,gBAAuB,EACvB,mBAA0B,EAC1B,gBAAuB,EACvB,cAAc,EACd,iBAAiB,EACjB,UAAU,EACV,4BAA4B,EAC5B,EAAE,EACF,YAAiB,GAClB,EAAE,kBAAkB,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,OAAO,CAqQzC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/EditableTable/index.tsx"],"names":[],"mappings":"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"}

package/components/EditableTable/index.js

@@ -194,13 +194,36 @@ function EditableTable(_ref) {
     if (enableGlobalFilter) {
       tbl.resetGlobalFilter();
     }
-    if (stickyFilters && storageKey) {
-      setColumnFilters([]);
+    setColumnFilters([]);
+    if (storageKey) {
       localStorage.removeItem("".concat(storageKey, "_columnFilters"));
     }
     onClearAllFilters === null || onClearAllFilters === void 0 ? void 0 : onClearAllFilters();
-  }, [enableGlobalFilter, stickyFilters, storageKey, onClearAllFilters]);
+  }, [enableGlobalFilter, storageKey, onClearAllFilters]);
   const consumerRenderTopToolbarCustomActions = tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.renderTopToolbarCustomActions;
+  const composedRenderToolbarInternalActions = (0, _react.useCallback)(_ref4 => {
+    let {
+      table: tbl
+    } = _ref4;
+    const state = tbl.getState();
+    const hasColumnFilters = state.columnFilters.length > 0;
+    const hasGlobalFilter = enableGlobalFilter && !!state.globalFilter;
+    const hasActiveFilters = hasColumnFilters || hasGlobalFilter;
+    return /*#__PURE__*/_react.default.createElement(_material.Box, {
+      sx: {
+        display: 'flex',
+        alignItems: 'center',
+        gap: 1
+      }
+    }, showClearAllFilters && hasActiveFilters && /*#__PURE__*/_react.default.createElement(_Button.default, {
+      onClick: () => handleClearAllFilters(tbl),
+      label: clearAllFiltersLabel,
+      priority: "ghost",
+      size: "small"
+    }), renderToolbarInternalActions === null || renderToolbarInternalActions === void 0 ? void 0 : renderToolbarInternalActions({
+      table: tbl
+    }));
+  }, [showClearAllFilters, renderToolbarInternalActions, enableGlobalFilter, handleClearAllFilters, clearAllFiltersLabel]);
   const table = (0, _materialReactTable.useMaterialReactTable)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     columns: mrtColumns,
     data,
@@ -219,7 +242,6 @@ function EditableTable(_ref) {
   }, Object.keys(initialStateConfig).length > 0 ? {
     initialState: initialStateConfig
   } : {}), {}, {
-    renderToolbarInternalActions,
     muiTableBodyProps: {
       sx: {
         '& tr:nth-of-type(odd) > td': {
@@ -230,10 +252,10 @@ function EditableTable(_ref) {
     muiTablePaperProps: {
       elevation: 0
     },
-    muiTableBodyRowProps: _ref4 => {
+    muiTableBodyRowProps: _ref5 => {
       let {
         row
-      } = _ref4;
+      } = _ref5;
       return {
         // eslint-disable-next-line react/prop-types
         onClick: onRowClick ? () => onRowClick(row.original) : undefined,
@@ -245,30 +267,11 @@ function EditableTable(_ref) {
         }
       };
     }
-  }, tableOptions), showClearAllFilters || consumerRenderTopToolbarCustomActions ? {
-    renderTopToolbarCustomActions: _ref5 => {
-      let {
-        table: tbl
-      } = _ref5;
-      const state = tbl.getState();
-      const hasColumnFilters = state.columnFilters.length > 0;
-      const hasGlobalFilter = enableGlobalFilter && !!state.globalFilter;
-      const hasActiveFilters = hasColumnFilters || hasGlobalFilter;
-      return /*#__PURE__*/_react.default.createElement(_material.Box, {
-        sx: {
-          display: 'flex',
-          alignItems: 'center',
-          gap: 1
-        }
-      }, consumerRenderTopToolbarCustomActions === null || consumerRenderTopToolbarCustomActions === void 0 ? void 0 : consumerRenderTopToolbarCustomActions({
-        table: tbl
-      }), showClearAllFilters && hasActiveFilters && /*#__PURE__*/_react.default.createElement(_Button.default, {
-        onClick: () => handleClearAllFilters(tbl),
-        label: clearAllFiltersLabel,
-        priority: "ghost",
-        size: "small"
-      }));
-    }
+  }, tableOptions), {}, {
+    // These must come after ...tableOptions to avoid being overridden
+    renderToolbarInternalActions: composedRenderToolbarInternalActions
+  }, consumerRenderTopToolbarCustomActions ? {
+    renderTopToolbarCustomActions: consumerRenderTopToolbarCustomActions
   } : {}), stickyFilters && storageKey ? {
     state: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.state), {}, {
       columnFilters

package/package.json

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