add more null safety to filterFns

Author: KevinVandy

packages/material-react-table/src/fns/filterFns.ts

@@ -12,9 +12,13 @@ const fuzzy = <TData extends MRT_RowData>(
   filterValue: number | string,
   addMeta: (item: RankingInfo) => void,
 ) => {
-  const itemRank = rankItem(row.getValue(columnId), filterValue as string, {
-    threshold: rankings.MATCHES,
-  });
+  const itemRank = rankItem(
+    row.getValue<string | number | null>(columnId),
+    filterValue as string,
+    {
+      threshold: rankings.MATCHES,
+    },
+  );
   addMeta(itemRank);
   return itemRank.passed;
 };
@@ -27,8 +31,8 @@ const contains = <TData extends MRT_RowData>(
   filterValue: number | string,
 ) =>
   row
-    .getValue<number | string>(id)
-    .toString()
+    .getValue<number | string | null>(id)
+    ?.toString()
     .toLowerCase()
     .trim()
     .includes(filterValue.toString().toLowerCase().trim());
@@ -41,8 +45,8 @@ const startsWith = <TData extends MRT_RowData>(
   filterValue: number | string,
 ) =>
   row
-    .getValue<number | string>(id)
-    .toString()
+    .getValue<number | string | null>(id)
+    ?.toString()
     .toLowerCase()
     .trim()
     .startsWith(filterValue.toString().toLowerCase().trim());
@@ -55,8 +59,8 @@ const endsWith = <TData extends MRT_RowData>(
   filterValue: number | string,
 ) =>
   row
-    .getValue<number | string>(id)
-    .toString()
+    .getValue<number | string | null>(id)
+    ?.toString()
     .toLowerCase()
     .trim()
     .endsWith(filterValue.toString().toLowerCase().trim());
@@ -68,8 +72,8 @@ const equals = <TData extends MRT_RowData>(
   id: string,
   filterValue: number | string,
 ) =>
-  row.getValue<number | string>(id).toString().toLowerCase().trim() ===
-  filterValue?.toString().toLowerCase().trim();
+  row.getValue<number | string | null>(id)?.toString().toLowerCase().trim() ===
+  filterValue.toString().toLowerCase().trim();
 
 equals.autoRemove = (val: any) => !val;
 
@@ -78,7 +82,7 @@ const notEquals = <TData extends MRT_RowData>(
   id: string,
   filterValue: number | string,
 ) =>
-  row.getValue<number | string>(id).toString().toLowerCase().trim() !==
+  row.getValue<number | string | null>(id)?.toString().toLowerCase().trim() !==
   filterValue.toString().toLowerCase().trim();
 
 notEquals.autoRemove = (val: any) => !val;
@@ -89,9 +93,11 @@ const greaterThan = <TData extends MRT_RowData>(
   filterValue: number | string,
 ) =>
   !isNaN(+filterValue) && !isNaN(+row.getValue<number | string>(id))
-    ? +row.getValue<number | string>(id) > +filterValue
-    : row.getValue<number | string>(id).toString().toLowerCase().trim() >
-      filterValue?.toString().toLowerCase().trim();
+    ? +(row.getValue<number | string | null>(id) ?? 0) > +filterValue
+    : (row.getValue<number | string | null>(id) ?? '')
+        ?.toString()
+        .toLowerCase()
+        .trim() > filterValue.toString().toLowerCase().trim();
 
 greaterThan.autoRemove = (val: any) => !val;
 
@@ -109,9 +115,11 @@ const lessThan = <TData extends MRT_RowData>(
   filterValue: number | string,
 ) =>
   !isNaN(+filterValue) && !isNaN(+row.getValue<number | string>(id))
-    ? +row.getValue<number | string>(id) < +filterValue
-    : row.getValue<number | string>(id).toString().toLowerCase().trim() <
-      filterValue?.toString().toLowerCase().trim();
+    ? +(row.getValue<number | string | null>(id) ?? 0) < +filterValue
+    : (row.getValue<number | string | null>(id) ?? '')
+        ?.toString()
+        .toLowerCase()
+        .trim() < filterValue.toString().toLowerCase().trim();
 
 lessThan.autoRemove = (val: any) => !val;
 
@@ -157,15 +165,15 @@ const empty = <TData extends MRT_RowData>(
   row: Row<TData>,
   id: string,
   _filterValue: number | string,
-) => !row.getValue<number | string>(id).toString().trim();
+) => !row.getValue<number | string | null>(id)?.toString().trim();
 
 empty.autoRemove = (val: any) => !val;
 
 const notEmpty = <TData extends MRT_RowData>(
   row: Row<TData>,
   id: string,
   _filterValue: number | string,
-) => !!row.getValue<number | string>(id).toString().trim();
+) => !!row.getValue<number | string | null>(id)?.toString().trim();
 
 notEmpty.autoRemove = (val: any) => !val;