Skip to content

Commit 9e12c09

Browse files
PR changes
1 parent 2fbde16 commit 9e12c09

File tree

6 files changed

+12
-15
lines changed

6 files changed

+12
-15
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ import 'react-accessible-accordion/dist/fancy-example.css';
8383
We recommend that you copy them into your own app and modify them to suit your
8484
needs, particularly if you're using your own `className`s.
8585
86-
The accordian trigger is built using native button elements which have default
87-
browser styling, this can be overridden in your stylesheet.
86+
The accordion trigger is built using native button and heading elements which
87+
have default browser styling, these can be overridden in your stylesheet.
8888
8989
## Component API
9090

demo/src/main.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ footer {
139139
padding: 10px 0;
140140
color: var(--colorPageLinks);
141141
background-color: transparent;
142-
font: 16px/1.5 sans-serif;
142+
font: inherit;
143143
font-weight: bold;
144144
border: none;
145145
text-decoration: underline solid var(--colorGreenShadow);

src/components/AccordionItemButton.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ const AccordionItemButton = ({
7979
<button
8080
className={className}
8181
{...rest}
82-
tabIndex={0}
8382
onClick={toggleExpanded}
8483
onKeyDown={handleKeyPress}
8584
data-accordion-component="AccordionItemButton"

src/components/AccordionItemHeading.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import DisplayName from '../helpers/DisplayName';
33
import { assertValidHtmlId } from '../helpers/id';
44
import { HeadingAttributes } from '../helpers/types';
55

6-
interface AccordianItemHeadingProps extends HeadingAttributes {
6+
interface AccordionItemHeadingProps extends HeadingAttributes {
77
className?: string;
88
'aria-level'?: number;
99
}
@@ -16,17 +16,17 @@ From the WAI-ARIA spec (https://www.w3.org/TR/wai-aria-practices-1.1/#accordion)
1616
1717
`;
1818

19-
const Heading = React.forwardRef<HTMLHeadingElement, AccordianItemHeadingProps>(
19+
const Heading = React.forwardRef<HTMLHeadingElement, AccordionItemHeadingProps>(
2020
(
2121
{
2222
'aria-level': ariaLevel = 3,
2323
className = 'accordion__heading',
2424
...props
25-
}: AccordianItemHeadingProps,
25+
}: AccordionItemHeadingProps,
2626
ref,
2727
) => {
28-
const HeadingTag = `h${ariaLevel}`;
29-
return React.createElement(HeadingTag, {
28+
const headingTag = `h${ariaLevel}`;
29+
return React.createElement(headingTag, {
3030
className,
3131
...props,
3232
ref,
@@ -36,7 +36,7 @@ const Heading = React.forwardRef<HTMLHeadingElement, AccordianItemHeadingProps>(
3636
);
3737
Heading.displayName = 'Heading';
3838

39-
export class AccordionItemHeading extends React.PureComponent<AccordianItemHeadingProps> {
39+
export class AccordionItemHeading extends React.PureComponent<AccordionItemHeadingProps> {
4040
ref: HTMLHeadingElement | undefined;
4141

4242
static VALIDATE(ref: HTMLHeadingElement | undefined): void | never {
@@ -73,8 +73,8 @@ export class AccordionItemHeading extends React.PureComponent<AccordianItemHeadi
7373
}
7474
}
7575

76-
const AccordionItemHeadingWrapper: React.FC<AccordianItemHeadingProps> = (
77-
props: AccordianItemHeadingProps,
76+
const AccordionItemHeadingWrapper: React.FC<AccordionItemHeadingProps> = (
77+
props: AccordionItemHeadingProps,
7878
): JSX.Element => {
7979
if (props.id) {
8080
assertValidHtmlId(props.id);

src/css/fancy-example.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414
.accordion__heading {
1515
margin: 0;
16-
font: 16px/1.5 sans-serif;
16+
font: inherit;
1717
}
1818
.accordion__button {
1919
background-color: #f4f4f4;

src/helpers/AccordionStore.ts

-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export interface InjectedButtonAttributes {
1313
'aria-controls': string;
1414
'aria-expanded': boolean;
1515
'aria-disabled': boolean;
16-
tabIndex: number;
1716
}
1817

1918
export default class AccordionStore {
@@ -103,7 +102,6 @@ export default class AccordionStore {
103102
'aria-disabled': disabled,
104103
'aria-expanded': expanded,
105104
'aria-controls': this.getPanelId(uuid),
106-
tabIndex: 0,
107105
};
108106
};
109107

0 commit comments

Comments
 (0)