Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function TopSearchBarCommandPaletteTrigger() {

const breakpoint = theme.breakpoints.values.lg;

const [isSmallScreen, setIsSmallScreen] = useState(!window.matchMedia(`(min-width: ${breakpoint}px)`).matches);
const [isSmallScreen, setIsSmallScreen] = useState(() => !window.matchMedia(`(min-width: ${breakpoint}px)`).matches);

useMediaQueryChange({
breakpoint,
Expand Down
5 changes: 5 additions & 0 deletions public/app/core/hooks/useMediaQueryChange.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ export function useMediaQueryChange({
useEffect(() => {
const mediaQuery = window.matchMedia(`(min-width: ${breakpoint}px)`);
const onMediaQueryChange = (e: MediaQueryListEvent) => onChange(e);
// @PERCONA
// Sync current state when effect runs so state is correct even if initial render was wrong
// (e.g. theme/breakpoint not ready). Without this, we only update on resize.
// This was deeply changed on later Grafana versions
onChange({ matches: mediaQuery.matches, media: mediaQuery.media } as MediaQueryListEvent);
mediaQuery.addEventListener('change', onMediaQueryChange);

return () => mediaQuery.removeEventListener('change', onMediaQueryChange);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('DashboardSceneUrlSync', () => {

expect(scene.urlSync?.getUrlState().kiosk).toBe(undefined);
scene.setState({ kioskMode: KioskMode.Full });
expect(scene.urlSync?.getUrlState().kiosk).toBe('');
expect(scene.urlSync?.getUrlState().kiosk).toBe('true');
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
viewPanel: state.viewPanelScene?.getUrlKey(),
editview: state.editview?.getUrlKey(),
editPanel: state.editPanel?.getUrlKey() || undefined,
kiosk: state.kioskMode === KioskMode.Full ? '' : undefined,
// @PERCONA
kiosk: state.kioskMode === KioskMode.Full ? 'true' : undefined,
shareView: state.shareView,
orgId: contextSrv.user.orgId.toString(),
};
Expand Down Expand Up @@ -175,10 +176,13 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
}
}

if (typeof values.kiosk === 'string') {
if (values.kiosk === 'true' || values.kiosk === '') {
update.kioskMode = KioskMode.Full;
}
// @PERCONA
const kioskOn =
values.kiosk === 'true' || values.kiosk === '' || (values as Record<string, unknown>).kiosk === true;
if (kioskOn) {
update.kioskMode = KioskMode.Full;
} else {
update.kioskMode = undefined;
}

if (Object.keys(update).length > 0) {
Expand Down
Loading