Add WHCM support for all the form elements #2830
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /* | ||
| Copyright 2019 Adobe. All rights reserved. | ||
| This file is licensed to you under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. You may obtain a copy | ||
|
|
@@ -207,3 +207,62 @@ governing permissions and limitations under the License. | |
| } | ||
| } | ||
| } | ||
| @media (forced-colors: active) { | ||
| .spectrum-Checkbox { | ||
| forced-color-adjust: none; | ||
| --spectrum-checkbox-box-border-color: ButtonText; | ||
| --spectrum-checkbox-box-border-color-error: Highlight; | ||
| --spectrum-checkbox-box-border-color-error-down: Highlight; | ||
| --spectrum-checkbox-box-border-color-error-hover: Highlight; | ||
| --spectrum-checkbox-box-border-color-key-focus: Highlight; | ||
| --spectrum-checkbox-checkmark-color: HighlightText; | ||
| --spectrum-checkbox-emphasized-box-background-color: ButtonFace; | ||
| --spectrum-checkbox-emphasized-box-background-color-disabled: ButtonFace; | ||
| --spectrum-checkbox-emphasized-box-border-color: ButtonText; | ||
| --spectrum-checkbox-emphasized-box-border-color-disabled: GrayText; | ||
| --spectrum-checkbox-emphasized-box-border-color-down: Highlight; | ||
| --spectrum-checkbox-emphasized-box-border-color-hover: Highlight; | ||
| --spectrum-checkbox-emphasized-box-border-color-selected: Highlight; | ||
| --spectrum-checkbox-emphasized-box-border-color-selected-down: Highlight; | ||
| --spectrum-checkbox-emphasized-box-border-color-selected-hover: Highlight; | ||
| --spectrum-checkbox-emphasized-box-border-color-selected-key-focus: Highlight; | ||
| --spectrum-checkbox-emphasized-text-color: FieldText; | ||
| --spectrum-checkbox-emphasized-text-color-down: FieldText; | ||
| --spectrum-checkbox-emphasized-text-color-hover: FieldText; | ||
| --spectrum-checkbox-emphasized-text-color-key-focus: FieldText; | ||
| --spectrum-checkbox-focus-ring-color-key-focus: ButtonText; | ||
| --spectrum-checkbox-quiet-box-border-color-selected: Highlight; | ||
| --spectrum-checkbox-quiet-box-border-color-selected-down: Highlight; | ||
| --spectrum-checkbox-quiet-box-border-color-selected-hover: Highlight; | ||
| --spectrum-checkbox-text-color: FieldText; | ||
| --spectrum-checkbox-text-color-disabled: GrayText; | ||
| --spectrum-checkbox-text-color-error: FieldText; | ||
| --spectrum-checkbox-text-color-error-down: FieldText; | ||
| --spectrum-checkbox-text-color-error-hover: FieldText; | ||
|
|
||
| &.is-invalid { | ||
|
Member
There was a problem hiding this comment. I'd prefer if we can only override variables and not re-define selectors if possible. I think most of this seems unnecessary because the vars are already overridden above?
Member
Author
There was a problem hiding this comment. The variables as defined assume the same border colour for :checked. in lines 158-165 where the same colour is used for checked and unchecked.
Member
Author
There was a problem hiding this comment. @devongovett is that the direction you would like me to go? |
||
| .spectrum-Checkbox-box { | ||
| &:before { | ||
| border-color: var(--spectrum-checkbox-box-border-color); | ||
|
Member
There was a problem hiding this comment. This conflicts with
Member
Author
There was a problem hiding this comment. It is intended to be ButtonText when unselected and Highlight when selected according to the XD |
||
| } | ||
| } | ||
| &.is-indeterminate .spectrum-Checkbox-box { | ||
| &:before { | ||
| border-color: var(--spectrum-checkbox-box-border-color-error); | ||
| } | ||
| } | ||
| &.is-disabled .spectrum-Checkbox-input:checked + .spectrum-Checkbox-box { | ||
| &:before { | ||
| border-color: GrayText; | ||
| } | ||
| } | ||
| /* Extra-specific selectors added here to handle checked state */ | ||
| .spectrum-Checkbox-input:checked + .spectrum-Checkbox-box | ||
| { | ||
| &:before { | ||
| border-color: var(--spectrum-checkbox-box-border-color-error); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
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
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
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Noticed the following when testing the Calendar/DateRangePicker WHCM. Lemme know if these are as expected due to color limitations or if they aren't/won't be handled in this PR:
vs
vs
vs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.