Skip to content

[UIK-3877][data-table] fixed focusing after opening the accordion via mouse #2532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: release/v16
Choose a base branch
from
Open

[UIK-3877][data-table] fixed focusing after opening the accordion via mouse #2532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
90d9023
[data-table] fixed keyboard interaction after mouse clicking in safari
ilyabrower Oct 16, 2025
7a8b386
[data-table] fixed focusing after opening the accordion via mouse
ilyabrower Oct 16, 2025
f3fea05
[data-table] removed unnecessary import
ilyabrower Oct 16, 2025
9394c5a
[chore] fixed types
ilyabrower Oct 16, 2025
59ed271
[chore] Merge branch 'UIK-3878/keyboard-interaction-in-safari' into U…
ilyabrower Oct 16, 2025
26eda3b
[chore] Merge remote-tracking branch 'origin/release/v16' into UIK-38…
ilyabrower Oct 22, 2025
93f53ff
Merge branch 'release/v16' into UIK-3877/table-with-table-mouse-keybo…
Valeria-Zimnitskaya Nov 4, 2025
0d31675
[data-table] fixed accordions
ilyabrower Nov 5, 2025
af65430
[data-table] tried to fix interaction with keyboard after clicking on…
ilyabrower Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions semcore/data-table/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

- Low performance when opening an accordion with a large number of rows.
- Keyboard interaction after mouse clicking in Safari.
- The focus did not move to the trigger via `Escape` when opening the accordion with the mouse.

Check warning on line 17 in semcore/data-table/CHANGELOG.md

View workflow job for this annotation

GitHub Actions / docs-lint 

[vale] reported by reviewdog 🐶
[DevDocs.Contractions] It's okay to use the contracted form 'didn't' instead of 'did not'.

Raw Output:
{"message": "[DevDocs.Contractions] It's okay to use the contracted form 'didn't' instead of 'did not'.", "location": {"path": "semcore/data-table/CHANGELOG.md", "range": {"start": {"line": 17, "column": 13}}}, "severity": "INFO"}

## [16.4.1] - 2025-10-17

Expand Down
4 changes: 4 additions & 0 deletions semcore/data-table/src/components/AccordionRows/AccordionRows.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import trottle from '@semcore/core/lib/utils/rafTrottle';
import React from 'react';

import type { CellRenderProps } from '../Body/Body.types';
import type { DataTableCellProps } from '../Body/Cell.types';
import { Row } from '../Body/Row';
import type { DTRow, DTRows } from '../Body/Row.types';
import styles from '../Body/style.shadow.css';
Expand Down Expand Up @@ -31,6 +32,7 @@ type AccordionRowsProps<Data extends DataTableData, UniqKeyType> = {
cell: Pick<DTColumn, 'name' | 'fixed'>,
) => [side: 'left' | 'right', style: string | number] | [side: undefined, style: undefined];

onCellClick: DataTableCellProps<Data, UniqKeyType>['onClick'];
renderCell: ((props: CellRenderProps<Data[number], UniqKeyType>) => React.ReactNode | Record<string, any>) | undefined;
rawData: DataRowItem[];
shadowVertical: '' | 'end' | 'start' | 'median' | undefined;
Expand Down Expand Up @@ -92,6 +94,7 @@ export class AccordionRows<Data extends DataTableData, UniqKeyType> extends Reac
renderCell,
rawData,
limit,
onCellClick,
} = this.props;

return sstyled(styles)(
Expand Down Expand Up @@ -133,6 +136,7 @@ export class AccordionRows<Data extends DataTableData, UniqKeyType> extends Reac
renderCell={renderCell}
rawData={rawData}
limit={limit}
onCellClick={onCellClick}
/>
);
})}
Expand Down
12 changes: 10 additions & 2 deletions semcore/data-table/src/components/Body/Cell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,17 @@ class CellRoot<Data extends DataTableData, UniqKeyType> extends Component<DataTa
};

handleClickCell = (e: React.SyntheticEvent<HTMLElement>) => {
const { rowIndex, columnIndex, onClick, row } = this.asProps;
const { rowIndex, columnIndex, onClick, row, accordionRowIndex } = this.asProps;

onClick?.(e, { rowIndex, colIndex: columnIndex, row });
const rowElement = e.currentTarget.parentElement?.parentElement;
const ariaRowindex = Number(rowElement?.getAttribute('aria-rowindex'));
let rowIndexValue = accordionRowIndex === undefined ? rowIndex : rowIndex + 1 + accordionRowIndex;

if (!isNaN(ariaRowindex)) {
rowIndexValue = ariaRowindex - 2;
}

onClick(e, { rowIndex: rowIndexValue, colIndex: columnIndex, row });
};

render() {
Expand Down
4 changes: 3 additions & 1 deletion semcore/data-table/src/components/Body/Row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,7 @@ export class RowRoot<Data extends DataTableData, UniqKeyType> extends Component<
tableRef,
scrollAreaRef,
accordionAnimationRows,
onCellClick,
} = this.asProps;

const { expandedForAnimation, accordionRows, accordionComponent } = this.state;
Expand Down Expand Up @@ -605,7 +606,7 @@ export class RowRoot<Data extends DataTableData, UniqKeyType> extends Component<
rowIndex={rowIndex}
rows={[row]}
row={row}
columnIndex={1}
columnIndex={0}
// @ts-ignore
column={{ name: ACCORDION }}
w='100%'
Expand Down Expand Up @@ -639,6 +640,7 @@ export class RowRoot<Data extends DataTableData, UniqKeyType> extends Component<
limit={limit}
renderCell={renderCell}
sideIndents={sideIndents}
onCellClick={onCellClick}
/>
)}
</>,
Expand Down
Loading