material-react-table 0.25.0 → 0.26.0

package/dist/table/MRT_TableRoot.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
-import { MaterialReactTableProps } from '../MaterialReactTable';
+import type { MaterialReactTableProps } from '..';
 export declare const MRT_TableRoot: <TData extends Record<string, any> = {}>(props: MaterialReactTableProps<TData>) => JSX.Element;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.25.0",
+  "version": "0.26.0",
   "license": "MIT",
   "name": "material-react-table",
   "description": "A fully featured Material UI implementation of TanStack React Table, inspired by material-table and the MUI X DataGrid, written from the ground up in TypeScript.",

package/src/filtersFns.ts

@@ -1,7 +1,7 @@
 import { rankItem, rankings, RankingInfo } from '@tanstack/match-sorter-utils';
 import { filterFns, Row } from '@tanstack/react-table';
 
-export const fuzzy = <TData extends Record<string, any> = {}>(
+const fuzzy = <TData extends Record<string, any> = {}>(
   row: Row<TData>,
   columnId: string,
   filterValue: string | number,
@@ -16,7 +16,7 @@ export const fuzzy = <TData extends Record<string, any> = {}>(
 
 fuzzy.autoRemove = (val: any) => !val;
 
-export const contains = <TData extends Record<string, any> = {}>(
+const contains = <TData extends Record<string, any> = {}>(
   row: Row<TData>,
   id: string,
   filterValue: string | number,
@@ -30,7 +30,7 @@ export const contains = <TData extends Record<string, any> = {}>(
 
 contains.autoRemove = (val: any) => !val;
 
-export const startsWith = <TData extends Record<string, any> = {}>(
+const startsWith = <TData extends Record<string, any> = {}>(
   row: Row<TData>,
   id: string,
   filterValue: string | number,
@@ -44,7 +44,7 @@ export const startsWith = <TData extends Record<string, any> = {}>(
 
 startsWith.autoRemove = (val: any) => !val;
 
-export const endsWith = <TData extends Record<string, any> = {}>(
+const endsWith = <TData extends Record<string, any> = {}>(
   row: Row<TData>,
   id: string,
   filterValue: string | number,
@@ -58,7 +58,7 @@ export const endsWith = <TData extends Record<string, any> = {}>(
 
 endsWith.autoRemove = (val: any) => !val;
 
-export const equals = <TData extends Record<string, any> = {}>(
+const equals = <TData extends Record<string, any> = {}>(
   row: Row<TData>,
   id: string,
   filterValue: string | number,
@@ -68,7 +68,7 @@ export const equals = <TData extends Record<string, any> = {}>(
 
 equals.autoRemove = (val: any) => !val;
 
-export const notEquals = <TData extends Record<string, any> = {}>(
+const notEquals = <TData extends Record<string, any> = {}>(
   row: Row<TData>,
   id: string,
   filterValue: string | number,
@@ -78,31 +78,47 @@ export const notEquals = <TData extends Record<string, any> = {}>(
 
 notEquals.autoRemove = (val: any) => !val;
 
-export const greaterThan = <TData extends Record<string, any> = {}>(
+const greaterThan = <TData extends Record<string, any> = {}>(
   row: Row<TData>,
   id: string,
   filterValue: string | number,
 ) =>
   !isNaN(+filterValue) && !isNaN(+row.getValue<string | number>(id))
-    ? +row.getValue<string | number>(id) >= +filterValue
+    ? +row.getValue<string | number>(id) > +filterValue
     : row.getValue<string | number>(id).toString().toLowerCase().trim() >
       filterValue.toString().toLowerCase().trim();
 
 greaterThan.autoRemove = (val: any) => !val;
 
-export const lessThan = <TData extends Record<string, any> = {}>(
+const greaterThanOrEqualTo = <TData extends Record<string, any> = {}>(
+  row: Row<TData>,
+  id: string,
+  filterValue: string | number,
+) => equals(row, id, filterValue) || greaterThan(row, id, filterValue);
+
+greaterThanOrEqualTo.autoRemove = (val: any) => !val;
+
+const lessThan = <TData extends Record<string, any> = {}>(
   row: Row<TData>,
   id: string,
   filterValue: string | number,
 ) =>
   !isNaN(+filterValue) && !isNaN(+row.getValue<string | number>(id))
-    ? +row.getValue<string | number>(id) <= +filterValue
+    ? +row.getValue<string | number>(id) < +filterValue
     : row.getValue<string | number>(id).toString().toLowerCase().trim() <
       filterValue.toString().toLowerCase().trim();
 
 lessThan.autoRemove = (val: any) => !val;
 
-export const between = <TData extends Record<string, any> = {}>(
+const lessThanOrEqualTo = <TData extends Record<string, any> = {}>(
+  row: Row<TData>,
+  id: string,
+  filterValue: string | number,
+) => equals(row, id, filterValue) || lessThan(row, id, filterValue);
+
+lessThanOrEqualTo.autoRemove = (val: any) => !val;
+
+const between = <TData extends Record<string, any> = {}>(
   row: Row<TData>,
   id: string,
   filterValues: [string | number, string | number],
@@ -117,7 +133,22 @@ export const between = <TData extends Record<string, any> = {}>(
 
 between.autoRemove = (val: any) => !val;
 
-export const empty = <TData extends Record<string, any> = {}>(
+const betweenInclusive = <TData extends Record<string, any> = {}>(
+  row: Row<TData>,
+  id: string,
+  filterValues: [string | number, string | number],
+) =>
+  ((['', undefined] as any[]).includes(filterValues[0]) ||
+    greaterThanOrEqualTo(row, id, filterValues[0])) &&
+  ((!isNaN(+filterValues[0]) &&
+    !isNaN(+filterValues[1]) &&
+    +filterValues[0] > +filterValues[1]) ||
+    (['', undefined] as any[]).includes(filterValues[1]) ||
+    lessThanOrEqualTo(row, id, filterValues[1]));
+
+betweenInclusive.autoRemove = (val: any) => !val;
+
+const empty = <TData extends Record<string, any> = {}>(
   row: Row<TData>,
   id: string,
   _filterValue: string | number,
@@ -125,7 +156,7 @@ export const empty = <TData extends Record<string, any> = {}>(
 
 empty.autoRemove = (val: any) => !val;
 
-export const notEmpty = <TData extends Record<string, any> = {}>(
+const notEmpty = <TData extends Record<string, any> = {}>(
   row: Row<TData>,
   id: string,
   _filterValue: string | number,
@@ -136,13 +167,16 @@ notEmpty.autoRemove = (val: any) => !val;
 export const MRT_FilterFns = {
   ...filterFns,
   between,
+  betweenInclusive,
   contains,
   empty,
   endsWith,
   equals,
   fuzzy,
   greaterThan,
+  greaterThanOrEqualTo,
   lessThan,
+  lessThanOrEqualTo,
   notEmpty,
   notEquals,
   startsWith,

package/src/head/MRT_TableHeadCellGrabHandle.tsx

@@ -1,6 +1,6 @@
 import React, { DragEvent, FC, RefObject } from 'react';
 import { MRT_GrabHandleButton } from '../buttons/MRT_GrabHandleButton';
-import { reorderColumn } from '../utils';
+import { reorderColumn } from '../column.utils';
 import type { MRT_Column, MRT_TableInstance } from '..';
 
 interface Props {

package/src/localization.ts

@@ -14,6 +14,7 @@ export interface MRT_Localization {
   expand: string;
   expandAll: string;
   filterBetween: string;
+  filterBetweenInclusive: string;
   filterByColumn: string;
   filterContains: string;
   filterEmpty: string;
@@ -21,7 +22,9 @@ export interface MRT_Localization {
   filterEquals: string;
   filterFuzzy: string;
   filterGreaterThan: string;
+  filterGreaterThanOrEqualTo: string;
   filterLessThan: string;
+  filterLessThanOrEqualTo: string;
   filterMode: string;
   filterNotEmpty: string;
   filterNotEquals: string;
@@ -83,6 +86,7 @@ export const MRT_DefaultLocalization_EN: MRT_Localization = {
   expand: 'Expand',
   expandAll: 'Expand all',
   filterBetween: 'Between',
+  filterBetweenInclusive: 'Between Inclusive',
   filterByColumn: 'Filter by {column}',
   filterContains: 'Contains',
   filterEmpty: 'Empty',
@@ -90,7 +94,9 @@ export const MRT_DefaultLocalization_EN: MRT_Localization = {
   filterEquals: 'Equals',
   filterFuzzy: 'Fuzzy',
   filterGreaterThan: 'Greater Than',
+  filterGreaterThanOrEqualTo: 'Greater Than Or Equal To',
   filterLessThan: 'Less Than',
+  filterLessThanOrEqualTo: 'Less Than Or Equal To',
   filterMode: 'Filter Mode: {filterType}',
   filterNotEmpty: 'Not Empty',
   filterNotEquals: 'Not Equals',

package/src/menus/MRT_FilterOptionMenu.tsx

@@ -1,13 +1,7 @@
 import React, { FC, useMemo } from 'react';
-import { Menu, MenuItem } from '@mui/material';
+import { Box, Menu, MenuItem } from '@mui/material';
 import type { MRT_FilterOption, MRT_Header, MRT_TableInstance } from '..';
 
-const commonMenuItemStyles = {
-  py: '6px',
-  my: 0,
-  alignItems: 'center',
-};
-
 interface Props {
   anchorEl: HTMLElement | null;
   header?: MRT_Header;
@@ -42,75 +36,107 @@ export const MRT_FilterOptionMenu: FC<Props> = ({
 
   const filterOptions = useMemo(
     () =>
-      [
-        {
-          option: 'fuzzy',
-          label: localization.filterFuzzy,
-          divider: false,
-        },
-        {
-          option: 'contains',
-          label: localization.filterContains,
-          divider: false,
-        },
-        {
-          option: 'startsWith',
-          label: localization.filterStartsWith,
-          divider: false,
-        },
-        {
-          option: 'endsWith',
-          label: localization.filterEndsWith,
-          divider: true,
-        },
-        {
-          option: 'equals',
-          label: localization.filterEquals,
-          divider: false,
-        },
-        {
-          option: 'notEquals',
-          label: localization.filterNotEquals,
-          divider: true,
-        },
-        {
-          option: 'between',
-          label: localization.filterBetween,
-          divider: false,
-        },
-        {
-          option: 'greaterThan',
-          label: localization.filterGreaterThan,
-          divider: false,
-        },
-        {
-          option: 'lessThan',
-          label: localization.filterLessThan,
-          divider: true,
-        },
-        {
-          option: 'empty',
-          label: localization.filterEmpty,
-          divider: false,
-        },
-        {
-          option: 'notEmpty',
-          label: localization.filterNotEmpty,
-          divider: false,
-        },
-      ].filter((filterType) =>
+      (
+        [
+          {
+            option: 'fuzzy',
+            symbol: '≈',
+            label: localization.filterFuzzy,
+            divider: false,
+          },
+          {
+            option: 'contains',
+            symbol: '[]',
+            label: localization.filterContains,
+            divider: false,
+          },
+          {
+            option: 'startsWith',
+            symbol: 'a',
+            label: localization.filterStartsWith,
+            divider: false,
+          },
+          {
+            option: 'endsWith',
+            symbol: 'z',
+            label: localization.filterEndsWith,
+            divider: true,
+          },
+          {
+            option: 'equals',
+            symbol: '=',
+            label: localization.filterEquals,
+            divider: false,
+          },
+          {
+            option: 'notEquals',
+            symbol: '≠',
+            label: localization.filterNotEquals,
+            divider: true,
+          },
+          {
+            option: 'between',
+            symbol: '⇿',
+            label: localization.filterBetween,
+            divider: false,
+          },
+          {
+            option: 'betweenInclusive',
+            symbol: '⬌',
+            label: localization.filterBetweenInclusive,
+            divider: true,
+          },
+          {
+            option: 'greaterThan',
+            symbol: '>',
+            label: localization.filterGreaterThan,
+            divider: false,
+          },
+          {
+            option: 'greaterThanOrEqualTo',
+            symbol: '≥',
+            label: localization.filterGreaterThanOrEqualTo,
+            divider: false,
+          },
+          {
+            option: 'lessThan',
+            symbol: '<',
+            label: localization.filterLessThan,
+            divider: false,
+          },
+          {
+            option: 'lessThanOrEqualTo',
+            symbol: '≤',
+            label: localization.filterLessThanOrEqualTo,
+            divider: true,
+          },
+          {
+            option: 'empty',
+            symbol: '∅',
+            label: localization.filterEmpty,
+            divider: false,
+          },
+          {
+            option: 'notEmpty',
+            symbol: '!∅',
+            label: localization.filterNotEmpty,
+            divider: false,
+          },
+        ] as Array<{
+          divider: boolean;
+          fn: Function;
+          label: string;
+          option: MRT_FilterOption;
+          symbol?: string;
+        }>
+      ).filter((filterType) =>
         columnDef
           ? allowedColumnFilterOptions === undefined ||
             allowedColumnFilterOptions?.includes(filterType.option)
           : (!enabledGlobalFilterOptions ||
               enabledGlobalFilterOptions.includes(filterType.option)) &&
             ['fuzzy', 'contains'].includes(filterType.option),
-      ) as Array<{
-        option: MRT_FilterOption;
-        label: string;
-        divider: boolean;
-        fn: Function;
-      }>,
+      ),
     [],
   );
 
@@ -148,15 +174,22 @@ export const MRT_FilterOptionMenu: FC<Props> = ({
         dense: density === 'compact',
       }}
     >
-      {filterOptions.map(({ option, label, divider }, index) => (
+      {filterOptions.map(({ option, label, divider, symbol }, index) => (
         <MenuItem
           divider={divider}
           key={index}
           onClick={() => handleSelectFilterType(option)}
           selected={option === filterOption}
-          sx={commonMenuItemStyles}
+          sx={{
+            py: '6px',
+            my: 0,
+            alignItems: 'center',
+            display: 'flex',
+            gap: '2ch',
+          }}
           value={option}
         >
+          <Box sx={{ fontSize: '1.25rem', width: '2ch' }}>{symbol}</Box>
           {label}
         </MenuItem>
       ))}

package/src/menus/MRT_ShowHideColumnsMenu.tsx

@@ -2,7 +2,7 @@ import React, { FC, useMemo, useState } from 'react';
 import { Button, Menu, Divider, Box } from '@mui/material';
 import { MRT_ShowHideColumnsMenuItems } from './MRT_ShowHideColumnsMenuItems';
 import type { MRT_Column, MRT_TableInstance } from '..';
-import { getDefaultColumnOrderIds } from '../utils';
+import { getDefaultColumnOrderIds } from '../column.utils';
 
 interface Props {
   anchorEl: HTMLElement | null;

package/src/menus/MRT_ShowHideColumnsMenuItems.tsx

@@ -15,7 +15,7 @@ import {
 } from '@mui/material';
 import { MRT_ColumnPinningButtons } from '../buttons/MRT_ColumnPinningButtons';
 import { MRT_GrabHandleButton } from '../buttons/MRT_GrabHandleButton';
-import { reorderColumn } from '../utils';
+import { reorderColumn } from '../column.utils';
 import type { MRT_Column, MRT_TableInstance } from '..';
 
 interface Props {

package/src/table/MRT_TableRoot.tsx

@@ -10,28 +10,28 @@ import {
   getSortedRowModel,
   useReactTable,
 } from '@tanstack/react-table';
-import {
-  MRT_Cell,
-  MRT_Column,
-  MRT_ColumnDef,
-  MRT_FilterOption,
-  MRT_Row,
-  MRT_TableInstance,
-  MRT_TableState,
-} from '..';
+import { Box, Dialog, Grow } from '@mui/material';
 import { MRT_ExpandAllButton } from '../buttons/MRT_ExpandAllButton';
 import { MRT_ExpandButton } from '../buttons/MRT_ExpandButton';
 import { MRT_ToggleRowActionMenuButton } from '../buttons/MRT_ToggleRowActionMenuButton';
 import { MRT_SelectCheckbox } from '../inputs/MRT_SelectCheckbox';
-import { MaterialReactTableProps } from '../MaterialReactTable';
 import { MRT_TablePaper } from './MRT_TablePaper';
-import { Box, Dialog, Grow } from '@mui/material';
 import {
   prepareColumns,
   getAllLeafColumnDefs,
   getDefaultColumnOrderIds,
-} from '../utils';
+} from '../column.utils';
 import { MRT_FilterFns } from '../filtersFns';
+import type {
+  MRT_Cell,
+  MRT_Column,
+  MRT_ColumnDef,
+  MRT_FilterOption,
+  MRT_Row,
+  MRT_TableInstance,
+  MRT_TableState,
+  MaterialReactTableProps,
+} from '..';
 
 const defaultDisplayColumnDefOptions = {
   columnDefType: 'display',