Repository navigation
fix(timeline): apply progress and emphasis label formatter - #21795
Open
Thanatos9404 wants to merge 1 commit into
Open
Thanatos9404 wants to merge 1 commit into
Thanatos9404 wants to merge 1 commit into
Conversation
…che#18673 `timeline.progress.label.formatter` and `timeline.emphasis.label.formatter` are documented, but the slider timeline only took the text style from those label models, so the label text never changed in those states. Format the text of each state with its own formatter in the same way as `label.formatter`, with the same arguments, and keep the normal text when a state has no formatter.
|
Thanks for your contribution! Please DO NOT commit the files in dist, i18n, and ssr/client/dist folders in a non-release pull request. These folders are for release use only. |
This branch has not been deployed
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
1 participant
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.
Brief Information
This pull request is in the type of:
What does this PR do?
Makes the slider timeline use
progress.label.formatterandemphasis.label.formatterfor the label text in those states.Fixed issues
Details
Before: What was the problem?
Both formatters are documented but had no effect.
SliderTimelineView._renderAxisLabelonly took the text fromlabel.formatter, and theprogressandemphasisstates only got a text style, so a label in progress could change color but kept its normal text.After: How does it behave after the fixing?
When
progress.labeloremphasis.labelhas aformatter(forprogress.label, also on a data item), that state's text goes through the samemakeLabelFormatterpath aslabel.formatter.makeLabelFormattergets an optional label model argument; existing callers are unchanged. States without aformatterkeep the normal text.Document Info
One of the following should be checked.
Misc
Security Checking
ZRender Changes
Related test cases or examples to use the new APIs
test/ut/spec/component/timeline/label.test.ts: six of its seven cases fail onreleaseand all pass with this change. There is also a new case at the bottom oftest/timeline-case.html.Merging options
Other information
On a
timeorvalueaxis the progress state is checked against the tick value instead of the data index, so it may not switch on there. That is a separate bug (it looks like #19137) and isn't changed here.