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

Use EuiInnerText in EuiBreadcrumbs #2425

Merged
merged 3 commits into from
Oct 14, 2019
Merged

Use EuiInnerText in EuiBreadcrumbs #2425

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
09110fb
use euiinnertext instead
thompsongl Oct 12, 2019
8541812
CL
thompsongl Oct 12, 2019
835aa79
Merge branch 'master' into breadcrumb-innertext
thompsongl Oct 14, 2019
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
11 changes: 6 additions & 5 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@
- Added new `EuiColorStops` component ([#2360](https://github.com/elastic/eui/pull/2360))
- Added `currency` glyph to 'EuiIcon' ([#2398](https://github.com/elastic/eui/pull/2398))
- Migrate `EuiBreadcrumbs`, `EuiHeader` etc, and `EuiLink` to TypeScript ([#2391](https://github.com/elastic/eui/pull/2391))
- Added `hasChildLabel` prop to `EuiFormRow` to avoid duplicate labels ([#2390](https://github.com/elastic/eui/pull/2390))
- Added `hasChildLabel` prop to `EuiFormRow` to avoid duplicate labels ([#2411](https://github.com/elastic/eui/pull/2411))
- Added `component` prop to `EuiPageBody`, switching the default from `div` to `main` ([#2410](https://github.com/elastic/eui/pull/2410))
- Added focus state to `EuiListGroupItem` ([#2406](https://github.com/elastic/eui/pull/2406))
- Added `keyboardShorcut` glyph to 'EuiIcon ([#2413](https://github.com/elastic/eui/pull/2413))
- Improved a11y in `EuiNavDrawer` ([#2417](https://github.com/elastic/eui/pull/2417))
- Improved a11y in `EuiSuperDatePicker` ([#2426](https://github.com/elastic/eui/pull/2426))

**Bug fixes**

- Fixed `EuiSelectable` to accept programmatic updates to its `options` prop ([#2390](https://github.com/elastic/eui/pull/2390))
- Fixed poor labeling in `EuiSuperDatePicker` ([#2390](https://github.com/elastic/eui/pull/2411))
- Fixed `EuiCodeEditor`'s ID to be dynamic between renders ([#2390](https://github.com/elastic/eui/pull/2411))
- Fixed `EuiCodeEditor` to not render multiple labels for some inputs ([#2390](https://github.com/elastic/eui/pull/2411))
- Continues a11y fixes in `EuiSuperDatePicker` ([#2426](https://github.com/elastic/eui/pull/2426))
- Fixed poor labeling in `EuiSuperDatePicker` ([#2411](https://github.com/elastic/eui/pull/2411))
- Fixed `EuiCodeEditor`'s ID to be dynamic between renders ([#2411](https://github.com/elastic/eui/pull/2411))
- Fixed `EuiCodeEditor` to not render multiple labels for some inputs ([#2411](https://github.com/elastic/eui/pull/2411))
- Fixed `EuiBreadcrumbs` improper use of `useInnerText` hook ([#2425](https://github.com/elastic/eui/pull/2425))

## [`14.4.0`](https://github.com/elastic/eui/tree/v14.4.0)

Expand Down
47 changes: 27 additions & 20 deletions src/components/breadcrumbs/breadcrumbs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import classNames from 'classnames';
import { CommonProps } from '../common';
import { EuiBadge } from '../badge';
import { EuiI18n } from '../i18n';
import { useInnerText } from '../inner_text';
import { EuiInnerText } from '../inner_text';
import { EuiLink } from '../link';
import { EuiPopover } from '../popover';

Expand Down Expand Up @@ -174,31 +174,38 @@ export const EuiBreadcrumbs: FunctionComponent<EuiBreadcrumbsProps> = ({
});

let link;
const [setRef, innerText] = useInnerText();

if (isLastBreadcrumb && !href) {
link = (
<span
ref={setRef}
className={breadcrumbClasses}
title={innerText}
aria-current="page"
{...breadcrumbRest}>
{text}
</span>
<EuiInnerText>
{(ref, innerText) => (
<span
ref={ref}
className={breadcrumbClasses}
title={innerText}
aria-current="page"
{...breadcrumbRest}>
{text}
</span>
)}
</EuiInnerText>
);
} else {
link = (
<EuiLink
ref={setRef}
color={isLastBreadcrumb ? 'text' : 'subdued'}
onClick={onClick}
href={href}
className={breadcrumbClasses}
title={innerText}
{...breadcrumbRest}>
{text}
</EuiLink>
<EuiInnerText>
{(ref, innerText) => (
<EuiLink
ref={ref}
color={isLastBreadcrumb ? 'text' : 'subdued'}
onClick={onClick}
href={href}
className={breadcrumbClasses}
title={innerText}
{...breadcrumbRest}>
{text}
</EuiLink>
)}
</EuiInnerText>
);
}

Expand Down