From 338172c5daabc7d35d6ede91c43573607655680e Mon Sep 17 00:00:00 2001 From: Reza Rahman <13340707+rezrah@users.noreply.github.com> Date: Thu, 28 Nov 2024 17:12:21 +0000 Subject: [PATCH] apply pr feedback --- .../src/Breadcrumbs/Breadcrumbs.test.tsx | 15 ++----- .../react/src/Breadcrumbs/Breadcrumbs.tsx | 44 +++++++++---------- 2 files changed, 25 insertions(+), 34 deletions(-) diff --git a/packages/react/src/Breadcrumbs/Breadcrumbs.test.tsx b/packages/react/src/Breadcrumbs/Breadcrumbs.test.tsx index df410cc83..603fb466b 100644 --- a/packages/react/src/Breadcrumbs/Breadcrumbs.test.tsx +++ b/packages/react/src/Breadcrumbs/Breadcrumbs.test.tsx @@ -55,7 +55,7 @@ describe('Breadcrumbs', () => { }) it('renders selected items correctly into the document', () => { - const {getByText, getAllByRole} = render( + const {getByText, getByRole, getAllByRole} = render( Resources GitHub Copilot @@ -65,16 +65,9 @@ describe('Breadcrumbs', () => { , ) - const breadcrumbLinkEls = getAllByRole('link') - expect(breadcrumbLinkEls).toHaveLength(2) - - const item1 = breadcrumbLinkEls[0] - expect(item1.textContent).toBe('Resources') - expect(item1.getAttribute('href')).toBe('/') - - const item2 = breadcrumbLinkEls[1] - expect(item2.textContent).toBe('GitHub Copilot') - expect(item2.getAttribute('href')).toBe('/copilot') + expect(getAllByRole('link')).toHaveLength(2) + expect(getByRole('link', {name: 'Resources'})).toHaveAttribute('href', '/') + expect(getByRole('link', {name: 'GitHub Copilot'})).toHaveAttribute('href', '/copilot') const item3 = getByText('Chat') expect(item3).toHaveAttribute('aria-current', 'page') diff --git a/packages/react/src/Breadcrumbs/Breadcrumbs.tsx b/packages/react/src/Breadcrumbs/Breadcrumbs.tsx index f2e76901c..fbc45278f 100644 --- a/packages/react/src/Breadcrumbs/Breadcrumbs.tsx +++ b/packages/react/src/Breadcrumbs/Breadcrumbs.tsx @@ -43,29 +43,27 @@ type ItemProps = { } & BaseProps & React.HTMLAttributes -const _Item = forwardRef( - ({'aria-current': ariaCurrent, className, children, href, selected, ...rest}, ref) => { - return ( -
  • - {selected ? ( - - {children} - - ) : ( - - {children} - - )} -
  • - ) - }, -) +const _Item = forwardRef(({className, children, href, selected, ...rest}, ref) => { + return ( +
  • + {selected ? ( + + {children} + + ) : ( + + {children} + + )} +
  • + ) +}) /** * Use Breadcrumbs to display the current location within a navigational hierarchy.