From aadd5bacfa30a7030f8cf22d705895d83942dfb5 Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Fri, 22 Sep 2023 11:33:39 -0500
Subject: [PATCH] Chore: uPlot v1.6.26 (#75199)

---
 package.json                                       |  2 +-
 packages/grafana-data/package.json                 |  2 +-
 packages/grafana-ui/package.json                   |  2 +-
 .../app/core/components/TimelineChart/timeline.ts  |  1 +
 .../panel/timeseries/plugins/ContextMenuPlugin.tsx |  8 --------
 yarn.lock                                          | 14 +++++++-------
 6 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 227e0ac57cd..56bdbc0452e 100644
--- a/package.json
+++ b/package.json
@@ -407,7 +407,7 @@
     "tinycolor2": "1.6.0",
     "tslib": "2.6.0",
     "tween-functions": "^1.2.0",
-    "uplot": "1.6.24",
+    "uplot": "1.6.26",
     "uuid": "9.0.0",
     "vendor": "link:./public/vendor",
     "visjs-network": "4.25.0",
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index 9c3f85348ee..a38c7bad684 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -58,7 +58,7 @@
     "string-hash": "^1.1.3",
     "tinycolor2": "1.6.0",
     "tslib": "2.6.0",
-    "uplot": "1.6.24",
+    "uplot": "1.6.26",
     "xss": "^1.0.14"
   },
   "devDependencies": {
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 77b4f1b8a44..5be44387fe1 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -111,7 +111,7 @@
     "slate-react": "0.22.10",
     "tinycolor2": "1.6.0",
     "tslib": "2.6.0",
-    "uplot": "1.6.24",
+    "uplot": "1.6.26",
     "uuid": "9.0.0"
   },
   "devDependencies": {
diff --git a/public/app/core/components/TimelineChart/timeline.ts b/public/app/core/components/TimelineChart/timeline.ts
index 892d0f4ea8f..b9a6007600c 100644
--- a/public/app/core/components/TimelineChart/timeline.ts
+++ b/public/app/core/components/TimelineChart/timeline.ts
@@ -90,6 +90,7 @@ export function getConfig(opts: TimelineCoreOptions) {
       mark.classList.add('bar-mark');
       mark.style.position = 'absolute';
       mark.style.background = 'rgba(255,255,255,0.2)';
+      mark.style.pointerEvents = 'none';
       return mark;
     });
 
diff --git a/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
index ae2c0fb777e..ee6573ff7cf 100644
--- a/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
@@ -1,4 +1,3 @@
-import { css as cssCore, Global } from '@emotion/react';
 import React, { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useClickAway } from 'react-use';
 
@@ -167,13 +166,6 @@ export const ContextMenuPlugin = ({
 
   return (
     <>
-      <Global
-        styles={cssCore`
-        .uplot .u-cursor-pt {
-          pointer-events: auto !important;
-        }
-      `}
-      />
       {isOpen && coords && (
         <ContextMenuView
           data={data}
diff --git a/yarn.lock b/yarn.lock
index 92f9639b309..9d37d1ab9eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3708,7 +3708,7 @@ __metadata:
     tinycolor2: 1.6.0
     tslib: 2.6.0
     typescript: 4.8.4
-    uplot: 1.6.24
+    uplot: 1.6.26
     xss: ^1.0.14
   peerDependencies:
     react: ^17.0.0 || ^18.0.0
@@ -4204,7 +4204,7 @@ __metadata:
     tinycolor2: 1.6.0
     tslib: 2.6.0
     typescript: 4.8.4
-    uplot: 1.6.24
+    uplot: 1.6.26
     uuid: 9.0.0
     webpack: 5.88.1
   peerDependencies:
@@ -20025,7 +20025,7 @@ __metadata:
     tslib: 2.6.0
     tween-functions: ^1.2.0
     typescript: 4.8.4
-    uplot: 1.6.24
+    uplot: 1.6.26
     uuid: 9.0.0
     vendor: "link:./public/vendor"
     visjs-network: 4.25.0
@@ -32999,10 +32999,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uplot@npm:1.6.24":
-  version: 1.6.24
-  resolution: "uplot@npm:1.6.24"
-  checksum: 253e389dc6db40e1231d1c63913dea1e6987856cfde985da036e70786ef0077afc40f3ed6883c54d95a97ecedc3ea52a7fa815e88f3c3d381b61c15e745f8a40
+"uplot@npm:1.6.26":
+  version: 1.6.26
+  resolution: "uplot@npm:1.6.26"
+  checksum: 873b5b049b0b2e00534e4a02bfcab7df6972099a2cedec0cd8b1ba949b318628a7d59b988e0f45fd3f8ed4eb6cc5a84d59f83a15b702c21f7396c664dc41a124
   languageName: node
   linkType: hard