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

feat(Dropdown): Added support for dropdown with primary button toggle by rebeccaalpert · Pull Request #2857 · patternfly/patternfly-react · GitHub

/ patternfly-react Public

feat(Dropdown): Added support for dropdown with primary button toggle #2857

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
jschuler merged 1 commit into from
Sep 5, 2019
Conversation 4 Commits 1 Checks 0 Files changed
Merged

feat(Dropdown): Added support for dropdown with primary button toggle #2857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .md  (1) .snap  (7) .tsx  (3) All 3 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
6 changes: 6 additions & 0 deletions ...ct-core/src/components/ApplicationLauncher/__snapshots__/ApplicationLauncher.test.js.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 @@ -262,6 +262,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
isHovered={false}
isOpen={true}
isPlain={false}
isPrimary={false}
isSplitButton={false}
onEnter={[Function]}
onToggle={[Function]}
Expand Down Expand Up @@ -926,6 +927,7 @@ exports[`ApplicationLauncher dropup + right aligned 1`] = `
isHovered={false}
isOpen={false}
isPlain={false}
isPrimary={false}
isSplitButton={false}
onEnter={[Function]}
onToggle={[Function]}
Expand Down Expand Up @@ -1185,6 +1187,7 @@ exports[`ApplicationLauncher dropup 1`] = `
isHovered={false}
isOpen={false}
isPlain={false}
isPrimary={false}
isSplitButton={false}
onEnter={[Function]}
onToggle={[Function]}
Expand Down Expand Up @@ -1531,6 +1534,7 @@ exports[`ApplicationLauncher expanded 1`] = `
isHovered={false}
isOpen={true}
isPlain={false}
isPrimary={false}
isSplitButton={false}
onEnter={[Function]}
onToggle={[Function]}
Expand Down Expand Up @@ -2192,6 +2196,7 @@ exports[`ApplicationLauncher regular 1`] = `
isHovered={false}
isOpen={false}
isPlain={false}
isPrimary={false}
isSplitButton={false}
onEnter={[Function]}
onToggle={[Function]}
Expand Down Expand Up @@ -2451,6 +2456,7 @@ exports[`ApplicationLauncher right aligned 1`] = `
isHovered={false}
isOpen={false}
isPlain={false}
isPrimary={false}
isSplitButton={false}
onEnter={[Function]}
onToggle={[Function]}
Expand Down
56 changes: 56 additions & 0 deletions packages/patternfly-4/react-core/src/components/Dropdown/Dropdown.md
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 @@ -240,6 +240,62 @@ class DisabledDropdown extends React.Component {
}
```

## Dropdown (primary toggle)

```js
import React from 'react';
import { Dropdown, DropdownToggle, DropdownItem, DropdownSeparator, DropdownPosition, DropdownDirection } from '@patternfly/react-core';
import { ThIcon, CaretDownIcon } from '@patternfly/react-icons';

class PrimaryDropdown extends React.Component {
constructor(props) {
super(props);
this.state = {
isOpen: false
};
this.onToggle = isOpen => {
this.setState({
isOpen
});
};
this.onSelect = event => {
this.setState({
isOpen: !this.state.isOpen
});
};
}

render() {
const { isOpen } = this.state;
const dropdownItems = [
<DropdownItem key="link">Link</DropdownItem>,
<DropdownItem key="action" component="button">
Action
</DropdownItem>,
<DropdownItem key="disabled link" isDisabled>
Disabled Link
</DropdownItem>,
<DropdownItem key="disabled action" isDisabled component="button">
Disabled Action
</DropdownItem>,
<DropdownSeparator key="separator" />,
<DropdownItem key="separated link">Separated Link</DropdownItem>,
<DropdownItem key="separated action" component="button">
Separated Action
</DropdownItem>
];
return (
<Dropdown
onSelect={this.onSelect}
toggle={<DropdownToggle onToggle={this.onToggle} iconComponent={CaretDownIcon} isPrimary>Dropdown</DropdownToggle>}
isOpen={isOpen}
dropdownItems={dropdownItems}
/>
);
}
}
```

## Dropdown (position right)

```js
Expand Down
10 changes: 10 additions & 0 deletions packages/patternfly-4/react-core/src/components/Dropdown/Dropdown.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 @@ -78,6 +78,16 @@ describe('dropdown', () => {
expect(view).toMatchSnapshot();
});

test('primary', () => {
const view = mount(
<Dropdown
dropdownItems={dropdownItems}
toggle={<DropdownToggle id="Dropdown Toggle" isPrimary>Dropdown</DropdownToggle>}
/>
);
expect(view).toMatchSnapshot();
});

test('basic', () => {
const view = mount(
<Dropdown isOpen toggle={<DropdownToggle id="Dropdown Toggle">Dropdown</DropdownToggle>}>
Expand Down
4 changes: 4 additions & 0 deletions packages/patternfly-4/react-core/src/components/Dropdown/DropdownToggle.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 @@ -28,6 +28,8 @@ export interface DropdownToggleProps extends React.HTMLProps<HTMLButtonElement>
isPlain?: boolean;
/** Whether or not the <div> has a disabled state */
isDisabled?: boolean;
/** Whether or not the dropdown toggle button should have primary button styling */
isPrimary?: boolean;
/** The icon to display for the toggle. Defaults to CaretDownIcon. Set to null to not show an icon. */
iconComponent?: React.ElementType | null;
/** Elements to display before the toggle button. When included, renders the toggle as a split button. */
Expand All @@ -51,6 +53,7 @@ export const DropdownToggle: React.FunctionComponent<DropdownToggleProps> = ({
isActive = false,
isDisabled = false,
isPlain = false,
isPrimary = false,
onToggle = (_isOpen: boolean) => undefined as any,
iconComponent: IconComponent = CaretDownIcon,
splitButtonItems,
Expand All @@ -72,6 +75,7 @@ export const DropdownToggle: React.FunctionComponent<DropdownToggleProps> = ({
isActive={isActive}
isDisabled={isDisabled}
isPlain={isPlain}
isPrimary={isPrimary}
onToggle={onToggle}
ariaHasPopup={ariaHasPopup}
{...splitButtonItems && { "isSplitButton": true, 'aria-label': props['aria-label'] || 'Select' }}>
Expand Down
5 changes: 5 additions & 0 deletions packages/patternfly-4/react-core/src/components/Dropdown/Toggle.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 @@ -31,6 +31,8 @@ export interface ToggleProps {
isDisabled?: boolean;
/** Display the toggle with no border or background */
isPlain?: boolean;
/** Display the toggle with a primary button style */
isPrimary?: boolean;
/** Style the toggle as a child of a split button */
isSplitButton?: boolean;
/** Flag for aria popup */
Expand All @@ -48,6 +50,7 @@ export class Toggle extends React.Component<ToggleProps> {
isActive: false,
isDisabled: false,
isPlain: false,
isPrimary: false,
isSplitButton: false,
onToggle: Function.prototype,
onEnter: Function.prototype
Expand Down Expand Up @@ -107,6 +110,7 @@ export class Toggle extends React.Component<ToggleProps> {
isHovered,
isDisabled,
isPlain,
isPrimary,
isSplitButton,
ariaHasPopup,
onToggle,
Expand All @@ -130,6 +134,7 @@ export class Toggle extends React.Component<ToggleProps> {
isActive && styles.modifiers.active,
isPlain && styles.modifiers.plain,
isDisabled && styles.modifiers.disabled,
isPrimary && styles.modifiers.primary,
className
)}
type={type || 'button'}
Expand Down
Loading
Back | FazBrowse Home | New Git URL