Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix(table-grouped): polish template layout, grouping, and column widths (#2156)

Ernest28b92df9a293
diff --git a/packages/cli/templates/pages/table-grouped/page.tsx b/packages/cli/templates/pages/table-grouped/page.tsx
index ccf9444081..35fabc727b 100644
--- a/packages/cli/templates/pages/table-grouped/page.tsx
+++ b/packages/cli/templates/pages/table-grouped/page.tsx
@@ -1,6 +1,8 @@
'use client';
import React, {useState, useMemo} from 'react';
+import {useXDSResizable, XDSResizeHandle} from '@xds/core/Resizable';
+import type {ResizableProps} from '@xds/core/Resizable';
import * as stylex from '@stylexjs/stylex';
import {XDSAppShell} from '@xds/core/AppShell';
import {
@@ -12,6 +14,8 @@ import {
import {
XDSLayout,
XDSLayoutContent,
+ XDSLayoutFooter,
+ XDSLayoutHeader,
XDSLayoutPanel,
XDSVStack,
XDSHStack,
@@ -26,6 +30,8 @@ import {XDSSelector} from '@xds/core/Selector';
import {XDSPowerSearch} from '@xds/core/PowerSearch';
import type {PowerSearchConfig, PowerSearchFilter} from '@xds/core/PowerSearch';
import {XDSDialog, XDSDialogHeader} from '@xds/core/Dialog';
+import {XDSPopover} from '@xds/core/Popover';
+import {XDSRadioList, XDSRadioListItem} from '@xds/core/RadioList';
import {XDSDropdownMenu} from '@xds/core/DropdownMenu';
import {XDSCenter} from '@xds/core/Center';
import {XDSIcon} from '@xds/core/Icon';
@@ -40,6 +46,7 @@ import {
XDSTableCell,
proportional,
pixel,
+ resolveColumnWidths,
} from '@xds/core/Table';
import type {XDSTableColumn} from '@xds/core/Table';
import {
@@ -76,6 +83,12 @@ const pageStyles = stylex.create({
groupHeaderRow: {
cursor: 'pointer',
backgroundColor: 'var(--color-background-muted)',
+ borderBottomWidth: 1,
+ borderBottomStyle: 'solid',
+ borderBottomColor: 'var(--color-border)',
+ },
+ headerRow: {
+ paddingBottom: 'var(--spacing-4)',
},
groupHeaderCell: {
padding: 'var(--spacing-3) var(--spacing-4)',
@@ -597,11 +610,52 @@ const STATUS_LABEL: Record<TaskStatus, string> = {
const GROUP_ORDER: TaskStatus[] = ['in_progress', 'todo', 'backlog', 'done'];
+type GroupByField = 'status' | 'priority' | 'project' | 'assignee' | 'none';
+
+const GROUP_BY_OPTIONS: {value: GroupByField; label: string}[] = [
+ {value: 'none', label: 'None'},
+ {value: 'status', label: 'Status'},
+ {value: 'priority', label: 'Priority'},
+ {value: 'project', label: 'Project'},
+ {value: 'assignee', label: 'Assignee'},
+];
+
+function groupTasks(
+ tasks: TaskRow[],
+ groupBy: GroupByField,
+): Map<string, TaskRow[]> {
+ if (groupBy === 'none') {
+ return new Map([['All', tasks]]);
+ }
+ const map = new Map<string, TaskRow[]>();
+ for (const task of tasks) {
+ const key = String(task[groupBy]) || '—';
+ if (!map.has(key)) map.set(key, []);
+ map.get(key)!.push(task);
+ }
+ return map;
+}
+
+function getGroupLabel(groupBy: GroupByField, key: string): string {
+ if (groupBy === 'status') return STATUS_LABEL[key as TaskStatus] ?? key;
+ if (groupBy === 'priority') {
+ const labels: Record<string, string> = {
+ urgent: 'Urgent',
+ high: 'High',
+ medium: 'Medium',
+ low: 'Low',
+ none: 'No priority',
+ };
+ return labels[key] ?? key;
+ }
+ return key;
+}
+
const columns: XDSTableColumn<TaskRow>[] = [
{
key: 'status',
header: '',
- width: pixel(48),
+ width: pixel(44),
},
{
key: 'title',
@@ -611,23 +665,27 @@ const columns: XDSTableColumn<TaskRow>[] = [
{
key: 'project',
header: 'Project',
+ width: pixel(180),
},
{
key: 'created',
header: 'Created',
+ width: pixel(72),
},
{
key: 'updated',
header: 'Updated',
+ width: pixel(72),
},
{
key: 'assignee',
header: 'Assignee',
+ width: pixel(52),
},
{
key: 'actions',
header: '',
- width: pixel(48),
+ width: pixel(56),
},
];
@@ -809,15 +867,17 @@ const PRIORITY_LABEL: Record<TaskPriority, string> = {
function TaskDetailPanel({
task,
onClose,
+ resizable,
}: {
task: TaskRow | null;
onClose: () => void;
+ resizable: ResizableProps;
}) {
if (!task) return null;
return (
<XDSLayoutPanel
hasDivider
- width={360}
+ resizable={resizable}
padding={4}
role="complementary"
label="Task details">
@@ -907,12 +967,12 @@ export default function DataTableTemplate() {
const [priorityFilter, setPriorityFilter] = useState('all');
const [dialogOpen, setDialogOpen] = useState(false);
const [selectedTask, setSelectedTask] = useState<TaskRow | null>(null);
- const [isAdvancedFilter, setIsAdvancedFilter] = useState(false);
const [powerSearchFilters, setPowerSearchFilters] = useState<
ReadonlyArray<PowerSearchFilter>
>([]);
- const [expandedGroups, setExpandedGroups] = useState<Set<TaskStatus>>(
- () => new Set(GROUP_ORDER),
+ const [groupBy, setGroupBy] = useState<GroupByField>('status');
+ const [expandedGroups, setExpandedGroups] = useState<Set<string>>(
+ () => new Set(GROUP_ORDER as string[]),
);
const filtered = useMemo(() => {
@@ -931,23 +991,34 @@ export default function DataTableTemplate() {
return data;
}, [search, priorityFilter]);
- const grouped = useMemo(() => {
- const map = new Map<TaskStatus, TaskRow[]>();
- for (const status of GROUP_ORDER) map.set(status, []);
- for (const task of filtered) map.get(task.status)!.push(task);
- return map;
- }, [filtered]);
+ const grouped = useMemo(
+ () => groupTasks(filtered, groupBy),
+ [filtered, groupBy],
+ );
+
+ const groupKeys = useMemo(() => Array.from(grouped.keys()), [grouped]);
+
+ React.useEffect(() => {
+ setExpandedGroups(new Set(groupKeys));
+ }, [groupKeys]);
- const toggleGroup = (status: TaskStatus) => {
+ const toggleGroup = (key: string) => {
setExpandedGroups(prev => {
const next = new Set(prev);
- if (next.has(status)) next.delete(status);
- else next.add(status);
+ if (next.has(key)) next.delete(key);
+ else next.add(key);
return next;
});
};
+ const detailPanel = useXDSResizable({
+ defaultSize: 360,
+ minSizePx: 280,
+ maxSizePx: 500,
+ });
+
const COL_COUNT = columns.length;
+ const resolvedWidths = resolveColumnWidths(columns);
return (
<XDSAppShell
@@ -956,131 +1027,100 @@ export default function DataTableTemplate() {
contentPadding={0}>
<XDSLayout
height="fill"
- content={
- <XDSLayoutContent role="main" padding={4}>
- <XDSVStack gap={2}>
+ header={
+ <XDSLayoutHeader hasDivider padding={4}>
+ <XDSVStack gap={4}>
<XDSHStack gap={3} vAlign="center">
<XDSStackItem size="fill">
<XDSHeading level={1}>All Issues</XDSHeading>
</XDSStackItem>
<XDSButton
- label="+ Create issue"
+ label="Create issue"
variant="primary"
- size="sm"
+ size="lg"
onClick={() => setDialogOpen(true)}
/>
</XDSHStack>
+ <XDSHStack gap={2} vAlign="center">
+ <XDSStackItem size="fill">
+ <XDSPowerSearch
+ config={powerSearchConfig}
+ filters={powerSearchFilters}
+ onChange={newFilters => setPowerSearchFilters(newFilters)}
+ placeholder="Filter issues..."
+ resultCount={`${filtered.length} issue${filtered.length !== 1 ? 's' : ''}`}
+ />
+ </XDSStackItem>
+ <XDSPopover
+ placement="below"
+ alignment="end"
+ width={320}
+ label="Grouping options"
+ content={
+ <XDSVStack gap={4}>
+ <XDSRadioList
+ label="Group by"
+ value={groupBy}
+ onChange={v => setGroupBy(v as GroupByField)}>
+ {GROUP_BY_OPTIONS.map(opt => (
+ <XDSRadioListItem
+ key={opt.value}
+ value={opt.value}
+ label={opt.label}
+ />
+ ))}
+ </XDSRadioList>
+ </XDSVStack>
+ }>
+ <XDSButton
+ label="View Options"
+ variant="secondary"
+ size="md"
+ />
+ </XDSPopover>
+ </XDSHStack>
+ </XDSVStack>
+ </XDSLayoutHeader>
+ }
+ content={
+ <XDSLayoutContent role="main" padding={0}>
+ <XDSTable
+ columns={columns}
+ density="balanced"
+ dividers="rows"
+ textOverflow="truncate"
+ hasHover>
+ <colgroup>
+ {columns.map(col => (
+ <col
+ key={col.key}
+ style={resolvedWidths.columns.get(col.key)?.style}
+ />
+ ))}
+ </colgroup>
+ {groupKeys.map(key => {
+ const tasks = grouped.get(key)!;
+ if (tasks.length === 0) return null;
+ const isExpanded = expandedGroups.has(key);
- {isAdvancedFilter ? (
- <XDSToolbar
- label="Filter toolbar"
- startContent={
- <>
- <div {...stylex.props(pageStyles.flexFill)}>
- <XDSPowerSearch
- config={powerSearchConfig}
- filters={powerSearchFilters}
- onChange={newFilters =>
- setPowerSearchFilters(newFilters)
- }
- placeholder="Filter issues..."
- resultCount={`${filtered.length} issue${filtered.length !== 1 ? 's' : ''}`}
- />
- </div>
- <XDSButton
- label="Simple filters"
- variant="ghost"
- size="md"
- icon={
- <XDSIcon icon={AdjustmentsHorizontalIcon} size="sm" />
- }
- isIconOnly
- onClick={() => setIsAdvancedFilter(false)}
- />
- <XDSButton
- label="View Options"
- variant="ghost"
- size="md"
- />
- </>
- }
- />
- ) : (
- <XDSToolbar
- label="Filter toolbar"
- startContent={
- <>
- <XDSTextInput
- label="Filter"
- isLabelHidden
- placeholder="Search issues..."
- value={search}
- onChange={setSearch}
- />
- <XDSSelector
- label="Priority"
- isLabelHidden
- value={priorityFilter}
- options={[
- {value: 'all', label: 'All priorities'},
- {value: 'urgent', label: 'Urgent'},
- {value: 'high', label: 'High'},
- {value: 'medium', label: 'Medium'},
- {value: 'low', label: 'Low'},
- {value: 'none', label: 'No priority'},
- ]}
- onChange={setPriorityFilter}
- />
- <XDSButton
- label="Advanced filters"
- variant="ghost"
- size="md"
- icon={
- <XDSIcon icon={AdjustmentsHorizontalIcon} size="sm" />
- }
- isIconOnly
- onClick={() => setIsAdvancedFilter(true)}
- />
- <XDSText type="supporting" color="secondary">
- {filtered.length} issue
- {filtered.length !== 1 ? 's' : ''}
- </XDSText>
- </>
- }
- endContent={
- <XDSButton label="View Options" variant="ghost" size="md" />
- }
- />
- )}
-
- <XDSTable
- columns={columns}
- density="balanced"
- dividers="rows"
- textOverflow="truncate"
- hasHover>
- {GROUP_ORDER.map(status => {
- const tasks = grouped.get(status)!;
- if (tasks.length === 0) return null;
- const isExpanded = expandedGroups.has(status);
-
- return (
- <React.Fragment key={status}>
+ return (
+ <React.Fragment key={key}>
+ {groupBy !== 'none' && (
<XDSTableRow
role="button"
tabIndex={0}
- onClick={() => toggleGroup(status)}
+ onClick={() => toggleGroup(key)}
onKeyDown={e => {
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault();
- toggleGroup(status);
+ toggleGroup(key);
}
}}
xstyle={[pageStyles.groupHeaderRow]}>
<td
colSpan={COL_COUNT}
{...stylex.props(pageStyles.groupHeaderCell)}>
- <XDSHStack gap={6} vAlign="center">
+ <XDSHStack gap={2} vAlign="center">
<XDSIcon
icon={
isExpanded ? ChevronDownIcon : ChevronRightIcon
@@ -1089,198 +1129,216 @@ export default function DataTableTemplate() {
color="secondary"
/>
<XDSText type="body" weight="bold">
- {STATUS_LABEL[status]}
+ {getGroupLabel(groupBy, key)}
</XDSText>
<XDSBadge
- variant={STATUS_BADGE[status]}
+ variant="neutral"
label={String(tasks.length)}
/>
</XDSHStack>
</td>
</XDSTableRow>
+ )}
- {isExpanded &&
- tasks.map(task => (
- <XDSTableRow
- key={task.id}
- onClick={() => setSelectedTask(task)}>
- <XDSTableCell>
- <XDSCenter axis="horizontal">
- <XDSStatusDot
- variant={STATUS_DOT_VARIANT[task.status]}
- label={STATUS_LABEL[task.status]}
- />
- </XDSCenter>
- </XDSTableCell>
- <XDSTableCell>
- <XDSHStack gap={3} vAlign="center">
- <XDSIcon
- icon={ChartBarIcon}
- size="sm"
- color={PRIORITY_COLOR[task.priority]}
- />
- <XDSText type="supporting" color="secondary">
- {task.taskId}
- </XDSText>
- <XDSText type="body" weight="bold" maxLines={1}>
- {task.title}
- </XDSText>
- {task.subtitle && (
- <XDSText
- type="body"
- color="secondary"
- maxLines={1}>
- › {task.subtitle}
- </XDSText>
- )}
- </XDSHStack>
- </XDSTableCell>
- <XDSTableCell>
- {task.project ? (
- <XDSText type="body" maxLines={1}>
- {task.project}
- </XDSText>
- ) : (
- <XDSText type="supporting" color="secondary">
- —
+ {(groupBy === 'none' || isExpanded) &&
+ tasks.map(task => (
+ <XDSTableRow
+ key={task.id}
+ onClick={() => setSelectedTask(task)}>
+ <XDSTableCell>
+ <XDSCenter axis="horizontal">
+ <XDSStatusDot
+ variant={STATUS_DOT_VARIANT[task.status]}
+ label={STATUS_LABEL[task.status]}
+ />
+ </XDSCenter>
+ </XDSTableCell>
+ <XDSTableCell>
+ <XDSHStack gap={3} vAlign="center">
+ <XDSIcon
+ icon={ChartBarIcon}
+ size="sm"
+ color={PRIORITY_COLOR[task.priority]}
+ />
+ <XDSText type="supporting" color="secondary">
+ {task.taskId}
+ </XDSText>
+ <XDSText type="body" maxLines={1}>
+ {task.title}
+ </XDSText>
+ {task.subtitle && (
+ <XDSText
+ type="body"
+ color="secondary"
+ maxLines={1}>
+ › {task.subtitle}
</XDSText>
)}
- </XDSTableCell>
- <XDSTableCell>
- <XDSText type="supporting" color="secondary">
- {task.created}
+ </XDSHStack>
+ </XDSTableCell>
+ <XDSTableCell>
+ {task.project ? (
+ <XDSText type="body" maxLines={1}>
+ {task.project}
</XDSText>
- </XDSTableCell>
- <XDSTableCell>
+ ) : (
<XDSText type="supporting" color="secondary">
- {task.updated}
+ —
</XDSText>
- </XDSTableCell>
- <XDSTableCell>
- <XDSAvatar name={task.assignee} size="xsmall" />
- </XDSTableCell>
- <XDSTableCell>
- <XDSDropdownMenu
- button={{
- label: 'Actions',
- variant: 'ghost',
- size: 'sm',
- icon: (
- <XDSIcon
- icon={EllipsisHorizontalIcon}
- size="sm"
- />
- ),
- isIconOnly: true,
- }}
- hasChevron={false}
- items={[
- {
- label: 'Edit issue',
- icon: PencilIcon,
- onClick: () => {},
- },
- {
- label: 'Assign to...',
- icon: UserIcon,
- onClick: () => {},
- },
- {
- label: 'Add label',
- icon: TagIcon,
- onClick: () => {},
- },
- {
- label: 'Duplicate',
- icon: DocumentDuplicateIcon,
- onClick: () => {},
- },
- {
- label: 'Move to project',
- icon: ArrowRightIcon,
- onClick: () => {},
- },
- {type: 'divider' as const},
- {
- label: 'Delete issue',
- icon: TrashIcon,
- onClick: () => {},
- },
- ]}
- />
- </XDSTableCell>
- </XDSTableRow>
- ))}
- </React.Fragment>
- );
- })}
- </XDSTable>
- </XDSVStack>
+ )}
+ </XDSTableCell>
+ <XDSTableCell>
+ <XDSText type="supporting" color="secondary">
+ {task.created}
+ </XDSText>
+ </XDSTableCell>
+ <XDSTableCell>
+ <XDSText type="supporting" color="secondary">
+ {task.updated}
+ </XDSText>
+ </XDSTableCell>
+ <XDSTableCell>
+ <XDSAvatar name={task.assignee} size="xsmall" />
+ </XDSTableCell>
+ <XDSTableCell>
+ <XDSDropdownMenu
+ button={{
+ label: 'Actions',
+ variant: 'ghost',
+ size: 'sm',
+ icon: (
+ <XDSIcon
+ icon={EllipsisHorizontalIcon}
+ size="sm"
+ />
+ ),
+ isIconOnly: true,
+ }}
+ hasChevron={false}
+ items={[
+ {
+ label: 'Edit issue',
+ icon: PencilIcon,
+ onClick: () => {},
+ },
+ {
+ label: 'Assign to...',
+ icon: UserIcon,
+ onClick: () => {},
+ },
+ {
+ label: 'Add label',
+ icon: TagIcon,
+ onClick: () => {},
+ },
+ {
+ label: 'Duplicate',
+ icon: DocumentDuplicateIcon,
+ onClick: () => {},
+ },
+ {
+ label: 'Move to project',
+ icon: ArrowRightIcon,
+ onClick: () => {},
+ },
+ {type: 'divider' as const},
+ {
+ label: 'Delete issue',
+ icon: TrashIcon,
+ onClick: () => {},
+ },
+ ]}
+ />
+ </XDSTableCell>
+ </XDSTableRow>
+ ))}
+ </React.Fragment>
+ );
+ })}
+ </XDSTable>
</XDSLayoutContent>
}
end={
- <TaskDetailPanel
- task={selectedTask}
- onClose={() => setSelectedTask(null)}
- />
+ selectedTask && (
+ <>
+ <XDSResizeHandle resizable={detailPanel.props} isReversed />
+ <TaskDetailPanel
+ task={selectedTask}
+ onClose={() => setSelectedTask(null)}
+ resizable={detailPanel.props}
+ />
+ </>
+ )
}
/>
<XDSDialog isOpen={dialogOpen} onOpenChange={open => setDialogOpen(open)}>
- <XDSDialogHeader
- title="Create Issue"
- onOpenChange={open => setDialogOpen(open)}
- />
- <XDSVStack gap={4}>
- <XDSTextInput
- label="Title"
- placeholder="Issue title"
- value=""
- onChange={() => {}}
- />
- <XDSSelector
- label="Status"
- value="todo"
- options={[
- {value: 'in_progress', label: 'In Progress'},
- {value: 'todo', label: 'Todo'},
- {value: 'backlog', label: 'Backlog'},
- ]}
- onChange={() => {}}
- />
- <XDSSelector
- label="Priority"
- value="none"
- options={[
- {value: 'urgent', label: 'Urgent'},
- {value: 'high', label: 'High'},
- {value: 'medium', label: 'Medium'},
- {value: 'low', label: 'Low'},
- {value: 'none', label: 'No priority'},
- ]}
- onChange={() => {}}
- />
- <XDSTextInput
- label="Project"
- placeholder="Project name"
- value=""
- onChange={() => {}}
- />
- <XDSHStack gap={2}>
- <XDSButton
- label="Create"
- variant="primary"
- size="sm"
- onClick={() => setDialogOpen(false)}
- />
- <XDSButton
- label="Cancel"
- variant="secondary"
- size="sm"
- onClick={() => setDialogOpen(false)}
+ <XDSLayout
+ header={
+ <XDSDialogHeader
+ title="Create Issue"
+ onOpenChange={open => setDialogOpen(open)}
/>
- </XDSHStack>
- </XDSVStack>
+ }
+ content={
+ <XDSLayoutContent padding={4}>
+ <XDSVStack gap={4}>
+ <XDSTextInput
+ label="Title"
+ placeholder="Issue title"
+ value=""
+ onChange={() => {}}
+ />
+ <XDSSelector
+ label="Status"
+ value="todo"
+ options={[
+ {value: 'in_progress', label: 'In Progress'},
+ {value: 'todo', label: 'Todo'},
+ {value: 'backlog', label: 'Backlog'},
+ ]}
+ onChange={() => {}}
+ />
+ <XDSSelector
+ label="Priority"
+ value="none"
+ options={[
+ {value: 'urgent', label: 'Urgent'},
+ {value: 'high', label: 'High'},
+ {value: 'medium', label: 'Medium'},
+ {value: 'low', label: 'Low'},
+ {value: 'none', label: 'No priority'},
+ ]}
+ onChange={() => {}}
+ />
+ <XDSTextInput
+ label="Project"
+ placeholder="Project name"
+ value=""
+ onChange={() => {}}
+ />
+ </XDSVStack>
+ </XDSLayoutContent>
+ }
+ footer={
+ <XDSLayoutFooter hasDivider>
+ <XDSHStack gap={2} hAlign="end">
+ <XDSButton
+ label="Cancel"
+ variant="secondary"
+ size="md"
+ onClick={() => setDialogOpen(false)}
+ />
+ <XDSButton
+ label="Create"
+ variant="primary"
+ size="md"
+ onClick={() => setDialogOpen(false)}
+ />
+ </XDSHStack>
+ </XDSLayoutFooter>
+ }
+ />
</XDSDialog>
</XDSAppShell>
);