Skip to content

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

TypeScript

fix(Table): keep editable content from toggling tree and expansion rows (#7163)

Joey0777b5020708
diff --git a/.changeset/table-contenteditable-guard.md b/.changeset/table-contenteditable-guard.md
new file mode 100644
index 0000000000..6eff40346d
--- /dev/null
+++ b/.changeset/table-contenteditable-guard.md
@@ -0,0 +1,11 @@
+---
+'@astryxdesign/core': patch
+---
+
+[fix] Keep editable content from toggling tree and expansion rows
+@josephfarina
+
+The shared click guard that row-expansion and tree-data use to decide
+whether a row click should toggle missed `[contenteditable]` elements.
+Clicking or typing inside editable content in a row toggled it. Restored
+the exclusion with tests on both paths.
diff --git a/packages/core/src/Table/plugins/rowExpansion/useTableRowExpansion.test.tsx b/packages/core/src/Table/plugins/rowExpansion/useTableRowExpansion.test.tsx
index 9c4928aac4..2cb97f75a6 100644
--- a/packages/core/src/Table/plugins/rowExpansion/useTableRowExpansion.test.tsx
+++ b/packages/core/src/Table/plugins/rowExpansion/useTableRowExpansion.test.tsx
@@ -433,6 +433,69 @@ describe('useTableRowExpansion (detail panel)', () => {
expect(screen.queryByTestId('panel')).not.toBeInTheDocument();
});
+ it('yields to a contenteditable cell', () => {
+ render(
+ <Harness
+ hasRowClickExpansion
+ columnsOverride={[
+ {
+ key: 'name',
+ header: 'Name',
+ renderCell: item => (
+ <div contentEditable data-testid={`editable-${item.id}`}>
+ {item.name}
+ </div>
+ ),
+ },
+ ]}
+ />,
+ );
+ fireEvent.click(screen.getByTestId('editable-a'));
+ expect(screen.queryByTestId('panel')).not.toBeInTheDocument();
+ });
+
+ it('yields to a nested element inside a contenteditable cell', () => {
+ render(
+ <Harness
+ hasRowClickExpansion
+ columnsOverride={[
+ {
+ key: 'name',
+ header: 'Name',
+ renderCell: item => (
+ <div contentEditable>
+ <span data-testid={`inner-${item.id}`}>{item.name}</span>
+ </div>
+ ),
+ },
+ ]}
+ />,
+ );
+ fireEvent.click(screen.getByTestId('inner-a'));
+ expect(screen.queryByTestId('panel')).not.toBeInTheDocument();
+ });
+
+ it('does not yield to contenteditable="false"', () => {
+ render(
+ <Harness
+ hasRowClickExpansion
+ columnsOverride={[
+ {
+ key: 'name',
+ header: 'Name',
+ renderCell: item => (
+ <div contentEditable="false" data-testid={`readonly-${item.id}`}>
+ {item.name}
+ </div>
+ ),
+ },
+ ]}
+ />,
+ );
+ fireEvent.click(screen.getByTestId('readonly-a'));
+ expect(screen.getByTestId('panel')).toHaveTextContent('Ada: Ada bio');
+ });
+
it('yields to a text selection', () => {
// Dragging across a cell to copy it ends in a click. Toggling then would
// shift the row out from under the text the reader just selected. The
diff --git a/packages/core/src/Table/plugins/rowExpansion/useTableRowExpansion.tsx b/packages/core/src/Table/plugins/rowExpansion/useTableRowExpansion.tsx
index 53f6eb41a7..c4c4607d4c 100644
--- a/packages/core/src/Table/plugins/rowExpansion/useTableRowExpansion.tsx
+++ b/packages/core/src/Table/plugins/rowExpansion/useTableRowExpansion.tsx
@@ -486,6 +486,19 @@ export function useTableRowExpansion<T extends Record<string, unknown>>(
if (target !== row && hasInteractiveAncestor(target, row)) {
return;
}
+ // A click inside a contenteditable region is an edit
+ // action, not a row toggle. The shared guard does not
+ // include contenteditable (it would change ClickableCard
+ // and other consumers), so the Table row-click path
+ // checks it separately.
+ if (
+ target !== row &&
+ target.closest(
+ '[contenteditable]:not([contenteditable="false"])',
+ )
+ ) {
+ return;
+ }
if (hasTextSelection(row)) {
return;
}
diff --git a/packages/core/src/Table/plugins/tree/useTableTreeData.test.tsx b/packages/core/src/Table/plugins/tree/useTableTreeData.test.tsx
index bdab599a16..167da95ab0 100644
--- a/packages/core/src/Table/plugins/tree/useTableTreeData.test.tsx
+++ b/packages/core/src/Table/plugins/tree/useTableTreeData.test.tsx
@@ -297,6 +297,102 @@ describe('useTableTreeData — row-click expansion', () => {
).toBeInTheDocument();
});
+ it('does not toggle when a contenteditable cell is clicked', async () => {
+ const user = userEvent.setup();
+ function TreeWithEditable() {
+ const {visibleData, treeConfig} = useTableTreeState<FileRow>({
+ data: fileTree,
+ idKey: 'id',
+ });
+ const tree = useTableTreeData({...treeConfig, hasRowClickExpansion: true});
+ return (
+ <Table
+ data={visibleData}
+ columns={[
+ {
+ key: 'name',
+ header: 'Name',
+ renderCell: item => (
+ <div contentEditable data-testid={`editable-${item.id}`}>
+ {item.name}
+ </div>
+ ),
+ },
+ ]}
+ idKey="id"
+ plugins={{tree}}
+ />
+ );
+ }
+ render(<TreeWithEditable />);
+ await user.click(screen.getByTestId('editable-src'));
+ expect(screen.queryByText('components')).toBeNull();
+ });
+
+ it('does not toggle when a nested element inside contenteditable is clicked', async () => {
+ const user = userEvent.setup();
+ function TreeWithNestedEditable() {
+ const {visibleData, treeConfig} = useTableTreeState<FileRow>({
+ data: fileTree,
+ idKey: 'id',
+ });
+ const tree = useTableTreeData({...treeConfig, hasRowClickExpansion: true});
+ return (
+ <Table
+ data={visibleData}
+ columns={[
+ {
+ key: 'name',
+ header: 'Name',
+ renderCell: item => (
+ <div contentEditable>
+ <span data-testid={`inner-${item.id}`}>{item.name}</span>
+ </div>
+ ),
+ },
+ ]}
+ idKey="id"
+ plugins={{tree}}
+ />
+ );
+ }
+ render(<TreeWithNestedEditable />);
+ await user.click(screen.getByTestId('inner-src'));
+ expect(screen.queryByText('components')).toBeNull();
+ });
+
+ it('still toggles on contenteditable="false"', async () => {
+ const user = userEvent.setup();
+ function TreeWithReadonly() {
+ const {visibleData, treeConfig} = useTableTreeState<FileRow>({
+ data: fileTree,
+ idKey: 'id',
+ });
+ const tree = useTableTreeData({...treeConfig, hasRowClickExpansion: true});
+ return (
+ <Table
+ data={visibleData}
+ columns={[
+ {
+ key: 'name',
+ header: 'Name',
+ renderCell: item => (
+ <div contentEditable="false" data-testid={`readonly-${item.id}`}>
+ {item.name}
+ </div>
+ ),
+ },
+ ]}
+ idKey="id"
+ plugins={{tree}}
+ />
+ );
+ }
+ render(<TreeWithReadonly />);
+ await user.click(screen.getByTestId('readonly-src'));
+ expect(screen.getByText('components')).toBeInTheDocument();
+ });
+
it('is a no-op on flat data even when hasRowClickExpansion is set', async () => {
const user = userEvent.setup();
const flat: FileRow[] = [
diff --git a/packages/core/src/Table/plugins/tree/useTableTreeData.tsx b/packages/core/src/Table/plugins/tree/useTableTreeData.tsx
index 3612b8786b..c23d5e5f0f 100644
--- a/packages/core/src/Table/plugins/tree/useTableTreeData.tsx
+++ b/packages/core/src/Table/plugins/tree/useTableTreeData.tsx
@@ -698,6 +698,19 @@ export function useTableTreeData<T extends Record<string, unknown>>(
if (target !== row && hasInteractiveAncestor(target, row)) {
return;
}
+ // A click inside a contenteditable region is an edit
+ // action, not a row toggle. The shared guard does not
+ // include contenteditable (it would change ClickableCard
+ // and other consumers), so the Table row-click path
+ // checks it separately.
+ if (
+ target !== row &&
+ target.closest(
+ '[contenteditable]:not([contenteditable="false"])',
+ )
+ ) {
+ return;
+ }
if (hasTextSelection(row)) {
return;
}