Skip to content
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

Jump to bottom

Dashboards: PanelChrome - remove untitled placeholder and add border when panel is transparent #73150

Merged
merged 3 commits into from Aug 10, 2023
Merged

Dashboards: PanelChrome - remove untitled placeholder and add border when panel is transparent #73150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
431f145
PanelChrome: Remove untitled placeholder
axelavargas Aug 10, 2023
b41b2bc
Remove unnecesary css untitled
axelavargas Aug 10, 2023
63a6e00
Add border on hover when panel is transparent
axelavargas Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions packages/grafana-ui/src/components/PanelChrome/HoverWidget.tsx
View file
Open in desktop
Expand Up @@ -48,7 +48,6 @@ export function HoverWidget({ menu, title, dragClass, children, offset = -32, on
<Icon name="expand-arrows" className={styles.draggableIcon} />
</div>
)}
{!title && <h6 className={cx(styles.untitled, { [styles.draggable]: !!dragClass }, dragClass)}>Untitled</h6>}
{children}
{menu && (
<PanelMenu
Expand Down Expand Up @@ -103,12 +102,6 @@ function getStyles(theme: GrafanaTheme2) {
background: theme.colors.secondary.main,
},
}),
untitled: css({
color: theme.colors.text.disabled,
fontStyle: 'italic',
padding: theme.spacing(0, 1),
marginBottom: 0,
}),
draggableIcon: css({
transform: 'rotate(45deg)',
color: theme.colors.text.secondary,
Expand Down
24 changes: 17 additions & 7 deletions packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
View file
Open in desktop
Expand Up @@ -122,6 +122,7 @@ export function PanelChrome({

// hover menu is only shown on hover when not on touch devices
const showOnHoverClass = 'show-on-hover';
const isPanelTransparent = displayMode === 'transparent';

const headerHeight = getHeaderHeight(theme, hasHeader);
const { contentStyle, innerWidth, innerHeight } = getContentStyle(
Expand All @@ -139,11 +140,6 @@ export function PanelChrome({
};

const containerStyles: CSSProperties = { width, height: isOpen ? height : headerHeight };
if (displayMode === 'transparent') {
containerStyles.backgroundColor = 'transparent';
containerStyles.border = 'none';
}

const [ref, { width: loadingBarWidth }] = useMeasure<HTMLDivElement>();

/** Old property name now maps to actions */
Expand Down Expand Up @@ -214,8 +210,13 @@ export function PanelChrome({

return (
// tabIndex={0} is needed for keyboard accessibility in the plot area
// eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
<div className={styles.container} style={containerStyles} data-testid={testid} tabIndex={0} ref={ref}>
<div
className={cx(styles.container, { [styles.transparentContainer]: isPanelTransparent })}
style={containerStyles}
data-testid={testid}
tabIndex={0} //eslint-disable-line jsx-a11y/no-noninteractive-tabindex
ref={ref}
>
<div className={styles.loadingBarContainer}>
{loadingState === LoadingState.Loading ? (
<LoadingBar width={loadingBarWidth} ariaLabel="Panel loading bar" />
Expand Down Expand Up @@ -361,6 +362,15 @@ const getStyles = (theme: GrafanaTheme2) => {
},
},
}),
transparentContainer: css({
label: 'panel-transparent-container',
backgroundColor: 'transparent',
border: '1px solid transparent',
boxSizing: 'border-box',
'&:hover': {
border: `1px solid ${borderColor}`,
},
}),
loadingBarContainer: css({
label: 'panel-loading-bar-container',
position: 'absolute',
Expand Down