Fix v2 dark theme #377
Merged
Fix v2 dark theme #377
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
|
@jamiees2 This looks okay once the linting error is resolved. I'll let @RichardLindhout be responsible for merging it after he takes a look. |
SoyDiego
reviewed
Apr 6, 2024
| const v2Color = theme.dark | ||
| ? overlay(10, theme.colors.surface) | ||
| : theme.colors.surface | ||
| let color |
There was a problem hiding this comment.
let color = theme.isV3
? (theme.dark ? theme.colors.elevation.level3 : theme.colors.surface)
: (theme.dark ? overlay(10, theme.colors.surface) : theme.colors.surface)A suggestion here.
Maybe like this is cleaner and avoid repeat color
There was a problem hiding this comment.
While I agree, this seemed like the style of code that e9d6955 was attempting to remove from the codebase.
Based on that commit, I just pattern matched some of the other rewrites that were done in that same commit, while fixing the issue.
|
@jamiees2 Can you resolve the merge conflict? Then I'll go ahead and merge it. |
|
Done :) |
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.
e9d6955 introduced a bug where if the app is using a Material V2 dark theme, the time picker will access a color property which isn't defined, resulting in a hard crash with a "Cannot read property 'level3' of undefined".
This is due to the previous logic gating on
theme.isV3before accessing the property, while the current logic does not gate on this.This PR changes the logic to be similar to the change to Day.tsx, which does check if the theme is V3 before accessing potentially undefined properties.
We have deployed this change to our app, and it has fixed the crashes our users were seeing.