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

fix(accordion): adds prop to heading level of parent component by jenny-s51 · Pull Request #2273 · patternfly/patternfly-react · GitHub

/ patternfly-react Public

fix(accordion): adds prop to heading level of parent component #2273

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

Closed
jenny-s51 wants to merge 12 commits into from
Conversation 19 Commits 12 Checks 0 Files changed
Closed

fix(accordion): adds prop to heading level of parent component #2273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
885b36e
fix(accordion): adds prop to heading level of parent component
jenny-s51 Jun 13, 2019
9db9ef3
fix(Accordion): TS; works as required
jenny-s51 Jun 17, 2019
9a4f484
feat(ContextSelector): Convert context selector to typescript (#2147)
jessiehuff Jun 17, 2019
bbdb763
fix(Accordion): updated snapshots
jenny-s51 Jun 17, 2019
7d9bd16
fix(ChartDonutThreshold): Don't show static threshold donut tooltips …
TheRealJon Jun 17, 2019
28a08ca
Fix test (#2263)
jessiehuff Jun 17, 2019
c5aced0
fix(accordion): refactor/update snapshots
jenny-s51 Jun 18, 2019
e756f55
fix(accordion): adds prop to heading level of parent component
jenny-s51 Jun 13, 2019
3ca8aec
fix(Accordion): TS; works as required
jenny-s51 Jun 17, 2019
27b006f
fix(Accordion): updated snapshots
jenny-s51 Jun 17, 2019
c751683
fix(accordion): refactor/update snapshots
jenny-s51 Jun 18, 2019
54e3ac8
Merge branch 'iss1881_copy' of https://github.com/jenny-s51/patternfl…
jenny-s51 Jun 18, 2019
File filter

Filter by extension

Filter by extension .js  (3) .md  (1) .snap  (30) .ts  (9) .tsx  (16) All 5 file types selected
Deleted files 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
68 changes: 41 additions & 27 deletions ...es/patternfly-4/react-charts/src/components/ChartDonutUtilization/ChartDonutThreshold.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 @@ -392,6 +392,7 @@ export const ChartDonutThreshold: React.FunctionComponent<ChartDonutThresholdPro
children,
data = [],
donutOrientation = 'left',
labels = [], // Don't show any tooltip labels by default, let consumer override if needed
standalone = true,
themeColor,
themeVariant,
Expand All @@ -405,25 +406,34 @@ export const ChartDonutThreshold: React.FunctionComponent<ChartDonutThresholdPro
donutHeight = Math.min(height, width),
donutWidth = Math.min(height, width),
innerRadius = (Math.min(donutHeight, donutWidth) - 34) / 2,

...rest
}: ChartDonutThresholdProps) => {

// Returns computed data representing pie chart slices
const getComputedData = () => {
const computedData = [];
const datum = getData(data);
let prevYVal = 0;
datum.forEach((dataPoint: {_x?: any, _y: any}) => {
computedData.push({ x: dataPoint._x, y: dataPoint._y ? Math.abs(dataPoint._y - prevYVal) : 0 });
prevYVal = dataPoint._y;
});
computedData.push({ y: prevYVal ? Math.abs(100 - prevYVal) : 0 });
return computedData;
};
// Format and sort data. Sorting ensures thresholds are displayed in the correct order and simplifies calculations.
const datum = Data.formatData(data, {x, y, ...rest}, ['x', 'y']).sort((a: any,b: any) => a._y - b._y);

const getData = (datum: any[]) => {
const accessorTypes = ['x', 'y'];
return Data.formatData(datum, { x, y, ...rest }, accessorTypes);
// Data must be offset so that the sum of all data point y-values (including the final slice) == 100.
const [prev, computedData] = datum.reduce((acc: [number, any], dataPoint: {_x: number | string, _y: number}) => {
return [
dataPoint._y, // Set the previous value to current y value
[
...acc[1],
{
x: dataPoint._x, // Conditionally add x property only if it is in the original data object
y: dataPoint._y - acc[0] // Must be offset by previous value
}
]
];
}, [0, []]);

return [
...computedData,
{
y: prev ? (100 - prev) : 0
}
];
};

// Returns the horizontal shift for the dynamic utilization donut cart
Expand All @@ -449,24 +459,27 @@ export const ChartDonutThreshold: React.FunctionComponent<ChartDonutThresholdPro
const renderChildren = () =>
React.Children.toArray(children).map(child => {
if (child.props) {
const datum = getData([{ ...child.props.data }]);
const orientation = child.props.donutOrientation || donutOrientation;
const {data: childData, ...childProps} = child.props;
const datum = Data.formatData([childData], childProps, ['x', 'y']); // Format child data independently of this component's props
const orientation = childProps.donutOrientation || donutOrientation;
const dynamicTheme =
child.props.theme ||
getDonutThresholdDynamicTheme(child.props.themeColor || themeColor,
child.props.themeVariant || themeVariant);
childProps.theme ||
getDonutThresholdDynamicTheme(childProps.themeColor || themeColor,
childProps.themeVariant || themeVariant);
return React.cloneElement(child, {
donutDx: child.props.donutDx || getDynamicDonutDx(dynamicTheme, orientation),
donutDy: child.props.donutDy || getDynamicDonutDy(dynamicTheme),
donutHeight: child.props.donutHeight || donutHeight - (theme.pie.height - dynamicTheme.pie.height),
data: childData,
donutDx: getDynamicDonutDx(dynamicTheme, orientation),
donutDy: getDynamicDonutDy(dynamicTheme),
donutHeight: donutHeight - (theme.pie.height - dynamicTheme.pie.height),
donutOrientation: orientation,
donutWidth: child.props.donutWidth || donutWidth - (theme.pie.width - dynamicTheme.pie.width),
endAngle: child.props.endAngle || 360 * (datum[0]._y ? datum[0]._y / 100 : 100),
height: child.props.height || height,
showStatic: child.props.showStatic || false,
donutWidth: donutWidth - (theme.pie.width - dynamicTheme.pie.width),
endAngle: 360 * (datum[0]._y ? datum[0]._y / 100 : 100),
height,
showStatic: false,
standalone: false,
theme: dynamicTheme,
width: child.props.width || width
width: width,
...childProps,
});
}
return child;
Expand All @@ -479,6 +492,7 @@ export const ChartDonutThreshold: React.FunctionComponent<ChartDonutThresholdPro
data={getComputedData()}
height={donutHeight}
innerRadius={innerRadius > 0 ? innerRadius : 0}
labels={labels}
origin={getChartOrigin({
chartHeight: donutHeight,
chartWidth: donutWidth,
Expand Down
13 changes: 8 additions & 5 deletions ...arts/src/components/ChartDonutUtilization/__snapshots__/ChartDonutThreshold.test.tsx.snap
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 @@ -15,6 +15,7 @@ exports[`Chart 1`] = `
}
height={230}
innerRadius={98}
labels={Array []}
origin={
Object {
"x": 115,
Expand Down Expand Up @@ -494,6 +495,7 @@ exports[`Chart 2`] = `
}
height={230}
innerRadius={98}
labels={Array []}
origin={
Object {
"x": 115,
Expand Down Expand Up @@ -966,25 +968,26 @@ exports[`renders component data 1`] = `
<Component
data={
Array [
Object {
"x": "Birds",
"y": 10,
},
Object {
"x": "Cats",
"y": 35,
"y": 25,
},
Object {
"x": "Dogs",
"y": 20,
},
Object {
"x": "Birds",
"y": 45,
},
Object {
"y": 90,
},
]
}
height={200}
innerRadius={83}
labels={Array []}
origin={
Object {
"x": 100,
Expand Down
2 changes: 0 additions & 2 deletions ...react-core/src/components/AboutModal/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap
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 @@ -11,7 +11,6 @@ exports[`AboutModalBoxCloseButton Test 1`] = `
>
<TimesIcon
color="currentColor"
noVerticalAlign={false}

mturley Jun 17, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I'm not sure why these unrelated snapshots are updating, @jschuler @redallen do you know what the deal is here?

jschuler Jun 17, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

react-icons was recently updated to include this prop, pull down latest from master and rerun yarn install
size="sm"
title={null}
/>
Expand All @@ -30,7 +29,6 @@ exports[`AboutModalBoxCloseButton Test onclose 1`] = `
>
<TimesIcon
color="currentColor"
noVerticalAlign={false}
size="sm"
title={null}
/>
Expand Down
15 changes: 15 additions & 0 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 @@ -2,6 +2,8 @@ import React from 'react';
import { shallow, mount } from 'enzyme';
import { Accordion } from './Accordion';
import { AccordionToggle } from './AccordionToggle';
import { AccordionContent } from './AccordionContent';
import { AccordionItem } from './AccordionItem';

describe('Accordion', () => {
test('Accordion default', () => {
Expand All @@ -25,4 +27,17 @@ describe('Accordion', () => {
expect(button.props['aria-expanded']).toBe(true);
expect(button.props.className).toContain('pf-m-expanded');
});

test('Accordion with non-default headingLevel', () => {
const view = shallow(
<Accordion headingLevel="h2">
<AccordionItem>
<AccordionToggle id="item-1">Item One</AccordionToggle>
<AccordionContent>Item One Content</AccordionContent>
</AccordionItem>
</Accordion>
);
expect(view.render()).toMatchSnapshot();
});

});
7 changes: 6 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 @@ -2,22 +2,27 @@ import * as React from 'react';
import { css } from '@patternfly/react-styles';
import styles from '@patternfly/react-styles/css/components/Accordion/accordion';

export const AccordionContext = React.createContext('h3');

export interface AccordionProps extends React.HTMLProps<HTMLDListElement> {
/** Content rendered inside the Accordion */
children?: React.ReactNode;
/** Additional classes added to the Accordion */
className?: string;
/** Adds accessible text to the Accordion */
'aria-label'?: string;
/** the heading level to use */
headingLevel?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
}

export const Accordion: React.FunctionComponent<AccordionProps> = ({
children = null,
className = '',
'aria-label': ariaLabel = '',
headingLevel = 'h3',
...props
}: AccordionProps) => (
<dl className={css(styles.accordion, className)} aria-label={ariaLabel} {...props}>
{children}
<AccordionContext.Provider value={headingLevel}>{children}</AccordionContext.Provider>
</dl>
);
28 changes: 17 additions & 11 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 @@ -2,7 +2,9 @@ import * as React from 'react';
import { css } from '@patternfly/react-styles';
import styles from '@patternfly/react-styles/css/components/Accordion/accordion';
import { AngleRightIcon } from '@patternfly/react-icons';
import { AccordionContext } from './Accordion';
import { Omit } from '../../helpers/typeUtils';
import { ElementType } from 'react';

export interface AccordionToggleProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'type'> {
/** Content rendered inside the Accordion toggle */
Expand All @@ -23,16 +25,20 @@ export const AccordionToggle: React.FunctionComponent<AccordionToggleProps> = ({
...props
}: AccordionToggleProps) => (
<dt>
<h3>
<button
id={id}
className={css(styles.accordionToggle, isExpanded && styles.modifiers.expanded, className)}
{...props}
aria-expanded={isExpanded}
>
<span className={css(styles.accordionToggleText)}>{children}</span>
<AngleRightIcon className={css(styles.accordionToggleIcon)} />
</button>
</h3>
<AccordionContext.Consumer>
{(AccordionHeadingLevel: any) => (
<AccordionHeadingLevel>
<button
id={id}
className={css(styles.accordionToggle, isExpanded && styles.modifiers.expanded, className)}
{...props}
aria-expanded={isExpanded}
>
<span className={css(styles.accordionToggleText)}>{children}</span>
<AngleRightIcon className={css(styles.accordionToggleIcon)} />
</button>
</AccordionHeadingLevel>
)}
</AccordionContext.Consumer>
</dt>
);
49 changes: 49 additions & 0 deletions ...es/patternfly-4/react-core/src/components/Accordion/__snapshots__/Accordion.test.tsx.snap
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 @@ -6,3 +6,52 @@ exports[`Accordion Accordion default 1`] = `
class="pf-c-accordion"
/>
`;

exports[`Accordion Accordion with non-default headingLevel 1`] = `
<dl
aria-label=""
class="pf-c-accordion"
>
<dt>
<h2>
<button
aria-expanded="false"
class="pf-c-accordion__toggle"
id="item-1"
>
<span
class="pf-c-accordion__toggle-text"
>
Item One
</span>
<svg
aria-hidden="true"
class="pf-c-accordion__toggle-icon"
fill="currentColor"
height="1em"
role="img"
style="vertical-align:-0.125em"
viewBox="0 0 256 512"
width="1em"
>
<path
d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
transform=""
/>
</svg>
</button>
</h2>
</dt>
<dd
aria-label=""
class="pf-c-accordion__expanded-content pf-m-expanded"
id=""
>
<div
class="pf-c-accordion__expanded-content-body"
>
Item One Content
</div>
</dd>
</dl>
`;
Loading
Back | FazBrowse Home | New Git URL