Skip to content

Commit 0c7341f

Browse files
committed
fix(picker): alternative approach for disabled hover fix
An alernative way to fix the issues caused by the postcss-hover-media-feature plugin moving hover styles below where they should be. Moves disabled styles to the very bottom, so they come after the hover media query added during the build.
1 parent 616c81c commit 0c7341f

File tree

1 file changed

+22
-20
lines changed

1 file changed

+22
-20
lines changed

components/picker/index.css

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ governing permissions and limitations under the License.
228228
border-radius: calc(var(--mod-picker-border-radius, var(--spectrum-picker-border-radius)) + var(--mod-picker-focus-indicator-gap, var(--spectrum-picker-focus-indicator-gap)) + var(--mod-picker-border-width, var(--spectrum-picker-border-width)));
229229
}
230230

231-
&:hover {
231+
.spectrum-Picker:hover {
232232
color: var(--highcontrast-picker-content-color-default, var(--mod-picker-font-color-hover, var(--spectrum-picker-font-color-hover)));
233233
background-color: var(--highcontrast-picker-background-color, var(--mod-picker-background-color-hover, var(--spectrum-picker-background-color-hover)));
234234
border-color: var(--highcontrast-picker-border-color-hover, var(--mod-picker-border-color-hover, var(--spectrum-picker-border-color-hover)));
@@ -343,25 +343,6 @@ governing permissions and limitations under the License.
343343
}
344344
}
345345

346-
/* Disabled state. */
347-
.spectrum-Picker.spectrum-Picker:disabled,
348-
.spectrum-Picker.spectrum-Picker.is-disabled {
349-
cursor: default;
350-
background-color: var(--highcontrast-picker-background-color, var(--mod-picker-background-color-disabled, var(--spectrum-picker-background-color-disabled)));
351-
border-color: var(--highcontrast-picker-border-color-disabled, transparent);
352-
color: var(--highcontrast-picker-content-color-disabled, var(--mod-picker-font-color-disabled, var(--spectrum-picker-font-color-disabled)));
353-
354-
.spectrum-Picker-icon,
355-
.spectrum-Picker-menuIcon,
356-
.spectrum-Picker-validationIcon {
357-
color: var(--highcontrast-picker-content-color-disabled, var(--mod-picker-icon-color-disabled, var(--spectrum-picker-icon-color-disabled)));
358-
}
359-
360-
.spectrum-Picker-label.is-placeholder {
361-
color: var(--highcontrast-picker-content-color-disabled, var(--mod-picker-font-color-disabled, var(--spectrum-picker-font-color-disabled)));
362-
}
363-
}
364-
365346
.spectrum-Picker-label {
366347
/* Be the biggest, but also shrink! */
367348
flex: 1 1 auto;
@@ -488,3 +469,24 @@ governing permissions and limitations under the License.
488469
display: inline-flex;
489470
vertical-align: top;
490471
}
472+
473+
/* Disabled state:
474+
Make sure this appears after any use of :hover while postcss-hover-media-feature is being used. The plugin moves
475+
all hover styles within a media query that changes the order of the CSS, affecting styles with the same specificity. */
476+
.spectrum-Picker:disabled,
477+
.spectrum-Picker.is-disabled {
478+
cursor: default;
479+
background-color: var(--highcontrast-picker-background-color, var(--mod-picker-background-color-disabled, var(--spectrum-picker-background-color-disabled)));
480+
border-color: var(--highcontrast-picker-border-color-disabled, transparent);
481+
color: var(--highcontrast-picker-content-color-disabled, var(--mod-picker-font-color-disabled, var(--spectrum-picker-font-color-disabled)));
482+
483+
.spectrum-Picker-icon,
484+
.spectrum-Picker-menuIcon,
485+
.spectrum-Picker-validationIcon {
486+
color: var(--highcontrast-picker-content-color-disabled, var(--mod-picker-icon-color-disabled, var(--spectrum-picker-icon-color-disabled)));
487+
}
488+
489+
.spectrum-Picker-label.is-placeholder {
490+
color: var(--highcontrast-picker-content-color-disabled, var(--mod-picker-font-color-disabled, var(--spectrum-picker-font-color-disabled)));
491+
}
492+
}

0 commit comments

Comments
 (0)