IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-13 00:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Migrate CustomScrollbar to react-custom-scrollbars-2 (#38013)

Browse Source
This commit is contained in:
Jack Westbrook 2021-08-23 09:28:58 +02:00 committed by GitHub
parent b9a538aff0
commit bafe16368a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/grafana-ui/package.json
View File

@ -55,7 +55,7 @@
"react-beautiful-dnd": "13.1.0",
"react-calendar": "2.19.2",
"react-colorful": "5.1.2",
"react-custom-scrollbars": "4.2.1",
"react-custom-scrollbars-2": "4.4.0",
"react-dom": "17.0.1",
"react-dropzone": "11.3.4",
"react-highlight-words": "0.17.0",
@ -95,7 +95,6 @@
"@types/react": "16.9.9",
"@types/react-beautiful-dnd": "13.1.1",
"@types/react-color": "3.0.1",
"@types/react-custom-scrollbars": "4.0.5",
"@types/react-router-dom": "^5.1.7",
"@types/react-select": "4.0.13",
"@types/react-table": "7.7.2",

2
packages/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.tsx
View File

@ -2,7 +2,7 @@ import React, { FC, useCallback, useEffect, useRef } from 'react';
import { isNil } from 'lodash';
import classNames from 'classnames';
import { css } from '@emotion/css';
import Scrollbars, { positionValues } from 'react-custom-scrollbars';
import Scrollbars, { positionValues } from 'react-custom-scrollbars-2';
import { useStyles2 } from '../../themes';
import { GrafanaTheme2 } from '@grafana/data';

15
yarn.lock
View File

@ -5110,13 +5110,6 @@
dependencies:
"@types/react" "*"
"@types/react-custom-scrollbars@4.0.5":
version "4.0.5"
resolved "https://registry.yarnpkg.com/@types/react-custom-scrollbars/-/react-custom-scrollbars-4.0.5.tgz#8629b4b3164914d27df7cb0ca0a086c0ad406389"
integrity sha512-Qdotjy9wbf9nrNRzGj0bFDlhYIvjMxwrxHR0V1zUSc2cqb74a8ujLWTfIQ6JBSUx+3hY74+tHgEOthRJLEMyKw==
dependencies:
"@types/react" "*"
"@types/react-dev-utils@^9.0.4":
version "9.0.4"
resolved "https://registry.yarnpkg.com/@types/react-dev-utils/-/react-dev-utils-9.0.4.tgz#3e4bee79b7536777cef219427ab1d38adc24f3f2"
@ -18916,10 +18909,10 @@ react-colorful@^5.1.2:
resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.3.0.tgz#bcbae49c1affa9ab9a3c8063398c5948419296bd"
integrity sha512-zWE5E88zmjPXFhv6mGnRZqKin9s5vip1O3IIGynY9EhZxN8MATUxZkT3e/9OwTEm4DjQBXc6PFWP6AetY+Px+A==
react-custom-scrollbars@4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/react-custom-scrollbars/-/react-custom-scrollbars-4.2.1.tgz#830fd9502927e97e8a78c2086813899b2a8b66db"
integrity sha1-gw/ZUCkn6X6KeMIIaBOJmyqLZts=
react-custom-scrollbars-2@4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/react-custom-scrollbars-2/-/react-custom-scrollbars-2-4.4.0.tgz#6cc237abc18f5ab32b5392b336e6f072c2b4cfc1"
integrity sha512-I+oxZ9rfHfvYm85jdH2lQqpzwNr/ZAdYB8htm6R/hwRGoIEK31jq+YE6MmFwBzuO7C5zcAtH5HN9vwZxnW61NQ==
dependencies:
dom-css "^2.0.0"
prop-types "^15.5.10"