schummar-table 0.6.0 → 0.7.0

package/dist/cjs/index.js

@@ -40,6 +40,34 @@ var dayzed = require("dayzed");
 var immer = require("immer");
 var react$2 = require("@emotion/react");
 require("react-dom");
+const TableMemoContext = react.createContext(/* @__PURE__ */ new Map());
+function TableMemoContextProvider({
+  children
+}) {
+  return jsxRuntime.jsx(TableMemoContext.Provider, {
+    value: react.useMemo(() => /* @__PURE__ */ new Map(), []),
+    children
+  });
+}
+function useTableMemo() {
+  const memoCache = react.useContext(TableMemoContext);
+  return (key, fn) => {
+    let deps;
+    if (Array.isArray(fn)) {
+      deps = fn.slice(1);
+      fn = fn[0];
+    } else {
+      deps = [fn.toString()];
+    }
+    let cachedValue = memoCache.get(key);
+    const hit = cachedValue && cachedValue[1].length === deps.length && cachedValue[1].every((x, i) => x === deps[i]);
+    if (!cachedValue || !hit) {
+      cachedValue = [fn, deps];
+      memoCache.set(key, cachedValue);
+    }
+    return cachedValue[0];
+  };
+}
 class Queue {
   constructor() {
     this.q = new Array();
@@ -295,8 +323,10 @@ function calcItems(state) {
         const column = activeColumns.find((column2) => column2.id === sort2.columnId);
         if (!column)
           return [];
-        const sortBy = column.sortBy instanceof Array ? column.sortBy : [column.sortBy];
-        return sortBy.map((sortBy2) => ({ selector: (item) => sortBy2(column.value(item), item), direction: sort2.direction }));
+        return column.sortBy.map((sortBy) => ({
+          selector: (item) => sortBy(column.value(item), item),
+          direction: sort2.direction
+        }));
       }).filter(Boolean);
       sorted = orderBy(tableItems, selectors.map((x) => x.selector), selectors.map((x) => x.direction));
     }
@@ -368,20 +398,20 @@ function calcItems(state) {
 }
 const noopParentId = () => void 0;
 function calcProps(props) {
-  const columnCache = react.useRef(/* @__PURE__ */ new Map());
+  const cache = useTableMemo();
   return react.useMemo(() => {
-    var _c, _d, _e, _f, _g, _h;
+    var _e, _f, _g, _h, _i, _j;
     let id;
-    if (props.id instanceof Function) {
-      id = props.id;
+    if (props.id instanceof Function || Array.isArray(props.id)) {
+      id = cache("id", props.id);
     } else {
-      id = (item) => item[props.id];
+      id = cache("id", [(item) => item[props.id], props.id]);
     }
     let parentId;
-    if (props.parentId instanceof Function) {
-      parentId = props.parentId;
-    } else if (typeof props.parentId === "string") {
-      parentId = (item) => item[props.parentId];
+    if (props.parentId instanceof Function || Array.isArray(props.parentId)) {
+      parentId = cache("parentId", props.parentId);
+    } else if (props.parentId !== void 0) {
+      parentId = cache("parentId", [(item) => item[props.parentId], props.parentId]);
     } else {
       parentId = noopParentId;
     }
@@ -391,42 +421,37 @@ function calcProps(props) {
     } else {
       inputColumns = props.columns.map((column) => __spreadProps(__spreadValues({}, column), { dependecies: void 0 }));
     }
-    const newColumnCache = /* @__PURE__ */ new Map();
-    const columns = inputColumns.map(function(_a, index) {
-      var _b = _a, {
+    const defCol = props.defaultColumnProps;
+    const mapColumn = ({
+      id: _id,
+      header = ((_a) => (_a = defCol == null ? void 0 : defCol.header) != null ? _a : null)(),
+      value,
+      renderCell = ((_b) => (_b = defCol == null ? void 0 : defCol.renderCell) != null ? _b : asString)(),
+      exportCell = ((_c) => (_c = defCol == null ? void 0 : defCol.exportCell) != null ? _c : asString)(),
+      sortBy = ((_d) => (_d = defCol == null ? void 0 : defCol.sortBy) != null ? _d : [(v) => typeof v === "number" || v instanceof Date ? v : String(v)])(),
+      cannotHide = defCol == null ? void 0 : defCol.cannotHide,
+      classes = defCol == null ? void 0 : defCol.classes,
+      filter = defCol == null ? void 0 : defCol.filter,
+      width = defCol == null ? void 0 : defCol.width
+    }, index) => {
+      const id2 = _id != null ? _id : index;
+      const cacheKey = typeof id2 === "string" ? `s${id2}` : `n${id2}`;
+      return {
         id: id2,
-        header = null,
-        renderCell = asString,
-        exportCell = asString,
-        sortBy = (v) => typeof v === "number" || v instanceof Date ? v : String(v),
-        dependencies = []
-      } = _b, props2 = __objRest(_b, [
-        "id",
-        "header",
-        "renderCell",
-        "exportCell",
-        "sortBy",
-        "dependencies"
-      ]);
-      var _a2;
-      const [depsInCache, columnInCache] = (_a2 = columnCache.current.get(id2 != null ? id2 : index)) != null ? _a2 : [];
-      let column;
-      if (depsInCache && columnInCache && depsInCache.length === dependencies.length && depsInCache.every((x, i) => dependencies[i] === x)) {
-        column = columnInCache;
-      } else {
-        column = __spreadValues({
-          id: id2 != null ? id2 : index,
-          header,
-          renderCell,
-          exportCell,
-          sortBy,
-          dependencies
-        }, props2);
-      }
-      newColumnCache.set(id2 != null ? id2 : index, [dependencies, column]);
-      return column;
-    });
-    columnCache.current = newColumnCache;
+        header,
+        value: cache(`columns.${cacheKey}.value`, value),
+        renderCell: cache(`columns.${cacheKey}.renderCell`, renderCell),
+        exportCell,
+        sortBy: sortBy.map((fn, i) => cache(`columns.${cacheKey}.sortBy.${i}`, fn)),
+        cannotHide,
+        classes,
+        filter,
+        width
+      };
+    };
+    const columns = inputColumns.map(mapColumn);
+    const wrapCell = props.wrapCell && cache("wrapCell", props.wrapCell);
+    const rowAction = props.rowAction instanceof Function || Array.isArray(props.rowAction) ? cache("rowAction", props.rowAction) : props.rowAction;
     let copy;
     if (props.enableExport === true || props.enableExport instanceof Object && props.enableExport.copy === true) {
       copy = { separator: "	" };
@@ -444,13 +469,15 @@ function calcProps(props) {
       id,
       parentId,
       columns,
-      enableSelection: (_c = props.enableSelection) != null ? _c : true,
-      selectSyncChildren: (_d = props.selectSyncChildren) != null ? _d : true,
-      stickyHeader: (_e = props.stickyHeader) != null ? _e : true,
+      wrapCell,
+      rowAction,
+      enableSelection: (_e = props.enableSelection) != null ? _e : true,
+      selectSyncChildren: (_f = props.selectSyncChildren) != null ? _f : true,
+      stickyHeader: (_g = props.stickyHeader) != null ? _g : true,
       enableExport,
-      enableColumnSelection: (_f = props.enableColumnSelection) != null ? _f : true,
-      enableColumnResize: (_g = props.enableColumnResize) != null ? _g : true,
-      enableColumnReorder: (_h = props.enableColumnReorder) != null ? _h : true
+      enableColumnSelection: (_h = props.enableColumnSelection) != null ? _h : true,
+      enableColumnResize: (_i = props.enableColumnResize) != null ? _i : true,
+      enableColumnReorder: (_j = props.enableColumnReorder) != null ? _j : true
     });
   }, [props]);
 }
@@ -580,16 +607,15 @@ function useTableState(_props) {
   return state;
 }
 function useCssVariables() {
-  const theme = useTheme();
-  return {
-    "--spacing": theme.spacing,
-    "--primaryMain": theme.colors.primary.main,
-    "--primaryLight": theme.colors.primary.light,
-    "--primaryContrastText": theme.colors.primary.contrastText,
-    "--secondaryMain": theme.colors.secondary.main,
-    "--secondaryLight": theme.colors.secondary.light,
-    "--secondaryContrastText": theme.colors.secondary.contrastText
-  };
+  return useTheme(({ spacing, colors }) => ({
+    "--spacing": spacing,
+    "--primaryMain": colors.primary.main,
+    "--primaryLight": colors.primary.light,
+    "--primaryContrastText": colors.primary.contrastText,
+    "--secondaryMain": colors.secondary.main,
+    "--secondaryLight": colors.secondary.light,
+    "--secondaryContrastText": colors.secondary.contrastText
+  }));
 }
 const ColumnHeaderContext = new react$1.StoreScope({
   items: /* @__PURE__ */ new Map()
@@ -755,17 +781,11 @@ function FormControlLabel({
   });
 }
 function ColumnSelection() {
-  const {
-    components: {
-      IconButton: IconButton2,
-      Popover,
-      Checkbox: Checkbox2
-    },
-    icons: {
-      Settings: Settings2
-    },
-    text
-  } = useTheme();
+  const IconButton2 = useTheme((t) => t.components.IconButton);
+  const Popover = useTheme((t) => t.components.Popover);
+  const Checkbox2 = useTheme((t) => t.components.Checkbox);
+  const Settings2 = useTheme((t) => t.icons.Settings);
+  const selectColumns = useTheme((t) => t.text.selectColumns);
   const cssVariables = useCssVariables();
   const table = useTableContext();
   const columns = table.useState("props.columns");
@@ -808,7 +828,7 @@ function ColumnSelection() {
           css: {
             marginBottom: "var(--spacing)"
           },
-          children: text.selectColumns
+          children: selectColumns
         }), columns.map((column) => jsxRuntime.jsx(FormControlLabel, {
           control: jsxRuntime.jsx(Checkbox2, {
             checked: !hiddenColumns.has(column.id),
@@ -835,18 +855,14 @@ function csvExport(data, { sepPrefix, separator = ",", quote = '"', eol = "\n" }
 }
 function Export$1() {
   const table = useTableContext();
-  const {
-    components: {
-      Button: Button2,
-      IconButton: IconButton2,
-      Popover
-    },
-    icons: {
-      Export: Export2,
-      Clipboard: Clipboard2
-    },
-    text
-  } = useTheme();
+  const Button2 = useTheme((t) => t.components.Button);
+  const IconButton2 = useTheme((t) => t.components.IconButton);
+  const Popover = useTheme((t) => t.components.Popover);
+  const Export2 = useTheme((t) => t.icons.Export);
+  const Clipboard2 = useTheme((t) => t.icons.Clipboard);
+  const exportTitle = useTheme((t) => t.text.exportTitle);
+  const exportCopy = useTheme((t) => t.text.exportCopy);
+  const exportDownload = useTheme((t) => t.text.exportDownload);
   const cssVariables = useCssVariables();
   const [anchor, setAnchor] = react.useState(null);
   const generate = (options) => {
@@ -895,15 +911,15 @@ function Export$1() {
           css: {
             marginBottom: "var(--spacing)"
           },
-          children: text.exportTitle
+          children: exportTitle
         }), jsxRuntime.jsx(Button2, {
           startIcon: jsxRuntime.jsx(Clipboard2, {}),
           onClick: copy,
-          children: text.exportCopy
+          children: exportCopy
         }), jsxRuntime.jsx(Button2, {
           startIcon: jsxRuntime.jsx(Export2, {}),
           onClick: download,
-          children: text.exportDownload
+          children: exportDownload
         })]
       })
     })]
@@ -913,16 +929,10 @@ const FilterControlContext = react.createContext(() => void 0);
 function FilterControl() {
   const table = useTableContext();
   const columnId = useColumnContext();
-  const {
-    components: {
-      IconButton: IconButton2,
-      Popover
-    },
-    icons: {
-      FilterList: FilterList2,
-      ArrowDropDown: ArrowDropDown2
-    }
-  } = useTheme();
+  const IconButton2 = useTheme((t) => t.components.IconButton);
+  const Popover = useTheme((t) => t.components.Popover);
+  const FilterList2 = useTheme((t) => t.icons.FilterList);
+  const ArrowDropDown2 = useTheme((t) => t.icons.ArrowDropDown);
   const cssVariables = useCssVariables();
   const [anchor, setAnchor] = react.useState(null);
   const isActive = table.useState((state) => {
@@ -1044,49 +1054,56 @@ function ResizeHandleView(_a) {
     }
   }, props));
 }
+const defaultWrapCell = (content) => {
+  if (typeof content === "string") {
+    return jsxRuntime.jsx("span", {
+      css: tableTheme.defaultClasses.text,
+      title: content,
+      children: content
+    });
+  }
+  return content;
+};
 const Cell = react.memo(function Cell2({
   itemId,
   rowIndex
 }) {
-  var _a, _b;
+  var _a;
   const table = useTableContext();
   const columnId = useColumnContext();
-  const {
-    classes
-  } = useTheme();
-  const column = table.useState((state) => state.activeColumns.find((column2) => column2.id === columnId));
+  const column = table.useState((state) => {
+    const col = state.activeColumns.find((column2) => column2.id === columnId);
+    return col && {
+      value: col.value,
+      renderCell: col.renderCell
+    };
+  });
+  const wrapCell = (_a = table.useState((state) => state.props.wrapCell)) != null ? _a : defaultWrapCell;
   const item = table.useState((state) => state.activeItemsById.get(itemId));
   const columnStyleOverride = table.useState((state) => state.columnStyleOverride.get(columnId), {
     throttle: 16
   });
+  react.useLayoutEffect(() => {
+    var _a2, _b;
+    return (_b = (_a2 = table.getState().props).debugRender) == null ? void 0 : _b.call(_a2, "render cell", itemId, columnId);
+  });
+  const className2 = useTheme((t) => cx(...calcClassNames(t.classes, item, rowIndex)));
   if (!column || !item)
     return null;
-  (_b = (_a = table.getState().props).debugRender) == null ? void 0 : _b.call(_a, "render cell", itemId, columnId);
-  const classNames = [...calcClassNames(classes, item, rowIndex), ...calcClassNames(column == null ? void 0 : column.classes, item, rowIndex)];
   const content = column.renderCell(column.value(item), item);
   return jsxRuntime.jsx("div", {
-    className: cx(...classNames),
-    css: [tableTheme.defaultClasses.cell, classNames, columnStyleOverride],
-    children: typeof content === "string" ? jsxRuntime.jsx("span", {
-      css: tableTheme.defaultClasses.text,
-      title: content,
-      children: content
-    }) : content
+    className: className2,
+    css: [tableTheme.defaultClasses.cell, columnStyleOverride],
+    children: wrapCell(content, column.value(item), item, rowIndex)
   });
 });
 function ExpandControl({
   itemId,
   hasDeferredChildren
 }) {
-  const {
-    components: {
-      IconButton: IconButton2,
-      Spinner: Spinner2
-    },
-    icons: {
-      ChevronRight: ChevronRight2
-    }
-  } = useTheme();
+  const IconButton2 = useTheme((t) => t.components.IconButton);
+  const Spinner2 = useTheme((t) => t.components.Spinner);
+  const ChevronRight2 = useTheme((t) => t.icons.ChevronRight);
   const table = useTableContext();
   const isExpanded = table.useState((state) => state.expanded.has(itemId));
   const hasChildren = table.useState((state) => {
@@ -1145,11 +1162,7 @@ function SelectComponent({
   itemId
 }) {
   const table = useTableContext();
-  const {
-    components: {
-      Checkbox: Checkbox2
-    }
-  } = useTheme();
+  const Checkbox2 = useTheme((t) => t.components.Checkbox);
   const isSelected = table.useState((state) => {
     const itemIds = itemId ? [itemId] : Array.from(state.activeItemsById.keys());
     return state.activeItemsById.size > 0 && itemIds.every((itemId2) => state.selection.has(itemId2));
@@ -1217,9 +1230,9 @@ const Row = react.memo(function Row2({
   itemId,
   rowIndex
 }) {
-  var _a, _b;
   const table = useTableContext();
   const divRef = react.useRef(null);
+  const classes = useTheme((t) => t.classes);
   const {
     className: className2,
     indent,
@@ -1229,17 +1242,16 @@ const Row = react.memo(function Row2({
     enableSelection,
     rowAction
   } = table.useState((state) => {
-    var _a2, _b2;
+    var _a, _b;
     const item = state.activeItemsById.get(itemId);
-    const index = !item ? -1 : state.activeItems.indexOf(item);
     return {
-      className: cx(...calcClassNames(state.props.classes, item, index)),
+      className: cx(...calcClassNames(classes, item, rowIndex)),
       indent: item ? getAncestors(state.activeItemsById, item).size : 0,
       hasChildren: !!(item == null ? void 0 : item.children.length),
-      hasDeferredChildren: item && ((_b2 = (_a2 = state.props).hasDeferredChildren) == null ? void 0 : _b2.call(_a2, item)),
+      hasDeferredChildren: item && ((_b = (_a = state.props).hasDeferredChildren) == null ? void 0 : _b.call(_a, item)),
       columnIds: state.activeColumns.map((column) => column.id),
       enableSelection: state.props.enableSelection,
-      rowAction: state.props.rowAction instanceof Function ? item ? state.props.rowAction(item, index) : null : state.props.rowAction
+      rowAction: state.props.rowAction instanceof Function ? item ? state.props.rowAction(item, rowIndex) : null : state.props.rowAction
     };
   });
   react.useEffect(() => {
@@ -1256,7 +1268,10 @@ const Row = react.memo(function Row2({
     o.observe(div);
     return () => o.disconnect();
   }, [divRef.current]);
-  (_b = (_a = table.getState().props).debugRender) == null ? void 0 : _b.call(_a, "render row", itemId);
+  react.useLayoutEffect(() => {
+    var _a, _b;
+    return (_b = (_a = table.getState().props).debugRender) == null ? void 0 : _b.call(_a, "render row", itemId);
+  });
   return jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [jsxRuntime.jsx("div", {
       className: className2,
@@ -1292,14 +1307,8 @@ function SortComponent({
 }) {
   const table = useTableContext();
   const columnId = useColumnContext();
-  const {
-    components: {
-      Badge: Badge2
-    },
-    icons: {
-      ArrowUpward: ArrowUpward2
-    }
-  } = useTheme();
+  const Badge2 = useTheme((t) => t.components.Badge);
+  const ArrowUpward2 = useTheme((t) => t.icons.ArrowUpward);
   const {
     direction,
     index
@@ -1393,6 +1402,11 @@ function throttle(fn, ms) {
       if (lastArgs) {
         run();
       }
+    },
+    cancel() {
+      if (timeout) {
+        clearTimeout(timeout);
+      }
     }
   });
 }
@@ -1419,7 +1433,7 @@ function Virtualized(_c) {
     "header",
     "children"
   ]);
-  var _a, _b, _c2, _d2;
+  var _a, _b;
   const table = useTableContext();
   const virtual = table.useState("props.virtual");
   const probeRef = react.useRef(null);
@@ -1493,7 +1507,11 @@ function Virtualized(_c) {
       window.removeEventListener("resize", incCounter, true);
     };
   }, [probeRef.current, incCounter]);
-  (_d2 = (_c2 = table.getState().props).debugRender) == null ? void 0 : _d2.call(_c2, `Virtualalized render ${from} to ${to}`);
+  react.useEffect(() => incCounter.cancel, [incCounter]);
+  react.useLayoutEffect(() => {
+    var _a2, _b2;
+    return (_b2 = (_a2 = table.getState().props).debugRender) == null ? void 0 : _b2.call(_a2, `Virtualalized render ${from} to ${to}`);
+  });
   return jsxRuntime.jsxs("div", __spreadProps(__spreadValues({}, props), {
     children: [header, virtual && jsxRuntime.jsx("div", {
       style: {
@@ -1524,18 +1542,20 @@ function useColumnContext() {
   return value;
 }
 function Table(props) {
-  var _a, _b;
   const table = useTableState(props);
-  (_b = (_a = table.getState().props).debugRender) == null ? void 0 : _b.call(_a, "render table");
+  react.useLayoutEffect(() => {
+    var _a, _b;
+    return (_b = (_a = table.getState().props).debugRender) == null ? void 0 : _b.call(_a, "render table");
+  });
   return jsxRuntime.jsx(TableContext.Provider, {
     value: table,
-    children: jsxRuntime.jsx(TableLoadingState, {})
+    children: jsxRuntime.jsx(TableMemoContextProvider, {
+      children: jsxRuntime.jsx(TableLoadingState, {})
+    })
   });
 }
 function TableLoadingState() {
-  const {
-    text
-  } = useTheme();
+  const loadingText = useTheme((t) => t.text.loading);
   const isHydrated = useTableStateStorage();
   const [showLoading, setShowLoading] = react.useState(false);
   react.useEffect(() => {
@@ -1544,7 +1564,7 @@ function TableLoadingState() {
   });
   return jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [!isHydrated && showLoading && jsxRuntime.jsx("div", {
-      children: text.loading
+      children: loadingText
     }), jsxRuntime.jsx(TableInner, {
       hidden: !isHydrated
     })]
@@ -1553,7 +1573,6 @@ function TableLoadingState() {
 const TableInner = react.memo(function TableInner2({
   hidden
 }) {
-  var _a, _b;
   const table = useTableContext();
   const fullWidth = table.useState("props.fullWidth");
   const activeColumns = table.useState((state) => state.activeColumns.map((column) => ({
@@ -1568,14 +1587,16 @@ const TableInner = react.memo(function TableInner2({
   const columnStyleOverride = table.useState("columnStyleOverride", {
     throttle: 16
   });
-  const defaultWidth = table.useState("props.defaultWidth");
   const classes = table.useState("props.classes");
   const stickyHeader = table.useState("props.stickyHeader");
   const enableSelection = table.useState("props.enableSelection");
   const enableColumnSelection = table.useState("props.enableColumnSelection");
   const enableExport = table.useState((state) => !!state.props.enableExport.copy || !!state.props.enableExport.download);
   const cssVariables = useCssVariables();
-  (_b = (_a = table.getState().props).debugRender) == null ? void 0 : _b.call(_a, "render table inner");
+  react.useLayoutEffect(() => {
+    var _a, _b;
+    return (_b = (_a = table.getState().props).debugRender) == null ? void 0 : _b.call(_a, "render table inner");
+  });
   return jsxRuntime.jsx(Virtualized, {
     className: classes == null ? void 0 : classes.table,
     css: [cssVariables, tableTheme.defaultClasses.table, {
@@ -1583,8 +1604,8 @@ const TableInner = react.memo(function TableInner2({
         fullWidth === "right" || fullWidth === true ? "auto" : "0",
         "max-content",
         ...activeColumns.map((column) => {
-          var _a2, _b2, _c;
-          return (_c = (_b2 = (_a2 = columnWidths.get(column.id)) != null ? _a2 : column.width) != null ? _b2 : defaultWidth) != null ? _c : "max-content";
+          var _a, _b;
+          return (_b = (_a = columnWidths.get(column.id)) != null ? _a : column.width) != null ? _b : "max-content";
         }),
         fullWidth === "left" || fullWidth === true ? "auto" : "0"
       ].join(" ")
@@ -1601,11 +1622,11 @@ const TableInner = react.memo(function TableInner2({
         children: [enableSelection && jsxRuntime.jsx(SelectComponent, {}), enableColumnSelection && jsxRuntime.jsx(ColumnSelection, {}), enableExport && jsxRuntime.jsx(Export$1, {}), jsxRuntime.jsx(ResizeHandleView, {})]
       }), jsxRuntime.jsx(ColumnHeaderContext.Provider, {
         children: activeColumns.map((column) => {
-          var _a2;
+          var _a;
           return jsxRuntime.jsx(ColumnContext.Provider, {
             value: column.id,
             children: jsxRuntime.jsxs(ColumnHeader, {
-              className: cx(classes == null ? void 0 : classes.headerCell, (_a2 = column.classes) == null ? void 0 : _a2.headerCell),
+              className: cx(classes == null ? void 0 : classes.headerCell, (_a = column.classes) == null ? void 0 : _a.headerCell),
               css: [tableTheme.defaultClasses.headerCell, columnStyleOverride.get(column.id), stickyHeader && tableTheme.defaultClasses.sticky, stickyHeader instanceof Object && stickyHeader],
               children: [jsxRuntime.jsx(SortComponent, {
                 children: column.header
@@ -2063,26 +2084,45 @@ const defaultTableTheme = {
   spacing: "5px"
 };
 const emptyStore = new react$1.Store(void 0);
-function useTheme() {
+function useTheme(selector) {
   var _a, _b;
-  const table = react.useContext(TableContext);
-  const localTheme = (_b = (_a = table == null ? void 0 : table.useState((state) => ({
-    text: state.props.text,
-    classes: state.props.classes,
-    components: state.props.components,
-    icons: state.props.icons,
-    colors: state.props.colors,
-    spacing: state.props.spacing
-  }))) != null ? _a : emptyStore.useState()) != null ? _b : {};
   const contextTableTheme = react.useContext(tableTheme.TableThemeContext);
-  return tableTheme.mergeThemes(defaultTableTheme, tableTheme.globalTableTheme, contextTableTheme, localTheme);
+  const table = react.useContext(TableContext);
+  const columnId = react.useContext(ColumnContext);
+  const memo = useTableMemo();
+  const process = (t) => {
+    var _a2;
+    const cell = (_a2 = t.classes) == null ? void 0 : _a2.cell;
+    const selected = t.text.selected;
+    return __spreadProps(__spreadValues({}, t), {
+      classes: __spreadProps(__spreadValues({}, t.classes), {
+        cell: cell instanceof Function || Array.isArray(cell) ? memo("theme.classes.cell", cell) : cell
+      }),
+      text: __spreadProps(__spreadValues({}, t.text), {
+        selected: selected instanceof Function || Array.isArray(selected) ? memo("theme.text.selected", selected) : selected
+      })
+    });
+  };
+  const theme = (_b = (_a = table == null ? void 0 : table.useState((state) => {
+    const localTheme = {
+      text: state.props.text,
+      classes: state.props.classes,
+      components: state.props.components,
+      icons: state.props.icons,
+      colors: state.props.colors,
+      spacing: state.props.spacing
+    };
+    const column = state.activeColumns.find((column2) => column2.id === columnId);
+    const columnsTheme = {
+      classes: column == null ? void 0 : column.classes
+    };
+    const theme2 = tableTheme.mergeThemes(defaultTableTheme, tableTheme.globalTableTheme, contextTableTheme, localTheme, columnsTheme);
+    return selector(process(theme2));
+  })) != null ? _a : emptyStore.useState()) != null ? _b : selector(process(tableTheme.mergeThemes(defaultTableTheme, tableTheme.globalTableTheme, contextTableTheme)));
+  return theme;
 }
 function AutoFocusTextField(props) {
-  const {
-    components: {
-      TextField: TextField2
-    }
-  } = useTheme();
+  const TextField2 = useTheme((t) => t.components.TextField);
   const ref = react.useRef(null);
   const {
     visible
@@ -2242,16 +2282,12 @@ function DatePicker({
   locale,
   firstDayOfWeek = 0
 }) {
-  const {
-    components: {
-      Button: Button2,
-      IconButton: IconButton2
-    },
-    icons: {
-      ChevronRight: ChevronRight2
-    },
-    text
-  } = useTheme();
+  const Button2 = useTheme((t) => t.components.Button);
+  const IconButton2 = useTheme((t) => t.components.IconButton);
+  const ChevronRight2 = useTheme((t) => t.icons.ChevronRight);
+  const textToday = useTheme((t) => t.text.today);
+  const textThisWeek = useTheme((t) => t.text.thisWeek);
+  const textReset = useTheme((t) => t.text.reset);
   const [baseDate] = react.useState(new Date());
   const [dateInView, setDateInView] = react.useState(baseDate);
   const [dirty, setDirty] = react.useState();
@@ -2465,21 +2501,21 @@ function DatePicker({
           setDirty(void 0);
           onChange(today());
         },
-        children: text.today
+        children: textToday
       }), jsxRuntime.jsx(Button2, {
         variant: "text",
         onClick: () => {
           setDirty(void 0);
           onChange(thisWeek(firstDayOfWeek));
         },
-        children: text.thisWeek
+        children: textThisWeek
       }), jsxRuntime.jsx(Button2, {
         variant: "text",
         onClick: () => {
           setDirty(void 0);
           onChange(null);
         },
-        children: text.reset
+        children: textReset
       })]
     })]
   });
@@ -2566,34 +2602,18 @@ function SelectFilter(_m) {
     "render",
     "singleSelect"
   ]);
-  const {
-    components: {
-      IconButton: IconButton2,
-      Checkbox: Checkbox2
-    },
-    icons: {
-      Search: Search2,
-      Clear: Clear2
-    },
-    text
-  } = useTheme();
+  const IconButton2 = useTheme((t) => t.components.IconButton);
+  const Checkbox2 = useTheme((t) => t.components.Checkbox);
+  const Search2 = useTheme((t) => t.icons.Search);
+  const Clear2 = useTheme((t) => t.icons.Clear);
+  const selected = useTheme((t) => t.text.selected);
+  const noResults = useTheme((t) => t.text.noResults);
   const table = useTableContext();
   const columnId = useColumnContext();
-  const options = table.useState((state) => {
-    var _a;
-    if (providedOptions)
-      return uniq(providedOptions);
-    const column = state.activeColumns.find((column2) => column2.id === columnId);
-    if (!column)
-      return [];
-    const filterBy = (_a = props.filterBy) != null ? _a : (x) => x;
-    return uniq(flatMap(state.items, (item) => castArray(filterBy(column.value(item), item))));
-  });
-  const [query, setQuery] = react.useState("");
-  const filtered = options.filter((option) => !query || stringValue(option).toLowerCase().includes(query.toLowerCase()));
   const {
     value = /* @__PURE__ */ new Set(),
-    onChange
+    onChange,
+    filterBy
   } = useFilter(__spreadProps(__spreadValues({}, props), {
     id: "selectFilter",
     isActive(filterValue) {
@@ -2603,6 +2623,16 @@ function SelectFilter(_m) {
       return filterValue.has(value2);
     }
   }));
+  const options = table.useState((state) => {
+    if (providedOptions)
+      return uniq(providedOptions);
+    const column = state.activeColumns.find((column2) => column2.id === columnId);
+    if (!column)
+      return [];
+    return uniq(flatMap(state.items, (item) => castArray(filterBy(column.value(item), item))));
+  });
+  const [query, setQuery] = react.useState("");
+  const filtered = options.filter((option) => !query || stringValue(option).toLowerCase().includes(query.toLowerCase()));
   return jsxRuntime.jsxs("div", {
     css: {
       padding: "calc(var(--spacing) * 2)",
@@ -2632,7 +2662,7 @@ function SelectFilter(_m) {
           onChange: () => onChange(/* @__PURE__ */ new Set())
         }),
         label: jsxRuntime.jsxs(jsxRuntime.Fragment, {
-          children: ["<", text.selected(value.size), ">"]
+          children: ["<", selected(value.size), ">"]
         })
       }), filtered.map((option, index) => jsxRuntime.jsx(FormControlLabel, {
         control: jsxRuntime.jsx(Checkbox2, {
@@ -2645,7 +2675,7 @@ function SelectFilter(_m) {
       css: {
         textAlign: "center"
       },
-      children: text.noResults
+      children: noResults
     })]
   });
 }
@@ -2676,6 +2706,8 @@ function debounce(fn, ms) {
 function useFilter(impl) {
   const table = useTableContext();
   const columnId = useColumnContext();
+  const cache = useTableMemo();
+  const filterBy = impl.filterBy && cache("", impl.filterBy);
   react.useEffect(() => {
     table.update((state) => {
       if (impl.defaultValue !== void 0) {
@@ -2685,7 +2717,7 @@ function useFilter(impl) {
   }, []);
   react.useEffect(() => {
     table.update((state) => {
-      state.filters.set(columnId, immer.castDraft(impl));
+      state.filters.set(columnId, immer.castDraft(__spreadProps(__spreadValues({}, impl), { filterBy })));
       if (impl.value !== void 0) {
         state.filterValues.set(columnId, impl.value);
       }
@@ -2720,7 +2752,8 @@ function useFilter(impl) {
   return {
     value: dirtyValue != null ? dirtyValue : value,
     onChange,
-    close: react.useContext(FilterControlContext)
+    close: react.useContext(FilterControlContext),
+    filterBy: filterBy != null ? filterBy : (x) => x
   };
 }
 const textMatch = (text, query) => {
@@ -2750,15 +2783,9 @@ function TextFilter(_o) {
     "compare",
     "filterBy"
   ]);
-  const {
-    components: {
-      IconButton: IconButton2
-    },
-    icons: {
-      Search: Search2,
-      Clear: Clear2
-    }
-  } = useTheme();
+  const IconButton2 = useTheme((t) => t.components.IconButton);
+  const Search2 = useTheme((t) => t.icons.Search);
+  const Clear2 = useTheme((t) => t.icons.Clear);
   const {
     value = "",
     onChange