react-better-html 1.1.122 → 1.1.123

package/dist/index.d.mts

@@ -647,6 +647,11 @@ declare const ColorThemeSwitch: typeof ColorThemeSwitchComponent & {
 };
 
 type FilterPreset = "today" | "yesterday" | "tomorrow" | "thisWeek" | "thisMonth" | "thisYear" | "lastWeek" | "lastMonth" | "lastYear" | "nextWeek" | "nextMonth" | "nextYear";
+type ListFilterValue = {
+    label?: string;
+    value: string;
+    count: number;
+};
 type TableFilterData = {
     type: "number";
     min?: number;
@@ -694,7 +699,7 @@ type DateFilter<DataItem> = {
 type ListFilter<DataItem> = {
     filter?: "list";
     withTotalNumber?: boolean;
-    getValueForList?: (item: DataItem) => string;
+    getValueForList?: (item: DataItem) => OmitProps<ListFilterValue, "count">;
 };
 type TableColumn<DataItem> = {
     label?: string;

package/dist/index.d.ts

@@ -647,6 +647,11 @@ declare const ColorThemeSwitch: typeof ColorThemeSwitchComponent & {
 };
 
 type FilterPreset = "today" | "yesterday" | "tomorrow" | "thisWeek" | "thisMonth" | "thisYear" | "lastWeek" | "lastMonth" | "lastYear" | "nextWeek" | "nextMonth" | "nextYear";
+type ListFilterValue = {
+    label?: string;
+    value: string;
+    count: number;
+};
 type TableFilterData = {
     type: "number";
     min?: number;
@@ -694,7 +699,7 @@ type DateFilter<DataItem> = {
 type ListFilter<DataItem> = {
     filter?: "list";
     withTotalNumber?: boolean;
-    getValueForList?: (item: DataItem) => string;
+    getValueForList?: (item: DataItem) => OmitProps<ListFilterValue, "count">;
 };
 type TableColumn<DataItem> = {
     label?: string;

package/dist/index.js

@@ -7291,7 +7291,7 @@ var TableComponent = (0, import_react23.forwardRef)(function Table({
           if (filter.min !== void 0 && minDate && itemValue < minDate) return false;
           if (filter.max !== void 0 && maxDate && itemValue > maxDate) return false;
         } else if (column.filter === "list" && filter.type === "list") {
-          const itemValue = column.getValueForList?.(item) ?? (column.type === "text" && column.keyName ? String(item[column.keyName]) : "");
+          const itemValue = column.getValueForList?.(item).value ?? (column.type === "text" && column.keyName ? String(item[column.keyName]) : "");
           if (!filter.list?.includes(itemValue)) return false;
         }
         return true;
@@ -7311,27 +7311,26 @@ var TableComponent = (0, import_react23.forwardRef)(function Table({
   }, [data, checkedItems]);
   const possibleFilterListValues = (0, import_react23.useMemo)(() => {
     if (!openedFilterColumn) return [];
-    return data.reduce(
-      (previousValue, currentValue) => {
-        const value = openedFilterColumn.type === "text" && openedFilterColumn.keyName ? String(currentValue[openedFilterColumn.keyName]) : void 0;
-        if (value !== void 0) {
-          if (previousValue.some((item) => item.value === value)) {
-            previousValue = previousValue.map(
-              (item) => item.value === value ? {
-                ...item,
-                count: item.count + 1
-              } : item
-            );
-          } else
-            previousValue.push({
-              value,
-              count: 1
-            });
-        }
-        return previousValue;
-      },
-      []
-    );
+    return data.reduce((previousValue, currentValue) => {
+      const valueFromList = openedFilterColumn.filter === "list" && openedFilterColumn.getValueForList ? openedFilterColumn.getValueForList(currentValue) : void 0;
+      const value = valueFromList ? valueFromList.value : openedFilterColumn.type === "text" && openedFilterColumn.keyName ? String(currentValue[openedFilterColumn.keyName]) : void 0;
+      if (value !== void 0) {
+        if (previousValue.some((item) => item.value === value)) {
+          previousValue = previousValue.map(
+            (item) => item.value === value ? {
+              ...item,
+              count: item.count + 1
+            } : item
+          );
+        } else
+          previousValue.push({
+            label: valueFromList ? valueFromList.label : value,
+            value,
+            count: 1
+          });
+      }
+      return previousValue;
+    }, []);
   }, [data, openedFilterColumn]);
   const pageCountInternal = pageCount ?? (pageSize !== void 0 ? Math.ceil(dataAfterFilter.length / pageSize) : 1);
   const paginationItems = (0, import_react23.useMemo)(() => {
@@ -7638,7 +7637,7 @@ var TableComponent = (0, import_react23.forwardRef)(function Table({
                     value: value.value,
                     onClickWithValue: onClickFilterListItem,
                     children: /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Div_default.row, { alignItems: "center", gap: theme2.styles.gap / 2, children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { children: value.value }),
+                      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { children: value.label ?? value.value }),
                       openedFilterColumn.withTotalNumber && /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(
                         Text_default,
                         {