fix(table): add filter boolean for no show order indicator in filters

DevoInc · Oct 23, 2024 · 82109b2 · 82109b2
1 parent 04261b8
commit 82109b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/packages/table/src/core/HeaderCell/HeaderCell.tsx b/packages/table/src/core/HeaderCell/HeaderCell.tsx
@@ -13,6 +13,7 @@ interface HeaderCellProps {
   offsetX: number;
   children: React.ReactNode;
   title?: string;
+  filter?: boolean;
 }
 
 export const HeaderCell: React.FC<HeaderCellProps> = ({
@@ -21,8 +22,9 @@ export const HeaderCell: React.FC<HeaderCellProps> = ({
   offsetX,
   children,
   title,
+  filter
 }) => {
-  const { density, onSort, resizableColumns, showFilters } = React.useContext(TableContext);
+  const { density, onSort, resizableColumns } = React.useContext(TableContext);
 
   return (
     <StyledHeaderCell
@@ -42,7 +44,7 @@ export const HeaderCell: React.FC<HeaderCellProps> = ({
       }
     >
       {children}
-      {colDef.sortable && !showFilters && <OrderIndicator colDef={colDef} />}
+      {colDef.sortable && !filter && <OrderIndicator colDef={colDef} />}
       {(colDef?.resizable ?? resizableColumns) && (
         <StyledHeaderCellResizer
           $density={density}

diff --git a/packages/table/src/core/TableHead/TableHead.tsx b/packages/table/src/core/TableHead/TableHead.tsx
@@ -63,6 +63,7 @@ export const TableHead: React.FC<TableHeadProps> = ({
                   colDef={colDef}
                   width={virtualColumn ? `${virtualColumn.size}px` : 'auto'}
                   offsetX={virtualColumn ? virtualColumn.start : undefined}
+                  filter={true}
                 >
                   {colDef?.headerOnFilterPosition ? (
                     colDef?.headerRenderer ? (

diff --git a/packages/table/stories/column/Order.stories.tsx b/packages/table/stories/column/Order.stories.tsx
@@ -76,6 +76,7 @@ const OrderTable = () => {
         editable: false,
         sortable: true,
       }}
+      showFilters
       colDefs={updateColDefsWithOrderStruct(colDefs, orderStruct)}
       data={dataOrdered}
     />