Skip to content

Commit 10afa8e

Browse files
authored
Merge branch 'spectrum-two' into aramos-adobe/css1016-checkbox-group-s2-migration
2 parents a8c2404 + 888e63d commit 10afa8e

File tree

8 files changed

+278
-102
lines changed

8 files changed

+278
-102
lines changed

.changeset/eighty-terms-lead.md

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
---
2+
"@spectrum-css/rating": major
3+
---
4+
5+
#### S2 migration rating
6+
7+
This migrates the `rating` component to S2. Custom properties have been remapped and added per the design specification.
8+
9+
##### Additions
10+
11+
The medium component variation is the default and a t-shirt size medium variation has been added.
12+
13+
A tooltip may be displayed to a user indicating whether interacting with the component will clear or edit the rating. A control and documentation example have been added.
14+
15+
A rating may have a partially filled star. The width and fill of this star is controlled by adding `.is-partial` to the parent `span` with classes of `spectrum-Rating-icon` and `is-selected` and then setting `--mod-rating-icon-fill` to the necessary fill percentage (e.g. `50%`).
16+
17+
##### New mods
18+
19+
`--mod-rating-width`
20+
`--mod-rating-height`
21+
`--mod-rating-bottom-to-content-area`
22+
`--mod-rating-edge-to-content-area`
23+
`--mod-rating-top-to-content-area`
24+
`--mod-rating-icon-fill`
25+
26+
##### Removed mods
27+
28+
`--mod-rating-icon-spacing-vertical-top`
29+
`--mod-rating-icon-count`
30+
`--mod-rating-indicator-border-radius`
31+
`--mod-rating-indicator-height`
32+
`--mod-rating-icon-color-key-focus`
33+
34+
##### New custom properties
35+
36+
`--spectrum-rating-width`
37+
`--spectrum-component-size-difference-down`
38+
`--spectrum-component-size-minimum-perspective-down`
39+
`--spectrum-corner-radius-medium-size-medium`
40+
`--spectrum-corner-radius-medium-size-small`
41+
`--spectrum-neutral-content-color-default`
42+
`--spectrum-neutral-content-color-down`
43+
`--spectrum-neutral-content-color-hover`
44+
`--spectrum-spacing-75`
45+
`--spectrum-workflow-icon-size-75`
46+
47+
##### Removed custom properties
48+
49+
`--spectrum-rating-indicator-width`
50+
`--spectrum-rating-icon-color-key-focus`
51+
`--spectrum-rating-icon-spacing-vertical-top`
52+
`--spectrum-rating-indicator-height`
53+
`--spectrum-rating-indicator-border-radius`
54+
`--spectrum-accent-content-color-key-focus`
55+
`--spectrum-border-width-200`
56+
`--spectrum-component-top-to-workflow-icon-100`
57+
`--spectrum-corner-radius-100`
58+
`--spectrum-neutral-subdued-content-color-default`
59+
`--spectrum-neutral-subdued-content-color-down`
60+
`--spectrum-neutral-subdued-content-color-hover`
61+
`--spectrum-neutral-subdued-content-color-key-focus`

components/rating/dist/metadata.json

Lines changed: 39 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@
77
".spectrum-Rating--emphasized .spectrum-Rating-icon:hover ~ .spectrum-Rating-icon",
88
".spectrum-Rating--emphasized.is-focused .spectrum-Rating-icon.is-selected",
99
".spectrum-Rating--emphasized:hover .spectrum-Rating-icon",
10-
".spectrum-Rating--emphasized:hover .spectrum-Rating-icon.is-currentValue:after",
1110
".spectrum-Rating--emphasized:hover .spectrum-Rating-icon:active",
1211
".spectrum-Rating--emphasized:hover .spectrum-Rating-icon:hover",
1312
".spectrum-Rating--emphasized:hover .spectrum-Rating-icon:hover ~ .spectrum-Rating-icon",
13+
".spectrum-Rating--sizeS",
1414
".spectrum-Rating-icon",
1515
".spectrum-Rating-icon .spectrum-Rating-starActive",
1616
".spectrum-Rating-icon .spectrum-Rating-starInactive",
17-
".spectrum-Rating-icon.is-currentValue:after",
17+
".spectrum-Rating-icon svg",
1818
".spectrum-Rating-icon.is-selected",
1919
".spectrum-Rating-icon.is-selected .spectrum-Rating-starActive",
2020
".spectrum-Rating-icon.is-selected .spectrum-Rating-starInactive",
21+
".spectrum-Rating-icon.is-selected.is-partial .spectrum-Rating-starActive",
22+
".spectrum-Rating-icon.is-selected.is-partial .spectrum-Rating-starInactive",
2123
".spectrum-Rating-icon:hover ~ .spectrum-Rating-icon",
2224
".spectrum-Rating-icon:hover ~ .spectrum-Rating-icon .spectrum-Rating-starActive",
2325
".spectrum-Rating-icon:hover ~ .spectrum-Rating-icon .spectrum-Rating-starInactive",
@@ -28,86 +30,95 @@
2830
".spectrum-Rating.is-disabled .spectrum-Rating-icon",
2931
".spectrum-Rating.is-disabled .spectrum-Rating-icon.is-selected",
3032
".spectrum-Rating.is-focused",
31-
".spectrum-Rating.is-focused .spectrum-Rating-icon",
32-
".spectrum-Rating.is-focused .spectrum-Rating-icon.is-selected",
3333
".spectrum-Rating.is-readOnly",
3434
".spectrum-Rating:hover .spectrum-Rating-icon",
35-
".spectrum-Rating:hover .spectrum-Rating-icon.is-currentValue:after",
3635
".spectrum-Rating:hover .spectrum-Rating-icon:active",
3736
".spectrum-Rating:hover .spectrum-Rating-icon:hover",
3837
".spectrum-Rating:hover .spectrum-Rating-starActive",
39-
".spectrum-Rating:hover .spectrum-Rating-starInactive"
38+
".spectrum-Rating:hover .spectrum-Rating-starInactive",
39+
".spectrum-Rating:not(.is-readOnly) .spectrum-Rating-input:not(:disabled) ~ .spectrum-Rating-icon:active"
4040
],
4141
"modifiers": [
4242
"--mod-rating-border-radius",
43+
"--mod-rating-bottom-to-content-area",
44+
"--mod-rating-edge-to-content-area",
4345
"--mod-rating-emphasized-icon-color-default",
4446
"--mod-rating-emphasized-icon-color-down",
4547
"--mod-rating-emphasized-icon-color-hover",
4648
"--mod-rating-emphasized-icon-color-key-focus",
4749
"--mod-rating-focus-indicator-color",
4850
"--mod-rating-focus-indicator-gap",
4951
"--mod-rating-focus-indicator-thickness",
52+
"--mod-rating-height",
5053
"--mod-rating-icon-color-default",
5154
"--mod-rating-icon-color-disabled",
5255
"--mod-rating-icon-color-down",
5356
"--mod-rating-icon-color-hover",
54-
"--mod-rating-icon-color-key-focus",
55-
"--mod-rating-icon-count",
57+
"--mod-rating-icon-fill",
5658
"--mod-rating-icon-height",
5759
"--mod-rating-icon-spacing",
58-
"--mod-rating-icon-spacing-vertical-top",
5960
"--mod-rating-icon-width",
60-
"--mod-rating-indicator-border-radius",
61-
"--mod-rating-indicator-height"
61+
"--mod-rating-top-to-content-area",
62+
"--mod-rating-width"
6263
],
6364
"component": [
6465
"--spectrum-rating-border-radius",
66+
"--spectrum-rating-bottom-to-content-area",
67+
"--spectrum-rating-bottom-to-content-area-medium",
68+
"--spectrum-rating-bottom-to-content-area-small",
69+
"--spectrum-rating-edge-to-content-area",
70+
"--spectrum-rating-edge-to-content-area-medium",
71+
"--spectrum-rating-edge-to-content-area-small",
6572
"--spectrum-rating-emphasized-icon-color-default",
6673
"--spectrum-rating-emphasized-icon-color-down",
6774
"--spectrum-rating-emphasized-icon-color-hover",
6875
"--spectrum-rating-emphasized-icon-color-key-focus",
6976
"--spectrum-rating-focus-indicator-color",
7077
"--spectrum-rating-focus-indicator-gap",
7178
"--spectrum-rating-focus-indicator-thickness",
79+
"--spectrum-rating-height",
80+
"--spectrum-rating-height-medium",
81+
"--spectrum-rating-height-small",
7282
"--spectrum-rating-icon-color-default",
7383
"--spectrum-rating-icon-color-disabled",
7484
"--spectrum-rating-icon-color-down",
7585
"--spectrum-rating-icon-color-hover",
76-
"--spectrum-rating-icon-color-key-focus",
77-
"--spectrum-rating-icon-count",
86+
"--spectrum-rating-icon-fill",
7887
"--spectrum-rating-icon-height",
7988
"--spectrum-rating-icon-spacing",
80-
"--spectrum-rating-icon-spacing-vertical-top",
8189
"--spectrum-rating-icon-width",
82-
"--spectrum-rating-indicator-border-radius",
83-
"--spectrum-rating-indicator-height",
84-
"--spectrum-rating-indicator-width"
90+
"--spectrum-rating-top-to-content-area",
91+
"--spectrum-rating-top-to-content-area-medium",
92+
"--spectrum-rating-top-to-content-area-small",
93+
"--spectrum-rating-width",
94+
"--spectrum-rating-width-medium",
95+
"--spectrum-rating-width-small"
8596
],
8697
"global": [
8798
"--spectrum-accent-content-color-default",
8899
"--spectrum-accent-content-color-down",
89100
"--spectrum-accent-content-color-hover",
90-
"--spectrum-accent-content-color-key-focus",
91-
"--spectrum-border-width-200",
92-
"--spectrum-component-top-to-workflow-icon-100",
93-
"--spectrum-corner-radius-100",
101+
"--spectrum-component-size-difference-down",
102+
"--spectrum-component-size-minimum-perspective-down",
103+
"--spectrum-corner-radius-medium-size-medium",
104+
"--spectrum-corner-radius-medium-size-small",
94105
"--spectrum-disabled-content-color",
95106
"--spectrum-focus-indicator-color",
96107
"--spectrum-focus-indicator-gap",
97108
"--spectrum-focus-indicator-thickness",
98-
"--spectrum-neutral-subdued-content-color-default",
99-
"--spectrum-neutral-subdued-content-color-down",
100-
"--spectrum-neutral-subdued-content-color-hover",
101-
"--spectrum-neutral-subdued-content-color-key-focus",
102-
"--spectrum-workflow-icon-size-100"
109+
"--spectrum-neutral-content-color-default",
110+
"--spectrum-neutral-content-color-down",
111+
"--spectrum-neutral-content-color-hover",
112+
"--spectrum-spacing-75",
113+
"--spectrum-workflow-icon-size-100",
114+
"--spectrum-workflow-icon-size-75"
103115
],
104116
"passthroughs": [],
105117
"high-contrast": [
106118
"--highcontrast-rating-emphasized-icon-color-default",
107119
"--highcontrast-rating-emphasized-icon-color-down",
108120
"--highcontrast-rating-emphasized-icon-color-hover",
109121
"--highcontrast-rating-focus-color-outline",
110-
"--highcontrast-rating-icon-color-disabled",
111-
"--highcontrast-rating-icon-color-key-focus"
122+
"--highcontrast-rating-icon-color-disabled"
112123
]
113124
}

0 commit comments

Comments
 (0)