rez-table-listing-mui 1.3.9 → 1.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez-table-listing-mui",
-  "version": "1.3.9",
+  "version": "1.3.10",
   "type": "module",
   "description": "A rez table listing component built on TanStack Table",
   "main": "dist/index.js",

package/src/listing/components/filter/index.tsx

@@ -5,7 +5,6 @@ import {
   FilterComponentOptions,
   FilterDrawerProps,
   FilterMasterStateProps,
-  TabType,
 } from "../../types/filter";
 import ConfirmModal, { InputField } from "../common/confirm-modal";
 import CustomTabPanel from "./components/tabs/custom-tab-panel";
@@ -89,10 +88,10 @@ export function TableFilter({
   }, [editModeFromTabOptions]);
 
   // Map tabs to type
-  const tabMapping: TabType[] = [];
-  if (showMainFilter) tabMapping.push("main");
-  if (showSavedFilter) tabMapping.push("saved");
-  if (showAttributesFilter) tabMapping.push("attributes");
+  const tabMapping: TabItem[] = [];
+  if (showMainFilter) tabMapping.push({ label: "Filter" });
+  if (showSavedFilter) tabMapping.push({ label: "Saved Filter" });
+  if (showAttributesFilter) tabMapping.push({ label: "Attributes" });
 
   const clearAttributeRadio = () => {
     const newFilterMaster = {
@@ -114,23 +113,16 @@ export function TableFilter({
     type: "text",
   };
 
-  //FOR TABS
-  const tabItems: TabItem[] = [
-    { label: "Filter" },
-    { label: "Saved Filter" },
-    { label: "Attributes" },
-  ];
-
   const handleTabChange = (_: React.SyntheticEvent, newValue: number) => {
-    const tabType = tabMapping[newValue];
+    const tabType = tabMapping[newValue]?.label;
 
-    if (tabType === "attributes" && tabMapping[tabValue] === "main") {
+    if (tabType === "Attributes" && tabMapping[tabValue]?.label === "Filter") {
       clearAttributeRadio();
     }
 
     setTabValue(newValue);
 
-    if (tabType === "main") {
+    if (tabType === "Filter") {
       setEditMode(false);
 
       setFilterMaster(
@@ -145,17 +137,17 @@ export function TableFilter({
 
     setFilters([]);
 
-    if (tabType === "saved") setEditMode(false);
+    if (tabType?.label === "Saved Filter") setEditMode(false);
 
     const patches: Partial<FilterMasterStateProps> = {};
 
-    if (tabType === "saved") {
+    if (tabType?.label === "Saved Filter") {
       patches.saved_filters = {
         selectedId: "",
         selectedName: "",
         selectedCode: "",
       };
-    } else if (tabType === "attributes") {
+    } else if (tabType?.label === "Attributes") {
       patches.attributes = { radio: [], selected: "" };
     }
 
@@ -214,7 +206,7 @@ export function TableFilter({
         <CustomTabs
           value={tabValue}
           onChange={handleTabChange}
-          tabItems={tabItems}
+          tabItems={tabMapping}
           activeFilterIndex={filterMaster?.activeFilterTabIndex ?? 0}
           handleCrossClick={handleTabCrossClick}
         />
@@ -233,7 +225,7 @@ export function TableFilter({
       {showMainFilter && (
         <CustomTabPanel
           value={tabValue}
-          index={tabMapping.indexOf("main")}
+          index={tabMapping.findIndex((tab) => tab.label === "Filter")}
           sx={{ p: "1.5rem 0.75rem" }}
         >
           <MainFilter
@@ -247,7 +239,7 @@ export function TableFilter({
       {showSavedFilter && (
         <CustomTabPanel
           value={tabValue}
-          index={tabMapping.indexOf("saved")}
+          index={tabMapping.findIndex((tab) => tab.label === "Saved Filter")}
           sx={{ p: "1.5rem 0.75rem" }}
         >
           <SavedFilter
@@ -262,7 +254,7 @@ export function TableFilter({
       {showAttributesFilter && (
         <CustomTabPanel
           value={tabValue}
-          index={tabMapping.indexOf("attributes")}
+          index={tabMapping.findIndex((tab) => tab.label === "Attributes")}
           sx={{ p: "1.5rem 0.75rem" }}
         >
           <AttributesFilter

package/src/listing/types/filter.ts

@@ -101,7 +101,7 @@ type RecordFilterComponentProps = {
   delete: ModalConfig;
 };
 
-export type TabType = "main" | "saved" | "attributes";
+type TabType = "main" | "saved" | "attributes";
 
 interface FilterComponentTabOptions {
   mainFilter?: FilterComponentOptionsMainFilterOptions;