@l3mpire/ui 2.16.3 → 2.17.0

package/dist/index.js

@@ -5360,7 +5360,7 @@ function getValueInputType(type, operator) {
     return ["is any of", "is none of"].includes(operator) ? "MultiRelationPicker" : "RelationPicker";
   return null;
 }
-function formatFilterValue(value) {
+function formatFilterValue(value, dynamicOptions) {
   if (value == null) return void 0;
   if (typeof value === "boolean") return value ? "Yes" : "No";
   if (value instanceof Date) {
@@ -5379,9 +5379,17 @@ function formatFilterValue(value) {
       const fmt = (d) => d.toLocaleDateString("en-US", { month: "short", day: "numeric", year: "numeric" });
       return `${fmt(value[0])} \u2013 ${value[1] instanceof Date ? fmt(value[1]) : "\u2026"}`;
     }
-    return String(value[0]);
+    const resolved = resolveDynamic(String(value[0]), dynamicOptions);
+    return resolved;
   }
-  return String(value);
+  return resolveDynamic(String(value), dynamicOptions);
+}
+function resolveDynamic(raw, dynamicOptions) {
+  if (dynamicOptions) {
+    const match = dynamicOptions.find((o) => o.value === raw);
+    if (match) return match.label;
+  }
+  return raw;
 }
 function getBadgeCount(value) {
   if (Array.isArray(value) && value.length > 1 && typeof value[0] === "string") {
@@ -5432,6 +5440,23 @@ function updateNodeInTree(nodes, id, updater) {
     return node;
   });
 }
+function toggleGroupLogicInTree(nodes, id) {
+  const idx = nodes.findIndex((n) => n.id === id);
+  if (idx >= 0) {
+    const current = nodes[idx].logicOperator ?? "and";
+    const next = current === "and" ? "or" : "and";
+    return nodes.map(
+      (n, i) => i === 0 ? n : { ...n, logicOperator: next }
+    );
+  }
+  return nodes.map((node) => {
+    if (isFilterGroup(node)) {
+      const updated = toggleGroupLogicInTree(node.children, id);
+      if (updated !== node.children) return { ...node, children: updated };
+    }
+    return node;
+  });
+}
 function removeNodeFromTree(nodes, id) {
   const result = [];
   for (const node of nodes) {
@@ -6606,7 +6631,6 @@ var PresetTagsValueInput = ({
 PresetTagsValueInput.displayName = "PresetTagsValueInput";
 
 // src/components/ui/filter/value-inputs/select-value-input.tsx
-var import_icons29 = require("@l3mpire/icons");
 var import_jsx_runtime47 = require("react/jsx-runtime");
 var DynamicOptionRow = ({
   option,
@@ -6643,14 +6667,6 @@ var DynamicOptionRow = ({
           ) })
         }
       ),
-      option.icon && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
-        import_icons29.Icon,
-        {
-          icon: option.icon,
-          size: "sm",
-          className: "shrink-0 mt-[1px] text-[var(--color-interactive-text-primary-dark-default,var(--color-primary))]"
-        }
-      ),
       /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("span", { className: "flex-1 flex flex-col gap-2xs min-w-0", children: [
         /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("span", { className: "text-sm font-regular leading-sm text-[var(--color-foreground)] truncate", children: option.label }),
         option.description && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("span", { className: "text-xs font-regular leading-xs text-[var(--color-muted-foreground)]", children: option.description })
@@ -6658,7 +6674,6 @@ var DynamicOptionRow = ({
     ]
   }
 );
-var DynamicOptionsDivider = () => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("div", { className: "h-px bg-[var(--color-dropdown-border)] mx-xs my-xs" });
 var SingleSelectValueInput = ({
   value,
   onChange,
@@ -6689,7 +6704,6 @@ var SingleSelectValueInput = ({
           },
           opt.value
         )),
-        dynamicOptions && dynamicOptions.length > 0 && options.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(DynamicOptionsDivider, {}),
         options.map((opt) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
           "button",
           {
@@ -6876,7 +6890,7 @@ ValueInput.displayName = "ValueInput";
 // src/components/ui/filter/property-selector.tsx
 var React44 = __toESM(require("react"));
 var PopoverPrimitive6 = __toESM(require("@radix-ui/react-popover"));
-var import_icons30 = require("@l3mpire/icons");
+var import_icons29 = require("@l3mpire/icons");
 var import_jsx_runtime50 = require("react/jsx-runtime");
 var AdvancedFilterFooter = ({ onClick, count }) => /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(import_jsx_runtime50.Fragment, { children: [
   /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("div", { className: "h-px bg-[var(--color-dropdown-border)] mx-xs" }),
@@ -6889,9 +6903,9 @@ var AdvancedFilterFooter = ({ onClick, count }) => /* @__PURE__ */ (0, import_js
       className: "flex items-center gap-base p-base rounded-base cursor-pointer transition-colors hover:bg-[var(--color-dropdown-item-hover)]",
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-          import_icons30.Icon,
+          import_icons29.Icon,
           {
-            icon: import_icons30.faFilterOutline,
+            icon: import_icons29.faFilterOutline,
             size: "sm",
             className: "shrink-0 text-[var(--color-dropdown-item-icon)]"
           }
@@ -6991,9 +7005,9 @@ var PropertySelector = ({
             /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)("div", { className: "flex flex-col gap-xs", children: [
               /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)("div", { className: "flex items-center gap-base px-md py-base border border-[var(--color-input)] rounded-md", children: [
                 /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-                  import_icons30.Icon,
+                  import_icons29.Icon,
                   {
-                    icon: import_icons30.faMagnifyingGlassOutline,
+                    icon: import_icons29.faMagnifyingGlassOutline,
                     size: "sm",
                     className: "shrink-0 text-[var(--color-muted-foreground)]"
                   }
@@ -7023,7 +7037,7 @@ var PropertySelector = ({
                     className: "flex items-center gap-base p-base rounded-base cursor-pointer transition-colors hover:bg-[var(--color-dropdown-item-hover)]",
                     children: [
                       /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-                        import_icons30.Icon,
+                        import_icons29.Icon,
                         {
                           icon: prop.icon,
                           size: "sm",
@@ -7050,7 +7064,7 @@ var PropertySelector = ({
                       className: "flex items-center gap-base p-base rounded-base cursor-pointer transition-colors hover:bg-[var(--color-dropdown-item-hover)]",
                       children: [
                         /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-                          import_icons30.Icon,
+                          import_icons29.Icon,
                           {
                             icon: g.groupIcon,
                             size: "sm",
@@ -7060,9 +7074,9 @@ var PropertySelector = ({
                         /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("span", { className: "flex-1 text-sm font-regular leading-sm text-[var(--color-dropdown-item-text)] text-left truncate", children: g.groupLabel }),
                         /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("span", { className: "text-xs font-semibold leading-xs text-[var(--color-muted-foreground)]", children: g.count }),
                         /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-                          import_icons30.Icon,
+                          import_icons29.Icon,
                           {
-                            icon: import_icons30.faChevronRightOutline,
+                            icon: import_icons29.faChevronRightOutline,
                             size: "xs",
                             className: "shrink-0 text-[var(--color-dropdown-item-icon)]"
                           }
@@ -7089,9 +7103,9 @@ var PropertySelector = ({
                   className: "flex items-center gap-base p-base rounded-base cursor-pointer transition-colors hover:bg-[var(--color-dropdown-item-hover)]",
                   children: [
                     /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-                      import_icons30.Icon,
+                      import_icons29.Icon,
                       {
-                        icon: import_icons30.faChevronLeftOutline,
+                        icon: import_icons29.faChevronLeftOutline,
                         size: "sm",
                         className: "shrink-0 text-[var(--color-dropdown-item-icon)]"
                       }
@@ -7102,9 +7116,9 @@ var PropertySelector = ({
               ),
               /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)("div", { className: "flex items-center gap-base px-md py-base border border-[var(--color-input)] rounded-md", children: [
                 /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-                  import_icons30.Icon,
+                  import_icons29.Icon,
                   {
-                    icon: import_icons30.faMagnifyingGlassOutline,
+                    icon: import_icons29.faMagnifyingGlassOutline,
                     size: "sm",
                     className: "shrink-0 text-[var(--color-muted-foreground)]"
                   }
@@ -7133,7 +7147,7 @@ var PropertySelector = ({
                     className: "flex items-center gap-base p-base rounded-base cursor-pointer transition-colors hover:bg-[var(--color-dropdown-item-hover)]",
                     children: [
                       /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-                        import_icons30.Icon,
+                        import_icons29.Icon,
                         {
                           icon: prop.icon,
                           size: "sm",
@@ -7165,7 +7179,7 @@ PropertySelector.displayName = "PropertySelector";
 
 // src/components/ui/filter/kebab-menu.tsx
 var PopoverPrimitive7 = __toESM(require("@radix-ui/react-popover"));
-var import_icons31 = require("@l3mpire/icons");
+var import_icons30 = require("@l3mpire/icons");
 var import_jsx_runtime51 = require("react/jsx-runtime");
 var KebabMenu = ({
   onConvertToAdvanced,
@@ -7200,9 +7214,9 @@ var KebabMenu = ({
             className: "flex items-center gap-base p-base rounded-base cursor-pointer transition-colors hover:bg-[var(--color-dropdown-item-hover)]",
             children: [
               /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
-                import_icons31.Icon,
+                import_icons30.Icon,
                 {
-                  icon: import_icons31.faArrowRightOutline,
+                  icon: import_icons30.faArrowRightOutline,
                   size: "sm",
                   className: "shrink-0 text-[var(--color-dropdown-item-icon)]"
                 }
@@ -7223,9 +7237,9 @@ var KebabMenu = ({
             className: "flex items-center gap-base p-base rounded-base cursor-pointer transition-colors hover:bg-[var(--color-dropdown-item-hover)]",
             children: [
               /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
-                import_icons31.Icon,
+                import_icons30.Icon,
                 {
-                  icon: import_icons31.faTrashOutline,
+                  icon: import_icons30.faTrashOutline,
                   size: "sm",
                   className: "shrink-0 text-[var(--color-destructive)]"
                 }
@@ -7243,7 +7257,7 @@ KebabMenu.displayName = "KebabMenu";
 // src/components/ui/filter/filter-editor.tsx
 var React45 = __toESM(require("react"));
 var PopoverPrimitive8 = __toESM(require("@radix-ui/react-popover"));
-var import_icons32 = require("@l3mpire/icons");
+var import_icons31 = require("@l3mpire/icons");
 var import_jsx_runtime52 = require("react/jsx-runtime");
 var FilterEditor = ({
   propertyDef,
@@ -7307,7 +7321,7 @@ var FilterEditor = ({
         children: [
           /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)("div", { className: "flex items-center gap-base px-base pt-base pb-xs border-b border-[var(--color-border)]", children: [
             /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
-              import_icons32.Icon,
+              import_icons31.Icon,
               {
                 icon: propertyDef.icon,
                 size: "sm",
@@ -7434,7 +7448,7 @@ var InteractiveFilterChip = ({
     setValueOpen(false);
   };
   const hasOperator = !!condition.operator;
-  const displayValue = formatFilterValue(condition.value);
+  const displayValue = formatFilterValue(condition.value, propertyDef.dynamicOptions);
   const hasValue = hasOperator && displayValue != null;
   const badgeCount = getBadgeCount(condition.value);
   return /* @__PURE__ */ (0, import_jsx_runtime53.jsxs)(
@@ -7570,11 +7584,11 @@ InteractiveFilterChip.displayName = "InteractiveFilterChip";
 
 // src/components/ui/filter/filter-system.tsx
 var React54 = __toESM(require("react"));
-var import_icons39 = require("@l3mpire/icons");
+var import_icons38 = require("@l3mpire/icons");
 
 // src/components/ui/filter/advanced-chip.tsx
 var React47 = __toESM(require("react"));
-var import_icons33 = require("@l3mpire/icons");
+var import_icons32 = require("@l3mpire/icons");
 var import_jsx_runtime54 = require("react/jsx-runtime");
 var btnBase = [
   "flex items-center justify-center",
@@ -7600,9 +7614,9 @@ var AdvancedChip = React47.forwardRef(
         ...props,
         children: [
           /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
-            import_icons33.Icon,
+            import_icons32.Icon,
             {
-              icon: import_icons33.faFilterOutline,
+              icon: import_icons32.faFilterOutline,
               size: "sm",
               className: "shrink-0 text-[var(--color-foreground)]"
             }
@@ -7626,7 +7640,7 @@ var AdvancedChip = React47.forwardRef(
           "rounded-r-md -ml-px"
         ),
         "aria-label": "Clear all advanced filters",
-        children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_icons33.Icon, { icon: import_icons33.faXmarkOutline, size: "sm", className: "text-[var(--color-foreground)]" })
+        children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_icons32.Icon, { icon: import_icons32.faXmarkOutline, size: "sm", className: "text-[var(--color-foreground)]" })
       }
     )
   ] })
@@ -7636,17 +7650,17 @@ AdvancedChip.displayName = "AdvancedChip";
 // src/components/ui/filter/advanced-popover.tsx
 var React51 = __toESM(require("react"));
 var PopoverPrimitive12 = __toESM(require("@radix-ui/react-popover"));
-var import_icons37 = require("@l3mpire/icons");
+var import_icons36 = require("@l3mpire/icons");
 
 // src/components/ui/filter/advanced-row.tsx
 var React49 = __toESM(require("react"));
 var PopoverPrimitive11 = __toESM(require("@radix-ui/react-popover"));
-var import_icons35 = require("@l3mpire/icons");
+var import_icons34 = require("@l3mpire/icons");
 
 // src/components/ui/filter/filter-node-actions.tsx
 var React48 = __toESM(require("react"));
 var PopoverPrimitive10 = __toESM(require("@radix-ui/react-popover"));
-var import_icons34 = require("@l3mpire/icons");
+var import_icons33 = require("@l3mpire/icons");
 var import_jsx_runtime55 = require("react/jsx-runtime");
 var FilterNodeActions = ({
   nodeType,
@@ -7658,17 +7672,17 @@ var FilterNodeActions = ({
   const items = [
     {
       label: "Duplicate",
-      icon: import_icons34.faCopyOutline,
+      icon: import_icons33.faCopyOutline,
       action: onDuplicate
     },
     {
       label: nodeType === "condition" ? "Turn into group" : "Turn into filter",
-      icon: nodeType === "condition" ? import_icons34.faFolderOutline : import_icons34.faFilterOutline,
+      icon: nodeType === "condition" ? import_icons33.faFolderOutline : import_icons33.faFilterOutline,
       action: onConvert
     },
     {
       label: "Delete",
-      icon: import_icons34.faTrashOutline,
+      icon: import_icons33.faTrashOutline,
       action: onDelete,
       destructive: true
     }
@@ -7681,9 +7695,9 @@ var FilterNodeActions = ({
         className: "shrink-0 flex items-center justify-center p-sm rounded-md cursor-pointer transition-colors hover:bg-[var(--color-accent)]",
         "aria-label": "More actions",
         children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-          import_icons34.Icon,
+          import_icons33.Icon,
           {
-            icon: import_icons34.faEllipsisOutline,
+            icon: import_icons33.faEllipsisOutline,
             size: "sm",
             className: "text-[var(--color-foreground)]"
           }
@@ -7717,7 +7731,7 @@ var FilterNodeActions = ({
             ),
             children: [
               /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-                import_icons34.Icon,
+                import_icons33.Icon,
                 {
                   icon: item.icon,
                   size: "sm",
@@ -7784,7 +7798,7 @@ var AdvancedRow = ({
   const handleValueChange = (val) => {
     onUpdate({ ...condition, value: val });
   };
-  const displayValue = formatFilterValue(condition.value);
+  const displayValue = formatFilterValue(condition.value, propertyDef.dynamicOptions);
   const badgeCount = getBadgeCount(condition.value);
   const hasValue = displayValue != null;
   return /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)("div", { className: "flex items-center gap-base w-full min-w-0", children: [
@@ -7803,15 +7817,15 @@ var AdvancedRow = ({
         ),
         children: [
           connector,
-          /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_icons35.Icon, { icon: import_icons35.faRefreshOutline, size: "xs", className: "text-[var(--color-foreground)]" })
+          /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_icons34.Icon, { icon: import_icons34.faRefreshOutline, size: "xs", className: "text-[var(--color-foreground)]" })
         ]
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(PopoverPrimitive11.Root, { open: propertyOpen, onOpenChange: setPropertyOpen, children: [
       /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(PopoverPrimitive11.Trigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)("button", { type: "button", className: cn(selectBtnStyle, "min-w-0"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_icons35.Icon, { icon: propertyDef.icon, size: "sm", className: "shrink-0 text-[var(--color-muted-foreground)]" }),
+        /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_icons34.Icon, { icon: propertyDef.icon, size: "sm", className: "shrink-0 text-[var(--color-muted-foreground)]" }),
         /* @__PURE__ */ (0, import_jsx_runtime56.jsx)("span", { className: "text-sm font-regular leading-sm text-[var(--color-foreground)] whitespace-nowrap truncate", children: propertyDef.label }),
-        /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_icons35.Icon, { icon: import_icons35.faChevronDownOutline, size: "xs", className: "shrink-0 text-[var(--color-foreground)]" })
+        /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_icons34.Icon, { icon: import_icons34.faChevronDownOutline, size: "xs", className: "shrink-0 text-[var(--color-foreground)]" })
       ] }) }),
       /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(PopoverPrimitive11.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
         PopoverPrimitive11.Content,
@@ -7839,7 +7853,7 @@ var AdvancedRow = ({
                 p.id === condition.propertyId && "bg-[var(--color-dropdown-item-hover)]"
               ),
               children: [
-                /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_icons35.Icon, { icon: p.icon, size: "sm", className: "shrink-0 text-[var(--color-dropdown-item-icon)]" }),
+                /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_icons34.Icon, { icon: p.icon, size: "sm", className: "shrink-0 text-[var(--color-dropdown-item-icon)]" }),
                 /* @__PURE__ */ (0, import_jsx_runtime56.jsx)("span", { className: "text-sm font-regular leading-sm text-[var(--color-dropdown-item-text)] truncate", children: p.label })
               ]
             },
@@ -7851,7 +7865,7 @@ var AdvancedRow = ({
     /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(PopoverPrimitive11.Root, { open: operatorOpen, onOpenChange: setOperatorOpen, children: [
       /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(PopoverPrimitive11.Trigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)("button", { type: "button", className: cn(selectBtnStyle, "min-w-0"), children: [
         /* @__PURE__ */ (0, import_jsx_runtime56.jsx)("span", { className: "text-sm font-regular leading-sm text-[var(--color-foreground)] whitespace-nowrap truncate text-left", children: condition.operator ?? "Select" }),
-        /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_icons35.Icon, { icon: import_icons35.faChevronDownOutline, size: "xs", className: "shrink-0 text-[var(--color-foreground)]" })
+        /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_icons34.Icon, { icon: import_icons34.faChevronDownOutline, size: "xs", className: "shrink-0 text-[var(--color-foreground)]" })
       ] }) }),
       /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(PopoverPrimitive11.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
         PopoverPrimitive11.Content,
@@ -7902,9 +7916,9 @@ var AdvancedRow = ({
                   badgeCount - 1
                 ] }),
                 /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
-                  import_icons35.Icon,
+                  import_icons34.Icon,
                   {
-                    icon: import_icons35.faChevronDownOutline,
+                    icon: import_icons34.faChevronDownOutline,
                     size: "xs",
                     className: "text-[var(--color-foreground)]"
                   }
@@ -7958,7 +7972,7 @@ AdvancedRow.displayName = "AdvancedRow";
 
 // src/components/ui/filter/advanced-group.tsx
 var React50 = __toESM(require("react"));
-var import_icons36 = require("@l3mpire/icons");
+var import_icons35 = require("@l3mpire/icons");
 var import_jsx_runtime57 = require("react/jsx-runtime");
 var AdvancedGroup = ({
   connector,
@@ -7987,7 +8001,7 @@ var AdvancedGroup = ({
         ),
         children: [
           connector,
-          /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(import_icons36.Icon, { icon: import_icons36.faRefreshOutline, size: "xs", className: "text-[var(--color-foreground)]" })
+          /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(import_icons35.Icon, { icon: import_icons35.faRefreshOutline, size: "xs", className: "text-[var(--color-foreground)]" })
         ]
       }
     ) }),
@@ -8009,7 +8023,7 @@ var AdvancedGroup = ({
               type: "button",
               className: "flex items-center gap-sm px-base py-sm text-sm font-semibold leading-sm text-[var(--color-muted-foreground)] cursor-pointer transition-colors rounded-md hover:bg-[var(--color-accent)] hover:text-[var(--color-foreground)] w-fit",
               children: [
-                /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(import_icons36.Icon, { icon: import_icons36.faPlusOutline, size: "sm" }),
+                /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(import_icons35.Icon, { icon: import_icons35.faPlusOutline, size: "sm" }),
                 "Add filter"
               ]
             }
@@ -8124,12 +8138,7 @@ var AdvancedPopover = ({
     }
   };
   const toggleLogicOp = (id) => {
-    onFiltersChange(
-      updateNodeInTree(filters, id, (n) => ({
-        ...n,
-        logicOperator: (n.logicOperator ?? "and") === "and" ? "or" : "and"
-      }))
-    );
+    onFiltersChange(toggleGroupLogicInTree(filters, id));
   };
   const handleGroupChildrenChange = (groupId, children2) => {
     onFiltersChange(
@@ -8229,7 +8238,7 @@ var AdvancedPopover = ({
                   open: addSelectorOpen,
                   onOpenChange: setAddSelectorOpen,
                   children: /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)("button", { type: "button", className: cn(ghostBtn, "text-[var(--color-foreground)]"), children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(import_icons37.Icon, { icon: import_icons37.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" }),
+                    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(import_icons36.Icon, { icon: import_icons36.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" }),
                     "Add filter"
                   ] })
                 }
@@ -8241,7 +8250,7 @@ var AdvancedPopover = ({
                   onClick: handleAddGroup,
                   className: cn(ghostBtn, "text-[var(--color-foreground)]"),
                   children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(import_icons37.Icon, { icon: import_icons37.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" }),
+                    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(import_icons36.Icon, { icon: import_icons36.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" }),
                     "Add filters group"
                   ]
                 }
@@ -8254,7 +8263,7 @@ var AdvancedPopover = ({
                 onClick: handleClearAll,
                 className: cn(ghostBtn, "text-[var(--color-destructive,#ef4444)]"),
                 children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(import_icons37.Icon, { icon: import_icons37.faXmarkOutline, size: "sm", className: "text-[var(--color-destructive,#ef4444)]" }),
+                  /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(import_icons36.Icon, { icon: import_icons36.faXmarkOutline, size: "sm", className: "text-[var(--color-destructive,#ef4444)]" }),
                   "Clear filters"
                 ]
               }
@@ -8305,9 +8314,9 @@ var DraftRow = ({
             children: [
               /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("span", { className: "text-sm font-regular leading-sm text-[var(--color-muted-foreground)] whitespace-nowrap", children: "Select property" }),
               /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
-                import_icons37.Icon,
+                import_icons36.Icon,
                 {
-                  icon: import_icons37.faChevronDownOutline,
+                  icon: import_icons36.faChevronDownOutline,
                   size: "xs",
                   className: "shrink-0 text-[var(--color-foreground)]"
                 }
@@ -8323,7 +8332,7 @@ var DraftRow = ({
 // src/components/ui/filter/summary-chip.tsx
 var React52 = __toESM(require("react"));
 var PopoverPrimitive13 = __toESM(require("@radix-ui/react-popover"));
-var import_icons38 = require("@l3mpire/icons");
+var import_icons37 = require("@l3mpire/icons");
 var import_jsx_runtime59 = require("react/jsx-runtime");
 var ghostBtn2 = [
   "flex items-center gap-sm px-base py-sm",
@@ -8418,12 +8427,7 @@ var SummaryChip = ({
     }
   };
   const toggleLogicOp = (id) => {
-    onFiltersChange(
-      updateNodeInTree(filters, id, (n) => ({
-        ...n,
-        logicOperator: (n.logicOperator ?? "and") === "and" ? "or" : "and"
-      }))
-    );
+    onFiltersChange(toggleGroupLogicInTree(filters, id));
   };
   const handleGroupChildrenChange = (groupId, newChildren) => {
     onFiltersChange(
@@ -8501,7 +8505,7 @@ var SummaryChip = ({
           className
         ),
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_icons38.Icon, { icon: import_icons38.faFilterOutline, size: "sm", className: "shrink-0 text-[var(--color-foreground)]" }),
+          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_icons37.Icon, { icon: import_icons37.faFilterOutline, size: "sm", className: "shrink-0 text-[var(--color-foreground)]" }),
           /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("span", { className: "text-sm font-semibold leading-sm whitespace-nowrap text-[var(--color-foreground)]", children: "Filters" }),
           count > 0 && /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("span", { className: "flex items-center p-2xs rounded-xs bg-filter-chip-badge-bg", children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("span", { className: "text-[10px] font-semibold leading-2xs text-filter-chip-badge-text", children: count }) })
         ]
@@ -8542,13 +8546,13 @@ var SummaryChip = ({
                   open: addSelectorOpen,
                   onOpenChange: setAddSelectorOpen,
                   children: /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)("button", { type: "button", className: cn(ghostBtn2, "text-[var(--color-foreground)]"), children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_icons38.Icon, { icon: import_icons38.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" }),
+                    /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_icons37.Icon, { icon: import_icons37.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" }),
                     "Add filter"
                   ] })
                 }
               ),
               /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)("button", { type: "button", onClick: handleAddGroup, className: cn(ghostBtn2, "text-[var(--color-foreground)]"), children: [
-                /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_icons38.Icon, { icon: import_icons38.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" }),
+                /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_icons37.Icon, { icon: import_icons37.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" }),
                 "Add filters group"
               ] })
             ] }),
@@ -8562,7 +8566,7 @@ var SummaryChip = ({
                 },
                 className: cn(ghostBtn2, "text-[var(--color-destructive,#ef4444)]"),
                 children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_icons38.Icon, { icon: import_icons38.faXmarkOutline, size: "sm", className: "text-[var(--color-destructive,#ef4444)]" }),
+                  /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_icons37.Icon, { icon: import_icons37.faXmarkOutline, size: "sm", className: "text-[var(--color-destructive,#ef4444)]" }),
                   "Clear filters"
                 ]
               }
@@ -8599,7 +8603,7 @@ var DraftRow2 = ({ properties, onSelect, open: openProp, onOpenChange }) => {
         ),
         children: [
           /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("span", { className: "text-sm font-regular leading-sm text-[var(--color-muted-foreground)] whitespace-nowrap", children: "Select property" }),
-          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_icons38.Icon, { icon: import_icons38.faChevronDownOutline, size: "xs", className: "shrink-0 text-[var(--color-foreground)]" })
+          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_icons37.Icon, { icon: import_icons37.faChevronDownOutline, size: "xs", className: "shrink-0 text-[var(--color-foreground)]" })
         ]
       }
     ) })
@@ -8716,7 +8720,8 @@ var FilterSystem = ({
   };
   const getPropertyDef = (propertyId) => properties.find((p) => p.id === propertyId);
   const hasAdvanced = filterState.advancedFilters.length > 0;
-  const isMinimal = mode === "minimal";
+  const isMinimal = mode === "minimal" || mode === "icon";
+  const isIconOnly = mode === "icon";
   const handleOpenAdvanced = () => {
     setPropertySelectorOpen(false);
     requestAnimationFrame(() => {
@@ -8729,7 +8734,6 @@ var FilterSystem = ({
   };
   const advancedFilterCount = filterState.advancedFilters.length;
   const showAdvancedChip = hasAdvanced || advancedOpen;
-  const showSummaryChip = totalCount > 0 || summaryOpen;
   return /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(FilterBar, { ref: containerRef, className, children: [
     /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(FilterBarLeft, { className: "flex-nowrap flex-1 min-w-0 overflow-x-auto scrollbar-none outline-none [&>*]:shrink-0", children: [
       children,
@@ -8743,38 +8747,32 @@ var FilterSystem = ({
           iconOnly: isMinimal
         }
       ),
-      isMinimal ? /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(import_jsx_runtime60.Fragment, { children: [
-        showSummaryChip && /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
-          SummaryChip,
-          {
-            count: totalCount,
-            filters: [...filterState.basicFilters, ...filterState.advancedFilters],
-            properties,
-            onFiltersChange: (nodes) => {
-              onFilterStateChange({
-                ...filterState,
-                basicFilters: [],
-                advancedFilters: nodes
-              });
-            },
-            onClearAll: handleClearAll,
-            open: summaryOpen,
-            onOpenChange: setSummaryOpen
-          }
-        ),
-        !showSummaryChip && /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
-          PropertySelector,
-          {
-            properties,
-            onSelect: handleAddFilter,
-            open: propertySelectorOpen,
-            onOpenChange: setPropertySelectorOpen,
-            onAdvancedFilter: handleOpenAdvanced,
-            advancedFilterCount,
-            children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(FilterBarButton, { iconOnly: true })
-          }
-        )
-      ] }) : (
+      isMinimal ? /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(import_jsx_runtime60.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
+        SummaryChip,
+        {
+          count: totalCount,
+          filters: [...filterState.basicFilters, ...filterState.advancedFilters],
+          properties,
+          onFiltersChange: (nodes) => {
+            onFilterStateChange({
+              ...filterState,
+              basicFilters: [],
+              advancedFilters: nodes
+            });
+          },
+          onClearAll: handleClearAll,
+          open: summaryOpen,
+          onOpenChange: setSummaryOpen,
+          children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
+            FilterBarButton,
+            {
+              iconOnly: isIconOnly,
+              count: totalCount > 0 ? totalCount : void 0,
+              title: buildFilterSummary(filterState.basicFilters, filterState.advancedFilters.length, properties)
+            }
+          )
+        }
+      ) }) : (
         /* ── DEFAULT MODE ────────────────────────────────────── */
         /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(import_jsx_runtime60.Fragment, { children: [
           showAdvancedChip && /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
@@ -8828,20 +8826,20 @@ var FilterSystem = ({
                 {
                   type: "button",
                   className: "shrink-0 inline-flex items-center justify-center size-8 rounded-md border border-[var(--color-btn-outlined-neutral-border-default)] bg-gradient-to-t from-[var(--color-btn-outlined-neutral-bg-default)] from-[10%] to-[var(--color-btn-outlined-neutral-bg-gradient-to-default)] shadow-sm cursor-pointer transition-colors hover:from-[var(--color-btn-outlined-neutral-bg-hover)] hover:to-[var(--color-btn-outlined-neutral-bg-gradient-to-hover)]",
-                  children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(import_icons39.Icon, { icon: import_icons39.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" })
+                  children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(import_icons38.Icon, { icon: import_icons38.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" })
                 }
               ) : /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(FilterBarButton, {})
             }
           )
         ] })
       ),
-      totalCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
+      totalCount > 0 && !isIconOnly && /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
         "button",
         {
           type: "button",
           onClick: handleClearAll,
-          className: "shrink-0 flex items-center gap-sm px-base py-sm min-h-[32px] max-h-[32px] rounded-md cursor-pointer transition-colors hover:bg-[var(--color-accent)]",
-          children: isMinimal ? /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(import_icons39.Icon, { icon: import_icons39.faXmarkOutline, size: "sm", className: "text-[var(--color-foreground)]" }) : /* @__PURE__ */ (0, import_jsx_runtime60.jsx)("span", { className: "text-sm font-semibold leading-sm text-[var(--color-foreground)]", children: "Clear" })
+          className: "shrink-0 flex items-center gap-sm px-base py-sm min-h-[32px] max-h-[32px] rounded-md cursor-pointer transition-colors text-btn-ghost-brand-text-default hover:bg-btn-ghost-brand-bg-hover hover:text-btn-ghost-brand-text-hover active:bg-btn-ghost-brand-bg-pressed active:text-btn-ghost-brand-text-pressed",
+          children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)("span", { className: "text-sm font-semibold leading-sm", children: "Clear" })
         }
       )
     ] }),
@@ -8849,6 +8847,20 @@ var FilterSystem = ({
   ] });
 };
 FilterSystem.displayName = "FilterSystem";
+function buildFilterSummary(filters, advancedCount, properties) {
+  if (filters.length === 0 && advancedCount === 0) return void 0;
+  const lines = [];
+  for (const f of filters) {
+    const prop = properties.find((p) => p.id === f.propertyId);
+    if (!prop) continue;
+    const val = formatFilterValue(f.value, prop.dynamicOptions);
+    lines.push(val ? `${prop.label} ${f.operator} ${val}` : `${prop.label} ${f.operator ?? ""}`);
+  }
+  if (advancedCount > 0) {
+    lines.push(`+ ${advancedCount} advanced filter${advancedCount > 1 ? "s" : ""}`);
+  }
+  return lines.join("\n");
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AdvancedChip,