Fixed TurnList items appear on top of one another #596
Conversation
This file contains 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
ShobhitAd
requested changes
Oct 12, 2021
app/view/sdl/shared/tbtTurnList.js
Outdated
Comment on lines
95
to
96
| classNames:turnListArray[i].turnIcon ? turnListArray[i].turnIcon.isTemplate ? ['list-item','ico-overlay'] : 'list-item':'' , | ||
| classNames:turnListArray[i].navigationText ? turnListArray[i].navigationText.isTemplate ? ['list-item','ico-overlay'] : 'list-item':'' , |
There was a problem hiding this comment.
This overwrites the check with the turnIcons (in the previous line) so sending an UpdateTurnList with only turnIcons results in the same overlap issue.
I think the logic should be combined
Suggested change
| classNames:turnListArray[i].turnIcon ? turnListArray[i].turnIcon.isTemplate ? ['list-item','ico-overlay'] : 'list-item':'' , | |
| classNames:turnListArray[i].navigationText ? turnListArray[i].navigationText.isTemplate ? ['list-item','ico-overlay'] : 'list-item':'' , | |
| classNames:(turnListArray[i].turnIcon?.isTemplate) ? ['list-item','ico-overlay'] : | |
| (turnListArray[i].turnIcon || turnListArray[i].navigationText) ? 'list-item' : '', |
There was a problem hiding this comment.
@ShobhitAd Looks like navigationText is just a TextFieldStruct which will never have isTemplate parameter so this line can be simplified to check turnIcon only
See 468e164 which works for any combinations as expected
ShobhitAd
approved these changes
Oct 26, 2021
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.
Fixes #483
This PR is ready for review.
Testing Plan
Navigation-1" group is assigned to mobile app;
SDL and HMI are started;
Navigation app is registered and activated;
ShowConstantTBT is requested successfully;
Mobile app requests UpdateTurnList with turn items without images;
Observe: HMI responds with SUCCESS to Navigation.UpdateTurnList;
HMI shows the list of added turn items in Turn List
Summary
Fixed TurnList items appear on top of one another.
CLA