fix(switch): backward compatibility in case labelOff is not set - #2816
Merged
tlabaj merged 1 commit intoSep 18, 2019
Merged
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
Copy link
Copy Markdown
Collaborator
|
PatternFly-React preview: https://patternfly-react-pr-2816.surge.sh |
Sorry, something went wrong.
jschuler
reviewed
Sep 10, 2019
Comment thread
packages/patternfly-4/react-core/src/components/Switch/Switch.tsx
Outdated
Copy link
Copy Markdown
Member
Author
|
fixed merge conflicts |
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
|
Hi @boaz0 , what i meant is that we don't need to code duplication, we can simply fix the conditionals. {label !== '' || labelOff !== '' ? (
<React.Fragment>
<span className={css(styles.switchToggle)} />
<span
className={css(styles.switchLabel, styles.modifiers.on)}
id={isAriaLabelledBy ? `${this.id}-on` : null}
aria-hidden="true"
>
{label}
</span>
<span
className={css(styles.switchLabel, styles.modifiers.off)}
id={isAriaLabelledBy ? `${this.id}-off` : null}
aria-hidden="true"
>
{labelOff}
</span>
</React.Fragment>
) : (
<span className={css(styles.switchToggle)}>
<div className={css(styles.switchToggleIcon)} aria-hidden="true">
<CheckIcon noVerticalAlign />
</div>
</span>
)}
After: {label !== '' ? (
<React.Fragment>
<span className={css(styles.switchToggle)} />
<span
className={css(styles.switchLabel, styles.modifiers.on)}
id={isAriaLabelledBy ? `${this.id}-on` : null}
aria-hidden="true"
>
{label}
</span>
<span
className={css(styles.switchLabel, styles.modifiers.off)}
id={isAriaLabelledBy ? `${this.id}-off` : null}
aria-hidden="true"
>
{labelOff || label}
</span>
</React.Fragment>
) : (
<span className={css(styles.switchToggle)}>
<div className={css(styles.switchToggleIcon)} aria-hidden="true">
<CheckIcon noVerticalAlign />
</div>
</span>
)}
|
Sorry, something went wrong.
Signed-off-by: Boaz Shuster <boaz.shuster.github@gmail.com>
jschuler
approved these changes
Sep 18, 2019
tlabaj
approved these changes
Sep 18, 2019
tlabaj
left a comment
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
LGTM
Sorry, something went wrong.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What:
Add a check if label is set but not labelOff - in that case display label on both labels.
if both label and labelOff are set display in the new format
Otherwise - display switch without labels.
Added tests to verify that if labelOff not given the label is shown.
fixes #2814
//cc @spytec