Skip to content

Commit 0bc54d9

Browse files
authored
Merge branch 'main' into am-double-double-click
2 parents 8a6bb28 + eaf0691 commit 0bc54d9

File tree

4 files changed

+31
-34
lines changed

4 files changed

+31
-34
lines changed

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,48 +53,48 @@
5353
"clsx": "^2.0.0"
5454
},
5555
"devDependencies": {
56-
"@babel/preset-typescript": "^7.26.0",
56+
"@babel/preset-typescript": "^7.27.0",
5757
"@biomejs/biome": "1.9.4",
5858
"@eslint/markdown": "^6.3.0",
5959
"@faker-js/faker": "^9.6.0",
6060
"@ianvs/prettier-plugin-sort-imports": "^4.4.1",
61-
"@linaria/core": "^6.0.0",
62-
"@microsoft/api-extractor": "^7.50.0",
61+
"@linaria/core": "^6.3.0",
62+
"@microsoft/api-extractor": "^7.52.2",
6363
"@tanstack/react-router": "^1.114.16",
6464
"@tanstack/router-plugin": "^1.114.16",
65-
"@types/node": "^22.13.1",
66-
"@types/react": "^19.0.8",
65+
"@types/node": "^22.13.16",
66+
"@types/react": "^19.0.12",
6767
"@types/react-dom": "^19.0.3",
68-
"@typescript-eslint/eslint-plugin": "^8.26.1",
69-
"@typescript-eslint/parser": "^8.26.1",
68+
"@typescript-eslint/eslint-plugin": "^8.29.0",
69+
"@typescript-eslint/parser": "^8.29.0",
7070
"@vitejs/plugin-react": "^4.3.4",
71-
"@vitest/browser": "^3.0.9",
72-
"@vitest/coverage-v8": "^3.0.9",
71+
"@vitest/browser": "^3.1.1",
72+
"@vitest/coverage-v8": "^3.1.1",
7373
"@vitest/eslint-plugin": "^1.1.38",
7474
"@wyw-in-js/rollup": "^0.6.0",
7575
"@wyw-in-js/vite": "^0.6.0",
7676
"browserslist": "^4.24.4",
77-
"eslint": "^9.22.0",
77+
"eslint": "^9.23.0",
7878
"eslint-plugin-jest-dom": "^5.5.0",
7979
"eslint-plugin-react": "^7.37.4",
80-
"eslint-plugin-react-compiler": "^19.0.0-beta-3229e95-20250315",
80+
"eslint-plugin-react-compiler": "^19.0.0-beta-e993439-20250328",
8181
"eslint-plugin-react-hooks": "^5.2.0",
82-
"eslint-plugin-react-hooks-extra": "^1.36.1",
82+
"eslint-plugin-react-hooks-extra": "^1.40.1",
8383
"eslint-plugin-sonarjs": "^3.0.2",
8484
"eslint-plugin-testing-library": "^7.1.1",
85-
"jspdf": "^3.0.0",
85+
"jspdf": "^3.0.1",
8686
"jspdf-autotable": "^5.0.2",
8787
"playwright": "^1.51.1",
8888
"postcss": "^8.5.2",
8989
"prettier": "3.5.3",
90-
"react": "^19.0.0",
90+
"react": "^19.1.0",
9191
"react-dnd": "^16.0.1",
9292
"react-dnd-html5-backend": "^16.0.1",
93-
"react-dom": "^19.0.0",
93+
"react-dom": "^19.1.0",
9494
"rolldown": "^1.0.0-beta.6",
9595
"typescript": "~5.8.2",
96-
"vite": "^6.2.2",
97-
"vitest": "^3.0.9",
96+
"vite": "^6.2.4",
97+
"vitest": "^3.1.1",
9898
"vitest-browser-react": "^0.1.1"
9999
},
100100
"peerDependencies": {

test/browser/column/colSpan.test.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ describe('colSpan', () => {
4949
expect(topSummarryRow1[7]).toHaveAttribute('aria-colindex', '8');
5050
expect(topSummarryRow1[7]).toHaveAttribute('aria-colspan', '2');
5151
expect(topSummarryRow1[7]).toHaveStyle({
52-
'grid-column-start': '8',
53-
'grid-column-end': '10'
52+
gridColumnStart: '8',
53+
gridColumnEnd: '10'
5454
});
5555
expect(getCellsAtRowIndex(1)).toHaveLength(15);
5656

@@ -61,8 +61,8 @@ describe('colSpan', () => {
6161
expect(row1[6]).toHaveAttribute('aria-colindex', '7');
6262
expect(row1[6]).toHaveAttribute('aria-colspan', '2');
6363
expect(row1[6]).toHaveStyle({
64-
'grid-column-start': '7',
65-
'grid-column-end': '9'
64+
gridTemplateColumns: '7',
65+
gridColumnEnd: '9'
6666
});
6767
expect(row1[7]).toHaveAttribute('aria-colindex', '9');
6868
expect(row1[7]).not.toHaveAttribute('aria-colspan');
@@ -72,15 +72,15 @@ describe('colSpan', () => {
7272
expect(row2).toHaveLength(12);
7373
expect(row2[2]).toHaveAttribute('aria-colindex', '3');
7474
expect(row2[2]).toHaveStyle({
75-
'grid-column-start': '3',
76-
'grid-column-end': '6'
75+
gridColumnStart: '3',
76+
gridColumnEnd: '6'
7777
});
7878
expect(row2[2]).toHaveAttribute('aria-colspan', '3');
7979
expect(row2[3]).toHaveAttribute('aria-colindex', '6');
8080
expect(row2[4]).toHaveAttribute('aria-colindex', '7');
8181
expect(row2[4]).toHaveStyle({
82-
'grid-column-start': '7',
83-
'grid-column-end': '9'
82+
gridColumnStart: '7',
83+
gridColumnEnd: '9'
8484
});
8585
expect(row2[5]).toHaveAttribute('aria-colindex', '9');
8686

test/browser/rowHeight.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test('rowHeight is number', async () => {
2525

2626
const grid = page.getByRole('grid').element();
2727
expect(grid).toHaveStyle({
28-
'grid-template-rows':
28+
gridTemplateRows:
2929
'40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px 40px'
3030
});
3131
expect(getRows()).toHaveLength(30);
@@ -41,7 +41,7 @@ test('rowHeight is function', async () => {
4141

4242
const grid = page.getByRole('grid').element();
4343
expect(grid).toHaveStyle({
44-
'grid-template-rows':
44+
gridTemplateRows:
4545
'35px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px 80px 40px 60px'
4646
});
4747
expect(getRows()).toHaveLength(22);

test/browser/utils.tsx

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,10 @@ export function getHeaderCells() {
4343
}
4444

4545
export function getSelectedCell() {
46-
const selectedGridCell = page.getByRole('gridcell', { selected: true });
47-
// TODO use `or` when available
48-
if (selectedGridCell.elements().length > 0) {
49-
return selectedGridCell;
50-
}
51-
52-
return page.getByRole('columnheader', { selected: true });
46+
return page
47+
.getByRole('gridcell', { selected: true })
48+
.or(page.getByRole('columnheader', { selected: true }))
49+
.first();
5350
}
5451

5552
export function validateCellPosition(columnIdx: number, rowIdx: number) {

0 commit comments

Comments
 (0)