@l3mpire/ui 2.13.0 → 2.14.0

package/dist/index.js

@@ -5187,6 +5187,130 @@ function getValueInputType(type, operator) {
     return ["is any of", "is none of"].includes(operator) ? "MultiRelationPicker" : "RelationPicker";
   return null;
 }
+function formatFilterValue(value) {
+  if (value == null) return void 0;
+  if (typeof value === "boolean") return value ? "Yes" : "No";
+  if (value instanceof Date) {
+    return value.toLocaleDateString("en-US", {
+      month: "short",
+      day: "numeric",
+      year: "numeric"
+    });
+  }
+  if (Array.isArray(value)) {
+    if (value.length === 0) return void 0;
+    if (value.length === 2 && typeof value[0] === "number") {
+      return `${value[0]} \u2013 ${value[1]}`;
+    }
+    if (value.length === 2 && value[0] instanceof Date) {
+      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]);
+  }
+  return String(value);
+}
+function getBadgeCount(value) {
+  if (Array.isArray(value) && value.length > 1 && typeof value[0] === "string") {
+    return value.length;
+  }
+  return void 0;
+}
+function isFilterGroup(node) {
+  return node.type === "group";
+}
+function createEmptyGroup() {
+  return {
+    id: crypto.randomUUID(),
+    type: "group",
+    children: []
+  };
+}
+function duplicateNode(node) {
+  if (isFilterGroup(node)) {
+    return {
+      ...node,
+      id: crypto.randomUUID(),
+      children: node.children.map(duplicateNode)
+    };
+  }
+  return { ...node, id: crypto.randomUUID() };
+}
+function wrapInGroup(condition) {
+  return {
+    id: crypto.randomUUID(),
+    type: "group",
+    logicOperator: condition.logicOperator,
+    children: [{ ...condition, logicOperator: void 0 }]
+  };
+}
+function unwrapGroup(group) {
+  const first = group.children.find((c) => !isFilterGroup(c));
+  if (!first) return null;
+  return { ...first, logicOperator: group.logicOperator };
+}
+function updateNodeInTree(nodes, id, updater) {
+  return nodes.map((node) => {
+    if (node.id === id) return updater(node);
+    if (isFilterGroup(node)) {
+      const updated = updateNodeInTree(node.children, id, updater);
+      if (updated !== node.children) return { ...node, children: updated };
+    }
+    return node;
+  });
+}
+function removeNodeFromTree(nodes, id) {
+  const result = [];
+  for (const node of nodes) {
+    if (node.id === id) continue;
+    if (isFilterGroup(node)) {
+      const updated = removeNodeFromTree(node.children, id);
+      result.push(updated !== node.children ? { ...node, children: updated } : node);
+    } else {
+      result.push(node);
+    }
+  }
+  return result;
+}
+function insertAfterInTree(nodes, afterId, newNode) {
+  const result = [];
+  let inserted = false;
+  for (const node of nodes) {
+    result.push(node);
+    if (node.id === afterId) {
+      result.push(newNode);
+      inserted = true;
+    } else if (!inserted && isFilterGroup(node)) {
+      const updated = insertAfterInTree(node.children, afterId, newNode);
+      if (updated.length !== node.children.length) {
+        result[result.length - 1] = { ...node, children: updated };
+        inserted = true;
+      }
+    }
+  }
+  return result;
+}
+function replaceNodeInTree(nodes, id, replacement) {
+  return nodes.map((node) => {
+    if (node.id === id) return replacement;
+    if (isFilterGroup(node)) {
+      const updated = replaceNodeInTree(node.children, id, replacement);
+      if (updated !== node.children) return { ...node, children: updated };
+    }
+    return node;
+  });
+}
+function countConditions(nodes) {
+  let count = 0;
+  for (const node of nodes) {
+    if (isFilterGroup(node)) {
+      count += countConditions(node.children);
+    } else {
+      count++;
+    }
+  }
+  return count;
+}
 
 // src/components/ui/filter/filter-bar.tsx
 var React37 = __toESM(require("react"));
@@ -7061,35 +7185,6 @@ FilterEditor.displayName = "FilterEditor";
 var React45 = __toESM(require("react"));
 var PopoverPrimitive9 = __toESM(require("@radix-ui/react-popover"));
 var import_jsx_runtime52 = require("react/jsx-runtime");
-function formatFilterValue(value) {
-  if (value == null) return void 0;
-  if (typeof value === "boolean") return value ? "Yes" : "No";
-  if (value instanceof Date) {
-    return value.toLocaleDateString("en-US", {
-      month: "short",
-      day: "numeric",
-      year: "numeric"
-    });
-  }
-  if (Array.isArray(value)) {
-    if (value.length === 0) return void 0;
-    if (value.length === 2 && typeof value[0] === "number") {
-      return `${value[0]} \u2013 ${value[1]}`;
-    }
-    if (value.length === 2 && value[0] instanceof Date) {
-      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]);
-  }
-  return String(value);
-}
-function getBadgeCount(value) {
-  if (Array.isArray(value) && value.length > 1 && typeof value[0] === "string") {
-    return value.length;
-  }
-  return void 0;
-}
 var SegmentPopover = ({
   open,
   onOpenChange,
@@ -7301,8 +7396,8 @@ var InteractiveFilterChip = ({
 InteractiveFilterChip.displayName = "InteractiveFilterChip";
 
 // src/components/ui/filter/filter-system.tsx
-var React51 = __toESM(require("react"));
-var import_icons36 = require("@l3mpire/icons");
+var React53 = __toESM(require("react"));
+var import_icons38 = require("@l3mpire/icons");
 
 // src/components/ui/filter/advanced-chip.tsx
 var React46 = __toESM(require("react"));
@@ -7358,15 +7453,121 @@ var AdvancedChip = React46.forwardRef(
 AdvancedChip.displayName = "AdvancedChip";
 
 // src/components/ui/filter/advanced-popover.tsx
+var React50 = __toESM(require("react"));
+var PopoverPrimitive12 = __toESM(require("@radix-ui/react-popover"));
+var import_icons36 = require("@l3mpire/icons");
+
+// src/components/ui/filter/advanced-row.tsx
 var React48 = __toESM(require("react"));
 var PopoverPrimitive11 = __toESM(require("@radix-ui/react-popover"));
 var import_icons34 = require("@l3mpire/icons");
 
-// src/components/ui/filter/advanced-row.tsx
+// src/components/ui/filter/filter-node-actions.tsx
 var React47 = __toESM(require("react"));
 var PopoverPrimitive10 = __toESM(require("@radix-ui/react-popover"));
 var import_icons33 = require("@l3mpire/icons");
 var import_jsx_runtime54 = require("react/jsx-runtime");
+var FilterNodeActions = ({
+  nodeType,
+  onDuplicate,
+  onConvert,
+  onDelete
+}) => {
+  const [open, setOpen] = React47.useState(false);
+  const items = [
+    {
+      label: "Duplicate",
+      icon: import_icons33.faCopyOutline,
+      action: onDuplicate
+    },
+    {
+      label: nodeType === "condition" ? "Turn into group" : "Turn into filter",
+      icon: nodeType === "condition" ? import_icons33.faFolderOutline : import_icons33.faFilterOutline,
+      action: onConvert
+    },
+    {
+      label: "Delete",
+      icon: import_icons33.faTrashOutline,
+      action: onDelete,
+      destructive: true
+    }
+  ];
+  return /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(PopoverPrimitive10.Root, { open, onOpenChange: setOpen, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(PopoverPrimitive10.Trigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
+      "button",
+      {
+        type: "button",
+        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_runtime54.jsx)(
+          import_icons33.Icon,
+          {
+            icon: import_icons33.faEllipsisOutline,
+            size: "sm",
+            className: "text-[var(--color-foreground)]"
+          }
+        )
+      }
+    ) }),
+    /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(PopoverPrimitive10.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
+      PopoverPrimitive10.Content,
+      {
+        sideOffset: 4,
+        align: "end",
+        className: cn(
+          "z-50 flex flex-col p-xs overflow-clip",
+          "bg-[var(--color-dropdown-bg)] border border-[var(--color-dropdown-border)] rounded-md shadow-lg",
+          "data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
+          "data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95",
+          "min-w-[180px]"
+        ),
+        children: items.map((item) => /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(
+          "button",
+          {
+            type: "button",
+            onClick: () => {
+              item.action();
+              setOpen(false);
+            },
+            className: cn(
+              "flex items-center gap-base p-base rounded-base cursor-pointer transition-colors text-left",
+              "hover:bg-[var(--color-dropdown-item-hover)]",
+              item.destructive && "text-[var(--color-destructive,#ef4444)]"
+            ),
+            children: [
+              /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
+                import_icons33.Icon,
+                {
+                  icon: item.icon,
+                  size: "sm",
+                  className: cn(
+                    "shrink-0",
+                    item.destructive ? "text-[var(--color-destructive,#ef4444)]" : "text-[var(--color-dropdown-item-icon)]"
+                  )
+                }
+              ),
+              /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
+                "span",
+                {
+                  className: cn(
+                    "text-sm font-regular leading-sm",
+                    item.destructive ? "text-[var(--color-destructive,#ef4444)]" : "text-[var(--color-dropdown-item-text)]"
+                  ),
+                  children: item.label
+                }
+              )
+            ]
+          },
+          item.label
+        ))
+      }
+    ) })
+  ] });
+};
+FilterNodeActions.displayName = "FilterNodeActions";
+
+// src/components/ui/filter/advanced-row.tsx
+var import_jsx_runtime55 = require("react/jsx-runtime");
 var selectBtnStyle = [
   "flex items-center gap-base",
   "px-base py-sm",
@@ -7383,10 +7584,13 @@ var AdvancedRow = ({
   properties,
   onUpdate,
   onPropertyChange,
-  onDelete
+  onDelete,
+  onDuplicate,
+  onTurnIntoGroup
 }) => {
-  const [operatorOpen, setOperatorOpen] = React47.useState(false);
-  const [propertyOpen, setPropertyOpen] = React47.useState(false);
+  const [operatorOpen, setOperatorOpen] = React48.useState(false);
+  const [propertyOpen, setPropertyOpen] = React48.useState(false);
+  const [valueOpen, setValueOpen] = React48.useState(false);
   const handleOperatorSelect = (op) => {
     if (isNoValueOperator(op)) {
       onUpdate({ ...condition, operator: op, value: null });
@@ -7399,16 +7603,18 @@ var AdvancedRow = ({
   const handleValueChange = (val) => {
     onUpdate({ ...condition, value: val });
   };
-  const displayValue = condition.value == null ? "" : typeof condition.value === "string" ? condition.value : String(condition.value);
-  return /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)("div", { className: "flex items-center gap-base w-full min-w-0", children: [
-    connector === "Where" ? /* @__PURE__ */ (0, import_jsx_runtime54.jsx)("div", { className: "shrink-0 w-[64px] flex items-center justify-end", children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)("span", { className: "text-xs font-semibold leading-xs text-[var(--color-muted-foreground)]", children: "Where" }) }) : /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(
+  const displayValue = formatFilterValue(condition.value);
+  const badgeCount = getBadgeCount(condition.value);
+  const hasValue = displayValue != null;
+  return /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("div", { className: "flex items-center gap-base w-full min-w-0", children: [
+    connector === "Where" ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)("div", { className: "shrink-0 w-[64px] flex items-center justify-end", children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)("span", { className: "text-xs font-semibold leading-xs text-[var(--color-muted-foreground)]", children: "Where" }) }) : /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
       "button",
       {
         type: "button",
         onClick: onConnectorToggle,
         className: cn(
           "shrink-0 flex items-center justify-center gap-xs",
-          "min-w-[64px] min-h-[24px] max-h-[24px] p-xs",
+          "min-w-[64px] min-h-[32px] max-h-[32px] px-base py-sm",
           "bg-gradient-to-t from-[var(--color-btn-outlined-neutral-bg-default)] from-[10%] to-[var(--color-btn-outlined-neutral-bg-gradient-to-default)]",
           "border border-[var(--color-btn-outlined-neutral-border-default)] rounded-base shadow-sm",
           "cursor-pointer transition-colors text-xs font-semibold leading-xs text-[var(--color-foreground)]",
@@ -7416,22 +7622,18 @@ var AdvancedRow = ({
         ),
         children: [
           connector,
-          /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_icons33.Icon, { icon: import_icons33.faRefreshOutline, size: "xs", className: "text-[var(--color-foreground)]" })
+          /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(import_icons34.Icon, { icon: import_icons34.faRefreshOutline, size: "xs", className: "text-[var(--color-foreground)]" })
         ]
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(PopoverPrimitive10.Root, { open: propertyOpen, onOpenChange: setPropertyOpen, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(PopoverPrimitive10.Trigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)("button", { type: "button", className: cn(selectBtnStyle, "min-w-0"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_icons33.Icon, { icon: propertyDef.icon, size: "sm", className: "shrink-0 text-[var(--color-muted-foreground)]" }),
-        /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)("span", { className: "text-sm font-regular leading-sm text-[var(--color-foreground)] whitespace-nowrap truncate", children: [
-          propertyDef.groupLabel,
-          " > ",
-          propertyDef.label
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_icons33.Icon, { icon: import_icons33.faChevronDownOutline, size: "xs", className: "shrink-0 text-[var(--color-foreground)]" })
+    /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(PopoverPrimitive11.Root, { open: propertyOpen, onOpenChange: setPropertyOpen, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(PopoverPrimitive11.Trigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("button", { type: "button", className: cn(selectBtnStyle, "min-w-0"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(import_icons34.Icon, { icon: propertyDef.icon, size: "sm", className: "shrink-0 text-[var(--color-muted-foreground)]" }),
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)("span", { className: "text-sm font-regular leading-sm text-[var(--color-foreground)] whitespace-nowrap truncate", children: propertyDef.label }),
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(import_icons34.Icon, { icon: import_icons34.faChevronDownOutline, size: "xs", className: "shrink-0 text-[var(--color-foreground)]" })
       ] }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(PopoverPrimitive10.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
-        PopoverPrimitive10.Content,
+      /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(PopoverPrimitive11.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+        PopoverPrimitive11.Content,
         {
           sideOffset: 4,
           align: "start",
@@ -7442,7 +7644,7 @@ var AdvancedRow = ({
             "data-[state=closed]:animate-out data-[state=closed]:fade-out-0",
             "min-w-[200px]"
           ),
-          children: properties.map((p) => /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(
+          children: properties.map((p) => /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
             "button",
             {
               type: "button",
@@ -7456,8 +7658,8 @@ var AdvancedRow = ({
                 p.id === condition.propertyId && "bg-[var(--color-dropdown-item-hover)]"
               ),
               children: [
-                /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_icons33.Icon, { icon: p.icon, size: "sm", className: "shrink-0 text-[var(--color-dropdown-item-icon)]" }),
-                /* @__PURE__ */ (0, import_jsx_runtime54.jsx)("span", { className: "text-sm font-regular leading-sm text-[var(--color-dropdown-item-text)] truncate", children: p.label })
+                /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(import_icons34.Icon, { icon: p.icon, size: "sm", className: "shrink-0 text-[var(--color-dropdown-item-icon)]" }),
+                /* @__PURE__ */ (0, import_jsx_runtime55.jsx)("span", { className: "text-sm font-regular leading-sm text-[var(--color-dropdown-item-text)] truncate", children: p.label })
               ]
             },
             p.id
@@ -7465,13 +7667,13 @@ var AdvancedRow = ({
         }
       ) })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(PopoverPrimitive10.Root, { open: operatorOpen, onOpenChange: setOperatorOpen, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(PopoverPrimitive10.Trigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)("button", { type: "button", className: cn(selectBtnStyle, "min-w-0"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime54.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_runtime54.jsx)(import_icons33.Icon, { icon: import_icons33.faChevronDownOutline, size: "xs", className: "shrink-0 text-[var(--color-foreground)]" })
+    /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(PopoverPrimitive11.Root, { open: operatorOpen, onOpenChange: setOperatorOpen, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(PopoverPrimitive11.Trigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("button", { type: "button", className: cn(selectBtnStyle, "min-w-0"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime55.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_runtime55.jsx)(import_icons34.Icon, { icon: import_icons34.faChevronDownOutline, size: "xs", className: "shrink-0 text-[var(--color-foreground)]" })
       ] }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(PopoverPrimitive10.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
-        PopoverPrimitive10.Content,
+      /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(PopoverPrimitive11.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+        PopoverPrimitive11.Content,
         {
           sideOffset: 4,
           align: "start",
@@ -7482,7 +7684,7 @@ var AdvancedRow = ({
             "data-[state=closed]:animate-out data-[state=closed]:fade-out-0",
             "min-w-[160px]"
           ),
-          children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
             OperatorList,
             {
               dataType: propertyDef.type,
@@ -7493,45 +7695,170 @@ var AdvancedRow = ({
         }
       ) })
     ] }),
-    condition.operator && !isNoValueOperator(condition.operator) && /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
-      "input",
+    condition.operator && !isNoValueOperator(condition.operator) && (() => {
+      const inputType = getValueInputType(propertyDef.type, condition.operator);
+      const dateWide = inputType === "DatePicker" || inputType === "DateRange";
+      return /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(PopoverPrimitive11.Root, { open: valueOpen, onOpenChange: setValueOpen, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(PopoverPrimitive11.Trigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
+          "button",
+          {
+            type: "button",
+            className: cn(selectBtnStyle, "flex-1 min-w-[80px] justify-between"),
+            children: [
+              /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                "span",
+                {
+                  className: cn(
+                    "text-sm font-regular leading-sm whitespace-nowrap truncate text-left",
+                    hasValue ? "text-[var(--color-foreground)]" : "text-[var(--color-muted-foreground)]"
+                  ),
+                  children: hasValue ? displayValue : "Enter a value"
+                }
+              ),
+              /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("span", { className: "flex items-center gap-xs shrink-0", children: [
+                badgeCount != null && /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("span", { className: "text-xs font-semibold leading-xs text-[var(--color-muted-foreground)]", children: [
+                  "+",
+                  badgeCount - 1
+                ] }),
+                /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                  import_icons34.Icon,
+                  {
+                    icon: import_icons34.faChevronDownOutline,
+                    size: "xs",
+                    className: "text-[var(--color-foreground)]"
+                  }
+                )
+              ] })
+            ]
+          }
+        ) }),
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(PopoverPrimitive11.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+          PopoverPrimitive11.Content,
+          {
+            sideOffset: 4,
+            align: "start",
+            className: cn(
+              "z-50 flex flex-col overflow-clip",
+              "bg-[var(--color-dropdown-bg)] border border-[var(--color-dropdown-border)] rounded-md shadow-lg",
+              "data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
+              "data-[state=closed]:animate-out data-[state=closed]:fade-out-0"
+            ),
+            style: { minWidth: dateWide ? "auto" : "240px" },
+            children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+              ValueInput,
+              {
+                dataType: propertyDef.type,
+                operator: condition.operator,
+                value: condition.value,
+                onChange: handleValueChange,
+                onSubmit: () => setValueOpen(false),
+                options: propertyDef.options,
+                dynamicOptions: propertyDef.dynamicOptions
+              }
+            )
+          }
+        ) })
+      ] });
+    })(),
+    /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+      FilterNodeActions,
       {
-        type: "text",
-        value: displayValue,
-        onChange: (e) => handleValueChange(e.target.value),
-        placeholder: "Placeholder",
-        className: cn(
-          "flex-1 min-w-[80px] px-base py-sm rounded-md",
-          "border border-[var(--color-input)]",
-          "bg-[var(--color-background)] text-sm font-regular leading-sm text-[var(--color-foreground)]",
-          "placeholder:text-[var(--color-muted-foreground)]",
-          "focus:outline-none focus:ring-2 focus:ring-[var(--color-ring)] focus:ring-offset-0"
-        )
+        nodeType: "condition",
+        onDuplicate: onDuplicate ?? (() => {
+        }),
+        onConvert: onTurnIntoGroup ?? (() => {
+        }),
+        onDelete
       }
-    ),
-    /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
+    )
+  ] });
+};
+AdvancedRow.displayName = "AdvancedRow";
+
+// src/components/ui/filter/advanced-group.tsx
+var React49 = __toESM(require("react"));
+var import_icons35 = require("@l3mpire/icons");
+var import_jsx_runtime56 = require("react/jsx-runtime");
+var AdvancedGroup = ({
+  connector,
+  onConnectorToggle,
+  onDuplicate,
+  onTurnIntoFilter,
+  onDelete,
+  onAddFilter,
+  properties,
+  children
+}) => {
+  const [addOpen, setAddOpen] = React49.useState(false);
+  return /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)("div", { className: "flex items-start gap-base w-full min-w-0", children: [
+    connector === "Where" ? /* @__PURE__ */ (0, import_jsx_runtime56.jsx)("div", { className: "shrink-0 w-[64px] flex items-center justify-end pt-base", children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)("span", { className: "text-xs font-semibold leading-xs text-[var(--color-muted-foreground)]", children: "Where" }) }) : /* @__PURE__ */ (0, import_jsx_runtime56.jsx)("div", { className: "shrink-0 w-[64px] flex items-center justify-end pt-base", children: /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(
       "button",
       {
         type: "button",
-        onClick: onDelete,
-        className: "ml-auto shrink-0 flex items-center justify-center p-sm rounded-md cursor-pointer transition-colors hover:bg-[var(--color-accent)]",
-        "aria-label": "Remove filter",
-        children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_icons33.Icon, { icon: import_icons33.faXmarkOutline, size: "sm", className: "text-[var(--color-foreground)]" })
+        onClick: onConnectorToggle,
+        className: cn(
+          "flex items-center justify-center gap-xs",
+          "min-w-[64px] min-h-[32px] max-h-[32px] px-base py-sm",
+          "bg-gradient-to-t from-[var(--color-btn-outlined-neutral-bg-default)] from-[10%] to-[var(--color-btn-outlined-neutral-bg-gradient-to-default)]",
+          "border border-[var(--color-btn-outlined-neutral-border-default)] rounded-base shadow-sm",
+          "cursor-pointer transition-colors text-xs font-semibold leading-xs text-[var(--color-foreground)]",
+          "hover:from-[var(--color-btn-outlined-neutral-bg-hover)] hover:to-[var(--color-btn-outlined-neutral-bg-gradient-to-hover)]"
+        ),
+        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.jsxs)("div", { className: "flex-1 min-w-0 flex flex-col gap-base p-base border border-[var(--color-border)] rounded-md bg-[var(--color-secondary,var(--color-accent))]", children: [
+      children,
+      onAddFilter && properties && /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
+        PropertySelector,
+        {
+          properties,
+          onSelect: (prop) => {
+            onAddFilter(prop);
+            setAddOpen(false);
+          },
+          open: addOpen,
+          onOpenChange: setAddOpen,
+          children: /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(
+            "button",
+            {
+              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_runtime56.jsx)(import_icons35.Icon, { icon: import_icons35.faPlusOutline, size: "sm" }),
+                "Add filter"
+              ]
+            }
+          )
+        }
+      )
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime56.jsx)("div", { className: "shrink-0 pt-base", children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
+      FilterNodeActions,
+      {
+        nodeType: "group",
+        onDuplicate,
+        onConvert: onTurnIntoFilter,
+        onDelete
+      }
+    ) })
   ] });
 };
-AdvancedRow.displayName = "AdvancedRow";
+AdvancedGroup.displayName = "AdvancedGroup";
 
 // src/components/ui/filter/advanced-popover.tsx
-var import_jsx_runtime55 = require("react/jsx-runtime");
-var outlinedBtn = [
+var import_jsx_runtime57 = (
+  /* Draft row in empty group */
+  require("react/jsx-runtime")
+);
+var ghostBtn = [
   "flex items-center gap-sm px-base py-sm",
-  "min-h-[32px] max-h-[32px] min-w-[80px]",
-  "bg-gradient-to-t from-[var(--color-btn-outlined-neutral-bg-default)] from-[10%] to-[var(--color-btn-outlined-neutral-bg-gradient-to-default)]",
-  "border border-[var(--color-btn-outlined-neutral-border-default)] rounded-md shadow-sm",
-  "cursor-pointer transition-colors text-sm font-semibold leading-sm text-[var(--color-foreground)]",
-  "hover:from-[var(--color-btn-outlined-neutral-bg-hover)] hover:to-[var(--color-btn-outlined-neutral-bg-gradient-to-hover)]"
+  "min-h-[32px]",
+  "cursor-pointer transition-colors text-sm font-semibold leading-sm",
+  "rounded-md hover:bg-[var(--color-accent)]"
 ];
 var AdvancedPopover = ({
   filters,
@@ -7541,41 +7868,153 @@ var AdvancedPopover = ({
   onOpenChange,
   children
 }) => {
-  const [addSelectorOpen, setAddSelectorOpen] = React48.useState(false);
-  const [draftPickerOpen, setDraftPickerOpen] = React48.useState(false);
+  const [addSelectorOpen, setAddSelectorOpen] = React50.useState(false);
+  const [draftPickerOpen, setDraftPickerOpen] = React50.useState(false);
+  const [groupSelectorOpen, setGroupSelectorOpen] = React50.useState(false);
   const getPropertyDef = (propertyId) => properties.find((p) => p.id === propertyId);
-  const handleUpdateFilter = (updated) => {
-    onFiltersChange(filters.map((f) => f.id === updated.id ? updated : f));
-  };
-  const handleDeleteFilter = (id) => {
-    onFiltersChange(filters.filter((f) => f.id !== id));
-  };
-  const handlePropertyChange = (filterId, newProp) => {
-    const newCondition = createFilterWithDefaults(newProp.id, newProp.type);
-    onFiltersChange(
-      filters.map((f) => f.id === filterId ? { ...newCondition, id: filterId } : f)
-    );
-  };
   const handleAddFilter = (property) => {
     const newFilter = createFilterWithDefaults(property.id, property.type);
     onFiltersChange([...filters, newFilter]);
     setAddSelectorOpen(false);
   };
+  const handleAddGroup = () => {
+    const group = createEmptyGroup();
+    onFiltersChange([...filters, group]);
+    setGroupSelectorOpen(false);
+  };
   const handleClearAll = () => {
     onFiltersChange([]);
     onOpenChange?.(false);
   };
-  const toggleLogicOp = (filterId) => {
+  const handleUpdateNode = (id, updated) => {
+    onFiltersChange(updateNodeInTree(filters, id, () => updated));
+  };
+  const handleDeleteNode = (id) => {
+    onFiltersChange(removeNodeFromTree(filters, id));
+  };
+  const handleDuplicateNode = (id) => {
+    const find = (nodes) => {
+      for (const n of nodes) {
+        if (n.id === id) return n;
+        if (isFilterGroup(n)) {
+          const found = find(n.children);
+          if (found) return found;
+        }
+      }
+    };
+    const node = find(filters);
+    if (!node) return;
+    const clone = duplicateNode(node);
+    clone.logicOperator = node.logicOperator ?? "and";
+    onFiltersChange(insertAfterInTree(filters, id, clone));
+  };
+  const handleWrapInGroup = (id) => {
+    const find = (nodes) => {
+      for (const n of nodes) {
+        if (n.id === id && !isFilterGroup(n)) return n;
+        if (isFilterGroup(n)) {
+          const found = find(n.children);
+          if (found) return found;
+        }
+      }
+    };
+    const condition = find(filters);
+    if (!condition) return;
+    const group = wrapInGroup(condition);
+    onFiltersChange(replaceNodeInTree(filters, id, group));
+  };
+  const handleUnwrapGroup = (id) => {
+    const find = (nodes) => {
+      for (const n of nodes) {
+        if (n.id === id && isFilterGroup(n)) return n;
+        if (isFilterGroup(n)) {
+          const found = find(n.children);
+          if (found) return found;
+        }
+      }
+    };
+    const group = find(filters);
+    if (!group) return;
+    const replacement = unwrapGroup(group);
+    if (replacement) {
+      onFiltersChange(replaceNodeInTree(filters, id, replacement));
+    } else {
+      onFiltersChange(removeNodeFromTree(filters, id));
+    }
+  };
+  const toggleLogicOp = (id) => {
+    onFiltersChange(
+      updateNodeInTree(filters, id, (n) => ({
+        ...n,
+        logicOperator: (n.logicOperator ?? "and") === "and" ? "or" : "and"
+      }))
+    );
+  };
+  const handleGroupChildrenChange = (groupId, children2) => {
     onFiltersChange(
-      filters.map(
-        (f) => f.id === filterId ? { ...f, logicOperator: (f.logicOperator ?? "and") === "and" ? "or" : "and" } : f
+      updateNodeInTree(
+        filters,
+        groupId,
+        (n) => isFilterGroup(n) ? { ...n, children: children2 } : n
       )
     );
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(PopoverPrimitive11.Root, { open, onOpenChange, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(PopoverPrimitive11.Trigger, { asChild: true, children }),
-    /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(PopoverPrimitive11.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
-      PopoverPrimitive11.Content,
+  const renderNode = (node, index) => {
+    const connector = index === 0 ? "Where" : (node.logicOperator ?? "and") === "and" ? "And" : "Or";
+    if (isFilterGroup(node)) {
+      return /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+        AdvancedGroup,
+        {
+          connector,
+          onConnectorToggle: index > 0 ? () => toggleLogicOp(node.id) : void 0,
+          onDuplicate: () => handleDuplicateNode(node.id),
+          onTurnIntoFilter: () => handleUnwrapGroup(node.id),
+          onDelete: () => handleDeleteNode(node.id),
+          properties,
+          onAddFilter: (prop) => {
+            const newFilter = createFilterWithDefaults(prop.id, prop.type);
+            handleGroupChildrenChange(node.id, [...node.children, newFilter]);
+          },
+          children: node.children.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+            DraftRow,
+            {
+              properties,
+              onSelect: (prop) => {
+                const newFilter = createFilterWithDefaults(prop.id, prop.type);
+                handleGroupChildrenChange(node.id, [newFilter]);
+              }
+            }
+          ) : node.children.map((child, i) => renderNode(child, i))
+        },
+        node.id
+      );
+    }
+    const propDef = getPropertyDef(node.propertyId);
+    if (!propDef) return null;
+    return /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+      AdvancedRow,
+      {
+        connector,
+        onConnectorToggle: index > 0 ? () => toggleLogicOp(node.id) : void 0,
+        propertyDef: propDef,
+        condition: node,
+        properties,
+        onUpdate: (updated) => handleUpdateNode(node.id, updated),
+        onPropertyChange: (p) => {
+          const newCondition = createFilterWithDefaults(p.id, p.type);
+          handleUpdateNode(node.id, { ...newCondition, id: node.id });
+        },
+        onDelete: () => handleDeleteNode(node.id),
+        onDuplicate: () => handleDuplicateNode(node.id),
+        onTurnIntoGroup: () => handleWrapInGroup(node.id)
+      },
+      node.id
+    );
+  };
+  return /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(PopoverPrimitive12.Root, { open, onOpenChange, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(PopoverPrimitive12.Trigger, { asChild: true, children }),
+    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(PopoverPrimitive12.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(
+      PopoverPrimitive12.Content,
       {
         sideOffset: 4,
         align: "start",
@@ -7587,87 +8026,56 @@ var AdvancedPopover = ({
           "data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
           "data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95",
           "data-[side=bottom]:slide-in-from-top-2",
-          "w-[min(520px,calc(100vw-32px))]"
+          "w-[min(640px,calc(100vw-32px))]"
         ),
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("div", { className: "flex flex-col gap-base p-base", children: [
-            filters.map((filter, i) => {
-              const propDef = getPropertyDef(filter.propertyId);
-              if (!propDef) return null;
-              return /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-                AdvancedRow,
-                {
-                  connector: i === 0 ? "Where" : (filter.logicOperator ?? "and") === "and" ? "And" : "Or",
-                  onConnectorToggle: i > 0 ? () => toggleLogicOp(filter.id) : void 0,
-                  propertyDef: propDef,
-                  condition: filter,
-                  properties,
-                  onUpdate: handleUpdateFilter,
-                  onPropertyChange: (p) => handlePropertyChange(filter.id, p),
-                  onDelete: () => handleDeleteFilter(filter.id)
-                },
-                filter.id
-              );
-            }),
-            filters.length === 0 && /* ── Draft row: inline "Select property" placeholder ──── */
-            /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("div", { className: "flex items-center gap-base w-full min-w-0", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime55.jsx)("div", { className: "shrink-0 w-[64px] flex items-center justify-end", children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)("span", { className: "text-xs font-semibold leading-xs text-[var(--color-muted-foreground)]", children: "Where" }) }),
-              /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime57.jsx)("div", { className: "flex flex-col gap-base p-base", children: filters.length > 0 ? filters.map((node, i) => renderNode(node, i)) : /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+            DraftRow,
+            {
+              properties,
+              onSelect: handleAddFilter,
+              open: draftPickerOpen,
+              onOpenChange: setDraftPickerOpen
+            }
+          ) }),
+          /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)("div", { className: "flex items-center justify-between p-base border-t border-[var(--color-border)]", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)("div", { className: "flex items-center gap-sm", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
                 PropertySelector,
                 {
                   properties,
                   onSelect: handleAddFilter,
-                  open: draftPickerOpen,
-                  onOpenChange: setDraftPickerOpen,
-                  children: /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
-                    "button",
-                    {
-                      type: "button",
-                      className: cn(
-                        "flex items-center gap-base px-base py-sm min-w-0",
-                        "bg-gradient-to-t from-[var(--color-btn-outlined-neutral-bg-default)] to-[var(--color-btn-outlined-neutral-bg-gradient-to-default)]",
-                        "border border-[var(--color-btn-outlined-neutral-border-default)] rounded-md 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_runtime55.jsx)("span", { className: "text-sm font-regular leading-sm text-[var(--color-muted-foreground)] whitespace-nowrap", children: "Select property" }),
-                        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-                          import_icons34.Icon,
-                          {
-                            icon: import_icons34.faChevronDownOutline,
-                            size: "xs",
-                            className: "shrink-0 text-[var(--color-foreground)]"
-                          }
-                        )
-                      ]
-                    }
-                  )
+                  open: addSelectorOpen,
+                  onOpenChange: setAddSelectorOpen,
+                  children: /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)("button", { type: "button", className: cn(ghostBtn, "text-[var(--color-foreground)]"), children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(import_icons36.Icon, { icon: import_icons36.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" }),
+                    "Add filter"
+                  ] })
+                }
+              ),
+              /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(
+                "button",
+                {
+                  type: "button",
+                  onClick: handleAddGroup,
+                  className: cn(ghostBtn, "text-[var(--color-foreground)]"),
+                  children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(import_icons36.Icon, { icon: import_icons36.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" }),
+                    "Add filters group"
+                  ]
                 }
               )
-            ] })
-          ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("div", { className: "flex items-center justify-between p-base border-t border-[var(--color-border)]", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-              PropertySelector,
-              {
-                properties,
-                onSelect: handleAddFilter,
-                open: addSelectorOpen,
-                onOpenChange: setAddSelectorOpen,
-                children: /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("button", { type: "button", className: cn(outlinedBtn), children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(import_icons34.Icon, { icon: import_icons34.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" }),
-                  "Add filter"
-                ] })
-              }
-            ),
-            /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+            ] }),
+            filters.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(
               "button",
               {
                 type: "button",
                 onClick: handleClearAll,
-                className: "text-sm font-semibold leading-sm text-[var(--color-foreground)] cursor-pointer transition-colors hover:opacity-70 px-base py-sm",
-                children: "Clear all filters"
+                className: cn(ghostBtn, "text-[var(--color-destructive,#ef4444)]"),
+                children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(import_icons36.Icon, { icon: import_icons36.faXmarkOutline, size: "sm", className: "text-[var(--color-destructive,#ef4444)]" }),
+                  "Clear filters"
+                ]
               }
             )
           ] })
@@ -7677,12 +8085,71 @@ var AdvancedPopover = ({
   ] });
 };
 AdvancedPopover.displayName = "AdvancedPopover";
+var DraftRow = ({
+  properties,
+  onSelect,
+  open: openProp,
+  onOpenChange
+}) => {
+  const [internalOpen, setInternalOpen] = React50.useState(false);
+  const isControlled = openProp !== void 0;
+  const open = isControlled ? openProp : internalOpen;
+  const setOpen = (v) => {
+    if (!isControlled) setInternalOpen(v);
+    onOpenChange?.(v);
+  };
+  return /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)("div", { className: "flex items-center gap-base w-full min-w-0", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)("div", { className: "shrink-0 w-[64px] flex items-center justify-end", children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)("span", { className: "text-xs font-semibold leading-xs text-[var(--color-muted-foreground)]", children: "Where" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+      PropertySelector,
+      {
+        properties,
+        onSelect: (prop) => {
+          onSelect(prop);
+          setOpen(false);
+        },
+        open,
+        onOpenChange: setOpen,
+        children: /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(
+          "button",
+          {
+            type: "button",
+            className: cn(
+              "flex items-center gap-base px-base py-sm min-w-0",
+              "bg-gradient-to-t from-[var(--color-btn-outlined-neutral-bg-default)] to-[var(--color-btn-outlined-neutral-bg-gradient-to-default)]",
+              "border border-[var(--color-btn-outlined-neutral-border-default)] rounded-md 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_runtime57.jsx)("span", { className: "text-sm font-regular leading-sm text-[var(--color-muted-foreground)] whitespace-nowrap", children: "Select property" }),
+              /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+                import_icons36.Icon,
+                {
+                  icon: import_icons36.faChevronDownOutline,
+                  size: "xs",
+                  className: "shrink-0 text-[var(--color-foreground)]"
+                }
+              )
+            ]
+          }
+        )
+      }
+    )
+  ] });
+};
 
 // src/components/ui/filter/summary-chip.tsx
-var React49 = __toESM(require("react"));
-var PopoverPrimitive12 = __toESM(require("@radix-ui/react-popover"));
-var import_icons35 = require("@l3mpire/icons");
-var import_jsx_runtime56 = require("react/jsx-runtime");
+var React51 = __toESM(require("react"));
+var PopoverPrimitive13 = __toESM(require("@radix-ui/react-popover"));
+var import_icons37 = require("@l3mpire/icons");
+var import_jsx_runtime58 = require("react/jsx-runtime");
+var ghostBtn2 = [
+  "flex items-center gap-sm px-base py-sm",
+  "min-h-[32px]",
+  "cursor-pointer transition-colors text-sm font-semibold leading-sm",
+  "rounded-md hover:bg-[var(--color-accent)]"
+];
 var SummaryChip = ({
   count,
   filters,
@@ -7694,44 +8161,152 @@ var SummaryChip = ({
   open: openProp,
   onOpenChange
 }) => {
-  const [uncontrolledOpen, setUncontrolledOpen] = React49.useState(false);
+  const [uncontrolledOpen, setUncontrolledOpen] = React51.useState(false);
   const isControlled = openProp !== void 0;
   const open = isControlled ? openProp : uncontrolledOpen;
   const setOpen = (v) => {
     if (!isControlled) setUncontrolledOpen(v);
     onOpenChange?.(v);
   };
-  const [addSelectorOpen, setAddSelectorOpen] = React49.useState(false);
-  const [draftPickerOpen, setDraftPickerOpen] = React49.useState(false);
+  const [addSelectorOpen, setAddSelectorOpen] = React51.useState(false);
+  const [draftPickerOpen, setDraftPickerOpen] = React51.useState(false);
   const getPropertyDef = (propertyId) => properties.find((p) => p.id === propertyId);
-  const handleUpdateFilter = (updated) => {
-    onFiltersChange(filters.map((f) => f.id === updated.id ? updated : f));
+  const handleAddFilter = (property) => {
+    const newFilter = createFilterWithDefaults(property.id, property.type);
+    onFiltersChange([...filters, newFilter]);
+    setAddSelectorOpen(false);
   };
-  const handleDeleteFilter = (id) => {
-    const next = filters.filter((f) => f.id !== id);
+  const handleAddGroup = () => {
+    onFiltersChange([...filters, createEmptyGroup()]);
+  };
+  const handleUpdateNode = (id, updated) => {
+    onFiltersChange(updateNodeInTree(filters, id, () => updated));
+  };
+  const handleDeleteNode = (id) => {
+    const next = removeNodeFromTree(filters, id);
     onFiltersChange(next);
     if (next.length === 0) setOpen(false);
   };
-  const handlePropertyChange = (filterId, newProp) => {
-    const newCondition = createFilterWithDefaults(newProp.id, newProp.type);
+  const handleDuplicateNode = (id) => {
+    const find = (nodes) => {
+      for (const n of nodes) {
+        if (n.id === id) return n;
+        if (isFilterGroup(n)) {
+          const f = find(n.children);
+          if (f) return f;
+        }
+      }
+    };
+    const node = find(filters);
+    if (!node) return;
+    const clone = duplicateNode(node);
+    clone.logicOperator = node.logicOperator ?? "and";
+    onFiltersChange(insertAfterInTree(filters, id, clone));
+  };
+  const handleWrapInGroup = (id) => {
+    const find = (nodes) => {
+      for (const n of nodes) {
+        if (n.id === id && !isFilterGroup(n)) return n;
+        if (isFilterGroup(n)) {
+          const f = find(n.children);
+          if (f) return f;
+        }
+      }
+    };
+    const condition = find(filters);
+    if (!condition) return;
+    onFiltersChange(replaceNodeInTree(filters, id, wrapInGroup(condition)));
+  };
+  const handleUnwrapGroup = (id) => {
+    const find = (nodes) => {
+      for (const n of nodes) {
+        if (n.id === id && isFilterGroup(n)) return n;
+        if (isFilterGroup(n)) {
+          const f = find(n.children);
+          if (f) return f;
+        }
+      }
+    };
+    const group = find(filters);
+    if (!group) return;
+    const replacement = unwrapGroup(group);
+    if (replacement) {
+      onFiltersChange(replaceNodeInTree(filters, id, replacement));
+    } else {
+      onFiltersChange(removeNodeFromTree(filters, id));
+    }
+  };
+  const toggleLogicOp = (id) => {
     onFiltersChange(
-      filters.map((f) => f.id === filterId ? { ...newCondition, id: filterId } : f)
+      updateNodeInTree(filters, id, (n) => ({
+        ...n,
+        logicOperator: (n.logicOperator ?? "and") === "and" ? "or" : "and"
+      }))
     );
   };
-  const handleAddFilter = (property) => {
-    const newFilter = createFilterWithDefaults(property.id, property.type);
-    onFiltersChange([...filters, newFilter]);
-    setAddSelectorOpen(false);
-  };
-  const toggleLogicOp = (filterId) => {
+  const handleGroupChildrenChange = (groupId, newChildren) => {
     onFiltersChange(
-      filters.map(
-        (f) => f.id === filterId ? { ...f, logicOperator: (f.logicOperator ?? "and") === "and" ? "or" : "and" } : f
+      updateNodeInTree(
+        filters,
+        groupId,
+        (n) => isFilterGroup(n) ? { ...n, children: newChildren } : n
       )
     );
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(PopoverPrimitive12.Root, { open, onOpenChange: setOpen, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(PopoverPrimitive12.Trigger, { asChild: true, children: children ?? /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(
+  const renderNode = (node, index) => {
+    const connector = index === 0 ? "Where" : (node.logicOperator ?? "and") === "and" ? "And" : "Or";
+    if (isFilterGroup(node)) {
+      return /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+        AdvancedGroup,
+        {
+          connector,
+          onConnectorToggle: index > 0 ? () => toggleLogicOp(node.id) : void 0,
+          onDuplicate: () => handleDuplicateNode(node.id),
+          onTurnIntoFilter: () => handleUnwrapGroup(node.id),
+          onDelete: () => handleDeleteNode(node.id),
+          properties,
+          onAddFilter: (prop) => {
+            const newFilter = createFilterWithDefaults(prop.id, prop.type);
+            handleGroupChildrenChange(node.id, [...node.children, newFilter]);
+          },
+          children: node.children.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+            DraftRow2,
+            {
+              properties,
+              onSelect: (prop) => {
+                const newFilter = createFilterWithDefaults(prop.id, prop.type);
+                handleGroupChildrenChange(node.id, [newFilter]);
+              }
+            }
+          ) : node.children.map((child, i) => renderNode(child, i))
+        },
+        node.id
+      );
+    }
+    const propDef = getPropertyDef(node.propertyId);
+    if (!propDef) return null;
+    return /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+      AdvancedRow,
+      {
+        connector,
+        onConnectorToggle: index > 0 ? () => toggleLogicOp(node.id) : void 0,
+        propertyDef: propDef,
+        condition: node,
+        properties,
+        onUpdate: (updated) => handleUpdateNode(node.id, updated),
+        onPropertyChange: (p) => {
+          const newCondition = createFilterWithDefaults(p.id, p.type);
+          handleUpdateNode(node.id, { ...newCondition, id: node.id });
+        },
+        onDelete: () => handleDeleteNode(node.id),
+        onDuplicate: () => handleDuplicateNode(node.id),
+        onTurnIntoGroup: () => handleWrapInGroup(node.id)
+      },
+      node.id
+    );
+  };
+  return /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(PopoverPrimitive13.Root, { open, onOpenChange: setOpen, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(PopoverPrimitive13.Trigger, { asChild: true, children: children ?? /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(
       "button",
       {
         type: "button",
@@ -7745,21 +8320,14 @@ var SummaryChip = ({
           className
         ),
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
-            import_icons35.Icon,
-            {
-              icon: import_icons35.faSlidersOutline,
-              size: "sm",
-              className: "shrink-0 text-[var(--color-foreground)]"
-            }
-          ),
-          /* @__PURE__ */ (0, import_jsx_runtime56.jsx)("span", { className: "text-sm font-semibold leading-sm whitespace-nowrap text-[var(--color-foreground)]", children: "Filters" }),
-          count > 0 && /* @__PURE__ */ (0, import_jsx_runtime56.jsx)("span", { className: "flex items-center p-2xs rounded-xs bg-filter-chip-badge-bg", children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)("span", { className: "text-[10px] font-semibold leading-2xs text-filter-chip-badge-text", children: count }) })
+          /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(import_icons37.Icon, { icon: import_icons37.faSlidersOutline, size: "sm", className: "shrink-0 text-[var(--color-foreground)]" }),
+          /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("span", { className: "text-sm font-semibold leading-sm whitespace-nowrap text-[var(--color-foreground)]", children: "Filters" }),
+          count > 0 && /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("span", { className: "flex items-center p-2xs rounded-xs bg-filter-chip-badge-bg", children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("span", { className: "text-[10px] font-semibold leading-2xs text-filter-chip-badge-text", children: count }) })
         ]
       }
     ) }),
-    /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(PopoverPrimitive12.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(
-      PopoverPrimitive12.Content,
+    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(PopoverPrimitive13.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(
+      PopoverPrimitive13.Content,
       {
         sideOffset: 4,
         align: "start",
@@ -7771,95 +8339,39 @@ var SummaryChip = ({
           "data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
           "data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95",
           "data-[side=bottom]:slide-in-from-top-2",
-          "w-[min(520px,calc(100vw-32px))]"
+          "w-[min(640px,calc(100vw-32px))]"
         ),
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)("div", { className: "flex flex-col gap-base p-base", children: [
-            filters.map((filter, i) => {
-              const propDef = getPropertyDef(filter.propertyId);
-              if (!propDef) return null;
-              return /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
-                AdvancedRow,
-                {
-                  connector: i === 0 ? "Where" : (filter.logicOperator ?? "and") === "and" ? "And" : "Or",
-                  onConnectorToggle: i > 0 ? () => toggleLogicOp(filter.id) : void 0,
-                  propertyDef: propDef,
-                  condition: filter,
-                  properties,
-                  onUpdate: handleUpdateFilter,
-                  onPropertyChange: (p) => handlePropertyChange(filter.id, p),
-                  onDelete: () => handleDeleteFilter(filter.id)
-                },
-                filter.id
-              );
-            }),
-            filters.length === 0 && /* ── Draft row: inline "Select property" placeholder ──── */
-            /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)("div", { className: "flex items-center gap-base w-full min-w-0", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime56.jsx)("div", { className: "shrink-0 w-[64px] flex items-center justify-end", children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)("span", { className: "text-xs font-semibold leading-xs text-[var(--color-muted-foreground)]", children: "Where" }) }),
-              /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("div", { className: "flex flex-col gap-base p-base", children: filters.length > 0 ? filters.map((node, i) => renderNode(node, i)) : /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+            DraftRow2,
+            {
+              properties,
+              onSelect: handleAddFilter,
+              open: draftPickerOpen,
+              onOpenChange: setDraftPickerOpen
+            }
+          ) }),
+          /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)("div", { className: "flex items-center justify-between p-base border-t border-[var(--color-border)]", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)("div", { className: "flex items-center gap-sm", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
                 PropertySelector,
                 {
                   properties,
                   onSelect: handleAddFilter,
-                  open: draftPickerOpen,
-                  onOpenChange: setDraftPickerOpen,
-                  children: /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(
-                    "button",
-                    {
-                      type: "button",
-                      className: cn(
-                        "flex items-center gap-base px-base py-sm min-w-0",
-                        "bg-gradient-to-t from-[var(--color-btn-outlined-neutral-bg-default)] to-[var(--color-btn-outlined-neutral-bg-gradient-to-default)]",
-                        "border border-[var(--color-btn-outlined-neutral-border-default)] rounded-md 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_runtime56.jsx)("span", { className: "text-sm font-regular leading-sm text-[var(--color-muted-foreground)] whitespace-nowrap", children: "Select property" }),
-                        /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
-                          import_icons35.Icon,
-                          {
-                            icon: import_icons35.faChevronDownOutline,
-                            size: "xs",
-                            className: "shrink-0 text-[var(--color-foreground)]"
-                          }
-                        )
-                      ]
-                    }
-                  )
+                  open: addSelectorOpen,
+                  onOpenChange: setAddSelectorOpen,
+                  children: /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)("button", { type: "button", className: cn(ghostBtn2, "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)]" }),
+                    "Add filter"
+                  ] })
                 }
-              )
-            ] })
-          ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)("div", { className: "flex items-center justify-between p-base border-t border-[var(--color-border)]", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
-              PropertySelector,
-              {
-                properties,
-                onSelect: handleAddFilter,
-                open: addSelectorOpen,
-                onOpenChange: setAddSelectorOpen,
-                children: /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(
-                  "button",
-                  {
-                    type: "button",
-                    className: cn(
-                      "flex items-center gap-sm px-base py-sm",
-                      "min-h-[32px] max-h-[32px] min-w-[80px]",
-                      "bg-gradient-to-t from-[var(--color-btn-outlined-neutral-bg-default)] from-[10%] to-[var(--color-btn-outlined-neutral-bg-gradient-to-default)]",
-                      "border border-[var(--color-btn-outlined-neutral-border-default)] rounded-md shadow-sm",
-                      "cursor-pointer transition-colors text-sm font-semibold leading-sm text-[var(--color-foreground)]",
-                      "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_runtime56.jsx)(import_icons35.Icon, { icon: import_icons35.faPlusOutline, size: "sm", className: "text-[var(--color-foreground)]" }),
-                      "Add filter"
-                    ]
-                  }
-                )
-              }
-            ),
-            filters.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
+              ),
+              /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)("button", { type: "button", onClick: handleAddGroup, className: cn(ghostBtn2, "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)]" }),
+                "Add filters group"
+              ] })
+            ] }),
+            filters.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(
               "button",
               {
                 type: "button",
@@ -7867,8 +8379,11 @@ var SummaryChip = ({
                   onClearAll();
                   setOpen(false);
                 },
-                className: "text-sm font-semibold leading-sm text-[var(--color-foreground)] cursor-pointer transition-colors hover:opacity-70 px-base py-sm",
-                children: "Clear all filters"
+                className: cn(ghostBtn2, "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)]" }),
+                  "Clear filters"
+                ]
               }
             )
           ] })
@@ -7878,13 +8393,44 @@ var SummaryChip = ({
   ] });
 };
 SummaryChip.displayName = "SummaryChip";
+var DraftRow2 = ({ properties, onSelect, open: openProp, onOpenChange }) => {
+  const [internalOpen, setInternalOpen] = React51.useState(false);
+  const isCtrl = openProp !== void 0;
+  const open = isCtrl ? openProp : internalOpen;
+  const setOpen = (v) => {
+    if (!isCtrl) setInternalOpen(v);
+    onOpenChange?.(v);
+  };
+  return /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)("div", { className: "flex items-center gap-base w-full min-w-0", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("div", { className: "shrink-0 w-[64px] flex items-center justify-end", children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("span", { className: "text-xs font-semibold leading-xs text-[var(--color-muted-foreground)]", children: "Where" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(PropertySelector, { properties, onSelect: (p) => {
+      onSelect(p);
+      setOpen(false);
+    }, open, onOpenChange: setOpen, children: /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(
+      "button",
+      {
+        type: "button",
+        className: cn(
+          "flex items-center gap-base px-base py-sm min-w-0",
+          "bg-gradient-to-t from-[var(--color-btn-outlined-neutral-bg-default)] to-[var(--color-btn-outlined-neutral-bg-gradient-to-default)]",
+          "border border-[var(--color-btn-outlined-neutral-border-default)] rounded-md 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_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, { icon: import_icons37.faChevronDownOutline, size: "xs", className: "shrink-0 text-[var(--color-foreground)]" })
+        ]
+      }
+    ) })
+  ] });
+};
 
 // src/components/ui/filter/use-filter-bar-mode.ts
-var React50 = __toESM(require("react"));
+var React52 = __toESM(require("react"));
 var DEFAULT_BREAKPOINT = 600;
 function useFilterBarMode(ref, override, breakpoint = DEFAULT_BREAKPOINT) {
-  const [mode, setMode] = React50.useState("default");
-  React50.useEffect(() => {
+  const [mode, setMode] = React52.useState("default");
+  React52.useEffect(() => {
     if (override) return;
     const el = ref.current;
     if (!el) return;
@@ -7899,7 +8445,7 @@ function useFilterBarMode(ref, override, breakpoint = DEFAULT_BREAKPOINT) {
 }
 
 // src/components/ui/filter/filter-system.tsx
-var import_jsx_runtime57 = require("react/jsx-runtime");
+var import_jsx_runtime59 = require("react/jsx-runtime");
 var FilterSystem = ({
   properties,
   filterState,
@@ -7911,14 +8457,13 @@ var FilterSystem = ({
   actions,
   className
 }) => {
-  const containerRef = React51.useRef(null);
+  const containerRef = React53.useRef(null);
   const mode = useFilterBarMode(containerRef, modeOverride, breakpoint);
-  const [propertySelectorOpen, setPropertySelectorOpen] = React51.useState(false);
-  const [advancedOpen, setAdvancedOpen] = React51.useState(false);
-  const [summaryOpen, setSummaryOpen] = React51.useState(false);
-  const [pendingFilterId, setPendingFilterId] = React51.useState(null);
-  const allFilters = [...filterState.basicFilters, ...filterState.advancedFilters];
-  const totalCount = allFilters.length;
+  const [propertySelectorOpen, setPropertySelectorOpen] = React53.useState(false);
+  const [advancedOpen, setAdvancedOpen] = React53.useState(false);
+  const [summaryOpen, setSummaryOpen] = React53.useState(false);
+  const [pendingFilterId, setPendingFilterId] = React53.useState(null);
+  const totalCount = filterState.basicFilters.length + countConditions(filterState.advancedFilters);
   const handleAddFilter = (property) => {
     const newFilter = createFilterWithDefaults(property.id, property.type);
     if (newFilter.operator && isNoValueOperator(newFilter.operator)) {
@@ -8004,10 +8549,10 @@ var FilterSystem = ({
   const advancedFilterCount = filterState.advancedFilters.length;
   const showAdvancedChip = hasAdvanced || advancedOpen;
   const showSummaryChip = totalCount > 0 || summaryOpen;
-  return /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(FilterBar, { ref: containerRef, className, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(FilterBarLeft, { className: "flex-nowrap flex-1 min-w-0 overflow-x-auto scrollbar-none outline-none [&>*]:shrink-0", children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(FilterBar, { ref: containerRef, className, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(FilterBarLeft, { className: "flex-nowrap flex-1 min-w-0 overflow-x-auto scrollbar-none outline-none [&>*]:shrink-0", children: [
       children,
-      sortFields && filterState.sort && /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+      sortFields && filterState.sort && /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
         SortButton,
         {
           fields: sortFields,
@@ -8017,23 +8562,23 @@ var FilterSystem = ({
           iconOnly: isMinimal
         }
       ),
-      isMinimal ? /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(import_jsx_runtime57.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+      isMinimal ? /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(import_jsx_runtime59.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
           "div",
           {
             className: showSummaryChip ? "inline-flex" : "inline-flex w-0 overflow-hidden opacity-0 pointer-events-none",
             "aria-hidden": !showSummaryChip || void 0,
-            children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+            children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
               SummaryChip,
               {
                 count: totalCount,
-                filters: allFilters,
+                filters: [...filterState.basicFilters, ...filterState.advancedFilters],
                 properties,
-                onFiltersChange: (filters) => {
+                onFiltersChange: (nodes) => {
                   onFilterStateChange({
                     ...filterState,
-                    basicFilters: filters,
-                    advancedFilters: []
+                    basicFilters: [],
+                    advancedFilters: nodes
                   });
                 },
                 onClearAll: handleClearAll,
@@ -8043,7 +8588,7 @@ var FilterSystem = ({
             )
           }
         ),
-        !showSummaryChip && /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+        !showSummaryChip && /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
           PropertySelector,
           {
             properties,
@@ -8052,13 +8597,13 @@ var FilterSystem = ({
             onOpenChange: setPropertySelectorOpen,
             onAdvancedFilter: handleOpenAdvanced,
             advancedFilterCount,
-            children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(FilterBarButton, { iconOnly: true })
+            children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(FilterBarButton, { iconOnly: true })
           }
         )
       ] }) : (
         /* ── DEFAULT MODE ────────────────────────────────────── */
-        /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(import_jsx_runtime57.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(import_jsx_runtime59.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
             AdvancedPopover,
             {
               filters: filterState.advancedFilters,
@@ -8066,12 +8611,12 @@ var FilterSystem = ({
               onFiltersChange: handleAdvancedFiltersChange,
               open: advancedOpen,
               onOpenChange: setAdvancedOpen,
-              children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+              children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
                 "div",
                 {
                   className: showAdvancedChip ? "inline-flex" : "inline-flex w-0 overflow-hidden opacity-0 pointer-events-none",
                   "aria-hidden": !showAdvancedChip || void 0,
-                  children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+                  children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
                     AdvancedChip,
                     {
                       count: filterState.advancedFilters.length,
@@ -8086,7 +8631,7 @@ var FilterSystem = ({
           filterState.basicFilters.map((filter) => {
             const propDef = getPropertyDef(filter.propertyId);
             if (!propDef) return null;
-            return /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+            return /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
               InteractiveFilterChip,
               {
                 propertyDef: propDef,
@@ -8102,7 +8647,7 @@ var FilterSystem = ({
               filter.id
             );
           }),
-          /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
             PropertySelector,
             {
               properties,
@@ -8111,29 +8656,29 @@ var FilterSystem = ({
               onOpenChange: setPropertySelectorOpen,
               onAdvancedFilter: handleOpenAdvanced,
               advancedFilterCount,
-              children: totalCount > 0 ? /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+              children: totalCount > 0 ? /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
                 "button",
                 {
                   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_runtime57.jsx)(import_icons36.Icon, { icon: import_icons36.faPlusOutline, size: "sm", className: "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_runtime57.jsx)(FilterBarButton, {})
+              ) : /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(FilterBarButton, {})
             }
           )
         ] })
       ),
-      totalCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+      totalCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime59.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_runtime57.jsx)(import_icons36.Icon, { icon: import_icons36.faXmarkOutline, size: "sm", className: "text-[var(--color-foreground)]" }) : /* @__PURE__ */ (0, import_jsx_runtime57.jsx)("span", { className: "text-sm font-semibold leading-sm text-[var(--color-foreground)]", children: "Clear" })
+          children: isMinimal ? /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_icons38.Icon, { icon: import_icons38.faXmarkOutline, size: "sm", className: "text-[var(--color-foreground)]" }) : /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("span", { className: "text-sm font-semibold leading-sm text-[var(--color-foreground)]", children: "Clear" })
         }
       )
     ] }),
-    actions && /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(FilterBarRight, { className: "shrink-0 -ml-2xl pl-2xl relative z-10 bg-[linear-gradient(to_right,transparent_0px,var(--filter-bar-bg,var(--color-background,#fff))_24px)]", children: actions })
+    actions && /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(FilterBarRight, { className: "shrink-0 -ml-2xl pl-2xl relative z-10 bg-[linear-gradient(to_right,transparent_0px,var(--filter-bar-bg,var(--color-background,#fff))_24px)]", children: actions })
   ] });
 };
 FilterSystem.displayName = "FilterSystem";