@multiplatform.one/table 6.0.4 → 6.3.0

package/dist/jsx/components/DataTableGrouping/index.mjs

@@ -1,14 +1,32 @@
-import { ChartBarIcon, CalculatorIcon, CaretDownIcon, CaretRightIcon, CaretUpIcon, HashIcon, MinusIcon, PlusIcon, GearIcon } from "@phosphor-icons/react";
+import { ChartBarIcon, CalculatorIcon, CaretDownIcon, CaretLeftIcon, CaretRightIcon, CaretUpIcon, HashIcon, MinusIcon, PlusIcon, GearIcon } from "@phosphor-icons/react";
+import { useDirection } from "@multiplatform.one/components";
 import { 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 } from "tamagui";
+import { Popover, Separator, Text, View, XStack, YStack, isWeb } from "tamagui";
+import { getViewLeafRows } from "../../utils/viewData.mjs";
 import { useDataTableState } from "../DataTable/DataTableStateContext.mjs";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { createElement } from "react";
+const EMPTY_EXPANDED_GROUPS = /* @__PURE__ */new Set();
+const groupHeaderPaddingMap = {
+  small: "$2",
+  medium: "$3",
+  large: "$4"
+};
+const groupItemPaddingMap = {
+  small: "$1",
+  medium: "$2",
+  large: "$3"
+};
+const groupMetaSizeMap = {
+  $3: "$2",
+  $4: "$3",
+  $5: "$4"
+};
 function DataTableGrouping(props) {
   const ctx = useDataTableState();
-  const data = props.data ?? ctx?.computed.filteredData ?? [];
+  const data = props.data ?? (ctx ? getViewLeafRows(ctx.table) : []);
   const columns = props.columns ?? (ctx ? ctx.table.getAllColumns().map(col => ({
     id: col.id,
     accessorKey: col.id,
@@ -20,10 +38,13 @@ function DataTableGrouping(props) {
     renderGroupHeader,
     renderGroupFooter,
     showAggregations = true,
-    expandedGroups = /* @__PURE__ */new Set(),
+    expandedGroups: expandedGroupsProp,
     onExpandedGroupsChange,
     maxDepth = 5
   } = props;
+  const isExpansionControlled = onExpandedGroupsChange != null;
+  const [internalExpandedGroups, setInternalExpandedGroups] = useState(() => new Set(expandedGroupsProp));
+  const expandedGroups = isExpansionControlled ? expandedGroupsProp ?? EMPTY_EXPANDED_GROUPS : internalExpandedGroups;
   const groupedData = useMemo(() => {
     if (!groupBy.length) return null;
     return groupData(data, groupBy, aggregations, maxDepth);
@@ -35,8 +56,12 @@ function DataTableGrouping(props) {
     } else {
       newExpanded.add(groupKey);
     }
-    onExpandedGroupsChange?.(newExpanded);
-  }, [expandedGroups, onExpandedGroupsChange]);
+    if (isExpansionControlled) {
+      onExpandedGroupsChange?.(newExpanded);
+    } else {
+      setInternalExpandedGroups(newExpanded);
+    }
+  }, [expandedGroups, isExpansionControlled, onExpandedGroupsChange]);
   if (!groupedData) return null;
   return /* @__PURE__ */jsx(GroupedDataRenderer, {
     groupedData,
@@ -65,19 +90,19 @@ function GroupedDataRenderer({
     children: groupedData.map(group => {
       const groupKey = getGroupKey(group);
       const isExpanded = expandedGroups.has(groupKey);
-      const hasChildren = group.children && group.children.length > 0;
+      const isExpandable = (group.children?.length ?? 0) > 0 || group.items.length > 0;
       return /* @__PURE__ */jsxs(YStack, {
         children: [/* @__PURE__ */jsx(GroupHeader, {
           group,
           level,
           isExpanded,
-          hasChildren: !!hasChildren,
+          hasChildren: isExpandable,
           aggregations,
           showAggregations: showAggregations ?? true,
           onToggleExpansion: () => onToggleExpansion(groupKey),
           renderCustomHeader: renderGroupHeader
         }), isExpanded && /* @__PURE__ */jsx(YStack, {
-          marginLeft: level * 20,
+          marginInlineStart: level * 20,
           children: group.children && group.children.length > 0 ? /* @__PURE__ */jsx(GroupedDataRenderer, {
             groupedData: group.children,
             columns,
@@ -114,6 +139,7 @@ function GroupHeader({
   const {
     knobProps
   } = useResolvedKnobs();
+  const CollapsedCaretIcon = useDirection() === "rtl" ? CaretLeftIcon : CaretRightIcon;
   if (renderCustomHeader) {
     return /* @__PURE__ */jsx(View, {
       children: renderCustomHeader(group, level)
@@ -122,12 +148,16 @@ function GroupHeader({
   return /* @__PURE__ */jsxs(XStack, {
     ...knobProps.borderRadius,
     alignItems: "center",
-    padding: "$3",
-    ...{
-      backgroundColor: "$color2"
-    },
-    borderLeftWidth: 4,
-    borderLeftColor: "$color6",
+    padding: groupHeaderPaddingMap[knobProps.space] ?? "$3",
+    backgroundColor: knobProps.inputBackground,
+    ...(isWeb ? {
+      borderInlineStartWidth: 4,
+      borderInlineStartStyle: "solid",
+      borderInlineStartColor: "$color6"
+    } : {
+      borderStartWidth: 4,
+      borderStartColor: "$color6"
+    }),
     cursor: "pointer",
     hoverStyle: {
       backgroundColor: level === 0 ? "$accentBackground" : {
@@ -135,12 +165,23 @@ function GroupHeader({
       }.backgroundColor
     },
     onPress: onToggleExpansion,
+    role: "button",
+    tabIndex: 0,
+    "aria-expanded": isExpanded,
+    ...{
+      onKeyDown: e => {
+        if (e.key === "Enter" || e.key === " ") {
+          e.preventDefault();
+          onToggleExpansion();
+        }
+      }
+    },
     children: [/* @__PURE__ */jsx(View, {
       width: 20,
       alignItems: "center",
       children: hasChildren && (isExpanded ? /* @__PURE__ */jsx(CaretDownIcon, {
         size: 16
-      }) : /* @__PURE__ */jsx(CaretRightIcon, {
+      }) : /* @__PURE__ */jsx(CollapsedCaretIcon, {
         size: 16
       }))
     }), /* @__PURE__ */jsxs(YStack, {
@@ -149,11 +190,11 @@ function GroupHeader({
         alignItems: "center",
         gap: "$2",
         children: [/* @__PURE__ */jsx(Text, {
-          fontSize: "$4",
+          fontSize: knobProps.sizeToken,
           fontWeight: "600",
-          children: group.value || "No Value"
+          children: group.value == null || group.value === "" ? "No Value" : String(group.value)
         }), /* @__PURE__ */jsxs(Text, {
-          fontSize: "$3",
+          fontSize: groupMetaSizeMap[knobProps.sizeToken] ?? "$3",
           color: "$color10",
           children: ["(", group.count, " item", group.count !== 1 ? "s" : "", ")"]
         })]
@@ -164,11 +205,11 @@ function GroupHeader({
           alignItems: "center",
           gap: "$1",
           children: [/* @__PURE__ */jsxs(Text, {
-            fontSize: "$3",
+            fontSize: groupMetaSizeMap[knobProps.sizeToken] ?? "$3",
             color: "$color10",
             children: [agg.label || `${agg.function}(${agg.column})`, ":"]
           }), /* @__PURE__ */jsx(Text, {
-            fontSize: "$3",
+            fontSize: groupMetaSizeMap[knobProps.sizeToken] ?? "$3",
             fontWeight: "500",
             children: group.aggregations[agg.column]?.[agg.function] || 0
           })]
@@ -188,8 +229,8 @@ function GroupItems({
     children: items.map((item, index) => /* @__PURE__ */createElement(XStack, {
       ...knobProps.borderRadius,
       key: index,
-      padding: "$2",
-      paddingLeft: "$4",
+      padding: groupItemPaddingMap[knobProps.space] ?? "$2",
+      paddingInlineStart: "$4",
       backgroundColor: index % 2 === 0 ? "$background" : "$color2",
       borderBottomWidth: 1,
       borderBottomColor: "$borderColor"
@@ -199,12 +240,12 @@ function GroupItems({
       return /* @__PURE__ */jsx(View, {
         flex: 1,
         children: /* @__PURE__ */jsx(Text, {
-          fontSize: "$3",
+          fontSize: groupMetaSizeMap[knobProps.sizeToken] ?? "$3",
           children: String(value ?? "")
         })
       }, key);
     }) : /* @__PURE__ */jsx(Text, {
-      fontSize: "$3",
+      fontSize: groupMetaSizeMap[knobProps.sizeToken] ?? "$3",
       children: JSON.stringify(item, null, 2)
     })))
   });
@@ -215,7 +256,7 @@ function GroupFooter({
   renderCustomFooter
 }) {
   return /* @__PURE__ */jsx(View, {
-    marginLeft: level * 20,
+    marginInlineStart: level * 20,
     children: renderCustomFooter(group, level)
   });
 }
@@ -274,180 +315,194 @@ function DataTableGroupingConfig(props) {
     };
     onConfigChange(newConfig);
   };
-  return /* @__PURE__ */jsxs(Popover, {
-    open: isOpen,
-    onOpenChange: setIsOpen,
-    children: [/* @__PURE__ */jsx(Popover.Trigger, {
-      asChild: true,
-      children: /* @__PURE__ */jsx(Button, {
-        size: knobProps.sizeToken,
-        variant: "outlined",
-        icon: /* @__PURE__ */jsx(GearIcon, {
-          size: 16
-        }),
-        disabled,
-        "aria-label": "Grouping configuration",
-        children: /* @__PURE__ */jsxs(XStack, {
-          alignItems: "center",
-          gap: "$2",
-          children: [/* @__PURE__ */jsx(ChartBarIcon, {
+  return (
+    // LC-06/LC-10: collision handling — the config list grows with every
+    // group-by/aggregation added and must clamp + scroll inside the viewport
+    // instead of painting rows past the fold (same fix as the export popover).
+    /* @__PURE__ */
+    jsxs(Popover, {
+      open: isOpen,
+      onOpenChange: setIsOpen,
+      stayInFrame: true,
+      allowFlip: true,
+      resize: true,
+      children: [/* @__PURE__ */jsx(Popover.Trigger, {
+        asChild: true,
+        children: /* @__PURE__ */jsx(Button, {
+          size: knobProps.sizeToken,
+          variant: "outlined",
+          icon: /* @__PURE__ */jsx(GearIcon, {
             size: 16
-          }), /* @__PURE__ */jsx(Text, {
-            children: "Group & Aggregate"
-          }), (currentConfig.columns.length > 0 || currentConfig.aggregations.length > 0) && /* @__PURE__ */jsx(View, {
-            backgroundColor: "$color6",
-            borderRadius: knobProps.borderRadius.borderRadius,
-            paddingHorizontal: "$1",
-            paddingVertical: 2,
-            minWidth: 20,
+          }),
+          disabled,
+          "aria-label": "Grouping configuration",
+          children: /* @__PURE__ */jsxs(XStack, {
             alignItems: "center",
-            children: /* @__PURE__ */jsx(Text, {
-              fontSize: "$2",
-              color: "white",
-              fontWeight: "600",
-              children: currentConfig.columns.length + currentConfig.aggregations.length
-            })
-          })]
+            gap: "$2",
+            children: [/* @__PURE__ */jsx(ChartBarIcon, {
+              size: 16
+            }), /* @__PURE__ */jsx(Text, {
+              children: "Group & Aggregate"
+            }), (currentConfig.columns.length > 0 || currentConfig.aggregations.length > 0) && /* @__PURE__ */jsx(View, {
+              backgroundColor: "$color6",
+              borderRadius: knobProps.borderRadius.borderRadius,
+              paddingHorizontal: "$1",
+              paddingVertical: 2,
+              minWidth: 20,
+              alignItems: "center",
+              children: /* @__PURE__ */jsx(Text, {
+                fontSize: "$2",
+                color: "$color12",
+                fontWeight: "600",
+                children: currentConfig.columns.length + currentConfig.aggregations.length
+              })
+            })]
+          })
         })
-      })
-    }), /* @__PURE__ */jsx(Popover.Content, {
-      ...knobProps.borderRadius,
-      borderWidth: 1,
-      borderColor: "$borderColor",
-      enterStyle: {
-        x: 0,
-        y: -10,
-        opacity: 0
-      },
-      exitStyle: {
-        x: 0,
-        y: -10,
-        opacity: 0
-      },
-      minWidth: popoverMinWidth,
-      maxWidth: popoverMaxWidth,
-      children: /* @__PURE__ */jsxs(YStack, {
-        ...knobProps.panelPadding,
-        gap: "$4",
-        children: [/* @__PURE__ */jsx(Text, {
-          fontSize: "$5",
-          fontWeight: "600",
-          children: "Grouping & Aggregation"
-        }), /* @__PURE__ */jsxs(YStack, {
-          gap: "$3",
-          children: [/* @__PURE__ */jsxs(XStack, {
-            justifyContent: "space-between",
-            alignItems: "center",
+      }), /* @__PURE__ */jsx(Popover.Content, {
+        ...knobProps.borderRadius,
+        borderWidth: 1,
+        borderColor: "$borderColor",
+        enterStyle: {
+          x: 0,
+          y: -10,
+          opacity: 0
+        },
+        exitStyle: {
+          x: 0,
+          y: -10,
+          opacity: 0
+        },
+        minWidth: popoverMinWidth,
+        maxWidth: popoverMaxWidth,
+        padding: 0,
+        overflow: "hidden",
+        children: /* @__PURE__ */jsx(Popover.ScrollView, {
+          minHeight: 0,
+          children: /* @__PURE__ */jsxs(YStack, {
+            ...knobProps.panelPadding,
+            gap: "$4",
             children: [/* @__PURE__ */jsx(Text, {
-              fontSize: "$4",
-              fontWeight: "500",
-              children: "Group By"
-            }), /* @__PURE__ */jsxs(Text, {
-              fontSize: "$2",
-              color: "$color10",
-              children: [currentConfig.columns.length, " selected"]
-            })]
-          }), /* @__PURE__ */jsx(YStack, {
-            gap: "$1",
-            children: currentConfig.columns.map((columnKey, index) => {
-              const column = columns.find(col => (col.accessorKey || col.id) === columnKey);
-              return /* @__PURE__ */jsxs(XStack, {
+              fontSize: "$5",
+              fontWeight: "600",
+              children: "Grouping & Aggregation"
+            }), /* @__PURE__ */jsxs(YStack, {
+              gap: "$3",
+              children: [/* @__PURE__ */jsxs(XStack, {
+                justifyContent: "space-between",
                 alignItems: "center",
+                children: [/* @__PURE__ */jsx(Text, {
+                  fontSize: "$4",
+                  fontWeight: "500",
+                  children: "Group By"
+                }), /* @__PURE__ */jsxs(Text, {
+                  fontSize: "$2",
+                  color: "$color10",
+                  children: [currentConfig.columns.length, " selected"]
+                })]
+              }), /* @__PURE__ */jsx(YStack, {
+                gap: "$1",
+                children: currentConfig.columns.map((columnKey, index) => {
+                  const column = columns.find(col => (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?.header || columnKey, " (", index + 1, ")"]
+                    }), /* @__PURE__ */jsx(Button, {
+                      size: knobProps.sizeToken,
+                      variant: "outlined",
+                      icon: /* @__PURE__ */jsx(MinusIcon, {
+                        size: 16
+                      }),
+                      onPress: () => handleRemoveGroupBy(columnKey),
+                      "aria-label": `Remove grouping by ${column?.header || columnKey}`
+                    })]
+                  }, columnKey);
+                })
+              }), availableColumns.length > 0 && /* @__PURE__ */jsxs(XStack, {
                 gap: "$2",
-                padding: "$2",
-                ...{
-                  backgroundColor: "$color2"
-                },
-                borderRadius: knobProps.borderRadius.borderRadius,
-                children: [/* @__PURE__ */jsxs(Text, {
+                children: [/* @__PURE__ */jsx(Text, {
                   fontSize: "$3",
-                  flex: 1,
-                  children: [column?.header || columnKey, " (", index + 1, ")"]
-                }), /* @__PURE__ */jsx(Button, {
-                  size: knobProps.sizeToken,
-                  variant: "outlined",
-                  icon: /* @__PURE__ */jsx(MinusIcon, {
-                    size: 16
-                  }),
-                  onPress: () => handleRemoveGroupBy(columnKey),
-                  "aria-label": `Remove grouping by ${column?.header || columnKey}`
+                  color: "$color10",
+                  children: "Add:"
+                }), availableColumns.slice(0, 3).map(column => {
+                  const key = column.accessorKey || column.id || "";
+                  return /* @__PURE__ */jsx(Button, {
+                    size: "$2",
+                    variant: "outlined",
+                    onPress: () => handleAddGroupBy(key),
+                    children: column.header || key
+                  }, key);
                 })]
-              }, columnKey);
-            })
-          }), availableColumns.length > 0 && /* @__PURE__ */jsxs(XStack, {
-            gap: "$2",
-            children: [/* @__PURE__ */jsx(Text, {
-              fontSize: "$3",
-              color: "$color10",
-              children: "Add:"
-            }), availableColumns.slice(0, 3).map(column => {
-              const key = column.accessorKey || column.id || "";
-              return /* @__PURE__ */jsx(Button, {
-                size: "$2",
-                variant: "outlined",
-                onPress: () => handleAddGroupBy(key),
-                children: column.header || key
-              }, key);
-            })]
-          })]
-        }), /* @__PURE__ */jsx(Separator, {}), /* @__PURE__ */jsxs(YStack, {
-          gap: "$3",
-          children: [/* @__PURE__ */jsxs(XStack, {
-            justifyContent: "space-between",
-            alignItems: "center",
-            children: [/* @__PURE__ */jsx(Text, {
-              fontSize: "$4",
-              fontWeight: "500",
-              children: "Aggregations"
-            }), /* @__PURE__ */jsxs(Text, {
-              fontSize: "$2",
-              color: "$color10",
-              children: [currentConfig.aggregations.length, " configured"]
-            })]
-          }), /* @__PURE__ */jsx(YStack, {
-            gap: "$1",
-            children: currentConfig.aggregations.map((agg, index) => /* @__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, {
+              })]
+            }), /* @__PURE__ */jsx(Separator, {}), /* @__PURE__ */jsxs(YStack, {
+              gap: "$3",
+              children: [/* @__PURE__ */jsxs(XStack, {
+                justifyContent: "space-between",
+                alignItems: "center",
+                children: [/* @__PURE__ */jsx(Text, {
+                  fontSize: "$4",
+                  fontWeight: "500",
+                  children: "Aggregations"
+                }), /* @__PURE__ */jsxs(Text, {
+                  fontSize: "$2",
+                  color: "$color10",
+                  children: [currentConfig.aggregations.length, " configured"]
+                })]
+              }), /* @__PURE__ */jsx(YStack, {
+                gap: "$1",
+                children: currentConfig.aggregations.map((agg, index) => /* @__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: () => handleRemoveAggregation(index),
+                    "aria-label": `Remove ${agg.function} aggregation on ${agg.column}`
+                  })]
+                }, index))
+              }), /* @__PURE__ */jsx(AggregationSelector, {
+                columns: aggregatableColumns,
+                onAddAggregation: handleAddAggregation
+              })]
+            }), (currentConfig.columns.length > 0 || currentConfig.aggregations.length > 0) && /* @__PURE__ */jsxs(Fragment, {
+              children: [/* @__PURE__ */jsx(Separator, {}), /* @__PURE__ */jsx(Button, {
                 size: knobProps.sizeToken,
                 variant: "outlined",
-                icon: /* @__PURE__ */jsx(MinusIcon, {
-                  size: 16
+                error: true,
+                onPress: () => onConfigChange({
+                  columns: [],
+                  aggregations: []
                 }),
-                onPress: () => handleRemoveAggregation(index),
-                "aria-label": `Remove ${agg.function} aggregation on ${agg.column}`
+                "aria-label": "Clear all grouping and aggregation",
+                children: "Clear All Grouping"
               })]
-            }, index))
-          }), /* @__PURE__ */jsx(AggregationSelector, {
-            columns: aggregatableColumns,
-            onAddAggregation: handleAddAggregation
-          })]
-        }), (currentConfig.columns.length > 0 || currentConfig.aggregations.length > 0) && /* @__PURE__ */jsxs(Fragment, {
-          children: [/* @__PURE__ */jsx(Separator, {}), /* @__PURE__ */jsx(Button, {
-            size: knobProps.sizeToken,
-            variant: "outlined",
-            theme: "red",
-            onPress: () => onConfigChange({
-              columns: [],
-              aggregations: []
-            }),
-            "aria-label": "Clear all grouping and aggregation",
-            children: "Clear All Grouping"
-          })]
-        })]
-      })
-    })]
-  });
+            })]
+          })
+        })
+      })]
+    })
+  );
 }
 function AggregationSelector({
   columns,
@@ -560,7 +615,7 @@ function groupData(data, groupByColumns, aggregations, maxDepth = 5) {
   const grouped = /* @__PURE__ */new Map();
   data.forEach(item => {
     const firstGroupValue = item[groupByColumns[0]];
-    const key = String(firstGroupValue || "null");
+    const key = String(firstGroupValue ?? "null");
     if (!grouped.has(key)) {
       grouped.set(key, {
         items: [],
@@ -597,12 +652,14 @@ function groupData(data, groupByColumns, aggregations, maxDepth = 5) {
           }
         case "min":
           {
-            aggregationsResult[agg.column].min = values.length > 0 ? Math.min(...values.map(Number)) : 0;
+            const nums = values.map(Number).filter(Number.isFinite);
+            aggregationsResult[agg.column].min = nums.length > 0 ? Math.min(...nums) : 0;
             break;
           }
         case "max":
           {
-            aggregationsResult[agg.column].max = values.length > 0 ? Math.max(...values.map(Number)) : 0;
+            const nums = values.map(Number).filter(Number.isFinite);
+            aggregationsResult[agg.column].max = nums.length > 0 ? Math.max(...nums) : 0;
             break;
           }
         case "custom":