Merge branch 'main' into kh-fix-10031

primer · Jan 17, 2025 · ee7db2a · ee7db2a
2 parents 03afcb2 + fb0113d
commit ee7db2a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/packages/react/src/Banner/Banner.docs.json b/packages/react/src/Banner/Banner.docs.json
@@ -46,6 +46,9 @@
     },
     {
       "id": "experimental-components-banner-features--custom-icon"
+    },
+    {
+      "id": "experimental-components-banner-examples--with-announcement"
     }
   ],
   "props": [

diff --git a/packages/react/src/Banner/Banner.examples.stories.tsx b/packages/react/src/Banner/Banner.examples.stories.tsx
@@ -46,7 +46,7 @@ export const WithUserAction = () => {
   )
 }
 
-export const WithDynamicContent = () => {
+export const WithAnnouncement = () => {
   type Choice = 'one' | 'two' | 'three'
   const messages: Map<Choice, string> = new Map([
     ['one', 'This is a message for choice one'],

diff --git a/packages/react/src/Button/Button.examples.stories.tsx b/packages/react/src/Button/Button.examples.stories.tsx
@@ -3,7 +3,7 @@ import type {Meta} from '@storybook/react'
 import {Button} from '.'
 import {DownloadIcon} from '@primer/octicons-react'
 import {Banner} from '../experimental'
-import {AriaStatus} from '../live-region'
+import {AriaStatus, AriaAlert} from '../live-region'
 
 const meta: Meta<typeof Button> = {
   title: 'Components/Button/Examples',
@@ -69,7 +69,11 @@ export const LoadingStatusAnnouncementError = () => {
 
   return (
     <>
-      {!loading && error ? <Banner title="Export failed" variant="critical" /> : null}
+      {!loading && error ? (
+        <AriaAlert>
+          <Banner title="Export failed" variant="critical" />
+        </AriaAlert>
+      ) : null}
 
       <Button loading={loading} leadingVisual={DownloadIcon} onClick={onClick('error')}>
         Export (error)
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,9 @@ @@
         },
         {
           "id": "experimental-components-banner-features--custom-icon"
+        },
+        {
+          "id": "experimental-components-banner-examples--with-announcement"
         }
       ],
       "props": [
@@ Expand Down @@