From f3cc62569b2b4bf8a9419af4eb4cf4c020e46600 Mon Sep 17 00:00:00 2001
From: Oscar Kilhed <oscar.kilhed@grafana.com>
Date: Tue, 21 Oct 2025 23:13:08 +0200
Subject: [PATCH] Dynamic dashboards: Make sure tab is selected when creating a
 new tab inside a row (#112630)

Make sure tab is selected when creating a new tab inside a row
---
 .../scene/layout-rows/RowsLayoutManagerRenderer.tsx             | 2 ++
 .../scene/layout-tabs/TabsLayoutManagerRenderer.tsx             | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManagerRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManagerRenderer.tsx
index af902374af6..85310dc65bf 100644
--- a/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManagerRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManagerRenderer.tsx
@@ -67,6 +67,7 @@ export function RowLayoutManagerRenderer({ model }: SceneComponentProps<RowsLayo
                   variant="primary"
                   fill="text"
                   onClick={() => model.addNewRow()}
+                  onPointerUp={(evt) => evt.stopPropagation()}
                   data-testid={selectors.components.CanvasGridAddActions.addRow}
                 >
                   <Trans i18nKey="dashboard.canvas-actions.new-row">New row</Trans>
@@ -77,6 +78,7 @@ export function RowLayoutManagerRenderer({ model }: SceneComponentProps<RowsLayo
                     variant="primary"
                     fill="text"
                     onClick={() => model.pasteRow()}
+                    onPointerUp={(evt) => evt.stopPropagation()}
                     data-testid={selectors.components.CanvasGridAddActions.pasteRow}
                   >
                     <Trans i18nKey="dashboard.canvas-actions.paste-row">Paste row</Trans>
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManagerRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManagerRenderer.tsx
index 62e1c3f3208..5f5f2a00025 100644
--- a/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManagerRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManagerRenderer.tsx
@@ -77,6 +77,7 @@ export function TabsLayoutManagerRenderer({ model }: SceneComponentProps<TabsLay
                   variant="primary"
                   fill="text"
                   onClick={() => model.addNewTab()}
+                  onPointerUp={(evt) => evt.stopPropagation()}
                   data-testid={selectors.components.CanvasGridAddActions.addTab}
                 >
                   <Trans i18nKey="dashboard.canvas-actions.new-tab">New tab</Trans>
@@ -87,6 +88,7 @@ export function TabsLayoutManagerRenderer({ model }: SceneComponentProps<TabsLay
                     variant="primary"
                     fill="text"
                     onClick={() => model.pasteTab()}
+                    onPointerUp={(evt) => evt.stopPropagation()}
                     data-testid={selectors.components.CanvasGridAddActions.pasteTab}
                   >
                     <Trans i18nKey="dashboard.canvas-actions.paste-tab">Paste tab</Trans>