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

[EuiBreadcrumbs] Fix broken truncation for breadcrumbs that toggle popovers #7375

Merged
merged 4 commits into from
Nov 20, 2023
Merged

[EuiBreadcrumbs] Fix broken truncation for breadcrumbs that toggle popovers #7375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db527a2
[docs] Update popover example with truncating text
cee-chen Nov 20, 2023
e8b9a5f
Seperate text truncation and dropdown arrow
cee-chen Nov 20, 2023
a9cf1e4
Fix responsive edge case
cee-chen Nov 20, 2023
21ec763
changelog
cee-chen Nov 20, 2023
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
3 changes: 3 additions & 0 deletions changelogs/upcoming/7375.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**Bug fixes**

- Fixed visual text truncation of `EuiBreadcrumb`s with `popoverContent`
6 changes: 3 additions & 3 deletions src-docs/src/views/breadcrumbs/popover_content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default () => {
prepend: <EuiAvatar type="space" size="s" name="Michael" />,
},
{
label: "Dwight's space",
label: "Assistant Manager Dwight's space",
prepend: <EuiAvatar type="space" size="s" name="Dwight" />,
},
]);
Expand Down Expand Up @@ -75,10 +75,10 @@ export default () => {
popoverProps: { panelPaddingSize: 'none' },
},
{
text: 'My space',
text: spaces.find((space) => space.checked === 'on')!.label,
popoverContent: (
<EuiSelectable
singleSelection
singleSelection="always"
options={spaces}
onChange={(newOptions) => setSpaces(newOptions)}
searchable
Expand Down
13 changes: 8 additions & 5 deletions src/components/breadcrumbs/__snapshots__/breadcrumb.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@ exports[`EuiBreadcrumbContent renders breadcrumbs with \`popoverContent\` with p
<body>
<div>
<div
class="euiPopover euiPopover-isOpen emotion-euiPopover-inline-block"
class="euiPopover euiPopover-isOpen emotion-euiPopover-inline-block-euiBreadcrumb__popoverWrapper"
data-test-subj="popover"
>
<button
class="euiLink euiBreadcrumb__content emotion-euiLink-subdued-euiBreadcrumb__content-page"
class="euiLink emotion-euiLink-subdued-euiBreadcrumb__popoverButton"
data-test-subj="popoverToggle"
title="Toggles a popover - Clicking this button will toggle a popover dialog."
title="Toggles a popover - Clicking this button will toggle a popover dialog."
type="button"
>
Toggles a popover

<span
class="euiBreadcrumb__content emotion-euiBreadcrumb__content-page"
>
Toggles a popover
</span>
<span
data-euiicon-type="arrowDown"
>
Expand Down
78 changes: 48 additions & 30 deletions src/components/breadcrumbs/__snapshots__/breadcrumbs.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,22 @@ exports[`EuiBreadcrumbs is rendered 1`] = `
data-test-subj="euiBreadcrumb"
>
<div
class="euiPopover emotion-euiPopover-inline-block"
class="euiPopover emotion-euiPopover-inline-block-euiBreadcrumb__popoverWrapper"
>
<button
class="euiLink euiBreadcrumb__content emotion-euiLink-subdued-euiBreadcrumb__content-page"
class="euiLink emotion-euiLink-subdued-euiBreadcrumb__popoverButton"
title="See collapsed breadcrumbs"
type="button"
>
<span
aria-label="See collapsed breadcrumbs"
class="euiBreadcrumb__content emotion-euiBreadcrumb__content-page"
>
…
<span
aria-label="See collapsed breadcrumbs"
>
…
</span>
</span>

<span
data-euiicon-type="arrowDown"
>
Expand Down Expand Up @@ -140,19 +143,22 @@ exports[`EuiBreadcrumbs is rendered with final item as link 1`] = `
data-test-subj="euiBreadcrumb"
>
<div
class="euiPopover emotion-euiPopover-inline-block"
class="euiPopover emotion-euiPopover-inline-block-euiBreadcrumb__popoverWrapper"
>
<button
class="euiLink euiBreadcrumb__content emotion-euiLink-subdued-euiBreadcrumb__content-page"
class="euiLink emotion-euiLink-subdued-euiBreadcrumb__popoverButton"
title="See collapsed breadcrumbs"
type="button"
>
<span
aria-label="See collapsed breadcrumbs"
class="euiBreadcrumb__content emotion-euiBreadcrumb__content-page"
>
…
<span
aria-label="See collapsed breadcrumbs"
>
…
</span>
</span>

<span
data-euiicon-type="arrowDown"
>
Expand Down Expand Up @@ -323,19 +329,22 @@ exports[`EuiBreadcrumbs props max renders 1 item 1`] = `
data-test-subj="euiBreadcrumb"
>
<div
class="euiPopover emotion-euiPopover-inline-block"
class="euiPopover emotion-euiPopover-inline-block-euiBreadcrumb__popoverWrapper"
>
<button
class="euiLink euiBreadcrumb__content emotion-euiLink-subdued-euiBreadcrumb__content-page"
class="euiLink emotion-euiLink-subdued-euiBreadcrumb__popoverButton"
title="See collapsed breadcrumbs"
type="button"
>
<span
aria-label="See collapsed breadcrumbs"
class="euiBreadcrumb__content emotion-euiBreadcrumb__content-page"
>
…
<span
aria-label="See collapsed breadcrumbs"
>
…
</span>
</span>

<span
data-euiicon-type="arrowDown"
>
Expand Down Expand Up @@ -505,19 +514,22 @@ exports[`EuiBreadcrumbs props responsive is rendered 1`] = `
data-test-subj="euiBreadcrumb"
>
<div
class="euiPopover emotion-euiPopover-inline-block"
class="euiPopover emotion-euiPopover-inline-block-euiBreadcrumb__popoverWrapper"
>
<button
class="euiLink euiBreadcrumb__content emotion-euiLink-subdued-euiBreadcrumb__content-page"
class="euiLink emotion-euiLink-subdued-euiBreadcrumb__popoverButton"
title="See collapsed breadcrumbs"
type="button"
>
<span
aria-label="See collapsed breadcrumbs"
class="euiBreadcrumb__content emotion-euiBreadcrumb__content-page"
>
…
<span
aria-label="See collapsed breadcrumbs"
>
…
</span>
</span>

<span
data-euiicon-type="arrowDown"
>
Expand Down Expand Up @@ -605,19 +617,22 @@ exports[`EuiBreadcrumbs props responsive is rendered as false 1`] = `
data-test-subj="euiBreadcrumb"
>
<div
class="euiPopover emotion-euiPopover-inline-block"
class="euiPopover emotion-euiPopover-inline-block-euiBreadcrumb__popoverWrapper"
>
<button
class="euiLink euiBreadcrumb__content emotion-euiLink-subdued-euiBreadcrumb__content-page"
class="euiLink emotion-euiLink-subdued-euiBreadcrumb__popoverButton"
title="See collapsed breadcrumbs"
type="button"
>
<span
aria-label="See collapsed breadcrumbs"
class="euiBreadcrumb__content emotion-euiBreadcrumb__content-page"
>
…
<span
aria-label="See collapsed breadcrumbs"
>
…
</span>
</span>

<span
data-euiicon-type="arrowDown"
>
Expand Down Expand Up @@ -680,19 +695,22 @@ exports[`EuiBreadcrumbs props responsive is rendered with custom breakpoints 1`]
data-test-subj="euiBreadcrumb"
>
<div
class="euiPopover emotion-euiPopover-inline-block"
class="euiPopover emotion-euiPopover-inline-block-euiBreadcrumb__popoverWrapper"
>
<button
class="euiLink euiBreadcrumb__content emotion-euiLink-subdued-euiBreadcrumb__content-page"
class="euiLink emotion-euiLink-subdued-euiBreadcrumb__popoverButton"
title="See collapsed breadcrumbs"
type="button"
>
<span
aria-label="See collapsed breadcrumbs"
class="euiBreadcrumb__content emotion-euiBreadcrumb__content-page"
>
…
<span
aria-label="See collapsed breadcrumbs"
>
…
</span>
</span>

<span
data-euiicon-type="arrowDown"
>
Expand Down
15 changes: 15 additions & 0 deletions src/components/breadcrumbs/breadcrumb.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,21 @@ export const euiBreadcrumbContentStyles = (euiThemeContext: UseEuiTheme) => {
${euiTextTruncate('none')}
`,

// Popover styles
euiBreadcrumb__popoverButton: css`
max-inline-size: 100%;
display: inline-flex;
align-items: center;
gap: ${euiTheme.size.xs};
`,
euiBreadcrumb__popoverWrapper: css`
/* At small container widths, the popover anchor needs to leave room for the breadcrumb separator,
which is weird to get an exact width for because it's transformed at an angle */
max-inline-size: calc(
100% - ${mathWithUnits(euiTheme.size.base, (x) => x + 1)}
);
`,

// Types
page: css`
&:is(a):focus {
Expand Down
20 changes: 9 additions & 11 deletions src/components/breadcrumbs/breadcrumb.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,29 +162,26 @@ export const EuiBreadcrumbContent: FunctionComponent<
{(ref, innerText) => {
const title = innerText === '' ? undefined : innerText;

const sharedProps = {
ref,
title,
'aria-current': ariaCurrent,
className: classes,
css: cssStyles,
};
const baseProps = { ref, title, 'aria-current': ariaCurrent };
const styleProps = { className: classes, css: cssStyles };

if (isPopoverBreadcrumb) {
return (
<EuiPopover
{...popoverProps}
isOpen={isPopoverOpen}
closePopover={() => setIsPopoverOpen(false)}
css={!isLastBreadcrumb && styles.euiBreadcrumb__popoverWrapper}
button={
<EuiLink
{...sharedProps}
{...baseProps}
color={linkColor}
css={styles.euiBreadcrumb__popoverButton}
// Avoid passing href and onClick - should only toggle the popover
onClick={() => setIsPopoverOpen((isOpen) => !isOpen)}
{...rest}
>
{text}{' '}
<span {...styleProps}>{text}</span>
<EuiIcon
type="arrowDown"
size="s"
Expand All @@ -199,7 +196,8 @@ export const EuiBreadcrumbContent: FunctionComponent<
} else if (isInteractiveBreadcrumb) {
return (
<EuiLink
{...sharedProps}
{...baseProps}
{...styleProps}
color={linkColor}
onClick={onClick}
href={href}
Expand All @@ -212,7 +210,7 @@ export const EuiBreadcrumbContent: FunctionComponent<
} else {
return (
<EuiTextColor color={plainTextColor} cloneElement>
<span {...sharedProps} {...rest}>
<span {...baseProps} {...styleProps} {...rest}>
{text}
</span>
</EuiTextColor>
Expand Down
Loading