updates

PandaTechAM · May 24, 2024 · ed407d9 · ed407d9
1 parent 0f33b8b
commit ed407d9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "beautiful-react-table",
-  "version": "7.4.9",
+  "version": "7.5.0",
   "description": "My first react typescript package",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",

diff --git a/src/table/MainHeader/Filter/FiltersPerColumn/UiTypes/MultipleCheck.tsx b/src/table/MainHeader/Filter/FiltersPerColumn/UiTypes/MultipleCheck.tsx
@@ -129,8 +129,11 @@ const MultipleCheck = ({
   }
   const isEqual = (option: any, value: any) => {
     let numericValue = value
-    if (option === '' || option === null || option === 'null') {
-      return true
+    if (numericValue === 'Empty') {
+      numericValue = ''
+    }
+    if (numericValue === 'Blank') {
+      numericValue = null
     }
     if (['Number', 'Currency', 'Percentage'].includes(item.ColumnType) && typeof value === 'string') {
       numericValue = +value

diff --git a/src/table/MainHeader/Filter/FiltersPerColumn/apiFilter.tsx b/src/table/MainHeader/Filter/FiltersPerColumn/apiFilter.tsx
@@ -191,7 +191,7 @@ const APIFilter = ({
       }
       if (filterUiHelper(typeElem.ColumnType, filterTypeing.TypeForUi) !== 2) {
         filteredData.ComparisonType =
-          item.ColumnType === 'Tags' && filteredData.ComparisonType === 'Contains'
+          item.ColumnType === 'Tags' || item.ColumnType === 'TagsCollection'
             ? filteredData.ComparisonType
             : checkedItems.length > 1
             ? 'In'

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -86,6 +86,9 @@ const filterUiHelperMap = {
     LessThanOrEqual: 6,
   },
   Tags: {
+    In:4
+  },
+  TagsCollection: {
     Contains:4
   }
 } as const