Skip to content

feat(ActionList): consumed Penta updates #10041

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
mattnolting merged 2 commits into from
Feb 14, 2024
Merged

feat(ActionList): consumed Penta updates #10041

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
9c1c764
feat(ActionList): consumed Penta updates
Jan 24, 2024
f73ad50
Updated id attrs to be unique
Jan 24, 2024
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
2 changes: 1 addition & 1 deletion packages/react-core/src/components/ActionList/ActionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export interface ActionListProps extends React.HTMLProps<HTMLDivElement> {
export const ActionList: React.FunctionComponent<ActionListProps> = ({
children,
isIconList,
className = '',
className,
...props
}: ActionListProps) => (
<div className={css(styles.actionList, isIconList && styles.modifiers.icons, className)} {...props}>
Expand Down
7 changes: 5 additions & 2 deletions packages/react-core/src/components/ActionList/ActionListGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@ export interface ActionListGroupProps extends React.HTMLProps<HTMLDivElement> {
children?: React.ReactNode;
/** Additional classes added to the action list group */
className?: string;
/** Flag indicating the action list group contains multiple icons and item padding should be removed */
isIconGroup?: boolean;
}

export const ActionListGroup: React.FunctionComponent<ActionListGroupProps> = ({
children,
className = '',
className,
isIconGroup,
...props
}: ActionListGroupProps) => (
<div className={css(styles.actionListGroup, className)} {...props}>
<div className={css(styles.actionListGroup, isIconGroup && styles.modifiers.icons, className)} {...props}>
{children}
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/ActionList/ActionListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export interface ActionListItemProps extends React.HTMLProps<HTMLDivElement> {

export const ActionListItem: React.FunctionComponent<ActionListItemProps> = ({
children,
className = '',
className,
...props
}: ActionListItemProps) => (
<div className={css(`${styles.actionList}__item`, className)} {...props}>
Expand Down
10 changes: 8 additions & 2 deletions packages/react-core/src/components/ActionList/__tests__/ActionListGroup.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,16 @@ test('Renders children', () => {
expect(screen.getByText('Test')).toBeVisible();
});

test(`Renders with class ${styles.actionListGroup}`, () => {
test(`Renders with only class ${styles.actionListGroup} by default`, () => {
render(<ActionListGroup>Test</ActionListGroup>);

expect(screen.getByText('Test')).toHaveClass(styles.actionListGroup);
expect(screen.getByText('Test')).toHaveClass(styles.actionListGroup, { exact: true });
});

test(`Renders with class ${styles.modifiers.icons} when isIconGroup is true`, () => {
render(<ActionListGroup isIconGroup>Test</ActionListGroup>);

expect(screen.getByText('Test')).toHaveClass(styles.modifiers.icons);
});

test('Renders with custom class names provided via prop', () => {
Expand Down
85 changes: 45 additions & 40 deletions packages/react-core/src/components/ActionList/examples/ActionListSingleGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import {
ActionList,
ActionListGroup,
ActionListItem,
Button,
Dropdown,
Expand Down Expand Up @@ -46,50 +47,54 @@ export const ActionListSingleGroup: React.FunctionComponent = () => {
return (
<React.Fragment>
<ActionList>
<ActionListItem>
<Button variant="primary" id="single-group-next-button">
Next
</Button>
</ActionListItem>
<ActionListItem>
<Button variant="secondary" id="single-group-back-button">
Back
</Button>
</ActionListItem>
<ActionListGroup>
<ActionListItem>
<Button variant="primary" id="single-group-next-button">
Next
</Button>
</ActionListItem>
<ActionListItem>
<Button variant="secondary" id="single-group-back-button">
Back
</Button>
</ActionListItem>
</ActionListGroup>
</ActionList>
<br />
With kebab
<ActionList>
<ActionListItem>
<Button variant="primary" id="single-group-next-button2">
Next
</Button>
</ActionListItem>
<ActionListItem>
<Button variant="secondary" id="single-group-back-button2">
Back
</Button>
</ActionListItem>
<ActionListItem>
<Dropdown
onSelect={onSelect}
toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
<MenuToggle
ref={toggleRef}
onClick={onToggle}
variant="plain"
isExpanded={isOpen}
aria-label="Action list single group kebab"
>
<EllipsisVIcon />
</MenuToggle>
)}
isOpen={isOpen}
onOpenChange={(isOpen: boolean) => setIsOpen(isOpen)}
>
<DropdownList>{dropdownItems}</DropdownList>
</Dropdown>
</ActionListItem>
<ActionListGroup>
<ActionListItem>
<Button variant="primary" id="single-group-next-button2">
Next
</Button>
</ActionListItem>
<ActionListItem>
<Button variant="secondary" id="single-group-back-button2">
Back
</Button>
</ActionListItem>
<ActionListItem>
<Dropdown
onSelect={onSelect}
toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
<MenuToggle
ref={toggleRef}
onClick={onToggle}
variant="plain"
isExpanded={isOpen}
aria-label="Action list single group kebab"
>
<EllipsisVIcon />
</MenuToggle>
)}
isOpen={isOpen}
onOpenChange={(isOpen: boolean) => setIsOpen(isOpen)}
>
<DropdownList>{dropdownItems}</DropdownList>
</Dropdown>
</ActionListItem>
</ActionListGroup>
</ActionList>
</React.Fragment>
);
Expand Down
22 changes: 12 additions & 10 deletions packages/react-core/src/components/ActionList/examples/ActionListWithCancelButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@ export const ActionListWithCancelButton: React.FunctionComponent = () => (
<React.Fragment>
In modals, forms, data lists
<ActionList>
<ActionListItem>
<Button variant="primary" id="with-cancel-save-button">
Save
</Button>
</ActionListItem>
<ActionListItem>
<Button variant="link" id="with-cancel-cancel-button">
Cancel
</Button>
</ActionListItem>
<ActionListGroup>
<ActionListItem>
<Button variant="primary" id="with-cancel-save-button">
Save
</Button>
</ActionListItem>
<ActionListItem>
<Button variant="link" id="with-cancel-cancel-button">
Cancel
</Button>
</ActionListItem>
</ActionListGroup>
</ActionList>
<br />
In wizards
Expand Down
57 changes: 44 additions & 13 deletions packages/react-core/src/components/ActionList/examples/ActionListWithIcons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,50 @@
import React from 'react';
import { ActionList, ActionListItem, Button } from '@patternfly/react-core';
import { ActionList, ActionListGroup, ActionListItem, Button } from '@patternfly/react-core';
import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';

export const ActionListWithIcons: React.FunctionComponent = () => (
<ActionList isIconList>
<ActionListItem>
<Button variant="plain" id="with-icons-times-button" aria-label="times icon button">
<TimesIcon />
</Button>
</ActionListItem>
<ActionListItem>
<Button variant="plain" id="with-icons-check-button" aria-label="check icon button">
<CheckIcon />
</Button>
</ActionListItem>
</ActionList>
<>
<h4>With list icons wrapper</h4>
<ActionList isIconList>
<ActionListItem>
<Button variant="plain" id="with-icons-times-button" aria-label="times icon button">
<TimesIcon />
</Button>
</ActionListItem>
<ActionListItem>
<Button variant="plain" id="with-icons-check-button" aria-label="check icon button">
<CheckIcon />
</Button>
</ActionListItem>
</ActionList>
<br />
<h4>With group icons wrapper</h4>
<ActionList>
<ActionListGroup isIconGroup>
<ActionListItem>
<Button variant="plain" id="with-icons-list-times-button" aria-label="times icon button">
<TimesIcon />
</Button>
</ActionListItem>
<ActionListItem>
<Button variant="plain" id="with-icons-list-check-button" aria-label="check icon button">
<CheckIcon />
</Button>
</ActionListItem>
</ActionListGroup>
<ActionListGroup isIconGroup>
<ActionListItem>
<Button variant="plain" id="with-icons-group-times-button" aria-label="times icon button">
<TimesIcon />
</Button>
</ActionListItem>
<ActionListItem>
<Button variant="plain" id="with-icons-group-check-button" aria-label="check icon button">
<CheckIcon />
</Button>
</ActionListItem>
</ActionListGroup>
</ActionList>
</>
);