material-react-table 1.14.0 → 1.15.1

package/src/body/MRT_TableBodyRow.tsx

@@ -120,16 +120,18 @@ export const MRT_TableBodyRow = ({
               ? (cellOrVirtualCell as VirtualItem)
               : undefined,
           };
-          return memoMode === 'cells' &&
+          return cell ? (
+            memoMode === 'cells' &&
             cell.column.columnDef.columnDefType === 'data' &&
             !draggingColumn &&
             !draggingRow &&
             editingCell?.id !== cell.id &&
             editingRow?.id !== row.id ? (
-            <Memo_MRT_TableBodyCell key={cell.id} {...props} />
-          ) : (
-            <MRT_TableBodyCell key={cell.id} {...props} />
-          );
+              <Memo_MRT_TableBodyCell key={cell.id} {...props} />
+            ) : (
+              <MRT_TableBodyCell key={cell.id} {...props} />
+            )
+          ) : null;
         })}
         {virtualPaddingRight ? (
           <td style={{ display: 'flex', width: virtualPaddingRight }} />

package/src/buttons/MRT_ExpandAllButton.tsx

@@ -35,9 +35,8 @@ export const MRT_ExpandAllButton = ({ table }: Props) => {
       enterDelay={1000}
       enterNextDelay={1000}
       title={
-        iconButtonProps?.title ?? isAllRowsExpanded
-          ? localization.collapseAll
-          : localization.expandAll
+        iconButtonProps?.title ??
+        (isAllRowsExpanded ? localization.collapseAll : localization.expandAll)
       }
     >
       <span>

package/src/buttons/MRT_ExpandButton.tsx

@@ -44,9 +44,8 @@ export const MRT_ExpandButton = <TData extends Record<string, any> = {}>({
       enterDelay={1000}
       enterNextDelay={1000}
       title={
-        iconButtonProps?.title ?? isExpanded
-          ? localization.collapse
-          : localization.expand
+        iconButtonProps?.title ??
+        (isExpanded ? localization.collapse : localization.expand)
       }
     >
       <span>

package/src/buttons/MRT_FullScreenToggleButton.tsx

@@ -31,7 +31,7 @@ export const MRT_FullScreenToggleButton = <
   return (
     <Tooltip arrow title={rest?.title ?? localization.toggleFullScreen}>
       <IconButton
-        aria-label={localization.showHideFilters}
+        aria-label={localization.toggleFullScreen}
         onClick={handleToggleFullScreen}
         {...rest}
         title={undefined}

package/src/footer/MRT_TableFooterRow.tsx

@@ -63,9 +63,9 @@ export const MRT_TableFooterRow = ({
           ? footerGroup.headers[footerOrVirtualFooter.index]
           : (footerOrVirtualFooter as MRT_Header);
 
-        return (
+        return footer ? (
           <MRT_TableFooterCell footer={footer} key={footer.id} table={table} />
-        );
+        ) : null;
       })}
       {virtualPaddingRight ? (
         <th style={{ display: 'flex', width: virtualPaddingRight }} />

package/src/head/MRT_TableHeadCellSortLabel.tsx

@@ -25,12 +25,15 @@ export const MRT_TableHeadCellSortLabel = ({
   const { column } = header;
   const { columnDef } = column;
   const { sorting } = getState();
+  const sorted = column.getIsSorted();
 
-  const sortTooltip = column.getIsSorted()
-    ? column.getIsSorted() === 'desc'
+  const sortTooltip = sorted
+    ? sorted === 'desc'
       ? localization.sortedByColumnDesc.replace('{column}', columnDef.header)
       : localization.sortedByColumnAsc.replace('{column}', columnDef.header)
-    : localization.unsorted;
+    : column.getNextSortingOrder() === 'desc'
+    ? localization.sortByColumnDesc.replace('{column}', columnDef.header)
+    : localization.sortByColumnAsc.replace('{column}', columnDef.header);
 
   return (
     <Tooltip arrow placement="top" title={sortTooltip}>
@@ -40,12 +43,8 @@ export const MRT_TableHeadCellSortLabel = ({
       >
         <TableSortLabel
           aria-label={sortTooltip}
-          active={!!column.getIsSorted()}
-          direction={
-            column.getIsSorted()
-              ? (column.getIsSorted() as 'asc' | 'desc')
-              : undefined
-          }
+          active={!!sorted}
+          direction={sorted ? (sorted as 'asc' | 'desc') : undefined}
           sx={{
             flex: '0 0',
             width: '2.4ch',

package/src/head/MRT_TableHeadRow.tsx

@@ -53,9 +53,9 @@ export const MRT_TableHeadRow = ({
           ? headerGroup.headers[headerOrVirtualHeader.index]
           : (headerOrVirtualHeader as MRT_Header);
 
-        return (
+        return header ? (
           <MRT_TableHeadCell header={header} key={header.id} table={table} />
-        );
+        ) : null;
       })}
       {virtualPaddingRight ? (
         <th style={{ display: 'flex', width: virtualPaddingRight }} />

package/src/sortingFns.ts

@@ -1,6 +1,5 @@
 import { compareItems, type RankingInfo } from '@tanstack/match-sorter-utils';
 import { type Row, sortingFns } from '@tanstack/react-table';
-import { type MRT_Row } from './types';
 
 const fuzzy = <TData extends Record<string, any> = {}>(
   rowA: Row<TData>,
@@ -25,9 +24,6 @@ export const MRT_SortingFns = {
   fuzzy,
 };
 
-export const rankGlobalFuzzy = <TData extends Record<string, any> = {}>(
-  rowA: MRT_Row<TData>,
-  rowB: MRT_Row<TData>,
-) =>
+export const rankGlobalFuzzy: any = (rowA: any, rowB: any) =>
   Math.max(...Object.values(rowB.columnFiltersMeta).map((v: any) => v.rank)) -
   Math.max(...Object.values(rowA.columnFiltersMeta).map((v: any) => v.rank));