react-better-html 1.1.214 → 1.1.215

package/dist/index.mjs

@@ -4038,6 +4038,7 @@ var filterHover = () => {
 
 // src/components/Chip.tsx
 import { jsx as jsx14 } from "react/jsx-runtime";
+var borderRadiusOffset = 1.3;
 var ChipComponent = forwardRef9(function Chip({
   text,
   color,
@@ -4062,7 +4063,7 @@ var ChipComponent = forwardRef9(function Chip({
     {
       width: "fit-content",
       backgroundColor: backgroundColor ?? theme2.colors.backgroundSecondary,
-      borderRadius: isCircle ? 999 : borderRadius ?? theme2.styles.borderRadius / 1.3,
+      borderRadius: isCircle ? 999 : borderRadius ?? theme2.styles.borderRadius / borderRadiusOffset,
       paddingBlock: theme2.styles.gap / 2,
       paddingInline: theme2.styles.space / 1.5,
       filterHover: onClick || onClickWithValue ? filterHover().z1 : void 0,
@@ -4074,11 +4075,11 @@ var ChipComponent = forwardRef9(function Chip({
     }
   );
 });
-ChipComponent.colored = forwardRef9(function Colored({ color, ...props }, ref) {
+ChipComponent.colored = forwardRef9(function Colored({ color, withWhiteBackground, ...props }, ref) {
   const theme2 = useTheme();
   const { colorTheme } = useBetterHtmlContextInternal();
   const readyColor = color ?? theme2.colors.textSecondary;
-  return /* @__PURE__ */ jsx14(
+  const chip = /* @__PURE__ */ jsx14(
     ChipComponent,
     {
       color: colorTheme === "light" ? darkenColor(readyColor, 0.7) : lightenColor(readyColor, 0.7),
@@ -4088,6 +4089,15 @@ ChipComponent.colored = forwardRef9(function Colored({ color, ...props }, ref) {
       ...props
     }
   );
+  return withWhiteBackground ? /* @__PURE__ */ jsx14(
+    Div_default,
+    {
+      width: "fit-content",
+      backgroundColor: withWhiteBackground ? colorTheme === "light" ? "#ffffff" : "#000000" : void 0,
+      borderRadius: withWhiteBackground ? props.borderRadius ?? theme2.styles.borderRadius / borderRadiusOffset + 0.3 : void 0,
+      children: chip
+    }
+  ) : chip;
 });
 var Chip2 = memo14(ChipComponent);
 Chip2.colored = ChipComponent.colored;
@@ -5723,6 +5733,7 @@ var Label_default = memo15(Label);
 // src/components/Dropdown.tsx
 import { forwardRef as forwardRef10, Fragment as Fragment3, memo as memo16, useCallback as useCallback8, useEffect as useEffect6, useMemo as useMemo4, useRef as useRef4, useState as useState5 } from "react";
 import { Fragment as Fragment4, jsx as jsx15, jsxs as jsxs11 } from "react/jsx-runtime";
+import { createElement as createElement2 } from "react";
 var DropdownComponent = forwardRef10(function Dropdown({
   label,
   labelColor,
@@ -5894,7 +5905,7 @@ var DropdownComponent = forwardRef10(function Dropdown({
               role: "option",
               "aria-selected": isSelected,
               "aria-disabled": isDisabled,
-              children: renderOption ? renderOption(option, index, isSelected) : /* @__PURE__ */ jsx15(Text_default, { children: option.label })
+              children: renderOption ? renderOption(option, index, isSelected) : /* @__PURE__ */ jsx15(Fragment4, { children: !option.renderType || option.renderType === "default" ? /* @__PURE__ */ jsx15(Text_default, { children: option.label }) : option.renderType === "chip" ? /* @__PURE__ */ jsx15(Chip_default, { text: option.label, ...option.chipProps }) : option.renderType === "chip.colored" ? /* @__PURE__ */ jsx15(Chip_default.colored, { text: option.label, withWhiteBackground: true, ...option.chipProps }) : void 0 })
             }
           ),
           renderOptionDivider ? renderOptionDivider(
@@ -5992,7 +6003,18 @@ var DropdownComponent = forwardRef10(function Dropdown({
           paddingBlock: theme2.styles.gap,
           paddingInline: (theme2.styles.space + theme2.styles.gap) / 2,
           transition: theme2.styles.transition,
-          children: /* @__PURE__ */ jsx15(Div_default.row, { width: "100%", flexWrap: "wrap", gap: theme2.styles.gap, children: selectedOption.map((option) => /* @__PURE__ */ jsx15(Chip_default, { text: option.label }, JSON.stringify(option))) })
+          children: /* @__PURE__ */ jsx15(Div_default.row, { width: "100%", flexWrap: "wrap", gap: theme2.styles.gap, children: selectedOption.map((option) => {
+            const ChipComponentTag = !option.renderType || option.renderType === "default" || option.renderType === "chip" ? Chip_default : option.renderType === "chip.colored" ? Chip_default.colored : Chip_default;
+            return /* @__PURE__ */ createElement2(
+              ChipComponentTag,
+              {
+                text: option.label,
+                ...option.renderType === "chip" || option.renderType === "chip.colored" ? option.chipProps : [],
+                withWhiteBackground: option.renderType === "chip.colored",
+                key: JSON.stringify(option)
+              }
+            );
+          }) })
         }
       ) : void 0,
       insideInputFieldAfterComponent: /* @__PURE__ */ jsxs11(Fragment4, { children: [
@@ -8389,7 +8411,7 @@ var TableComponent = forwardRef15(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).value ?? (column.type === "text" && column.keyName ? String(item[column.keyName]) : "");
+          const itemValue = column.getItemValue?.(item) ?? (column.type === "text" && column.keyName ? String(item[column.keyName]) : "");
           if (!filter.list?.includes(itemValue)) return false;
         }
         return true;
@@ -8408,32 +8430,17 @@ var TableComponent = forwardRef15(function Table({
     return data.length > 0 && checkedItems.every((checked) => checked) && checkedItems.length === data.length;
   }, [data, checkedItems]);
   const possibleFilterListValues = useMemo9(() => {
-    if (!openedFilterColumn) return [];
-    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;
-      const label = valueFromList ? valueFromList.label : value;
-      let searchPassed = openedFilterColumn.filter === "list" && openedFilterColumn.withSearch ? false : true;
-      if (openedFilterColumn.filter === "list" && openedFilterColumn.withSearch) {
-        searchPassed = label?.toString().toLowerCase().includes(filterForm.values.search.toLowerCase()) ?? false;
-      }
-      if (value !== void 0 && value !== null && value !== "" && searchPassed) {
-        if (previousValue.some((item) => item.value === value)) {
-          previousValue = previousValue.map(
-            (item) => item.value === value ? {
-              ...item,
-              count: item.count + 1
-            } : item
-          );
-        } else
-          previousValue.push({
-            label: label?.toString() ?? "",
-            value,
-            count: 1
-          });
-      }
-      return previousValue;
-    }, []);
+    if (!openedFilterColumn || openedFilterColumn.filter !== "list") return [];
+    return openedFilterColumn.list.map((item) => ({
+      ...item,
+      count: data.reduce((previousValue, currentValue) => {
+        const value = openedFilterColumn.getItemValue?.(currentValue) ?? (openedFilterColumn.type === "text" && openedFilterColumn.keyName ? String(currentValue[openedFilterColumn.keyName]) : "");
+        return previousValue + (item.value === value ? 1 : 0);
+      }, 0)
+    })).reduce(
+      (previousValue, currentValue) => !previousValue.some((item) => item.value === currentValue.value) ? [...previousValue, currentValue] : previousValue,
+      []
+    );
   }, [data, openedFilterColumn, filterForm.values.search]);
   const pageCountInternal = pageCount ?? (pageSize !== void 0 ? Math.ceil(dataAfterFilter.length / pageSize) : 1);
   const onClickSelectAllFilterListItems = useCallback13(