From 54dc5398c525900d961164976583f2c127ba5132 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Wed, 3 Dec 2025 17:11:18 +0000
Subject: [PATCH] update rc-tree

---
 package.json                                  |  2 +-
 .../editor/layer/TreeNavigationEditor.tsx     |  2 +-
 yarn.lock                                     | 40 ++++++++++++++++---
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 76ee5404a36..5d7935110eb 100644
--- a/package.json
+++ b/package.json
@@ -319,6 +319,7 @@
     "@opentelemetry/semantic-conventions": "1.38.0",
     "@popperjs/core": "2.11.8",
     "@rc-component/slider": "1.0.1",
+    "@rc-component/tree": "1.1.0",
     "@react-aria/dialog": "3.5.31",
     "@react-aria/focus": "3.21.2",
     "@react-aria/overlays": "3.30.0",
@@ -387,7 +388,6 @@
     "ol-mapbox-style": "^13.0.1",
     "pluralize": "^8.0.0",
     "prismjs": "1.30.0",
-    "rc-tree": "5.13.1",
     "re-resizable": "6.11.2",
     "react": "18.3.1",
     "react-diff-viewer-continued": "^3.4.0",
diff --git a/public/app/plugins/panel/canvas/editor/layer/TreeNavigationEditor.tsx b/public/app/plugins/panel/canvas/editor/layer/TreeNavigationEditor.tsx
index 0ac11d42758..1117a684ac1 100644
--- a/public/app/plugins/panel/canvas/editor/layer/TreeNavigationEditor.tsx
+++ b/public/app/plugins/panel/canvas/editor/layer/TreeNavigationEditor.tsx
@@ -1,6 +1,6 @@
 import { css } from '@emotion/css';
 import { Global } from '@emotion/react';
-import Tree, { TreeNodeProps } from 'rc-tree';
+import Tree, { TreeNodeProps } from '@rc-component/tree';
 import { Key, useEffect, useMemo, useState } from 'react';
 
 import { GrafanaTheme2, StandardEditorProps } from '@grafana/data';
diff --git a/yarn.lock b/yarn.lock
index 31f5896622f..ae9aabb3ae6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6804,7 +6804,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rc-component/motion@npm:^1.1.4":
+"@rc-component/motion@npm:^1.0.0, @rc-component/motion@npm:^1.1.4":
   version: 1.1.5
   resolution: "@rc-component/motion@npm:1.1.5"
   dependencies:
@@ -6873,7 +6873,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rc-component/resize-observer@npm:^1.0.0":
+"@rc-component/resize-observer@npm:^1.0.0, @rc-component/resize-observer@npm:^1.0.1":
   version: 1.0.1
   resolution: "@rc-component/resize-observer@npm:1.0.1"
   dependencies:
@@ -6912,6 +6912,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rc-component/tree@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@rc-component/tree@npm:1.1.0"
+  dependencies:
+    "@rc-component/motion": "npm:^1.0.0"
+    "@rc-component/util": "npm:^1.2.1"
+    "@rc-component/virtual-list": "npm:^1.0.1"
+    clsx: "npm:^2.1.1"
+  peerDependencies:
+    react: "*"
+    react-dom: "*"
+  checksum: 10/2195332316b95501d0afad15d2edeaddd1eb6ccf98f1c46588750ad6911d1692b64279a46e4cba7c2a202f170d4363a3a3411819bc3087e5a8d99323acb5056f
+  languageName: node
+  linkType: hard
+
 "@rc-component/trigger@npm:^2.1.1":
   version: 2.2.0
   resolution: "@rc-component/trigger@npm:2.2.0"
@@ -6945,7 +6960,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.3.0":
+"@rc-component/util@npm:^1.2.0, @rc-component/util@npm:^1.2.1, @rc-component/util@npm:^1.3.0, @rc-component/util@npm:^1.4.0":
   version: 1.4.0
   resolution: "@rc-component/util@npm:1.4.0"
   dependencies:
@@ -6958,6 +6973,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rc-component/virtual-list@npm:^1.0.1":
+  version: 1.0.2
+  resolution: "@rc-component/virtual-list@npm:1.0.2"
+  dependencies:
+    "@babel/runtime": "npm:^7.20.0"
+    "@rc-component/resize-observer": "npm:^1.0.1"
+    "@rc-component/util": "npm:^1.4.0"
+    clsx: "npm:^2.1.1"
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: 10/a0e0e730e4ba362b1c4c52977b952a8d056235b232c4f2d73f66b2d0639ed7a3d6eb1faa3c2d835f77fa793b5dbab8b6093240477433098162abc8b0c3cdae7f
+  languageName: node
+  linkType: hard
+
 "@reach/observe-rect@npm:^1.1.0":
   version: 1.2.0
   resolution: "@reach/observe-rect@npm:1.2.0"
@@ -19401,6 +19431,7 @@ __metadata:
     "@pmmmwh/react-refresh-webpack-plugin": "npm:0.6.1"
     "@popperjs/core": "npm:2.11.8"
     "@rc-component/slider": "npm:1.0.1"
+    "@rc-component/tree": "npm:1.1.0"
     "@react-aria/dialog": "npm:3.5.31"
     "@react-aria/focus": "npm:3.21.2"
     "@react-aria/overlays": "npm:3.30.0"
@@ -19611,7 +19642,6 @@ __metadata:
     prismjs: "npm:1.30.0"
     prom-client: "npm:^15.1.3"
     publint: "npm:^0.3.12"
-    rc-tree: "npm:5.13.1"
     re-resizable: "npm:6.11.2"
     react: "npm:18.3.1"
     react-diff-viewer-continued: "npm:^3.4.0"
@@ -28139,7 +28169,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-tree@npm:5.13.1, rc-tree@npm:~5.13.0":
+"rc-tree@npm:~5.13.0":
   version: 5.13.1
   resolution: "rc-tree@npm:5.13.1"
   dependencies: