Skip to content

fix(picker): correct disabled state colors #2737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
castastrophe merged 3 commits into from
Jun 6, 2024
Merged

fix(picker): correct disabled state colors #2737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fa7380
fix(picker): correct disabled state colors
jawinn May 7, 2024
8096e58
refactor(picker): remove unused custom property
jawinn May 16, 2024
879f00b
fix(picker): alternative approach for disabled hover fix
jawinn May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/sixty-pandas-impress.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@spectrum-css/picker": patch
---

Fixes an issue where colors could change when hovering over the Picker in the disabled state and disabled + invalid state.
87 changes: 43 additions & 44 deletions components/picker/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ governing permissions and limitations under the License.
--spectrum-picker-spacing-bottom-to-text: var(--spectrum-component-bottom-to-text-100);
--spectrum-picker-spacing-edge-to-text: var(--spectrum-component-edge-to-text-100);
--spectrum-picker-spacing-edge-to-text-quiet: var(--spectrum-field-edge-to-text-quiet);
--spectrum-picker-spacing-top-to-text-side-label-quiet: var(--spectrum-component-top-to-text-100);
Copy link
Copy Markdown
Contributor

@castastrophe castastrophe Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you outline why these variables are okay to be removed in the PR description when you get a chance? I see that it's fine in the baselines but just want to have it documented for the future.

Copy link
Copy Markdown
Collaborator Author

@jawinn jawinn Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. It was an unused variable called out by the linter. Added to the PR description.

--spectrum-picker-spacing-label-to-picker: var(--spectrum-field-label-to-component);

--spectrum-picker-spacing-text-to-icon: var(--spectrum-text-to-visual-100);
Expand Down Expand Up @@ -89,7 +88,6 @@ governing permissions and limitations under the License.
.spectrum-Picker--sizeS {
--spectrum-picker-font-size: var(--spectrum-font-size-75);
--spectrum-picker-block-size: var(--spectrum-component-height-75);
--spectrum-picker-spacing-top-to-text-side-label-quiet: var(--spectrum-component-top-to-text-75);
--spectrum-picker-spacing-top-to-text: var(--spectrum-component-top-to-text-75);
--spectrum-picker-spacing-bottom-to-text: var(--spectrum-component-bottom-to-text-75);
--spectrum-picker-spacing-edge-to-text: var(--spectrum-component-edge-to-text-75);
Expand All @@ -110,7 +108,6 @@ governing permissions and limitations under the License.
.spectrum-Picker--sizeL {
--spectrum-picker-font-size: var(--spectrum-font-size-200);
--spectrum-picker-block-size: var(--spectrum-component-height-200);
--spectrum-picker-spacing-top-to-text-side-label-quiet: var(--spectrum-component-top-to-text-200);
--spectrum-picker-spacing-top-to-text: var(--spectrum-component-top-to-text-200);
--spectrum-picker-spacing-bottom-to-text: var(--spectrum-component-bottom-to-text-200);
--spectrum-picker-spacing-edge-to-text: var(--spectrum-component-edge-to-text-200);
Expand All @@ -131,7 +128,6 @@ governing permissions and limitations under the License.
.spectrum-Picker--sizeXL {
--spectrum-picker-font-size: var(--spectrum-font-size-300);
--spectrum-picker-block-size: var(--spectrum-component-height-300);
--spectrum-picker-spacing-top-to-text-side-label-quiet: var(--spectrum-component-top-to-text-300);
--spectrum-picker-spacing-top-to-text: var(--spectrum-component-top-to-text-300);
--spectrum-picker-spacing-bottom-to-text: var(--spectrum-component-bottom-to-text-300);
--spectrum-picker-spacing-edge-to-text: var(--spectrum-component-edge-to-text-300);
Expand Down Expand Up @@ -277,6 +273,26 @@ governing permissions and limitations under the License.
}
}

&.is-open:not(.spectrum-Picker--quiet, :disabled, .is-disabled) {
Comment thread
castastrophe marked this conversation as resolved.
color: var(--highcontrast-picker-content-color-default, var(--mod-picker-font-color-default-open, var(--spectrum-picker-font-color-default-open)));
background-color: var(--highcontrast-picker-background-color, var(--mod-picker-background-color-default-open, var(--spectrum-picker-background-color-default-open)));
border-color: var(--highcontrast-picker-border-color-default, var(--mod-picker-border-default-open, var(--spectrum-picker-border-color-default-open)));

&:hover {
color: var(--highcontrast-picker-content-color-default, var(--mod-picker-font-color-hover-open, var(--spectrum-picker-font-color-hover-open)));
background-color: var(--highcontrast-picker-background-color, var(--mod-picker-background-color-hover-open, var(--spectrum-picker-background-color-hover-open)));
border-color: var(--highcontrast-picker-border-color-hover, var(--mod-picker-border-color-hover-open, var(--spectrum-picker-border-color-hover-open)));

.spectrum-Picker-menuIcon {
color: var(--highcontrast-picker-content-color-default, var(--mod-picker-icon-color-hover-open, var(--spectrum-picker-icon-color-hover-open)));
}
}

.spectrum-Picker-menuIcon {
color: var(--highcontrast-picker-content-color-default, var(--mod-picker-icon-color-default-open, var(--spectrum-picker-icon-color-default-open)));
}
}

&.is-invalid:not(:disabled, .is-disabled) {
border-color: var(--highcontrast-picker-border-color-default, var(--mod-picker-border-color-error-default, var(--spectrum-picker-border-color-error-default)));

Expand Down Expand Up @@ -321,50 +337,12 @@ governing permissions and limitations under the License.
}
}

&:disabled,
&.is-disabled {
cursor: default;
background-color: var(--highcontrast-picker-background-color, var(--mod-picker-background-color-disabled, var(--spectrum-picker-background-color-disabled)));
border-color: var(--highcontrast-picker-border-color-disabled, transparent);
color: var(--highcontrast-picker-content-color-disabled, var(--mod-picker-font-color-disabled, var(--spectrum-picker-font-color-disabled)));

.spectrum-Picker-icon,
.spectrum-Picker-menuIcon,
.spectrum-Picker-validationIcon {
color: var(--highcontrast-picker-content-color-disabled, var(--mod-picker-icon-color-disabled, var(--spectrum-picker-icon-color-disabled)));
}

.spectrum-Picker-label.is-placeholder {
color: var(--highcontrast-picker-content-color-disabled, var(--mod-picker-font-color-disabled, var(--spectrum-picker-font-color-disabled)));
}
}

.spectrum-Picker-icon {
flex-shrink: 0;
margin-inline-end: var(--mod-picker-spacing-text-to-icon, var(--spectrum-picker-spacing-text-to-icon));
}
}

.spectrum-Picker.is-open:not(.spectrum-Picker--quiet) {
color: var(--highcontrast-picker-content-color-default, var(--mod-picker-font-color-default-open, var(--spectrum-picker-font-color-default-open)));
background-color: var(--highcontrast-picker-background-color, var(--mod-picker-background-color-default-open, var(--spectrum-picker-background-color-default-open)));
border-color: var(--highcontrast-picker-border-color-default, var(--mod-picker-border-default-open, var(--spectrum-picker-border-color-default-open)));

&:hover {
color: var(--highcontrast-picker-content-color-default, var(--mod-picker-font-color-hover-open, var(--spectrum-picker-font-color-hover-open)));
background-color: var(--highcontrast-picker-background-color, var(--mod-picker-background-color-hover-open, var(--spectrum-picker-background-color-hover-open)));
border-color: var(--highcontrast-picker-border-color-hover, var(--mod-picker-border-color-hover-open, var(--spectrum-picker-border-color-hover-open)));

.spectrum-Picker-menuIcon {
color: var(--highcontrast-picker-content-color-default, var(--mod-picker-icon-color-hover-open, var(--spectrum-picker-icon-color-hover-open)));
}
}

.spectrum-Picker-menuIcon {
color: var(--highcontrast-picker-content-color-default, var(--mod-picker-icon-color-default-open, var(--spectrum-picker-icon-color-default-open)));
}
}

.spectrum-Picker-label {
/* Be the biggest, but also shrink! */
flex: 1 1 auto;
Expand Down Expand Up @@ -481,8 +459,8 @@ governing permissions and limitations under the License.
background-color: var(--highcontrast-picker-background-color, transparent);
}

&:disabled,
&.is-disabled {
&.spectrum-Picker:disabled,
&.spectrum-Picker.is-disabled {
background-color: var(--highcontrast-picker-background-color, transparent);
}
}
Expand All @@ -491,3 +469,24 @@ governing permissions and limitations under the License.
display: inline-flex;
vertical-align: top;
}

/* Disabled state:
Make sure this appears after any use of :hover while postcss-hover-media-feature is being used. The plugin moves
all hover styles within a media query that changes the order of the CSS, affecting styles with the same specificity. */
.spectrum-Picker:disabled,
.spectrum-Picker.is-disabled {
cursor: default;
background-color: var(--highcontrast-picker-background-color, var(--mod-picker-background-color-disabled, var(--spectrum-picker-background-color-disabled)));
border-color: var(--highcontrast-picker-border-color-disabled, transparent);
color: var(--highcontrast-picker-content-color-disabled, var(--mod-picker-font-color-disabled, var(--spectrum-picker-font-color-disabled)));

.spectrum-Picker-icon,
.spectrum-Picker-menuIcon,
.spectrum-Picker-validationIcon {
color: var(--highcontrast-picker-content-color-disabled, var(--mod-picker-icon-color-disabled, var(--spectrum-picker-icon-color-disabled)));
}

.spectrum-Picker-label.is-placeholder {
color: var(--highcontrast-picker-content-color-disabled, var(--mod-picker-font-color-disabled, var(--spectrum-picker-font-color-disabled)));
}
}