Skip to content
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

Jump to bottom

fix(button): set the disable modifier when component is not button #2683

Merged
merged 1 commit into from Sep 19, 2019
Merged

fix(button): set the disable modifier when component is not button #2683

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
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-core/src/components/Button/Button.tsx
View file
Open in desktop
Expand Up @@ -76,7 +76,7 @@ const Button: React.FunctionComponent<ButtonProps & InjectedOuiaProps> = ({
styles.button,
getModifier(styles.modifiers, variant),
isBlock && styles.modifiers.block,
isDisabled && styles.modifiers.disabled,
isDisabled && !isButtonElement && styles.modifiers.disabled,
isActive && styles.modifiers.active,
isFocus && styles.modifiers.focus,
isHover && styles.modifiers.hover,
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-core/src/components/Button/__snapshots__/Button.test.tsx.snap
View file
Open in desktop
Expand Up @@ -150,7 +150,7 @@ exports[`isDisabled 1`] = `
<button
aria-disabled={null}
aria-label={null}
className="pf-c-button pf-m-primary pf-m-disabled"
className="pf-c-button pf-m-primary"
disabled={true}
tabIndex={null}
type="button"
Expand Down
64 changes: 32 additions & 32 deletions .../patternfly-4/react-core/src/components/Pagination/__snapshots__/Pagination.test.tsx.snap
View file
Open in desktop
Expand Up @@ -543,7 +543,7 @@ exports[`component render custom pagination toggle 1`] = `
<button
aria-disabled={null}
aria-label="Go to first page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="first"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -622,7 +622,7 @@ exports[`component render custom pagination toggle 1`] = `
<button
aria-disabled={null}
aria-label="Go to previous page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="previous"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -1335,7 +1335,7 @@ exports[`component render custom perPageOptions 1`] = `
<button
aria-disabled={null}
aria-label="Go to first page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="first"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -1414,7 +1414,7 @@ exports[`component render custom perPageOptions 1`] = `
<button
aria-disabled={null}
aria-label="Go to previous page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="previous"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -2730,7 +2730,7 @@ exports[`component render empty per page options 1`] = `
<button
aria-disabled={null}
aria-label="Go to first page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="first"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -2809,7 +2809,7 @@ exports[`component render empty per page options 1`] = `
<button
aria-disabled={null}
aria-label="Go to previous page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="previous"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -3805,7 +3805,7 @@ exports[`component render last page 1`] = `
<button
aria-disabled={null}
aria-label="Go to next page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="next"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -3884,7 +3884,7 @@ exports[`component render last page 1`] = `
<button
aria-disabled={null}
aria-label="Go to last page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="last"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -4521,7 +4521,7 @@ exports[`component render limited number of pages 1`] = `
<button
aria-disabled={null}
aria-label="Go to first page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="first"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -4600,7 +4600,7 @@ exports[`component render limited number of pages 1`] = `
<button
aria-disabled={null}
aria-label="Go to previous page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="previous"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -4700,7 +4700,7 @@ exports[`component render limited number of pages 1`] = `
<button
aria-disabled={null}
aria-label="Go to next page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="next"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -4779,7 +4779,7 @@ exports[`component render limited number of pages 1`] = `
<button
aria-disabled={null}
aria-label="Go to last page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="last"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -5418,7 +5418,7 @@ exports[`component render no items 1`] = `
<button
aria-disabled={null}
aria-label="Go to first page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="first"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -5497,7 +5497,7 @@ exports[`component render no items 1`] = `
<button
aria-disabled={null}
aria-label="Go to previous page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="previous"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -5597,7 +5597,7 @@ exports[`component render no items 1`] = `
<button
aria-disabled={null}
aria-label="Go to next page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="next"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -5676,7 +5676,7 @@ exports[`component render no items 1`] = `
<button
aria-disabled={null}
aria-label="Go to last page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="last"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -6308,7 +6308,7 @@ exports[`component render should render correctly bottom 1`] = `
<button
aria-disabled={null}
aria-label="Go to first page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="first"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -6387,7 +6387,7 @@ exports[`component render should render correctly bottom 1`] = `
<button
aria-disabled={null}
aria-label="Go to previous page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="previous"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -7206,7 +7206,7 @@ exports[`component render should render correctly disabled 1`] = `
<button
aria-disabled={null}
aria-label="Go to first page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="first"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -7285,7 +7285,7 @@ exports[`component render should render correctly disabled 1`] = `
<button
aria-disabled={null}
aria-label="Go to previous page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="previous"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -7385,7 +7385,7 @@ exports[`component render should render correctly disabled 1`] = `
<button
aria-disabled={null}
aria-label="Go to next page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="next"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -7464,7 +7464,7 @@ exports[`component render should render correctly disabled 1`] = `
<button
aria-disabled={null}
aria-label="Go to last page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="last"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -8100,7 +8100,7 @@ exports[`component render should render correctly top 1`] = `
<button
aria-disabled={null}
aria-label="Go to first page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="first"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -8179,7 +8179,7 @@ exports[`component render should render correctly top 1`] = `
<button
aria-disabled={null}
aria-label="Go to previous page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="previous"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -9000,7 +9000,7 @@ exports[`component render titles 1`] = `
<button
aria-disabled={null}
aria-label="Go to first page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="first"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -9079,7 +9079,7 @@ exports[`component render titles 1`] = `
<button
aria-disabled={null}
aria-label="Go to previous page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="previous"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -9895,7 +9895,7 @@ exports[`component render up drop direction 1`] = `
<button
aria-disabled={null}
aria-label="Go to first page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="first"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -9974,7 +9974,7 @@ exports[`component render up drop direction 1`] = `
<button
aria-disabled={null}
aria-label="Go to previous page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="previous"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -10792,7 +10792,7 @@ exports[`component render zero results 1`] = `
<button
aria-disabled={null}
aria-label="Go to first page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="first"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -10871,7 +10871,7 @@ exports[`component render zero results 1`] = `
<button
aria-disabled={null}
aria-label="Go to previous page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="previous"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -10971,7 +10971,7 @@ exports[`component render zero results 1`] = `
<button
aria-disabled={null}
aria-label="Go to next page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="next"
disabled={true}
onClick={[Function]}
Expand Down Expand Up @@ -11050,7 +11050,7 @@ exports[`component render zero results 1`] = `
<button
aria-disabled={null}
aria-label="Go to last page"
className="pf-c-button pf-m-plain pf-m-disabled"
className="pf-c-button pf-m-plain"
data-action="last"
disabled={true}
onClick={[Function]}
Expand Down