Skip to content

feat(Drawer, DataList, Page): rename noPadding to hasNoPadding #4133

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
redallen merged 2 commits into from
May 7, 2020
Merged

feat(Drawer, DataList, Page): rename noPadding to hasNoPadding #4133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa37c6b
feat(Drawer, DataList, Page): rename noPadding to hasNoPadding, add P…
kmcfaul Apr 27, 2020
f75f6e1
feat(PageSection): refactor breakpoint logic to use util, add to demo…
kmcfaul May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions packages/react-core/src/components/DataList/DataListContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export interface DataListContentProps extends React.HTMLProps<HTMLElement> {
/** Flag to show if the expanded content of the DataList item is visible */
isHidden?: boolean;
/** Flag to remove padding from the expandable content */
noPadding?: boolean;
hasNoPadding?: boolean;
Copy link
Contributor

@redallen redallen May 4, 2020

Choose a reason for hiding this comment

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

Can we change this to hasPadding and default it to true? Sounds a little better and codemods fix it all the same.

Copy link
Contributor Author

@kmcfaul kmcfaul May 6, 2020

Choose a reason for hiding this comment

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

@tlabaj Thoughts?

I don't mind either way.

Copy link
Contributor Author

@kmcfaul kmcfaul May 6, 2020

Choose a reason for hiding this comment

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

Keeping as hasNoPadding per standup discussion for now

/** Adds accessible text to the DataList toggle */
'aria-label': string;
}
Expand All @@ -25,7 +25,7 @@ export const DataListContent: React.FunctionComponent<DataListContentProps> = ({
id = '',
isHidden = false,
'aria-label': ariaLabel,
noPadding = false,
hasNoPadding = false,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
rowid = '',
...props
Expand All @@ -37,6 +37,8 @@ export const DataListContent: React.FunctionComponent<DataListContentProps> = ({
aria-label={ariaLabel}
{...props}
>
<div className={css(styles.dataListExpandableContentBody, noPadding && styles.modifiers.noPadding)}>{children}</div>
<div className={css(styles.dataListExpandableContentBody, hasNoPadding && styles.modifiers.noPadding)}>
{children}
</div>
</section>
);
8 changes: 3 additions & 5 deletions packages/react-core/src/components/DataList/__tests__/DataList.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ describe('DataList', () => {
});

test('Toggle default with aria label', () => {
const view = shallow(
<DataListToggle aria-label="Toggle details for" id="ex-toggle2" />
);
const view = shallow(<DataListToggle aria-label="Toggle details for" id="ex-toggle2" />);

expect(view.find(Button).props()['aria-label']).toBe('Toggle details for');
expect(view.find(Button).props()['aria-labelledby']).toBe(null);
Expand Down Expand Up @@ -181,9 +179,9 @@ describe('DataList', () => {
expect(view).toMatchSnapshot();
});

test('DataListContent noPadding', () => {
test('DataListContent hasNoPadding', () => {
const view = shallow(
<DataListContent aria-label="Primary Content Details" hidden noPadding>
<DataListContent aria-label="Primary Content Details" hidden hasNoPadding>
test
</DataListContent>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/DataList/__tests__/Generated/DataListContent.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ it('DataListContent should match snapshot (auto-generated)', () => {
id={"''"}
rowid={"''"}
isHidden={false}
noPadding={false}
hasNoPadding={false}
aria-label={'string'}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/DataList/__tests__/__snapshots__/DataList.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ exports[`DataList DataListContent 1`] = `
</section>
`;

exports[`DataList DataListContent noPadding 1`] = `
exports[`DataList DataListContent hasNoPadding 1`] = `
<section
aria-label="Primary Content Details"
className="pf-c-data-list__expandable-content"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/DataList/examples/DataList.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ class ExpandableDataList extends React.Component {
aria-label="Primary Content Details"
id="ex-expand3"
isHidden={!this.state.expanded.includes('ex-toggle3')}
noPadding
hasNoPadding
>
This expanded section has no padding.
</DataListContent>
Expand Down
6 changes: 3 additions & 3 deletions packages/react-core/src/components/Drawer/DrawerHead.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ export interface DrawerHeadProps extends React.HTMLProps<HTMLDivElement> {
/** Content to be rendered in the drawer head */
children?: React.ReactNode;
/** Indicates if there should be no padding around the drawer panel body of the head*/
noPadding?: boolean;
hasNoPadding?: boolean;
}

export const DrawerHead: React.SFC<DrawerHeadProps> = ({
// eslint-disable-next-line @typescript-eslint/no-unused-vars
className = '',
children,
noPadding = false,
hasNoPadding = false,
...props
}: DrawerHeadProps) => (
<DrawerPanelBody noPadding={noPadding}>
<DrawerPanelBody hasNoPadding={hasNoPadding}>
<div className={css(styles.drawerHead, className)} {...props}>
{children}
</div>
Expand Down
6 changes: 3 additions & 3 deletions packages/react-core/src/components/Drawer/DrawerPanelBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ export interface DrawerPanelBodyProps extends React.HTMLProps<HTMLDivElement> {
/** Content to be rendered in the drawer */
children?: React.ReactNode;
/** Indicates if there should be no padding around the drawer panel body */
noPadding?: boolean;
hasNoPadding?: boolean;
}

export const DrawerPanelBody: React.SFC<DrawerPanelBodyProps> = ({
// eslint-disable-next-line @typescript-eslint/no-unused-vars
className = '',
children,
noPadding = false,
hasNoPadding = false,
...props
}: DrawerPanelBodyProps) => (
<div className={css(styles.drawerBody, noPadding && styles.modifiers.noPadding, className)} {...props}>
<div className={css(styles.drawerBody, hasNoPadding && styles.modifiers.noPadding, className)} {...props}>
{children}
</div>
);
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Drawer/__tests__/Generated/DrawerPanelContent.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ import { DrawerPanelContent } from '../../DrawerPanelContent';
import {} from '../..';

it('DrawerPanelContent should match snapshot (auto-generated)', () => {
const view = shallow(<DrawerPanelContent className={"''"} children={<div>ReactNode</div>} />);
const view = shallow(<DrawerPanelContent className={"''"} children={<div>ReactNode</div>} hasNoPadding={false} />);
expect(view).toMatchSnapshot();
});
10 changes: 5 additions & 5 deletions packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ exports[`Drawer isExpanded = false and isInline = false and isStatic = false 1`]
>
<DrawerHead>
<DrawerPanelBody
noPadding={false}
hasNoPadding={false}
>
<div
className="pf-c-drawer__body"
Expand Down Expand Up @@ -179,7 +179,7 @@ exports[`Drawer isExpanded = false and isInline = true and isStatic = false 1`]
>
<DrawerHead>
<DrawerPanelBody
noPadding={false}
hasNoPadding={false}
>
<div
className="pf-c-drawer__body"
Expand Down Expand Up @@ -312,7 +312,7 @@ exports[`Drawer isExpanded = true and isInline = false and isStatic = false 1`]
>
<DrawerHead>
<DrawerPanelBody
noPadding={false}
hasNoPadding={false}
>
<div
className="pf-c-drawer__body"
Expand Down Expand Up @@ -445,7 +445,7 @@ exports[`Drawer isExpanded = true and isInline = false and isStatic = true 1`] =
>
<DrawerHead>
<DrawerPanelBody
noPadding={false}
hasNoPadding={false}
>
<div
className="pf-c-drawer__body"
Expand Down Expand Up @@ -578,7 +578,7 @@ exports[`Drawer isExpanded = true and isInline = true and isStatic = false 1`] =
>
<DrawerHead>
<DrawerPanelBody
noPadding={false}
hasNoPadding={false}
>
<div
className="pf-c-drawer__body"
Expand Down
Loading