From aee05c743ab35e994e5cdbf2b56077c7bec0feea Mon Sep 17 00:00:00 2001
From: guidari <guilhermedatilio@gmail.com>
Date: Mon, 2 Sep 2024 09:24:12 -0300
Subject: [PATCH 1/3] fix: fixed aria-current

---
 .../react/src/components/Breadcrumb/Breadcrumb.stories.js  | 7 ++++++-
 .../react/src/components/Breadcrumb/BreadcrumbItem.tsx     | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/react/src/components/Breadcrumb/Breadcrumb.stories.js b/packages/react/src/components/Breadcrumb/Breadcrumb.stories.js
index d1605545a3f7..dccad0bc2608 100644
--- a/packages/react/src/components/Breadcrumb/Breadcrumb.stories.js
+++ b/packages/react/src/components/Breadcrumb/Breadcrumb.stories.js
@@ -35,6 +35,9 @@ export const Default = () => (
     <BreadcrumbItem href="#">Breadcrumb 2</BreadcrumbItem>
     <BreadcrumbItem href="#">Breadcrumb 3</BreadcrumbItem>
     <BreadcrumbItem href="#">Breadcrumb 4</BreadcrumbItem>
+    <BreadcrumbItem href="#" isCurrentPage>
+      Breadcrumb 5
+    </BreadcrumbItem>
   </Breadcrumb>
 );
 
@@ -51,7 +54,9 @@ export const BreadcrumbWithOverflowMenu = () => (
       </OverflowMenu>
     </BreadcrumbItem>
     <BreadcrumbItem href="#">Breadcrumb 5</BreadcrumbItem>
-    <BreadcrumbItem isCurrentPage>Breadcrumb 6</BreadcrumbItem>
+    <BreadcrumbItem href="#" isCurrentPage>
+      Breadcrumb 6
+    </BreadcrumbItem>
   </Breadcrumb>
 );
 
diff --git a/packages/react/src/components/Breadcrumb/BreadcrumbItem.tsx b/packages/react/src/components/Breadcrumb/BreadcrumbItem.tsx
index f044c20a4608..6026566ba222 100644
--- a/packages/react/src/components/Breadcrumb/BreadcrumbItem.tsx
+++ b/packages/react/src/components/Breadcrumb/BreadcrumbItem.tsx
@@ -80,7 +80,7 @@ const BreadcrumbItem: ForwardRefReturn<HTMLLIElement, BreadcrumbItemProps> =
       return (
         <li className={className} ref={ref} {...rest}>
           {href ? (
-            <Link href={href} aria-current={ariaCurrent}>
+            <Link href={href} aria-current={ariaCurrent || isCurrentPage}>
               {children}
             </Link>
           ) : (

From 21d2f0094f479a6920b1bc1eb25afe8d5ad880aa Mon Sep 17 00:00:00 2001
From: guidari <guilhermedatilio@gmail.com>
Date: Wed, 4 Sep 2024 16:29:50 -0300
Subject: [PATCH 2/3] fix: fixed test to match the new stories

---
 e2e/components/Breadcrumb/Breadcrumb-test.avt.e2e.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/components/Breadcrumb/Breadcrumb-test.avt.e2e.js b/e2e/components/Breadcrumb/Breadcrumb-test.avt.e2e.js
index c2c47f662a53..cb51348b45f6 100644
--- a/e2e/components/Breadcrumb/Breadcrumb-test.avt.e2e.js
+++ b/e2e/components/Breadcrumb/Breadcrumb-test.avt.e2e.js
@@ -96,6 +96,6 @@ test.describe('@avt Breadcrumb', () => {
 
     await page.keyboard.press('Tab');
     await expect(page.getByText('Breadcrumb 6')).toBeVisible();
-    await expect(page.getByText('Breadcrumb 6')).not.toBeFocused();
+    await expect(page.getByText('Breadcrumb 6')).toBeFocused();
   });
 });

From b88d68d0e6f01095ddf7c128cb7dd78f37fded10 Mon Sep 17 00:00:00 2001
From: guidari <guilhermedatilio@gmail.com>
Date: Fri, 6 Sep 2024 08:35:36 -0300
Subject: [PATCH 3/3] fix: fixed changes in storybook

---
 e2e/components/Breadcrumb/Breadcrumb-test.avt.e2e.js       | 2 +-
 .../react/src/components/Breadcrumb/Breadcrumb.stories.js  | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/e2e/components/Breadcrumb/Breadcrumb-test.avt.e2e.js b/e2e/components/Breadcrumb/Breadcrumb-test.avt.e2e.js
index cb51348b45f6..c2c47f662a53 100644
--- a/e2e/components/Breadcrumb/Breadcrumb-test.avt.e2e.js
+++ b/e2e/components/Breadcrumb/Breadcrumb-test.avt.e2e.js
@@ -96,6 +96,6 @@ test.describe('@avt Breadcrumb', () => {
 
     await page.keyboard.press('Tab');
     await expect(page.getByText('Breadcrumb 6')).toBeVisible();
-    await expect(page.getByText('Breadcrumb 6')).toBeFocused();
+    await expect(page.getByText('Breadcrumb 6')).not.toBeFocused();
   });
 });
diff --git a/packages/react/src/components/Breadcrumb/Breadcrumb.stories.js b/packages/react/src/components/Breadcrumb/Breadcrumb.stories.js
index dccad0bc2608..d1605545a3f7 100644
--- a/packages/react/src/components/Breadcrumb/Breadcrumb.stories.js
+++ b/packages/react/src/components/Breadcrumb/Breadcrumb.stories.js
@@ -35,9 +35,6 @@ export const Default = () => (
     <BreadcrumbItem href="#">Breadcrumb 2</BreadcrumbItem>
     <BreadcrumbItem href="#">Breadcrumb 3</BreadcrumbItem>
     <BreadcrumbItem href="#">Breadcrumb 4</BreadcrumbItem>
-    <BreadcrumbItem href="#" isCurrentPage>
-      Breadcrumb 5
-    </BreadcrumbItem>
   </Breadcrumb>
 );
 
@@ -54,9 +51,7 @@ export const BreadcrumbWithOverflowMenu = () => (
       </OverflowMenu>
     </BreadcrumbItem>
     <BreadcrumbItem href="#">Breadcrumb 5</BreadcrumbItem>
-    <BreadcrumbItem href="#" isCurrentPage>
-      Breadcrumb 6
-    </BreadcrumbItem>
+    <BreadcrumbItem isCurrentPage>Breadcrumb 6</BreadcrumbItem>
   </Breadcrumb>
 );