Compare commits

...

3 Commits

Author SHA1 Message Date
grafakus 17459fe1f4 Add min width 2025-12-15 14:35:47 +01:00
grafakus 23cffc0849 Hide close button 2025-12-15 13:43:46 +01:00
grafakus 70a4e090f7 DynamicDashboards: Fix to enable the selection of options for variables in the controls menu 2025-12-15 13:09:57 +01:00
2 changed files with 6 additions and 21 deletions
@@ -18,23 +18,7 @@ interface DashboardControlsMenuProps {
export function DashboardControlsMenu({ variables, links, annotations, dashboardUID }: DashboardControlsMenuProps) { export function DashboardControlsMenu({ variables, links, annotations, dashboardUID }: DashboardControlsMenuProps) {
return ( return (
<Box <Box minWidth={32}>
minWidth={32}
borderColor={'weak'}
borderStyle={'solid'}
boxShadow={'z3'}
display={'flex'}
direction={'column'}
borderRadius={'default'}
backgroundColor={'primary'}
padding={1}
gap={0.5}
onClick={(e) => {
// Normally, clicking the overlay closes the dropdown.
// We stop event propagation here to keep it open while users interact with variable controls.
e.stopPropagation();
}}
>
{/* Variables */} {/* Variables */}
{variables.map((variable, index) => ( {variables.map((variable, index) => (
<div key={variable.state.key}> <div key={variable.state.key}>
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
import { GrafanaTheme2 } from '@grafana/data'; import { GrafanaTheme2 } from '@grafana/data';
import { t } from '@grafana/i18n'; import { t } from '@grafana/i18n';
import { Dropdown, ToolbarButton, useStyles2 } from '@grafana/ui'; import { Toggletip, ToolbarButton, useStyles2 } from '@grafana/ui';
import { DashboardScene } from '../DashboardScene'; import { DashboardScene } from '../DashboardScene';
@@ -24,11 +24,12 @@ export function DashboardControlsButton({ dashboard }: { dashboard: DashboardSce
} }
return ( return (
<Dropdown <Toggletip
placement="bottom-start" placement="bottom-start"
overlay={ content={
<DashboardControlsMenu variables={variables} links={links} annotations={annotations} dashboardUID={uid} /> <DashboardControlsMenu variables={variables} links={links} annotations={annotations} dashboardUID={uid} />
} }
closeButton={false}
> >
<ToolbarButton <ToolbarButton
aria-label={t('dashboard.controls.menu.aria-label', DASHBOARD_CONTROLS_MENU_ARIA_LABEL)} aria-label={t('dashboard.controls.menu.aria-label', DASHBOARD_CONTROLS_MENU_ARIA_LABEL)}
@@ -40,7 +41,7 @@ export function DashboardControlsButton({ dashboard }: { dashboard: DashboardSce
> >
+ {dashboardControlsCount} + {dashboardControlsCount}
</ToolbarButton> </ToolbarButton>
</Dropdown> </Toggletip>
); );
} }