Skip to content

Commit cb18460

Browse files
speshkar-c-eightfoldshazare-eightfoldypatadia-eightfold
authored
fix(ui): remove aria properties from arrow button , added role presentation (#951)
* fix(ui): remove aria properties from arrow button and add presentation role * fix: updated snapshots --------- Co-authored-by: Siddesh Bharat Hazare <[email protected]> Co-authored-by: ypatadia-eightfold <[email protected]>
1 parent 134dacd commit cb18460

File tree

2 files changed

+18
-32
lines changed

2 files changed

+18
-32
lines changed

Diff for: src/components/Accordion/Accordion.tsx

+11-4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import React, {
77
useContext,
88
useEffect,
99
useState,
10+
useRef,
1011
} from 'react';
1112
import GradientContext, { Gradient } from '../ConfigProvider/GradientContext';
1213
import { OcThemeName } from '../ConfigProvider';
@@ -55,6 +56,14 @@ export const AccordionSummary: FC<AccordionSummaryProps> = ({
5556
size,
5657
...rest
5758
}) => {
59+
const buttonRef = useRef<HTMLButtonElement>(null);
60+
61+
useEffect(() => {
62+
if (buttonRef.current) {
63+
buttonRef.current.removeAttribute('aria-disabled');
64+
}
65+
}, []);
66+
5867
const headerClassnames = mergeClasses([
5968
styles.accordionSummary,
6069
classNames,
@@ -88,7 +97,6 @@ export const AccordionSummary: FC<AccordionSummaryProps> = ({
8897
<div className={headerClassnames} id={`${id}-header`} {...rest}>
8998
<div
9099
aria-controls={`${id}-content`}
91-
aria-label={expanded ? expandAriaLabelText : collapseAriaLabelText}
92100
aria-expanded={expanded}
93101
aria-describedby={expandButtonDescribedBy || `${id}-header-content`}
94102
className={styles.clickableArea}
@@ -108,10 +116,9 @@ export const AccordionSummary: FC<AccordionSummaryProps> = ({
108116
{badgeProps && <Badge classNames={styles.badge} {...badgeProps} />}
109117
</div>
110118
<Button
119+
ref={buttonRef}
111120
tabIndex={-1}
112-
aria-controls={`${id}-content`}
113-
ariaLabel={expanded ? expandAriaLabelText : collapseAriaLabelText}
114-
disabled={disabled}
121+
role="presentation"
115122
gradient={gradient}
116123
iconProps={{ classNames: iconButtonClassNames, ...expandIconProps }}
117124
onClick={onIconButtonClick}

Diff for: src/components/Accordion/__snapshots__/Accordion.test.tsx.snap

+7-28
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ exports[`Accordion Accordion is large 1`] = `
1414
aria-controls="myAccordionId-content"
1515
aria-describedby="myAccordionId-header-content"
1616
aria-expanded="false"
17-
aria-label="Accordion"
1817
class="clickable-area"
1918
role="button"
2019
tabindex="0"
@@ -53,10 +52,8 @@ exports[`Accordion Accordion is large 1`] = `
5352
</span>
5453
</div>
5554
<button
56-
aria-controls="myAccordionId-content"
57-
aria-disabled="false"
58-
aria-label="Accordion"
5955
class="button button-neutral button-medium round-shape icon-left"
56+
role="presentation"
6057
tabindex="-1"
6158
>
6259
<span
@@ -111,7 +108,6 @@ exports[`Accordion Accordion is medium 1`] = `
111108
aria-controls="myAccordionId-content"
112109
aria-describedby="myAccordionId-header-content"
113110
aria-expanded="false"
114-
aria-label="Accordion"
115111
class="clickable-area"
116112
role="button"
117113
tabindex="0"
@@ -150,10 +146,8 @@ exports[`Accordion Accordion is medium 1`] = `
150146
</span>
151147
</div>
152148
<button
153-
aria-controls="myAccordionId-content"
154-
aria-disabled="false"
155-
aria-label="Accordion"
156149
class="button button-neutral button-medium round-shape icon-left"
150+
role="presentation"
157151
tabindex="-1"
158152
>
159153
<span
@@ -208,7 +202,6 @@ exports[`Accordion Accordion is not bordered 1`] = `
208202
aria-controls="myAccordionId-content"
209203
aria-describedby="myAccordionId-header-content"
210204
aria-expanded="false"
211-
aria-label="Accordion"
212205
class="clickable-area"
213206
role="button"
214207
tabindex="0"
@@ -247,10 +240,8 @@ exports[`Accordion Accordion is not bordered 1`] = `
247240
</span>
248241
</div>
249242
<button
250-
aria-controls="myAccordionId-content"
251-
aria-disabled="false"
252-
aria-label="Accordion"
253243
class="button button-neutral button-medium round-shape icon-left"
244+
role="presentation"
254245
tabindex="-1"
255246
>
256247
<span
@@ -305,7 +296,6 @@ exports[`Accordion Accordion is pill shaped 1`] = `
305296
aria-controls="myAccordionId-content"
306297
aria-describedby="myAccordionId-header-content"
307298
aria-expanded="false"
308-
aria-label="Accordion"
309299
class="clickable-area"
310300
role="button"
311301
tabindex="0"
@@ -344,10 +334,8 @@ exports[`Accordion Accordion is pill shaped 1`] = `
344334
</span>
345335
</div>
346336
<button
347-
aria-controls="myAccordionId-content"
348-
aria-disabled="false"
349-
aria-label="Accordion"
350337
class="button button-neutral button-medium round-shape icon-left"
338+
role="presentation"
351339
tabindex="-1"
352340
>
353341
<span
@@ -402,7 +390,6 @@ exports[`Accordion Accordion is rectangle shaped 1`] = `
402390
aria-controls="myAccordionId-content"
403391
aria-describedby="myAccordionId-header-content"
404392
aria-expanded="false"
405-
aria-label="Accordion"
406393
class="clickable-area"
407394
role="button"
408395
tabindex="0"
@@ -441,10 +428,8 @@ exports[`Accordion Accordion is rectangle shaped 1`] = `
441428
</span>
442429
</div>
443430
<button
444-
aria-controls="myAccordionId-content"
445-
aria-disabled="false"
446-
aria-label="Accordion"
447431
class="button button-neutral button-medium round-shape icon-left"
432+
role="presentation"
448433
tabindex="-1"
449434
>
450435
<span
@@ -500,7 +485,6 @@ exports[`Accordion Accordion renders custom content and its buttons are clickabl
500485
aria-controls="myAccordionId-content"
501486
aria-describedby="myAccordionId-header-content"
502487
aria-expanded="true"
503-
aria-label="Accordion"
504488
class="clickable-area"
505489
role="button"
506490
tabindex="0"
@@ -633,10 +617,8 @@ exports[`Accordion Accordion renders custom content and its buttons are clickabl
633617
</span>
634618
</div>
635619
<button
636-
aria-controls="myAccordionId-content"
637-
aria-disabled="false"
638-
aria-label="Accordion"
639620
class="button button-neutral button-medium round-shape icon-left"
621+
role="presentation"
640622
tabindex="-1"
641623
>
642624
<span
@@ -691,7 +673,6 @@ exports[`Accordion Renders without crashing 1`] = `
691673
aria-controls="myAccordionId-content"
692674
aria-describedby="myAccordionId-header-content"
693675
aria-expanded="false"
694-
aria-label="Accordion"
695676
class="clickable-area"
696677
role="button"
697678
tabindex="0"
@@ -730,10 +711,8 @@ exports[`Accordion Renders without crashing 1`] = `
730711
</span>
731712
</div>
732713
<button
733-
aria-controls="myAccordionId-content"
734-
aria-disabled="false"
735-
aria-label="Accordion"
736714
class="button button-neutral button-medium round-shape icon-left"
715+
role="presentation"
737716
tabindex="-1"
738717
>
739718
<span

0 commit comments

Comments
 (0)