FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

feat(accordion): add content and toggle container props by redallen · Pull Request #2713 · patternfly/patternfly-react · GitHub

/ patternfly-react Public

feat(accordion): add content and toggle container props #2713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tlabaj merged 7 commits into from
Sep 6, 2019
Conversation 13 Commits 7 Checks 0 Files changed
Merged

feat(accordion): add content and toggle container props #2713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71ba3bf
feat(accordion): add content and toggle container props
redallen Aug 15, 2019
8c8b9f1
add jest tests
redallen Aug 15, 2019
a299918
remove redundant prop
redallen Aug 20, 2019
e460551
address titani feedback
redallen Sep 6, 2019
cb96801
fix test
redallen Sep 6, 2019
c3a245f
rename accordiontoggle prop as well
redallen Sep 6, 2019
5679990
Change prop comment
redallen Sep 6, 2019
File filter

Filter by extension

Filter by extension .ts  (1) .tsx  (4) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
24 changes: 18 additions & 6 deletions packages/patternfly-4/react-core/src/components/Accordion/Accordion.test.tsx
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Accordion } from './Accordion';
import { AccordionToggle } from './AccordionToggle';
import { AccordionContent } from './AccordionContent';
import { AccordionItem } from './AccordionItem';
import { AccordionContext } from './AccordionContext';

describe('Accordion', () => {
test('Accordion default', () => {
Expand All @@ -26,10 +25,9 @@ describe('Accordion', () => {

test('It should pass optional aria props', () => {
const view = mount(
<AccordionContext.Provider value={{ asDefinitionList: true }}>
<Accordion asDefinitionList>
<AccordionToggle aria-label="Toggle details for" aria-labelledby="ex-toggle2 ex-item2" id="ex-toggle2" />
</AccordionContext.Provider>,
{}
</Accordion>
);
const button = view.find('button[id="ex-toggle2"]').getElement();
expect(button.props['aria-label']).toBe('Toggle details for');
Expand All @@ -39,12 +37,26 @@ describe('Accordion', () => {

test('Toggle expanded', () => {
const view = mount(
<AccordionContext.Provider value={{ asDefinitionList: true }}>
<Accordion asDefinitionList>
<AccordionToggle aria-label="Toggle details for" id="ex-toggle2" isExpanded />
</AccordionContext.Provider>
</Accordion>
);
const button = view.find('button[id="ex-toggle2"]').getElement();
expect(button.props['aria-expanded']).toBe(true);
expect(button.props.className).toContain('pf-m-expanded');
});

test('Custom containers', () => {
const container = 'a';
const view = mount(
<Accordion headingLevel="h2">
<AccordionItem>
<AccordionToggle id="item-1" component={container}>Item One</AccordionToggle>
<AccordionContent component={container}>Item One Content</AccordionContent>
</AccordionItem>
</Accordion>
);
expect(view.find(AccordionToggle).getDOMNode().tagName).toBe(container.toLocaleUpperCase());
expect(view.find(AccordionContent).getDOMNode().tagName).toBe(container.toLocaleUpperCase());
});
});
5 changes: 4 additions & 1 deletion packages/patternfly-4/react-core/src/components/Accordion/Accordion.tsx
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ export const Accordion: React.FunctionComponent<AccordionProps> = ({
const AccordionList: any = asDefinitionList ? 'dl' : 'div';
return (
<AccordionList className={css(styles.accordion, className)} aria-label={ariaLabel} {...props}>
<AccordionContext.Provider value={{ AccordionHeadingLevel: headingLevel, asDefinitionList }}>
<AccordionContext.Provider value={{
ContentContainer: asDefinitionList ? 'dd' : 'div',
ToggleContainer: asDefinitionList ? 'dt' : headingLevel
}}>
{children}
</AccordionContext.Provider>
</AccordionList>
Expand Down
11 changes: 7 additions & 4 deletions packages/patternfly-4/react-core/src/components/Accordion/AccordionContent.tsx
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export interface AccordionContentProps extends React.HTMLProps<HTMLDivElement> {
isFixed?: boolean;
/** Adds accessible text to the Accordion content */
'aria-label'?: string;
/** Component to use as content container */
component?: React.ElementType;
}

export const AccordionContent: React.FunctionComponent<AccordionContentProps> = ({
Expand All @@ -25,13 +27,14 @@ export const AccordionContent: React.FunctionComponent<AccordionContentProps> =
isHidden = false,
isFixed = false,
'aria-label': ariaLabel = '',
component,
...props
}: AccordionContentProps) => (
<AccordionContext.Consumer>
{({ asDefinitionList }) => {
const AccordionContentContainer = asDefinitionList ? 'dd' : 'div';
{({ ContentContainer }) => {
const Container = component || ContentContainer;
return (
<AccordionContentContainer
<Container
id={id}
className={css(
styles.accordionExpandedContent,
Expand All @@ -44,7 +47,7 @@ export const AccordionContent: React.FunctionComponent<AccordionContentProps> =
{...props}
>
<div className={css(styles.accordionExpandedContentBody)}>{children}</div>
</AccordionContentContainer>
</Container>
);
}}
</AccordionContext.Consumer>
Expand Down
4 changes: 2 additions & 2 deletions packages/patternfly-4/react-core/src/components/Accordion/AccordionContext.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as React from 'react';

interface AccordionContextProps {
AccordionHeadingLevel: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
asDefinitionList: boolean;
ContentContainer: React.ElementType;
ToggleContainer: React.ElementType;
}

export const AccordionContext = React.createContext<Partial<AccordionContextProps>>({});
11 changes: 7 additions & 4 deletions packages/patternfly-4/react-core/src/components/Accordion/AccordionToggle.tsx
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,23 @@ export interface AccordionToggleProps extends Omit<React.HTMLProps<HTMLButtonEle
isExpanded?: boolean;
/** Identify the Accordion toggle number */
id: string;
/** Container to override the default for toggle */
component?: React.ElementType;
}

export const AccordionToggle: React.FunctionComponent<AccordionToggleProps> = ({
className = '',
id,
isExpanded = false,
children = null,
component,
...props
}: AccordionToggleProps) => (
<AccordionContext.Consumer>
{({ asDefinitionList, AccordionHeadingLevel }) => {
const AccordionToggleContainer = asDefinitionList ? 'dt' : AccordionHeadingLevel;
{({ ToggleContainer }) => {
const Container = component || ToggleContainer;
return (
<AccordionToggleContainer>
<Container>
<button
id={id}
className={css(styles.accordionToggle, isExpanded && styles.modifiers.expanded, className)}
Expand All @@ -37,7 +40,7 @@ export const AccordionToggle: React.FunctionComponent<AccordionToggleProps> = ({
<span className={css(styles.accordionToggleText)}>{children}</span>
<AngleRightIcon className={css(styles.accordionToggleIcon)} />
</button>
</AccordionToggleContainer>
</Container>
);
}}
</AccordionContext.Consumer>
Expand Down
Back | FazBrowse Home | New Git URL