Skip to content

fix: [Obs Inventory][KEYBOARD]: The map view tooltips must be available on keyboard focus #187861

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

Merged
alexwizp merged 5 commits into from
Aug 22, 2024
Merged

fix: [Obs Inventory][KEYBOARD]: The map view tooltips must be available on keyboard focus #187861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef71bd6
fix: [Obs Inventory][KEYBOARD]: The map view tooltips must be availab…
alexwizp Aug 21, 2024
11f1bd1
fix issue with focus
alexwizp Aug 21, 2024
7038add
remove extra methods
alexwizp Aug 21, 2024
76d07da
fix ts error
alexwizp Aug 21, 2024
ae09ef0
Merge branch 'main' into k8s-focus
alexwizp Aug 21, 2024
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
1 change: 1 addition & 0 deletions ...bservability_solution/infra/public/pages/metrics/inventory_view/components/table_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export const TableView = (props: Props) => {
isOpen={openPopoverId === uniqueID}
closePopover={closePopover}
anchorPosition="rightCenter"
zIndex={0}
>
<NodeContextMenu
node={item.node}
Expand Down
77 changes: 35 additions & 42 deletions ...servability_solution/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export const Node = ({
setFlyoutUrlState,
detailsItemId,
}: Props) => {
const [isToolTipOpen, { off: hideToolTip, on: showToolTip }] = useBoolean(false);
const [isPopoverOpen, { off: closePopover, toggle: togglePopover }] = useBoolean(false);

const metric = first(node.metrics);
Expand All @@ -57,58 +56,52 @@ export const Node = ({
const value = formatter(rawValue);

const isContainerAssetViewEnabled = useUiSetting(enableInfrastructureContainerAssetView);

const showContainerAssetDetailPage = nodeType === 'container' && isContainerAssetViewEnabled;
const isFlyoutMode = nodeType === 'host' || showContainerAssetDetailPage;

const toggleAssetPopover = () => {
if (nodeType === 'host' || showContainerAssetDetailPage) {
if (isFlyoutMode) {
setFlyoutUrlState({ detailsItemId: node.id, assetType: nodeType });
} else {
togglePopover();
}
};

const nodeSquare = (
<NodeSquare
squareSize={squareSize}
togglePopover={toggleAssetPopover}
showToolTip={showToolTip}
hideToolTip={hideToolTip}
color={color}
nodeName={node.name}
value={value}
showBorder={detailsItemId === node.id || isPopoverOpen}
/>
<EuiToolTip
delay="regular"
position="right"
content={<ConditionalToolTip currentTime={currentTime} node={node} nodeType={nodeType} />}
>
<div>
<NodeSquare
squareSize={squareSize}
togglePopover={toggleAssetPopover}
color={color}
nodeName={node.name}
value={value}
showBorder={detailsItemId === node.id || isPopoverOpen}
/>
</div>
</EuiToolTip>
);

return (
<>
{isPopoverOpen ? (
<EuiPopover
button={nodeSquare}
Comment thread
alexwizp marked this conversation as resolved.
Outdated
isOpen={isPopoverOpen}
closePopover={closePopover}
anchorPosition="downCenter"
style={{ height: squareSize }}
>
<NodeContextMenu
node={node}
nodeType={nodeType}
options={options}
currentTime={currentTime}
/>
</EuiPopover>
) : isToolTipOpen ? (
<EuiToolTip
delay="regular"
position="right"
content={<ConditionalToolTip currentTime={currentTime} node={node} nodeType={nodeType} />}
>
{nodeSquare}
</EuiToolTip>
) : (
nodeSquare
)}
</>
return !isFlyoutMode ? (
<EuiPopover
button={nodeSquare}
isOpen={isPopoverOpen}
closePopover={closePopover}
anchorPosition="downCenter"
zIndex={0}
>
<NodeContextMenu
node={node}
nodeType={nodeType}
options={options}
currentTime={currentTime}
/>
</EuiPopover>
) : (
nodeSquare
);
};
18 changes: 5 additions & 13 deletions ...lity_solution/infra/public/pages/metrics/inventory_view/components/waffle/node_square.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ const NodeContainerSmall = ({ children, ...props }: NodeProps & { color: string
{children}
</div>
);
const ValueInner = ({ children, ...props }: NodeProps<HTMLButtonElement>) => (
<button
const ValueInner = ({ children, ...props }: NodeProps) => (
<div
css={css`
position: absolute;
top: 0;
Expand All @@ -89,10 +89,11 @@ const ValueInner = ({ children, ...props }: NodeProps<HTMLButtonElement>) => (
box-shadow: none;
}
`}
tabIndex={0}
{...props}
>
{children}
</button>
</div>
);
const SquareOuter = ({ children, ...props }: NodeProps & { color: string }) => (
<div
Expand Down Expand Up @@ -154,17 +155,13 @@ const Value = ({ children, ...props }: NodeProps & { color: string }) => (
export const NodeSquare = ({
squareSize,
togglePopover,
showToolTip,
hideToolTip,
color,
nodeName,
value,
showBorder,
}: {
squareSize: number;
togglePopover: UseBooleanHandlers['toggle'];
showToolTip: () => void;
hideToolTip: () => void;
color: string;
nodeName: string;
value: string;
Expand All @@ -184,9 +181,6 @@ export const NodeSquare = ({
style={{ width: squareSize || 0, height: squareSize || 0 }}
onClick={togglePopover}
onKeyPress={togglePopover}
onFocus={showToolTip}
onMouseOver={showToolTip}
onMouseLeave={hideToolTip}
Comment thread
alexwizp marked this conversation as resolved.
Outdated
className="buttonContainer"
>
<SquareOuter color={color} style={style}>
Expand Down Expand Up @@ -217,10 +211,8 @@ export const NodeSquare = ({
style={{ width: squareSize || 0, height: squareSize || 0, ...style }}
onClick={togglePopover}
onKeyPress={togglePopover}
onMouseOver={showToolTip}
onFocus={showToolTip}
onMouseLeave={hideToolTip}
color={color}
tabIndex={0}
/>
);
};