From 3c18add70b83b761109ecfd7bc11f294ec2b366b Mon Sep 17 00:00:00 2001 From: Sven Grossmann Date: Mon, 21 Jul 2025 12:24:26 +0200 Subject: [PATCH] ExtensionSidebar: Make sure sidebar will not render more than max width (#108374) ExtensionSidebar: Make sure sidebar will not render more than max --- .../ExtensionSidebar/ExtensionSidebarProvider.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionSidebarProvider.tsx b/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionSidebarProvider.tsx index 84484eab290..571b264cdd3 100644 --- a/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionSidebarProvider.tsx +++ b/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionSidebarProvider.tsx @@ -6,7 +6,7 @@ import { config, getAppEvents, reportInteraction, usePluginLinks, locationServic import { ExtensionPointPluginMeta, getExtensionPointPluginMeta } from 'app/features/plugins/extensions/utils'; import { CloseExtensionSidebarEvent, OpenExtensionSidebarEvent } from 'app/types/events'; -import { DEFAULT_EXTENSION_SIDEBAR_WIDTH } from './ExtensionSidebar'; +import { DEFAULT_EXTENSION_SIDEBAR_WIDTH, MAX_EXTENSION_SIDEBAR_WIDTH } from './ExtensionSidebar'; export const EXTENSION_SIDEBAR_DOCKED_LOCAL_STORAGE_KEY = 'grafana.navigation.extensionSidebarDocked'; export const EXTENSION_SIDEBAR_WIDTH_LOCAL_STORAGE_KEY = 'grafana.navigation.extensionSidebarWidth'; @@ -231,7 +231,10 @@ export const ExtensionSidebarContextProvider = ({ children }: ExtensionSidebarCo dockedComponentId, setDockedComponentId: (componentId) => setDockedComponentWithProps(componentId, undefined), availableComponents, - extensionSidebarWidth: extensionSidebarWidth ?? DEFAULT_EXTENSION_SIDEBAR_WIDTH, + extensionSidebarWidth: Math.min( + extensionSidebarWidth ?? DEFAULT_EXTENSION_SIDEBAR_WIDTH, + MAX_EXTENSION_SIDEBAR_WIDTH + ), setExtensionSidebarWidth, props, }}