From ffaf98fa7d21061076d774fe07c5eee88f78382d Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Wed, 3 Dec 2025 16:42:28 +0000 Subject: [PATCH] upgrade rc-slider --- package.json | 2 +- packages/grafana-ui/package.json | 2 +- .../src/components/Slider/RangeSlider.tsx | 2 +- .../src/components/Slider/Slider.tsx | 2 +- .../src/components/Slider/styles.ts | 2 +- .../app/core/components/OptionsUI/slider.tsx | 2 +- yarn.lock | 35 +++++++++---------- 7 files changed, 23 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 987ccf379e7..76ee5404a36 100644 --- a/package.json +++ b/package.json @@ -318,6 +318,7 @@ "@opentelemetry/exporter-collector": "0.25.0", "@opentelemetry/semantic-conventions": "1.38.0", "@popperjs/core": "2.11.8", + "@rc-component/slider": "1.0.1", "@react-aria/dialog": "3.5.31", "@react-aria/focus": "3.21.2", "@react-aria/overlays": "3.30.0", @@ -386,7 +387,6 @@ "ol-mapbox-style": "^13.0.1", "pluralize": "^8.0.0", "prismjs": "1.30.0", - "rc-slider": "11.1.9", "rc-tree": "5.13.1", "re-resizable": "6.11.2", "react": "18.3.1", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 04f24ad6925..c10b9126a2b 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -76,6 +76,7 @@ "@monaco-editor/react": "4.7.0", "@popperjs/core": "2.11.8", "@rc-component/drawer": "1.3.0", + "@rc-component/slider": "1.0.1", "@react-aria/dialog": "3.5.31", "@react-aria/focus": "3.21.2", "@react-aria/overlays": "3.30.0", @@ -104,7 +105,6 @@ "prismjs": "1.30.0", "rc-cascader": "3.34.0", "rc-picker": "4.11.3", - "rc-slider": "11.1.9", "rc-tooltip": "6.4.0", "react-calendar": "^6.0.0", "react-colorful": "5.6.1", diff --git a/packages/grafana-ui/src/components/Slider/RangeSlider.tsx b/packages/grafana-ui/src/components/Slider/RangeSlider.tsx index 6b791fd7211..9dacf6c4747 100644 --- a/packages/grafana-ui/src/components/Slider/RangeSlider.tsx +++ b/packages/grafana-ui/src/components/Slider/RangeSlider.tsx @@ -1,6 +1,6 @@ import { cx } from '@emotion/css'; import { Global } from '@emotion/react'; -import Slider, { SliderProps } from 'rc-slider'; +import Slider, { SliderProps } from '@rc-component/slider'; import { useCallback } from 'react'; import { t } from '@grafana/i18n'; diff --git a/packages/grafana-ui/src/components/Slider/Slider.tsx b/packages/grafana-ui/src/components/Slider/Slider.tsx index 9458b500532..df3fe571bfe 100644 --- a/packages/grafana-ui/src/components/Slider/Slider.tsx +++ b/packages/grafana-ui/src/components/Slider/Slider.tsx @@ -1,6 +1,6 @@ import { cx } from '@emotion/css'; import { Global } from '@emotion/react'; -import SliderComponent from 'rc-slider'; +import SliderComponent from '@rc-component/slider'; import { useState, useCallback, ChangeEvent, FocusEvent, useEffect } from 'react'; import { usePrevious } from 'react-use'; diff --git a/packages/grafana-ui/src/components/Slider/styles.ts b/packages/grafana-ui/src/components/Slider/styles.ts index dc2f060abae..3095372f6fa 100644 --- a/packages/grafana-ui/src/components/Slider/styles.ts +++ b/packages/grafana-ui/src/components/Slider/styles.ts @@ -3,7 +3,7 @@ import { css as cssCore } from '@emotion/react'; import { GrafanaTheme2 } from '@grafana/data'; -import 'rc-slider/assets/index.css'; +import '@rc-component/slider/assets/index.css'; export const getStyles = (theme: GrafanaTheme2, isHorizontal: boolean, hasMarks = false) => { const { spacing } = theme; diff --git a/public/app/core/components/OptionsUI/slider.tsx b/public/app/core/components/OptionsUI/slider.tsx index 01835ea9a38..7c42b7802c0 100644 --- a/public/app/core/components/OptionsUI/slider.tsx +++ b/public/app/core/components/OptionsUI/slider.tsx @@ -1,6 +1,6 @@ import { css, cx } from '@emotion/css'; import { Global } from '@emotion/react'; -import Slider from 'rc-slider'; +import Slider from '@rc-component/slider'; import { useCallback, useEffect, useRef, useState } from 'react'; import { StandardEditorProps, GrafanaTheme2, SliderFieldConfigSettings } from '@grafana/data'; diff --git a/yarn.lock b/yarn.lock index 753d9c2724e..8485888e66d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3783,6 +3783,7 @@ __metadata: "@monaco-editor/react": "npm:4.7.0" "@popperjs/core": "npm:2.11.8" "@rc-component/drawer": "npm:1.3.0" + "@rc-component/slider": "npm:1.0.1" "@react-aria/dialog": "npm:3.5.31" "@react-aria/focus": "npm:3.21.2" "@react-aria/overlays": "npm:3.30.0" @@ -3865,7 +3866,6 @@ __metadata: process: "npm:^0.11.10" rc-cascader: "npm:3.34.0" rc-picker: "npm:4.11.3" - rc-slider: "npm:11.1.9" rc-tooltip: "npm:6.4.0" react: "npm:18.3.1" react-calendar: "npm:^6.0.0" @@ -6844,6 +6844,19 @@ __metadata: languageName: node linkType: hard +"@rc-component/slider@npm:1.0.1": + version: 1.0.1 + resolution: "@rc-component/slider@npm:1.0.1" + dependencies: + "@rc-component/util": "npm:^1.3.0" + clsx: "npm:^2.1.1" + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10/23ee6d696e7e60fa0d707ef0d58aba7892e4e3630b0f466b4ffda374210be0cd2e63fff034fcfcf11f72c03d4a4e980560ab5be3807f441cf8e20280793ba33e + languageName: node + linkType: hard + "@rc-component/trigger@npm:^2.0.0, @rc-component/trigger@npm:^2.1.1": version: 2.2.0 resolution: "@rc-component/trigger@npm:2.2.0" @@ -6861,7 +6874,7 @@ __metadata: languageName: node linkType: hard -"@rc-component/util@npm:^1.2.0, @rc-component/util@npm:^1.2.1": +"@rc-component/util@npm:^1.2.0, @rc-component/util@npm:^1.2.1, @rc-component/util@npm:^1.3.0": version: 1.4.0 resolution: "@rc-component/util@npm:1.4.0" dependencies: @@ -19316,6 +19329,7 @@ __metadata: "@playwright/test": "npm:1.56.1" "@pmmmwh/react-refresh-webpack-plugin": "npm:0.6.1" "@popperjs/core": "npm:2.11.8" + "@rc-component/slider": "npm:1.0.1" "@react-aria/dialog": "npm:3.5.31" "@react-aria/focus": "npm:3.21.2" "@react-aria/overlays": "npm:3.30.0" @@ -19526,7 +19540,6 @@ __metadata: prismjs: "npm:1.30.0" prom-client: "npm:^15.1.3" publint: "npm:^0.3.12" - rc-slider: "npm:11.1.9" rc-tree: "npm:5.13.1" re-resizable: "npm:6.11.2" react: "npm:18.3.1" @@ -28085,20 +28098,6 @@ __metadata: languageName: node linkType: hard -"rc-slider@npm:11.1.9": - version: 11.1.9 - resolution: "rc-slider@npm:11.1.9" - dependencies: - "@babel/runtime": "npm:^7.10.1" - classnames: "npm:^2.2.5" - rc-util: "npm:^5.36.0" - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: 10/b9b1c5b9e690db565a09fde0d6cc9b8562cbb15dd8a0d1eb0a7039c4fcb6c4307ba1cb58047322b8be518a6eb226af9db5c7d974d6ff197fe07f0db84d56cc5e - languageName: node - linkType: hard - "rc-tooltip@npm:6.4.0": version: 6.4.0 resolution: "rc-tooltip@npm:6.4.0" @@ -28130,7 +28129,7 @@ __metadata: languageName: node linkType: hard -"rc-util@npm:^5.15.0, rc-util@npm:^5.16.1, rc-util@npm:^5.21.0, rc-util@npm:^5.24.4, rc-util@npm:^5.36.0, rc-util@npm:^5.37.0, rc-util@npm:^5.38.0, rc-util@npm:^5.43.0, rc-util@npm:^5.44.1, rc-util@npm:^5.44.3": +"rc-util@npm:^5.15.0, rc-util@npm:^5.16.1, rc-util@npm:^5.21.0, rc-util@npm:^5.24.4, rc-util@npm:^5.37.0, rc-util@npm:^5.38.0, rc-util@npm:^5.43.0, rc-util@npm:^5.44.1, rc-util@npm:^5.44.3": version: 5.44.3 resolution: "rc-util@npm:5.44.3" dependencies: