This repository was archived by the owner on Mar 4, 2020. It is now read-only.
fix(Loader): Adding labeling when loader get focus #2352
Merged
Conversation
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
kolaps33
requested review from
dvdzkwsk,
dzearing,
ecraig12345,
JasonGore,
jdhuntington,
kenotron,
layershifter,
levithomason,
miroslavstastny and
mnajdova
as code owners
layershifter
suggested changes
Feb 13, 2020
|
|
||
| componentDidUpdate(prevProps) { | ||
| if (this.getIdFromShorthand(this.props.label) !== this.getIdFromShorthand(prevProps.label)) { | ||
| this.setState(prevState => ({ labelLoaderId: getOrGenerateIdFromShorthand('loader-label-', this.props.label, prevState.labelLoaderId) })) | ||
| } |
There was a problem hiding this comment.
Why don't use getDerivedStateFromProps()? This will produce an additional render
There was a problem hiding this comment.
do you mean getAutoControlledStateFromProps @layershifter? - please see Dialog.tsx
There was a problem hiding this comment.
getDerivedStateFromProps should be enough. This is not Autocontrolled component.
| }) | ||
|
|
||
| test('do NOT add aria-labelledby, when aria-labelled was set already', () => { | ||
| props['aria-labelledby'] = 'id' |
There was a problem hiding this comment.
Let's avoid mutation of props:
const expectedResult = loaderBehavior({ labelLoaderId: "label-id",'aria-labelledby':'id' })
jurokapsiar
reviewed
Feb 13, 2020
docs/src/examples/components/Loader/BestPractices/LoaderBestPractices.tsx
Outdated
Show resolved
Hide resolved
jurokapsiar
reviewed
Feb 13, 2020
…actices.tsx Co-Authored-By: Juraj Kapsiar <jurokapsiar@gmail.com>
Co-Authored-By: Juraj Kapsiar <jurokapsiar@gmail.com>
Perf comparison
Perf tests with no regressions
Generated by 🚫 dangerJS |
mnajdova
reviewed
Feb 13, 2020
| } | ||
|
|
||
| static getDerivedStateFromProps(props, state) { | ||
| if (Loader.getIdFromShorthand(props.label) !== Loader.getIdFromShorthand(state.labelLoaderId)) { |
There was a problem hiding this comment.
Shouldn't we compare here getIdFromShorthand(props.label) with getIdFromShorthand(this.props.label)?
| @@ -94,9 +97,40 @@ class Loader extends UIComponent<WithAsProp<LoaderProps>, LoaderState> { | |||
|
|
|||
| this.state = { | |||
| visible: this.props.delay === 0, | |||
| labelLoaderId: getOrGenerateIdFromShorthand('loader-label-', props.label, ''), | |||
There was a problem hiding this comment.
We don't need this anymore as getDerivedStateFromProps() is executed before each render
|
|
||
| type LoaderBehaviorProps = { | ||
| /** id of the loader label element. */ | ||
| labelLoaderId?: string |
There was a problem hiding this comment.
I expect that it will be just labelId
| state.labelLoaderId, | ||
| ) | ||
| return { | ||
| labelLoaderId: nextLabelLoaderId, |
There was a problem hiding this comment.
I believe that it can used in the same way as in Dialog, just:
return {
labelId: getOrGenerateIdFromShorthand('loader-label-', props.label, state.loaderId),
}
| return result | ||
| } | ||
|
|
||
| static getDerivedStateFromProps(props, state) { |
There was a problem hiding this comment.
Let's type this method as in Dialog
| if (props['aria-label'] || props['aria-labelledby']) { | ||
| return undefined | ||
| } | ||
| return props['tabIndex'] !== undefined ? props.labelLoaderId : undefined |
There was a problem hiding this comment.
Nit: Let's invert this condition to make more readable:
return props['tabIndex'] === undefined ? undefined : props.labelLoaderId
layershifter
approved these changes
Feb 14, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixing the ticket:
#2254