@multiplatform.one/table 6.7.0 → 7.1.0

package/dist/esm/components/DataTableGrouping/index.native.js

@@ -1,8 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { createElement as _createElement } from "react";
-import { ChartBarIcon, CalculatorIcon, CaretDownIcon, CaretLeftIcon, CaretRightIcon, CaretUpIcon, HashIcon, MinusIcon, PlusIcon, GearIcon } from "@phosphor-icons/react";
+import { ArrowDownIcon, ArrowUpIcon, ChartBarIcon, CalculatorIcon, CaretDownIcon, CaretLeftIcon, CaretRightIcon, CaretUpIcon, HashIcon, MinusIcon, PlusIcon, GearIcon } from "@phosphor-icons/react";
 import { useDirection } from "@multiplatform.one/components";
-import { formatNumber, useResolvedKnobs } from "@multiplatform.one/theme";
+import { ensureFocusVisibleRing, formatNumber, getGroupPosition, hairline, sizeRecipeForToken, stackEdgeRadius, stackRadiusProps, useResolvedKnobs } from "@multiplatform.one/theme";
 import { useCallback, useMemo, useState } from "react";
 import { Button, Select } from "@multiplatform.one/forms";
 import { Popover, Separator, Text, View, XStack, YStack, isWeb } from "tamagui";
@@ -19,11 +18,38 @@ var groupItemPaddingMap = {
   medium: "$2",
   large: "$3"
 };
+var groupIndentStepMap = {
+  small: 12,
+  medium: 16,
+  large: 24
+};
 var groupMetaSizeMap = {
   $3: "$2",
   $4: "$3",
   $5: "$4"
 };
+var groupIconSize = function groupIconSize2(token) {
+  return sizeRecipeForToken(token).iconSize;
+};
+var startRail = isWeb ? {
+  borderInlineStartWidth: 4,
+  borderInlineStartStyle: "solid",
+  borderInlineStartColor: "$color6"
+} : {
+  borderStartWidth: 4,
+  borderStartColor: "$color6"
+};
+function groupIndent(space, level) {
+  var _groupIndentStepMap_;
+  return ((_groupIndentStepMap_ = groupIndentStepMap[space !== null && space !== void 0 ? space : "medium"]) !== null && _groupIndentStepMap_ !== void 0 ? _groupIndentStepMap_ : 16) * Math.max(0, level);
+}
+function formatCellValue(value) {
+  if (value == null) return "";
+  if (typeof value === "number") {
+    return Number.isFinite(value) ? formatNumber(value) : "";
+  }
+  return String(value);
+}
 function formatAggregateValue(value, agg) {
   if (value == null) return formatNumber(0);
   if (typeof value === "number") {
@@ -86,6 +112,8 @@ function DataTableGrouping(props) {
     groupedData,
     columns,
     level: 0,
+    stackStart: true,
+    stackEnd: true,
     aggregations,
     showAggregations,
     expandedGroups,
@@ -99,6 +127,8 @@ function GroupedDataRenderer(param) {
     groupedData,
     columns,
     level,
+    stackStart,
+    stackEnd,
     aggregations,
     showAggregations,
     expandedGroups,
@@ -107,15 +137,22 @@ function GroupedDataRenderer(param) {
     renderGroupFooter
   } = param;
   return /* @__PURE__ */_jsx(YStack, {
-    children: groupedData.map(function (group) {
+    children: groupedData.map(function (group, groupIndex) {
       var _ref;
       var _group_children;
       var groupKey = getGroupKey(group);
       var isExpanded = expandedGroups.has(groupKey);
       var isExpandable = ((_ref = (_group_children = group.children) === null || _group_children === void 0 ? void 0 : _group_children.length) !== null && _ref !== void 0 ? _ref : 0) > 0 || group.items.length > 0;
+      var position = getGroupPosition(groupIndex, groupedData.length);
+      var isFirst = position === "first" || position === "only";
+      var isLast = position === "last" || position === "only";
+      var headerStart = stackStart && isFirst;
+      var headerEnd = stackEnd && isLast && !isExpanded;
+      var childStackEnd = stackEnd && isLast;
       return /* @__PURE__ */_jsxs(YStack, {
-        children: [/* Group Header */
-        /* @__PURE__ */_jsx(GroupHeader, {
+        children: [groupIndex > 0 ? /* @__PURE__ */_jsx(View, {
+          ...hairline.line
+        }) : null, /* @__PURE__ */_jsx(GroupHeader, {
           group,
           level,
           isExpanded,
@@ -125,14 +162,19 @@ function GroupedDataRenderer(param) {
           onToggleExpansion: function onToggleExpansion1() {
             return onToggleExpansion(groupKey);
           },
-          renderCustomHeader: renderGroupHeader
-        }), /* Group Content */
-        isExpanded && /* @__PURE__ */_jsx(YStack, {
-          marginInlineStart: level * 20,
-          children: group.children && group.children.length > 0 ? /* @__PURE__ */_jsx(GroupedDataRenderer, {
+          renderCustomHeader: renderGroupHeader,
+          position,
+          stackStart: headerStart,
+          stackEnd: headerEnd
+        }), isExpanded && /* @__PURE__ */_jsxs(_Fragment, {
+          children: [/* @__PURE__ */_jsx(View, {
+            ...hairline.line
+          }), group.children && group.children.length > 0 ? /* @__PURE__ */_jsx(GroupedDataRenderer, {
             groupedData: group.children,
             columns,
             level: level + 1,
+            stackStart: false,
+            stackEnd: childStackEnd,
             aggregations,
             showAggregations,
             expandedGroups,
@@ -141,10 +183,11 @@ function GroupedDataRenderer(param) {
             renderGroupFooter
           }) : /* @__PURE__ */_jsx(GroupItems, {
             items: group.items,
-            columns
-          })
-        }), /* Group Footer */
-        renderGroupFooter && isExpanded && /* @__PURE__ */_jsx(GroupFooter, {
+            columns,
+            level: level + 1,
+            stackEnd: childStackEnd
+          })]
+        }), renderGroupFooter && isExpanded && /* @__PURE__ */_jsx(GroupFooter, {
           group,
           level,
           renderCustomFooter: renderGroupFooter
@@ -162,48 +205,67 @@ function GroupHeader(param) {
     aggregations,
     showAggregations,
     onToggleExpansion,
-    renderCustomHeader
+    renderCustomHeader,
+    position = "only",
+    stackStart,
+    stackEnd
   } = param;
-  var _groupHeaderPaddingMap_knobProps_space, _groupMetaSizeMap_knobProps_sizeToken;
+  var _groupMetaSizeMap_knobProps_sizeToken, _groupHeaderPaddingMap_knobProps_space;
   var {
     knobProps
   } = useResolvedKnobs();
   var CollapsedCaretIcon = useDirection() === "rtl" ? CaretLeftIcon : CaretRightIcon;
+  var corners = stackEdgeRadius(knobProps.borderRadius.borderRadius, {
+    start: stackStart,
+    end: stackEnd
+  });
+  var iconSize = groupIconSize(String(knobProps.sizeToken));
+  var metaSize = (_groupMetaSizeMap_knobProps_sizeToken = groupMetaSizeMap[knobProps.sizeToken]) !== null && _groupMetaSizeMap_knobProps_sizeToken !== void 0 ? _groupMetaSizeMap_knobProps_sizeToken : "$3";
+  var indent = groupIndent(knobProps.space, level);
+  var label = group.value == null || group.value === "" ? "No Value" : String(group.value);
+  var countLabel = `${formatNumber(group.count, {
+    maximumFractionDigits: 0
+  })} item${group.count !== 1 ? "s" : ""}`;
   if (renderCustomHeader) {
     return /* @__PURE__ */_jsx(View, {
       children: renderCustomHeader(group, level)
     });
   }
   return /* @__PURE__ */_jsxs(XStack, {
-    ...knobProps.borderRadius,
+    ...corners,
+    ...startRail,
     alignItems: "center",
+    gap: "$2",
+    minHeight: 44,
     padding: (_groupHeaderPaddingMap_knobProps_space = groupHeaderPaddingMap[knobProps.space]) !== null && _groupHeaderPaddingMap_knobProps_space !== void 0 ? _groupHeaderPaddingMap_knobProps_space : "$3",
-    // SF-CONTROL fill tier: filled keeps the previous $color2; outlined
-    // flips to transparent (InputParts pattern, spec:388-392).
     backgroundColor: knobProps.inputBackground,
-    // Logical start accent so the group rail mirrors in RTL; tamagui
-    // borderStartWidth does not compile to working CSS on web (SB-M-1215).
-    ...(isWeb ? {
-      borderInlineStartWidth: 4,
-      borderInlineStartStyle: "solid",
-      borderInlineStartColor: "$color6"
-    } : {
-      borderStartWidth: 4,
-      borderStartColor: "$color6"
-    }),
+    overflow: "hidden",
     cursor: "pointer",
     hoverStyle: {
-      backgroundColor: level === 0 ? "$accentBackground" : {
-        backgroundColor: "$color2"
-      }.backgroundColor
+      backgroundColor: "$backgroundHover",
+      ...corners
+    },
+    pressStyle: {
+      backgroundColor: "$backgroundPress",
+      ...corners
     },
     onPress: onToggleExpansion,
-    // Keyboard + AT contract: the header is a toggle button with an
-    // expanded state; Enter/Space activate it like the pointer does.
     role: "button",
     tabIndex: 0,
     "aria-expanded": isExpanded,
+    "aria-label": `${label}, ${countLabel}`,
+    outlineWidth: 0,
+    focusStyle: {
+      outlineWidth: 0
+    },
+    focusVisibleStyle: ensureFocusVisibleRing({
+      outlineOffset: -2
+    }),
     ...{
+      "data-testid": "data-table-group-header",
+      "data-group-position": position,
+      "data-stack-start": stackStart ? "true" : "false",
+      "data-stack-end": stackEnd ? "true" : "false",
       onKeyDown: function onKeyDown(e) {
         if (e.key === "Enter" || e.key === " ") {
           e.preventDefault();
@@ -211,50 +273,52 @@ function GroupHeader(param) {
         }
       }
     },
-    children: [/* Expansion Toggle */
-    /* @__PURE__ */_jsx(View, {
-      width: 20,
+    children: [/* @__PURE__ */_jsx(View, {
+      width: iconSize + 4,
       alignItems: "center",
+      marginInlineStart: indent,
       children: hasChildren && (isExpanded ? /* @__PURE__ */_jsx(CaretDownIcon, {
-        size: 16
+        size: iconSize
       }) : /* @__PURE__ */_jsx(CollapsedCaretIcon, {
-        size: 16
+        size: iconSize
       }))
-    }), /* Group Info */
-    /* @__PURE__ */_jsxs(YStack, {
+    }), /* @__PURE__ */_jsxs(XStack, {
       flex: 1,
+      alignItems: "center",
+      justifyContent: "space-between",
+      gap: "$3",
+      flexWrap: "wrap",
       children: [/* @__PURE__ */_jsxs(XStack, {
         alignItems: "center",
         gap: "$2",
+        flexShrink: 1,
+        minWidth: 0,
         children: [/* @__PURE__ */_jsx(Text, {
           fontSize: knobProps.sizeToken,
           fontWeight: "600",
-          children: (
-          /* Nullish/empty shows the placeholder; falsy-but-real values
-          like 0 and false render as themselves. */
-          group.value == null || group.value === "" ? "No Value" : String(group.value))
+          numberOfLines: 1,
+          children: label
         }), /* @__PURE__ */_jsxs(Text, {
-          fontSize: (_groupMetaSizeMap_knobProps_sizeToken = groupMetaSizeMap[knobProps.sizeToken]) !== null && _groupMetaSizeMap_knobProps_sizeToken !== void 0 ? _groupMetaSizeMap_knobProps_sizeToken : "$3",
+          fontSize: metaSize,
           color: "$color10",
-          children: ["(", group.count, " item", group.count !== 1 ? "s" : "", ")"]
+          children: ["(", countLabel, ")"]
         })]
-      }), /* Aggregations */
-      showAggregations && aggregations.length > 0 && /* @__PURE__ */_jsx(XStack, {
-        gap: "$4",
-        marginTop: "$2",
+      }), showAggregations && aggregations.length > 0 && /* @__PURE__ */_jsx(XStack, {
+        gap: "$3",
+        flexWrap: "wrap",
+        justifyContent: "flex-end",
         children: aggregations.map(function (agg, index) {
-          var _groupMetaSizeMap_knobProps_sizeToken2, _groupMetaSizeMap_knobProps_sizeToken1;
           var _group_aggregations_agg_column;
           return /* @__PURE__ */_jsxs(XStack, {
-            alignItems: "center",
+            alignItems: "baseline",
             gap: "$1",
-            children: [/* @__PURE__ */_jsxs(Text, {
-              fontSize: (_groupMetaSizeMap_knobProps_sizeToken2 = groupMetaSizeMap[knobProps.sizeToken]) !== null && _groupMetaSizeMap_knobProps_sizeToken2 !== void 0 ? _groupMetaSizeMap_knobProps_sizeToken2 : "$3",
+            children: [/* @__PURE__ */_jsx(Text, {
+              fontSize: metaSize,
               color: "$color10",
-              children: [agg.label || `${agg.function}(${agg.column})`, ":"]
+              children: `${agg.label || `${agg.function}(${agg.column})`}:`
             }), /* @__PURE__ */_jsx(Text, {
-              fontSize: (_groupMetaSizeMap_knobProps_sizeToken1 = groupMetaSizeMap[knobProps.sizeToken]) !== null && _groupMetaSizeMap_knobProps_sizeToken1 !== void 0 ? _groupMetaSizeMap_knobProps_sizeToken1 : "$3",
-              fontWeight: "500",
+              fontSize: metaSize,
+              fontWeight: "600",
               children: formatAggregateValue((_group_aggregations_agg_column = group.aggregations[agg.column]) === null || _group_aggregations_agg_column === void 0 ? void 0 : _group_aggregations_agg_column[agg.function], agg)
             })]
           }, index);
@@ -266,37 +330,61 @@ function GroupHeader(param) {
 function GroupItems(param) {
   var {
     items,
-    columns = []
+    columns = [],
+    level,
+    stackEnd
   } = param;
+  var _groupMetaSizeMap_knobProps_sizeToken;
   var {
     knobProps
   } = useResolvedKnobs();
+  var metaSize = (_groupMetaSizeMap_knobProps_sizeToken = groupMetaSizeMap[knobProps.sizeToken]) !== null && _groupMetaSizeMap_knobProps_sizeToken !== void 0 ? _groupMetaSizeMap_knobProps_sizeToken : "$3";
+  var indent = groupIndent(knobProps.space, level);
   return /* @__PURE__ */_jsx(YStack, {
     children: items.map(function (item, index) {
-      var _groupItemPaddingMap_knobProps_space, _groupMetaSizeMap_knobProps_sizeToken;
-      return /* @__PURE__ */_createElement(XStack, {
-        ...knobProps.borderRadius,
-        key: index,
-        padding: (_groupItemPaddingMap_knobProps_space = groupItemPaddingMap[knobProps.space]) !== null && _groupItemPaddingMap_knobProps_space !== void 0 ? _groupItemPaddingMap_knobProps_space : "$2",
-        paddingInlineStart: "$4",
-        backgroundColor: index % 2 === 0 ? "$background" : "$color2",
-        borderBottomWidth: 1,
-        borderBottomColor: "$borderColor"
-      }, columns.length > 0 ? columns.map(function (column, colIndex) {
-        var _groupMetaSizeMap_knobProps_sizeToken2;
-        var key = column.accessorKey || column.id || `col-${colIndex}`;
-        var value = item[key];
-        return /* @__PURE__ */_jsx(View, {
-          flex: 1,
-          children: /* @__PURE__ */_jsx(Text, {
-            fontSize: (_groupMetaSizeMap_knobProps_sizeToken2 = groupMetaSizeMap[knobProps.sizeToken]) !== null && _groupMetaSizeMap_knobProps_sizeToken2 !== void 0 ? _groupMetaSizeMap_knobProps_sizeToken2 : "$3",
-            children: String(value !== null && value !== void 0 ? value : "")
+      var _groupItemPaddingMap_knobProps_space;
+      var position = getGroupPosition(index, items.length);
+      var isLast = position === "last" || position === "only";
+      var corners = stackEdgeRadius(knobProps.borderRadius.borderRadius, {
+        start: false,
+        end: stackEnd && isLast
+      });
+      return /* @__PURE__ */_jsxs(YStack, {
+        children: [index > 0 ? /* @__PURE__ */_jsx(View, {
+          ...hairline.line
+        }) : null, /* @__PURE__ */_jsx(XStack, {
+          ...corners,
+          padding: (_groupItemPaddingMap_knobProps_space = groupItemPaddingMap[knobProps.space]) !== null && _groupItemPaddingMap_knobProps_space !== void 0 ? _groupItemPaddingMap_knobProps_space : "$2",
+          paddingInlineStart: indent + 12,
+          overflow: "hidden",
+          backgroundColor: index % 2 === 0 ? "$background" : "$color2",
+          hoverStyle: {
+            backgroundColor: "$backgroundHover",
+            ...corners
+          },
+          ...{
+            "data-testid": "data-table-group-item",
+            "data-group-position": position,
+            "data-stack-end": stackEnd && isLast ? "true" : "false"
+          },
+          children: columns.length > 0 ? columns.map(function (column, colIndex) {
+            var key = column.accessorKey || column.id || `col-${colIndex}`;
+            var value = item[key];
+            return /* @__PURE__ */_jsx(View, {
+              flex: 1,
+              minWidth: 0,
+              children: /* @__PURE__ */_jsx(Text, {
+                fontSize: metaSize,
+                numberOfLines: 1,
+                children: formatCellValue(value)
+              })
+            }, key);
+          }) : /* @__PURE__ */_jsx(Text, {
+            fontSize: metaSize,
+            children: JSON.stringify(item, null, 2)
           })
-        }, key);
-      }) : /* @__PURE__ */_jsx(Text, {
-        fontSize: (_groupMetaSizeMap_knobProps_sizeToken = groupMetaSizeMap[knobProps.sizeToken]) !== null && _groupMetaSizeMap_knobProps_sizeToken !== void 0 ? _groupMetaSizeMap_knobProps_sizeToken : "$3",
-        children: JSON.stringify(item, null, 2)
-      }));
+        })]
+      }, index);
     })
   });
 }
@@ -306,8 +394,11 @@ function GroupFooter(param) {
     level,
     renderCustomFooter
   } = param;
+  var {
+    knobProps
+  } = useResolvedKnobs();
   return /* @__PURE__ */_jsx(View, {
-    marginInlineStart: level * 20,
+    paddingInlineStart: groupIndent(knobProps.space, level),
     children: renderCustomFooter(group, level)
   });
 }
@@ -373,6 +464,18 @@ function DataTableGroupingConfig(props) {
     };
     onConfigChange(newConfig);
   };
+  var handleMoveGroupBy = function handleMoveGroupBy2(index, direction) {
+    var next = [...currentConfig.columns];
+    var swap = index + direction;
+    if (swap < 0 || swap >= next.length) return;
+    [next[index], next[swap]] = [next[swap], next[index]];
+    onConfigChange({
+      ...currentConfig,
+      columns: next
+    });
+  };
+  var iconSize = groupIconSize(String(sz));
+  var radius = knobProps.borderRadius.borderRadius;
   return (
     // LC-06/LC-10: collision handling — the config list grows with every
     // group-by/aggregation added and must clamp + scroll inside the viewport
@@ -390,7 +493,7 @@ function DataTableGroupingConfig(props) {
           size: knobProps.sizeToken,
           variant: "outlined",
           icon: /* @__PURE__ */_jsx(GearIcon, {
-            size: 16
+            size: iconSize
           }),
           disabled,
           "aria-label": "Grouping configuration",
@@ -398,26 +501,22 @@ function DataTableGroupingConfig(props) {
             alignItems: "center",
             gap: "$2",
             children: [/* @__PURE__ */_jsx(ChartBarIcon, {
-              size: 16
+              size: iconSize
             }), /* @__PURE__ */_jsx(Text, {
               children: "Group & Aggregate"
             }), (currentConfig.columns.length > 0 || currentConfig.aggregations.length > 0) && /* @__PURE__ */_jsx(View, {
               backgroundColor: "$color6",
-              borderRadius: knobProps.borderRadius.borderRadius,
+              borderRadius: 1e3,
               paddingHorizontal: "$1",
               paddingVertical: 2,
               minWidth: 20,
               alignItems: "center",
-              children: (
-              /* LC-05/DG-COL-01: theme ink, not a named hue — "white" was
-              unreadable on the light-scheme $color6 badge fill. */
-              /* @__PURE__ */
-              _jsx(Text, {
+              children: /* @__PURE__ */_jsx(Text, {
                 fontSize: "$2",
                 color: "$color12",
                 fontWeight: "600",
                 children: currentConfig.columns.length + currentConfig.aggregations.length
-              }))
+              })
             })]
           })
         })
@@ -425,6 +524,7 @@ function DataTableGroupingConfig(props) {
         ...knobProps.borderRadius,
         borderWidth: 1,
         borderColor: "$borderColor",
+        // LC-24: enter/exit styles are dead code without a resolved token
         transition: knobProps.transition,
         enterStyle: {
           x: 0,
@@ -466,31 +566,69 @@ function DataTableGroupingConfig(props) {
                 })]
               }), /* Current Group By Columns */
               /* @__PURE__ */_jsx(YStack, {
-                gap: "$1",
                 children: currentConfig.columns.map(function (columnKey, index) {
                   var column = columns.find(function (col) {
                     return (col.accessorKey || col.id) === columnKey;
                   });
-                  return /* @__PURE__ */_jsxs(XStack, {
-                    alignItems: "center",
-                    gap: "$2",
-                    padding: "$2",
-                    backgroundColor: "$color2",
-                    borderRadius: knobProps.borderRadius.borderRadius,
-                    children: [/* @__PURE__ */_jsxs(Text, {
-                      fontSize: "$3",
-                      flex: 1,
-                      children: [(column === null || column === void 0 ? void 0 : column.header) || columnKey, " (", index + 1, ")"]
-                    }), /* @__PURE__ */_jsx(Button, {
-                      size: knobProps.sizeToken,
-                      variant: "outlined",
-                      icon: /* @__PURE__ */_jsx(MinusIcon, {
-                        size: 16
-                      }),
-                      onPress: function onPress() {
-                        return handleRemoveGroupBy(columnKey);
+                  var position = getGroupPosition(index, currentConfig.columns.length);
+                  var corners = stackRadiusProps(position, radius);
+                  var label = String((column === null || column === void 0 ? void 0 : column.header) || columnKey);
+                  return /* @__PURE__ */_jsxs(YStack, {
+                    children: [index > 0 ? /* @__PURE__ */_jsx(View, {
+                      ...hairline.line
+                    }) : null, /* @__PURE__ */_jsxs(XStack, {
+                      alignItems: "center",
+                      gap: "$2",
+                      padding: "$2",
+                      overflow: "hidden",
+                      backgroundColor: "$color2",
+                      ...corners,
+                      hoverStyle: {
+                        backgroundColor: "$backgroundHover",
+                        ...corners
                       },
-                      "aria-label": `Remove grouping by ${(column === null || column === void 0 ? void 0 : column.header) || columnKey}`
+                      ...{
+                        "data-group-position": position
+                      },
+                      children: [/* @__PURE__ */_jsx(Text, {
+                        fontSize: "$3",
+                        flex: 1,
+                        numberOfLines: 1,
+                        children: `${label} \xB7 ${index + 1}`
+                      }), /* @__PURE__ */_jsx(Button, {
+                        size: "$2",
+                        variant: "outlined",
+                        icon: /* @__PURE__ */_jsx(ArrowUpIcon, {
+                          size: iconSize
+                        }),
+                        disabled: disabled || index === 0,
+                        onPress: function onPress() {
+                          return handleMoveGroupBy(index, -1);
+                        },
+                        "aria-label": `Move ${label} up`
+                      }), /* @__PURE__ */_jsx(Button, {
+                        size: "$2",
+                        variant: "outlined",
+                        icon: /* @__PURE__ */_jsx(ArrowDownIcon, {
+                          size: iconSize
+                        }),
+                        disabled: disabled || index === currentConfig.columns.length - 1,
+                        onPress: function onPress() {
+                          return handleMoveGroupBy(index, 1);
+                        },
+                        "aria-label": `Move ${label} down`
+                      }), /* @__PURE__ */_jsx(Button, {
+                        size: "$2",
+                        variant: "outlined",
+                        icon: /* @__PURE__ */_jsx(MinusIcon, {
+                          size: iconSize
+                        }),
+                        disabled,
+                        onPress: function onPress() {
+                          return handleRemoveGroupBy(columnKey);
+                        },
+                        "aria-label": `Remove grouping by ${label}`
+                      })]
                     })]
                   }, columnKey);
                 })
@@ -530,30 +668,45 @@ function DataTableGroupingConfig(props) {
                 })]
               }), /* Current Aggregations */
               /* @__PURE__ */_jsx(YStack, {
-                gap: "$1",
                 children: currentConfig.aggregations.map(function (agg, index) {
-                  return /* @__PURE__ */_jsxs(XStack, {
-                    alignItems: "center",
-                    gap: "$2",
-                    padding: "$2",
-                    backgroundColor: "$color2",
-                    borderRadius: knobProps.borderRadius.borderRadius,
-                    children: [/* @__PURE__ */_jsxs(Text, {
-                      fontSize: "$3",
-                      flex: 1,
-                      children: [agg.function, "(", agg.column, ")", agg.label && ` as "${agg.label}"`]
-                    }), /* @__PURE__ */_jsx(Button, {
-                      size: knobProps.sizeToken,
-                      variant: "outlined",
-                      icon: /* @__PURE__ */_jsx(MinusIcon, {
-                        size: 16
-                      }),
-                      onPress: function onPress() {
-                        return handleRemoveAggregation(index);
+                  var position = getGroupPosition(index, currentConfig.aggregations.length);
+                  var corners = stackRadiusProps(position, radius);
+                  return /* @__PURE__ */_jsxs(YStack, {
+                    children: [index > 0 ? /* @__PURE__ */_jsx(View, {
+                      ...hairline.line
+                    }) : null, /* @__PURE__ */_jsxs(XStack, {
+                      alignItems: "center",
+                      gap: "$2",
+                      padding: "$2",
+                      overflow: "hidden",
+                      backgroundColor: "$color2",
+                      ...corners,
+                      hoverStyle: {
+                        backgroundColor: "$backgroundHover",
+                        ...corners
+                      },
+                      ...{
+                        "data-group-position": position
                       },
-                      "aria-label": `Remove ${agg.function} aggregation on ${agg.column}`
+                      children: [/* @__PURE__ */_jsxs(Text, {
+                        fontSize: "$3",
+                        flex: 1,
+                        numberOfLines: 1,
+                        children: [agg.function, "(", agg.column, ")", agg.label && ` as "${agg.label}"`]
+                      }), /* @__PURE__ */_jsx(Button, {
+                        size: "$2",
+                        variant: "outlined",
+                        icon: /* @__PURE__ */_jsx(MinusIcon, {
+                          size: iconSize
+                        }),
+                        disabled,
+                        onPress: function onPress() {
+                          return handleRemoveAggregation(index);
+                        },
+                        "aria-label": `Remove ${agg.function} aggregation on ${agg.column}`
+                      })]
                     })]
-                  }, index);
+                  }, `${agg.function}-${agg.column}-${index}`);
                 })
               }), /* Add Aggregation */
               /* @__PURE__ */_jsx(AggregationSelector, {