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

VizPanelRenderer: Emit SetPanelAttention event #716

Merged
merged 9 commits into from
May 30, 2024
Merged

VizPanelRenderer: Emit SetPanelAttention event #716

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
41465ba
Add attention state as a combination between keyboard focus and mouse…
tskarhed May 3, 2024
8c567b7
Use PanelAttentionService
tskarhed May 22, 2024
655f646
Use viz-panel-key instead
tskarhed May 23, 2024
d6a5418
support undefined service use case
tskarhed May 23, 2024
5885025
Debounce mousemove
tskarhed May 24, 2024
ae36737
Use AppEvents
tskarhed May 27, 2024
5f4ef92
Memoize functions
tskarhed May 30, 2024
74b3657
Ignore onFocus (it is avilable in grafana/ui canary)
tskarhed May 30, 2024
897eb8c
Update packages/scenes/src/components/VizPanel/VizPanelRenderer.tsx
tskarhed May 30, 2024
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
28 changes: 27 additions & 1 deletion packages/scenes/src/components/layout/grid/SceneGridLayoutRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import { GrafanaTheme2 } from '@grafana/data';
export function SceneGridLayoutRenderer({ model }: SceneComponentProps<SceneGridLayout>) {
const { children, isLazy, isDraggable, isResizable } = model.useState();

// Attention to handle keyboard and hover shortcuts
const [attention, setAttention] = React.useState<string | undefined>();

validateChildrenSize(children);

return (
Expand Down Expand Up @@ -66,6 +69,8 @@ export function SceneGridLayoutRenderer({ model }: SceneComponentProps<SceneGrid
index={index}
isLazy={isLazy}
totalCount={layout.length}
hasAttention={attention === gridItem.i}
setAttention={() => setAttention(gridItem.i)}
/>
))}
</ReactGridLayout>
Expand All @@ -82,10 +87,25 @@ interface GridItemWrapperProps extends React.HTMLAttributes<HTMLDivElement> {
index: number;
totalCount: number;
isLazy?: boolean;
hasAttention: boolean;
setAttention: () => void;
}

const GridItemWrapper = React.forwardRef<HTMLDivElement, GridItemWrapperProps>((props, ref) => {
const { grid, layoutItem, index, totalCount, isLazy, style, onLoad, onChange, children, ...divProps } = props;
const {
grid,
layoutItem,
index,
totalCount,
isLazy,
style,
onLoad,
onChange,
children,
hasAttention,
setAttention,
...divProps
} = props;
const sceneChild = grid.getSceneLayoutChild(layoutItem.i)!;
const className = sceneChild.getClassName?.();

Expand All @@ -97,6 +117,9 @@ const GridItemWrapper = React.forwardRef<HTMLDivElement, GridItemWrapperProps>((
{...divProps}
key={sceneChild.state.key!}
data-griditem-key={sceneChild.state.key}
data-attention={hasAttention}
onFocus={() => !hasAttention && setAttention()}
onMouseMove={() => !hasAttention && setAttention()}
className={cx(className, props.className)}
style={style}
ref={ref}
Expand All @@ -113,6 +136,9 @@ const GridItemWrapper = React.forwardRef<HTMLDivElement, GridItemWrapperProps>((
ref={ref}
key={sceneChild.state.key}
data-griditem-key={sceneChild.state.key}
data-attention={hasAttention}
onFocus={() => !hasAttention && setAttention()}
onMouseMove={() => !hasAttention && setAttention()}
className={cx(className, props.className)}
style={style}
>
Expand Down