From 21cbcde15fcb6ed7182e3398063ced4f8a379d71 Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Fri, 24 Apr 2020 23:04:36 +0200 Subject: [PATCH] Revert rc-slider dependency update, add z-index to tooltip (#23873) --- packages/grafana-ui/package.json | 2 +- packages/grafana-ui/src/components/Slider/Slider.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 489895c6149..0daa8ddd6e0 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -50,7 +50,7 @@ "papaparse": "4.6.3", "rc-cascader": "1.0.1", "rc-drawer": "3.1.3", - "rc-slider": "9.2.3", + "rc-slider": "8.7.1", "rc-time-picker": "^3.7.3", "react": "16.12.0", "react-beautiful-dnd": "13.0.0", diff --git a/packages/grafana-ui/src/components/Slider/Slider.tsx b/packages/grafana-ui/src/components/Slider/Slider.tsx index 3d17535678c..5b766c5f2a6 100644 --- a/packages/grafana-ui/src/components/Slider/Slider.tsx +++ b/packages/grafana-ui/src/components/Slider/Slider.tsx @@ -75,6 +75,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme, isHorizontal: boolean) => .rc-slider-tooltip { cursor: grab; user-select: none; + z-index: ${theme.zIndex.tooltip}; } .rc-slider-tooltip-inner {