Merge branch 'main' into rmotwani/form-error-focus-fix

EightfoldAI · Sep 9, 2024 · 99ebaf1 · 99ebaf1
2 parents 0299a8b + 2fa3c0f
commit 99ebaf1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/components/Accordion/Accordion.tsx b/src/components/Accordion/Accordion.tsx
@@ -108,9 +108,9 @@ export const AccordionSummary: FC<AccordionSummaryProps> = ({
         {badgeProps && <Badge classNames={styles.badge} {...badgeProps} />}
       </div>
       <Button
-        role="presentation"
         tabIndex={-1}
         aria-controls={`${id}-content`}
+        ariaLabel={expanded ? expandAriaLabelText : collapseAriaLabelText}
         disabled={disabled}
         gradient={gradient}
         iconProps={{ classNames: iconButtonClassNames, ...expandIconProps }}

diff --git a/src/components/Accordion/__snapshots__/Accordion.test.tsx.snap b/src/components/Accordion/__snapshots__/Accordion.test.tsx.snap
@@ -55,8 +55,8 @@ exports[`Accordion Accordion is large 1`] = `
       <button
         aria-controls="myAccordionId-content"
         aria-disabled="false"
+        aria-label="Accordion"
         class="button button-neutral button-medium round-shape icon-left"
-        role="presentation"
         tabindex="-1"
       >
         <span
@@ -152,8 +152,8 @@ exports[`Accordion Accordion is medium 1`] = `
       <button
         aria-controls="myAccordionId-content"
         aria-disabled="false"
+        aria-label="Accordion"
         class="button button-neutral button-medium round-shape icon-left"
-        role="presentation"
         tabindex="-1"
       >
         <span
@@ -249,8 +249,8 @@ exports[`Accordion Accordion is not bordered 1`] = `
       <button
         aria-controls="myAccordionId-content"
         aria-disabled="false"
+        aria-label="Accordion"
         class="button button-neutral button-medium round-shape icon-left"
-        role="presentation"
         tabindex="-1"
       >
         <span
@@ -346,8 +346,8 @@ exports[`Accordion Accordion is pill shaped 1`] = `
       <button
         aria-controls="myAccordionId-content"
         aria-disabled="false"
+        aria-label="Accordion"
         class="button button-neutral button-medium round-shape icon-left"
-        role="presentation"
         tabindex="-1"
       >
         <span
@@ -443,8 +443,8 @@ exports[`Accordion Accordion is rectangle shaped 1`] = `
       <button
         aria-controls="myAccordionId-content"
         aria-disabled="false"
+        aria-label="Accordion"
         class="button button-neutral button-medium round-shape icon-left"
-        role="presentation"
         tabindex="-1"
       >
         <span
@@ -635,8 +635,8 @@ exports[`Accordion Accordion renders custom content and its buttons are clickabl
       <button
         aria-controls="myAccordionId-content"
         aria-disabled="false"
+        aria-label="Accordion"
         class="button button-neutral button-medium round-shape icon-left"
-        role="presentation"
         tabindex="-1"
       >
         <span
@@ -732,8 +732,8 @@ exports[`Accordion Renders without crashing 1`] = `
       <button
         aria-controls="myAccordionId-content"
         aria-disabled="false"
+        aria-label="Accordion"
         class="button button-neutral button-medium round-shape icon-left"
-        role="presentation"
         tabindex="-1"
       >
         <span