public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update TableNG to use the grafana fork of react-data-grid, which supports React 18 (#105970)

Browse Source
This commit is contained in:
Paul Marbach
2025-05-28 09:50:15 -04:00
committed by GitHub
parent 312fcb4a54
commit 840afe448f
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jest.config.js
+1
View File
@@ -21,6 +21,7 @@ const esModules = [
'lodash-es',
'vscode-languageserver-types',
'@bsull/augurs',
'react-data-grid',
].join('|');
module.exports = {
packages/grafana-ui/package.json
+1 -1
View File
@@ -108,7 +108,7 @@
"react-calendar": "^5.1.0",
"react-colorful": "5.6.1",
"react-custom-scrollbars-2": "4.5.0",
"react-data-grid": "7.0.0-beta.46",
"react-data-grid": "grafana/react-data-grid#3420f7f2a9e0d707d3313ec5b143a6be53f720b5",
"react-dropzone": "14.3.8",
"react-highlight-words": "0.21.0",
"react-hook-form": "^7.49.2",
packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import 'react-data-grid/lib/styles.css';
import { css } from '@emotion/css';
import { useMemo, useState, useLayoutEffect, useCallback, useRef, useEffect } from 'react';
import DataGrid, { RenderCellProps, RenderRowProps, Row, SortColumn, DataGridHandle } from 'react-data-grid';
import { DataGrid, RenderCellProps, RenderRowProps, Row, SortColumn, DataGridHandle } from 'react-data-grid';
import { useMeasure } from 'react-use';
import {
yarn.lock
+5 -5
View File
@@ -3672,7 +3672,7 @@ __metadata:
react-calendar: "npm:^5.1.0"
react-colorful: "npm:5.6.1"
react-custom-scrollbars-2: "npm:4.5.0"
react-data-grid: "npm:7.0.0-beta.46"
react-data-grid: "grafana/react-data-grid#3420f7f2a9e0d707d3313ec5b143a6be53f720b5"
react-dom: "npm:18.3.1"
react-dropzone: "npm:14.3.8"
react-highlight-words: "npm:0.21.0"
@@ -25932,15 +25932,15 @@ __metadata:
languageName: node
linkType: hard
"react-data-grid@npm:7.0.0-beta.46":
version: 7.0.0-beta.46
resolution: "react-data-grid@npm:7.0.0-beta.46"
"react-data-grid@grafana/react-data-grid#3420f7f2a9e0d707d3313ec5b143a6be53f720b5":
version: 7.0.0-beta.55
resolution: "react-data-grid@https://github.com/grafana/react-data-grid.git#commit=3420f7f2a9e0d707d3313ec5b143a6be53f720b5"
dependencies:
clsx: "npm:^2.0.0"
peerDependencies:
react: ^18.0 || ^19.0
react-dom: ^18.0 || ^19.0
checksum: 10/d8a679b5e22a07293923894591adcac5ad57b8bd28dcc93f7438563384f6acc2287f14394a3ef360bc1dc901defa00b4030aa9af37c70cf53cf121437e0882bc
checksum: 10/9fe309924a7b22d0a62f0df69bdc7b9e0df62c5624e96125f2d729500dfe103037cfbe654fa63294d89fc9b5fea618a540160e2e12e7de4c7052049827df3687
languageName: node
linkType: hard