From 184cfecbb3ff48d65dadf4d038c90e0bd15e0b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20DOREAU?= <remi.d45@gmail.com>
Date: Tue, 15 Sep 2020 18:17:35 +0200
Subject: [PATCH] fix(core): filter count + nullable category label

---
 packages/core/src/components/Table/Filters.tsx | 4 ++--
 packages/core/src/components/Table/Table.tsx   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/components/Table/Filters.tsx b/packages/core/src/components/Table/Filters.tsx
index 84663a4467..e11736604b 100644
--- a/packages/core/src/components/Table/Filters.tsx
+++ b/packages/core/src/components/Table/Filters.tsx
@@ -105,11 +105,11 @@ export const Filters = (props: Props) => {
                     [filter.element.label]: el
                       .filter(
                         (checkboxFilter: any) =>
-                          checkboxFilter.category ||
+                          checkboxFilter.category !== null ||
                           checkboxFilter.selectedChilds.length,
                       )
                       .map((checkboxFilter: any) =>
-                        checkboxFilter.category
+                        checkboxFilter.category !== null
                           ? [
                               ...checkboxFilter.selectedChilds,
                               checkboxFilter.category,
diff --git a/packages/core/src/components/Table/Table.tsx b/packages/core/src/components/Table/Table.tsx
index 0886d8e177..ace5aa3fac 100644
--- a/packages/core/src/components/Table/Table.tsx
+++ b/packages/core/src/components/Table/Table.tsx
@@ -230,10 +230,10 @@ export function Table<T extends object = {}>({
           }),
       );
       setTableData(newData);
-      setSelectedFiltersLength(selectedFiltersArray.flat().length);
     } else {
       setTableData(props.data as any[]);
     }
+    setSelectedFiltersLength(selectedFiltersArray.flat().length);
   };
 
   const constructFilters = (filterConfig: TableFilter[], dataValue: any[]) => {