Skip to content

Commit 188d5b2

Browse files
authored
Merge branch 'main' into more-editable-cells
2 parents d73314d + 36d0dc1 commit 188d5b2

File tree

90 files changed

+2996
-1531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+2996
-1531
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
contact_links:
22
- name: Questions and discussions
3-
url: https://github.com/adazzle/react-data-grid/discussions
3+
url: https://github.com/Comcast/react-data-grid/discussions
44
about: Please check the discussions tab for help and discussions.

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ updates:
1111
patterns:
1212
- 'react'
1313
- 'react-dom'
14-
react-dnd:
15-
patterns:
16-
- 'react-dnd'
17-
- 'react-dnd-html5-backend'
1814
babel:
1915
patterns:
2016
- '@babel/*'

.github/workflows/ci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v5
13-
- uses: actions/setup-node@v5
13+
- uses: actions/setup-node@v6
1414
with:
15-
node-version: 24
15+
node-version: 25
1616
check-latest: true
17-
- name: npm install
17+
- name: Install dependencies
1818
run: npm i
1919
- name: Biome
2020
run: node --run biome:ci
@@ -29,10 +29,12 @@ jobs:
2929
- name: Build website
3030
run: node --run build:website
3131
- name: Install Playwright Browsers
32-
run: npx playwright install chromium
32+
run: npx playwright install chromium firefox
3333
- name: Test
3434
run: node --run test
3535
timeout-minutes: 4
36+
- name: Visual regression test
37+
run: node --run visual
3638
- name: Upload coverage
3739
uses: codecov/codecov-action@v5
3840
with:
@@ -50,4 +52,4 @@ jobs:
5052
touch .nojekyll
5153
git add .
5254
git commit -m "gh-pages deployment" || echo "Nothing to commit"
53-
git push -f https://adazzle:${{secrets.GITHUB_TOKEN}}@github.com/adazzle/react-data-grid.git
55+
git push -f https://comcast:${{secrets.GITHUB_TOKEN}}@github.com/Comcast/react-data-grid.git
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Update Screenshots
2+
3+
on:
4+
pull_request:
5+
types: [labeled]
6+
workflow_dispatch:
7+
8+
env:
9+
AUTHOR_NAME: 'github-actions[bot]'
10+
AUTHOR_EMAIL: '41898282+github-actions[bot]@users.noreply.github.com'
11+
COMMIT_MESSAGE: |
12+
Update screenshots
13+
14+
Co-authored-by: ${{ github.actor }}
15+
16+
jobs:
17+
update-screenshots:
18+
if: ${{ github.event.label.name == 'Update Screenshots' || github.event_name == 'workflow_dispatch' }}
19+
runs-on: ubuntu-latest
20+
21+
permissions:
22+
contents: write
23+
pull-requests: write
24+
25+
# one at a time per branch
26+
concurrency:
27+
group: update-screenshots@${{ github.head_ref }}
28+
cancel-in-progress: true
29+
30+
steps:
31+
- uses: actions/checkout@v5
32+
with:
33+
ref: ${{ github.head_ref }}
34+
- uses: actions/setup-node@v6
35+
with:
36+
node-version: 25
37+
check-latest: true
38+
- name: Remove label
39+
if: github.event_name == 'pull_request'
40+
run: gh pr edit --remove-label 'Update Screenshots'
41+
env:
42+
GH_TOKEN: ${{ github.token }}
43+
- name: Install dependencies
44+
run: npm i
45+
- name: Install Playwright Browsers
46+
run: npx playwright install chromium firefox
47+
- name: Update screenshots
48+
run: |
49+
rm -r test/visual/__screenshots__
50+
node --run visual:update
51+
- name: Push new screenshots
52+
run: |
53+
git config --global user.name "${{ env.AUTHOR_NAME }}"
54+
git config --global user.email "${{ env.AUTHOR_EMAIL }}"
55+
git add test/visual/__screenshots__/.
56+
git diff-index --quiet HEAD || git commit -m "${{ env.COMMIT_MESSAGE }}"
57+
git push

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
/lib
55
/node_modules
66
/package-lock.json
7-
__screenshots__
7+
test/browser/**/__screenshots__
88

99
npm-debug.log
1010
**.orig
1111
.idea
12+
.vitest-attachments
13+
14+
__traces__

.prettierignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
*.js
2-
*.json
3-
*.css
1+
package.json
42
/website/routeTree.gen.ts

CHANGELOG.md

Lines changed: 113 additions & 113 deletions
Large diffs are not rendered by default.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The MIT License (MIT)
22

33
Original work Copyright (c) 2014 Prometheus Research
4-
Modified work Copyright 2015 Adazzle
4+
Modified work Copyright 2015 Comcast
55

66
For the original source code please see https://github.com/prometheusresearch-archive/react-grid
77

0 commit comments

Comments
 (0)