fix(marker): respect markLine z2 for labels. close #21650#21674
Open
jesco-absolut wants to merge 1 commit into
Open
fix(marker): respect markLine z2 for labels. close #21650#21674jesco-absolut wants to merge 1 commit into
jesco-absolut wants to merge 1 commit into
Conversation
|
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 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.
Brief Information
This pull request is in the type of:
What does this PR do?
Makes
markLinelabels follow the same itemz2ordering as their corresponding markLine graphic.Fixed issues
markLine.data[].z2affected the line but not the label, so labels could render above higher-z2markLines.Details
Before: What was the problem?
markLineitemz2was applied to the line path, but the attached label received the default text-content z2 lift fromtraverseUpdateZ.That meant a lower-
z2markLine label could still be rendered above a higher-z2markLine. In the reported case, two markLines with differentz2values ordered their lines correctly, but their labels did not follow the same ordering.After: How does it behave after the fixing?
traverseUpdateZnow supports a configurable label z2 lift while preserving the existing default behavior.MarkerViewuses a zero label lift formarkLine, so the label keeps the same z2 ordering as the markLine item.markPointandmarkAreakeep the previous default label lift behavior.A visual case was added to
test/marker-z-z2.htmlwhere two overlapping markLines usez2: 1andz2: 2; the bluez2: 2line and label should render above the redz2: 1label.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/marker-z-z2.htmlMerging options
Other information
Validation run locally:
npm run checktypenpm run buildnpx eslint src/util/graphic.ts src/component/marker/MarkerView.tsgit diff --checkNo
dist/files are included in this PR.