Skip to content

Refresh button width adaptation #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ivanortegaalba wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Refresh button width adaptation #1387

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c3c7972
RefreshPicker: adapt button width to label content instead of fixed 96px
cursoragent Mar 9, 2026
6958734
Fix prettier formatting
cursoragent Mar 9, 2026
b7dcb69
RefreshPicker: remove fixed 96px width, let button adapt to content
cursoragent Mar 9, 2026
cd71aea
RefreshPicker: use two overlapping spans for stable button width
cursoragent Mar 9, 2026
2157917
Simplify: use inline-grid with two overlapping spans for stable width
cursoragent Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 18 additions & 23 deletions packages/scenes/src/components/SceneRefreshPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { ReactNode } from 'react';
import { Unsubscribable } from 'rxjs';
import { rangeUtil } from '@grafana/data';
import { config } from '@grafana/runtime';
Expand Down Expand Up @@ -212,38 +212,33 @@ export function SceneRefreshPickerRenderer({ model }: SceneComponentProps<SceneR
const { refresh, intervals, autoEnabled, autoValue, isOnCanvas, primary, withText } = model.useState();
const isRunning = useQueryControllerState(model);

let text =
refresh === RefreshPicker.autoOption?.value
? autoValue
: withText
? t('grafana-scenes.components.scene-refresh-picker.text-refresh', 'Refresh')
: undefined;
let tooltip: string | undefined;
let width: string | undefined;
const refreshLabel = t('grafana-scenes.components.scene-refresh-picker.text-refresh', 'Refresh');
const cancelLabel = t('grafana-scenes.components.scene-refresh-picker.text-cancel', 'Cancel');

if (isRunning) {
tooltip = t('grafana-scenes.components.scene-refresh-picker.tooltip-cancel', 'Cancel all queries');
let text: string | ReactNode | undefined;

if (withText) {
text = t('grafana-scenes.components.scene-refresh-picker.text-cancel', 'Cancel');
}
}

if (withText) {
width = '96px';
if (refresh === RefreshPicker.autoOption?.value) {
text = isRunning && withText ? cancelLabel : autoValue;
} else if (withText) {
text = (
<span style={{ display: 'inline-grid' }}>
<span style={{ gridArea: '1/1', visibility: isRunning ? 'hidden' : 'visible' }}>{refreshLabel}</span>
<span style={{ gridArea: '1/1', visibility: isRunning ? 'visible' : 'hidden' }}>{cancelLabel}</span>
</span>
);
}

return (
<RefreshPicker
showAutoInterval={autoEnabled}
value={refresh}
intervals={intervals}
tooltip={tooltip}
width={width}
tooltip={
isRunning ? t('grafana-scenes.components.scene-refresh-picker.tooltip-cancel', 'Cancel all queries') : undefined
}
// @ts-expect-error RefreshPicker types text as string but accepts ReactNode at runtime
text={text}
onRefresh={() => {
model.onRefresh();
}}
onRefresh={() => model.onRefresh()}
primary={primary}
onIntervalChanged={model.onIntervalChanged}
isLoading={isRunning}
Expand Down