Merge pull request #284 from komarovalexander/dev

Fix custom data filter for date column

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ka-table",
-  "version": "7.10.0",
+  "version": "7.10.1",
   "license": "MIT",
   "repository": "github:komarovalexander/ka-table",
   "homepage": "https://komarovalexander.github.io/ka-table/#/overview",

src/lib/Utils/FilterUtils.test.ts

@@ -1,10 +1,15 @@
 import { DataType, FilterOperatorName } from '../enums';
-import { Column } from '../Models/Column';
-import { SearchFunc } from '../types';
 import {
-  filterData, getDefaultOperatorForType, getRowEditableCells, predefinedFilterOperators, searchData,
+  filterData,
+  getDefaultOperatorForType,
+  getRowEditableCells,
+  predefinedFilterOperators,
+  searchData,
 } from './FilterUtils';
 
+import { Column } from '../Models/Column';
+import { SearchFunc } from '../types';
+
 describe('FilterUtils', () => {
   it('getRowEditableCells should return required cells from table EditableCells', () => {
     const rowEditableCells = getRowEditableCells(10, [{
@@ -104,6 +109,22 @@ describe('FilterUtils', () => {
       expect(result).toMatchSnapshot();
     });
 
+    it('custom filter: column with data type = "date" should not change filterRowValue', () => {
+      const columns = [{
+        dataType: DataType.Date,
+        filterRowValue: ['date 1'],
+        key: 'date',
+      }];
+      const result = filterData(data, columns, ({ column }) => {
+        if (column.key === 'date'){
+          return (value, filterValue) => {
+            return filterValue[0] === 'date 1' && value === data[0].date
+          };
+        }
+      });
+      expect(result).toMatchSnapshot();
+    });
+
     it('should throw an error in case of unknown filterOperator', () => {
       const columns = [{
         filterRowOperator: 'unknownOperator',

src/lib/Utils/FilterUtils.ts

@@ -1,13 +1,14 @@
-import { ITableProps } from '../';
-import defaultOptions from '../defaultOptions';
 import { DataType, FilterOperatorName } from '../enums';
+import { FilterFunc, FormatFunc, SearchFunc } from '../types';
+
 import { Column } from '../Models/Column';
 import { EditableCell } from '../Models/EditableCell';
 import { FilterOperator } from '../Models/FilterOperator';
-import { FilterFunc, FormatFunc, SearchFunc } from '../types';
-import { isEmpty } from './CommonUtils';
-import { getValueByColumn } from './DataUtils';
+import { ITableProps } from '../';
 import { convertToColumnTypes } from './TypeUtils';
+import defaultOptions from '../defaultOptions';
+import { getValueByColumn } from './DataUtils';
+import { isEmpty } from './CommonUtils';
 
 export const getRowEditableCells = (rowKeyValue: any, editableCells: EditableCell[]): EditableCell[] => {
   return editableCells.filter((c) => c.rowKeyValue === rowKeyValue);
@@ -75,11 +76,13 @@ export const filterData = (data: any[], columns: Column[], filter?: FilterFunc):
     ) {
       return initialData;
     }
-    const compare = filter?.({ column }) || getCompare(column);
+    const customFilter = filter?.({ column });
+    const compare = customFilter || getCompare(column);
+
     return initialData.filter((d: any) => {
       let fieldValue = getValueByColumn(d, column);
       let conditionValue = column.filterRowValue;
-      if (column.dataType === DataType.Date) {
+      if (column.dataType === DataType.Date && !customFilter) {
         fieldValue = fieldValue == null ? fieldValue : new Date(fieldValue).setHours(0, 0, 0, 0);
         conditionValue = conditionValue == null ? conditionValue : new Date(conditionValue).setHours(0, 0, 0, 0);
       }

src/lib/Utils/__snapshots__/FilterUtils.test.ts.snap

@@ -111,6 +111,18 @@ Array [
 ]
 `;
 
+exports[`FilterUtils filterData custom filter: column with data type = "date" should not change filterRowValue 1`] = `
+Array [
+  Object {
+    "date": 2021-12-20T09:00:00.000Z,
+    "id": 1,
+    "name": "Mike Wazowski",
+    "passed": true,
+    "score": 80,
+  },
+]
+`;
+
 exports[`FilterUtils filterData one item 1`] = `
 Array [
   Object {