Change the color of color-picker icon even when the text tool is selected #11642
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
hiroshisuga
commented
Mar 13, 2021
| @@ -283,15 +283,15 @@ class WhiteboardToolbar extends Component { | |||
| * 4. Trigger initial animation for the icons | |||
| */ | |||
| // 1st case | |||
| if (this.thicknessListIconRadius && this.thicknessListIconColor) { | |||
| if ( (this.thicknessListIconRadius && this.thicknessListIconColor) || annotationSelected.value === 'text') { | |||
| if (colorSelected.value !== prevState.colorSelected.value) { | |||
There was a problem hiding this comment.
Another solution is to completely remove this condition, which I confirmed to work as well.
|
Thanks @hiroshisuga and @KDSBrowne ! |
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 does this PR do?
Let the color of the color-picker icon be changed even when the text tool is selected
Closes Issue(s)
closes #11641
Motivation
I think the color of the color-picker and that of the annotation icon should always be the same to avoid confusion.
More
In the current implementation, both this.thicknessListIconRadius and this.thicknessListIconColor are null when the text tool is selected. So "if (this.thicknessListIconRadius && this.thicknessListIconColor)" never happens as long as the text tool is selected. I don't think it's the intended behaviour.
Anyway, this is what happens when this modification is applied:
