From 0f67f901189190b8eb87a6a2843bb21194c155ea Mon Sep 17 00:00:00 2001 From: Valentyna Date: Fri, 27 Oct 2023 11:32:29 +0200 Subject: [PATCH 1/7] Removed page with href attributes. Added link functionality by default --- .../components/Breadcrumb/Breadcrumb.test.tsx | 3 - .../BreadcrumbButton.test.tsx | 2 - .../BreadcrumbButton/useBreadcrumbButton.ts | 18 +++-- .../useBreadcrumbButtonStyles.styles.ts | 23 +++++- ...adcrumbButtonWithHrefAttribute.stories.tsx | 80 ------------------- .../Breadcrumb/BreadcrumbDefault.stories.tsx | 22 ++++- .../Breadcrumb/BreadcrumbSize.stories.tsx | 4 +- .../stories/Breadcrumb/index.stories.tsx | 1 - 8 files changed, 52 insertions(+), 101 deletions(-) delete mode 100644 packages/react-components/react-breadcrumb-preview/stories/Breadcrumb/BreadcrumbButtonWithHrefAttribute.stories.tsx diff --git a/packages/react-components/react-breadcrumb-preview/src/components/Breadcrumb/Breadcrumb.test.tsx b/packages/react-components/react-breadcrumb-preview/src/components/Breadcrumb/Breadcrumb.test.tsx index 6b338fed0c7ba9..5a648a3842a9d9 100644 --- a/packages/react-components/react-breadcrumb-preview/src/components/Breadcrumb/Breadcrumb.test.tsx +++ b/packages/react-components/react-breadcrumb-preview/src/components/Breadcrumb/Breadcrumb.test.tsx @@ -34,7 +34,6 @@ describe('Breadcrumb', () => { > @@ -68,9 +67,7 @@ describe('Breadcrumb', () => { > Link 1 diff --git a/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/BreadcrumbButton.test.tsx b/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/BreadcrumbButton.test.tsx index 1e0da8c7fbdb57..214368e3368ca4 100644 --- a/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/BreadcrumbButton.test.tsx +++ b/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/BreadcrumbButton.test.tsx @@ -28,7 +28,6 @@ describe('BreadcrumbButton', () => {
@@ -44,7 +43,6 @@ describe('BreadcrumbButton', () => {
+ diff --git a/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/BreadcrumbButton.test.tsx b/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/BreadcrumbButton.test.tsx index 214368e3368ca4..a35254dea79414 100644 --- a/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/BreadcrumbButton.test.tsx +++ b/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/BreadcrumbButton.test.tsx @@ -26,11 +26,12 @@ describe('BreadcrumbButton', () => { const result = render(Default BreadcrumbButton); expect(result.container).toMatchInlineSnapshot(`
- +
`); }); @@ -41,8 +42,9 @@ describe('BreadcrumbButton', () => { ); expect(result.container).toMatchInlineSnapshot(`
- +
`); }); From 5f7139641fc104016b8bbe1458fdb094ec9d162b Mon Sep 17 00:00:00 2001 From: Humberto Makoto Morimoto Burgos Date: Tue, 31 Oct 2023 15:33:54 -0700 Subject: [PATCH 6/7] Fixing build issue. --- .../src/components/BreadcrumbButton/useBreadcrumbButton.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/useBreadcrumbButton.ts b/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/useBreadcrumbButton.ts index a76e5125ddd24b..0d8dbc55adcf95 100644 --- a/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/useBreadcrumbButton.ts +++ b/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/useBreadcrumbButton.ts @@ -1,5 +1,6 @@ import * as React from 'react'; import { useButton_unstable } from '@fluentui/react-button'; +import type { ButtonProps } from '@fluentui/react-button'; import { useBreadcrumbContext_unstable } from '../Breadcrumb/BreadcrumbContext'; import type { BreadcrumbButtonProps, BreadcrumbButtonState } from './BreadcrumbButton.types'; @@ -31,7 +32,7 @@ export const useBreadcrumbButton_unstable = ( 'aria-current': current ? props['aria-current'] ?? 'page' : undefined, 'aria-disabled': current ? props['aria-disabled'] ?? true : undefined, ...rest, - }, + } as ButtonProps, ref, ), current, From 3d323d619a0f701aab19c5f792929748ef4fcd15 Mon Sep 17 00:00:00 2001 From: Valentyna Date: Wed, 1 Nov 2023 12:41:18 +0100 Subject: [PATCH 7/7] removed quick fix --- .../src/components/BreadcrumbButton/useBreadcrumbButton.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/useBreadcrumbButton.ts b/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/useBreadcrumbButton.ts index f1fb789ed2d7ee..07125e03b7548e 100644 --- a/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/useBreadcrumbButton.ts +++ b/packages/react-components/react-breadcrumb-preview/src/components/BreadcrumbButton/useBreadcrumbButton.ts @@ -19,7 +19,6 @@ export const useBreadcrumbButton_unstable = ( ): BreadcrumbButtonState => { const { size } = useBreadcrumbContext_unstable(); const { current = false, ...rest } = props; - rest.as = 'a'; return { ...useButton_unstable(