Skip to content

Commit 646763a

Browse files
authored
feat(infield-button): new s2 migration (#3642)
* feat(infield-button): new s2 migration * chore(infield-button): restoring s2 files * feat(infieldbutton): adding downstate function * chore(infieldbutton): removing metadata files * feat(infieldbutton): add supported icons story, add inline side edge tokens, update css * chore(infieldbutton): restoring metadata files * feat(infieldbutton): adding metadata file * feat(infieldbutton): fixing template and story * chore(ifbutton): restoring metadata * feat(ifbutton): updating custom tokens * feat(ifbutton): fixing typos and stuff * feat(ifbutton): adding metadata file * feat(ifbutton): adding field edge to icon tokens * feat(ifbutton): swap custom token sizes and fix story typo * feat(ifbutton): adding new metadata * feat(ifbutton): adding minimum perspective on smallest button size * feat(ifbutton): moving active interaction to style selector * chore(ifbutton): restoring metadata * feat(ifbutton): adjusting mod * chore(ifbutton): restoring actual mod * feat(ifbutton): adding click function to button element * feat(ifbutton): add minus click function for stepper
1 parent 2dcdc6e commit 646763a

File tree

8 files changed

+363
-308
lines changed

8 files changed

+363
-308
lines changed

.changeset/true-shrimps-dream.md

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
"@spectrum-css/infieldbutton": major
3+
---
4+
5+
### In-field button S2 Migration
6+
7+
In-field buttons are used to represent actions within input fields. They’re currently used inside number field. This component has updated colors, corner radius, and icons compared to the Spectrum 1 version. The “Error” and “Key-focus” variants have been removed, since this now utilizes those states from the parent component.
8+
9+
The position styles and controls have also been removed now that there's a consistent corner radius.
10+
11+
#### Removed mods
12+
13+
Due to deprecation of the position variants in the infield button, some spacing and border radius mods have been removed.
14+
15+
`--mod-infield-button-inner-edge-to-fill`
16+
`--mod-infield-button-stacked-border-radius-reset`
17+
`--mod-infield-button-stacked-bottom-border-block-end-width`
18+
`--mod-infield-button-stacked-bottom-border-radius-end-end`
19+
`--mod-infield-button-stacked-bottom-border-radius-end-start`
20+
`--mod-infield-button-stacked-fill-padding-inline`
21+
`--mod-infield-button-stacked-fill-padding-inner`
22+
23+
#### New tokens
24+
25+
These new tokens are the inline variant & stepper (number field) use case. The padding changes here.
26+
27+
`--spectrum-in-field-button-side-edge-to-fill-small`
28+
`--spectrum-in-field-button-side-edge-to-fill-medium`
29+
`--spectrum-in-field-button-side-edge-to-fill-large`
30+
`--spectrum-in-field-button-side-edge-to-fill-extra-large`
31+
`--spectrum-field-edge-to-icon-75`
32+
`--spectrum-field-edge-to-icon-100`
33+
`--spectrum-field-edge-to-icon-200`
34+
`--spectrum-field-edge-to-icon-300`

components/infieldbutton/dist/metadata.json

+43-66
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,21 @@
22
"sourceFile": "index.css",
33
"selectors": [
44
".spectrum-InfieldButton",
5-
".spectrum-InfieldButton--bottom .spectrum-InfieldButton-fill",
6-
".spectrum-InfieldButton--left .spectrum-InfieldButton-fill",
7-
".spectrum-InfieldButton--right .spectrum-InfieldButton-fill",
8-
".spectrum-InfieldButton--top .spectrum-InfieldButton-fill",
5+
".spectrum-InfieldButton--quiet",
6+
".spectrum-InfieldButton--quiet:disabled",
7+
".spectrum-InfieldButton--quiet:not(:disabled):active",
8+
".spectrum-InfieldButton--quiet:not(:disabled):focus-visible",
9+
".spectrum-InfieldButton--quiet:not(:disabled):hover",
910
".spectrum-InfieldButton-fill",
1011
".spectrum-InfieldButton-icon",
11-
".spectrum-InfieldButton.spectrum-InfieldButton--bottom",
12-
".spectrum-InfieldButton.spectrum-InfieldButton--bottom.spectrum-InfieldButton--sizeL",
13-
".spectrum-InfieldButton.spectrum-InfieldButton--bottom.spectrum-InfieldButton--sizeS",
14-
".spectrum-InfieldButton.spectrum-InfieldButton--bottom.spectrum-InfieldButton--sizeXL",
12+
".spectrum-InfieldButton-inline",
13+
".spectrum-InfieldButton-inline .spectrum-InfieldButton",
14+
".spectrum-InfieldButton-inline > .spectrum-InfieldButton.spectrum-InfieldButton--sizeS",
1515
".spectrum-InfieldButton.spectrum-InfieldButton--quiet",
1616
".spectrum-InfieldButton.spectrum-InfieldButton--quiet:disabled",
1717
".spectrum-InfieldButton.spectrum-InfieldButton--sizeL",
1818
".spectrum-InfieldButton.spectrum-InfieldButton--sizeS",
1919
".spectrum-InfieldButton.spectrum-InfieldButton--sizeXL",
20-
".spectrum-InfieldButton.spectrum-InfieldButton--top",
21-
".spectrum-InfieldButton.spectrum-InfieldButton--top.spectrum-InfieldButton--sizeL",
22-
".spectrum-InfieldButton.spectrum-InfieldButton--top.spectrum-InfieldButton--sizeS",
23-
".spectrum-InfieldButton.spectrum-InfieldButton--top.spectrum-InfieldButton--sizeXL",
2420
".spectrum-InfieldButton:active",
2521
".spectrum-InfieldButton:disabled",
2622
".spectrum-InfieldButton:focus-visible",
@@ -30,8 +26,6 @@
3026
".spectrum-InfieldButton:not(:disabled):hover"
3127
],
3228
"modifiers": [
33-
"--mod-infield-border-color",
34-
"--mod-infield-border-color-quiet",
3529
"--mod-infield-button-background-color",
3630
"--mod-infield-button-background-color-disabled",
3731
"--mod-infield-button-background-color-down",
@@ -48,10 +42,8 @@
4842
"--mod-infield-button-border-color-disabled",
4943
"--mod-infield-button-border-color-quiet-disabled",
5044
"--mod-infield-button-border-radius",
51-
"--mod-infield-button-border-radius-reset",
52-
"--mod-infield-button-border-width",
53-
"--mod-infield-button-border-width-quiet",
5445
"--mod-infield-button-edge-to-fill",
46+
"--mod-infield-button-field-edge-to-icon",
5547
"--mod-infield-button-fill-justify-content",
5648
"--mod-infield-button-fill-padding",
5749
"--mod-infield-button-height",
@@ -63,84 +55,69 @@
6355
"--mod-infield-button-icon-color-hover-disabled",
6456
"--mod-infield-button-icon-color-key-focus",
6557
"--mod-infield-button-icon-color-key-focus-disabled",
66-
"--mod-infield-button-inner-edge-to-fill",
67-
"--mod-infield-button-stacked-border-radius-reset",
68-
"--mod-infield-button-stacked-bottom-border-block-end-width",
69-
"--mod-infield-button-stacked-bottom-border-radius-end-end",
70-
"--mod-infield-button-stacked-bottom-border-radius-end-start",
71-
"--mod-infield-button-stacked-fill-padding-inline",
72-
"--mod-infield-button-stacked-fill-padding-inner",
73-
"--mod-infield-button-stacked-fill-padding-outer",
74-
"--mod-infield-button-stacked-top-border-radius-start-start",
75-
"--mod-infield-button-width",
76-
"--mod-infield-button-width-stacked"
58+
"--mod-infield-button-side-edge-to-fill",
59+
"--mod-infield-button-width"
7760
],
7861
"component": [
79-
"--spectrum-in-field-button-edge-to-disclosure-icon-stacked-extra-large",
80-
"--spectrum-in-field-button-edge-to-disclosure-icon-stacked-large",
81-
"--spectrum-in-field-button-edge-to-disclosure-icon-stacked-medium",
82-
"--spectrum-in-field-button-edge-to-disclosure-icon-stacked-small",
83-
"--spectrum-in-field-button-edge-to-fill",
84-
"--spectrum-in-field-button-fill-stacked-inner-border-rounding",
85-
"--spectrum-in-field-button-inner-edge-to-disclosure-icon-stacked-extra-large",
86-
"--spectrum-in-field-button-inner-edge-to-disclosure-icon-stacked-large",
87-
"--spectrum-in-field-button-inner-edge-to-disclosure-icon-stacked-medium",
88-
"--spectrum-in-field-button-inner-edge-to-disclosure-icon-stacked-small",
89-
"--spectrum-in-field-button-outer-edge-to-disclosure-icon-stacked-extra-large",
90-
"--spectrum-in-field-button-outer-edge-to-disclosure-icon-stacked-large",
91-
"--spectrum-in-field-button-outer-edge-to-disclosure-icon-stacked-medium",
92-
"--spectrum-in-field-button-outer-edge-to-disclosure-icon-stacked-small",
93-
"--spectrum-in-field-button-stacked-inner-edge-to-fill",
94-
"--spectrum-in-field-button-width-stacked-extra-large",
95-
"--spectrum-in-field-button-width-stacked-large",
96-
"--spectrum-in-field-button-width-stacked-medium",
97-
"--spectrum-in-field-button-width-stacked-small",
62+
"--spectrum-in-field-button-edge-to-fill-extra-large",
63+
"--spectrum-in-field-button-edge-to-fill-large",
64+
"--spectrum-in-field-button-edge-to-fill-medium",
65+
"--spectrum-in-field-button-edge-to-fill-small",
66+
"--spectrum-in-field-button-side-edge-to-fill-extra-large",
67+
"--spectrum-in-field-button-side-edge-to-fill-large",
68+
"--spectrum-in-field-button-side-edge-to-fill-medium",
69+
"--spectrum-in-field-button-side-edge-to-fill-small",
9870
"--spectrum-infield-button-background-color",
9971
"--spectrum-infield-button-background-color-down",
10072
"--spectrum-infield-button-background-color-hover",
101-
"--spectrum-infield-button-background-color-key-focus",
102-
"--spectrum-infield-button-border-color",
10373
"--spectrum-infield-button-border-radius",
104-
"--spectrum-infield-button-border-radius-reset",
105-
"--spectrum-infield-button-border-width",
74+
"--spectrum-infield-button-downstate-perspective",
10675
"--spectrum-infield-button-edge-to-fill",
76+
"--spectrum-infield-button-field-edge-to-disclosure-icon",
10777
"--spectrum-infield-button-fill-justify-content",
10878
"--spectrum-infield-button-fill-padding",
10979
"--spectrum-infield-button-height",
11080
"--spectrum-infield-button-icon-color",
11181
"--spectrum-infield-button-icon-color-down",
11282
"--spectrum-infield-button-icon-color-hover",
113-
"--spectrum-infield-button-icon-color-key-focus",
114-
"--spectrum-infield-button-inner-edge-to-fill",
115-
"--spectrum-infield-button-stacked-border-radius-reset",
116-
"--spectrum-infield-button-stacked-bottom-border-radius-end-start",
117-
"--spectrum-infield-button-stacked-fill-padding-inline",
118-
"--spectrum-infield-button-stacked-fill-padding-inner",
119-
"--spectrum-infield-button-stacked-fill-padding-outer",
120-
"--spectrum-infield-button-stacked-top-border-radius-start-start",
83+
"--spectrum-infield-button-inline-edge-to-fill",
84+
"--spectrum-infield-button-inline-field-edge-to-icon",
12185
"--spectrum-infield-button-width"
12286
],
12387
"global": [
12488
"--spectrum-animation-duration-100",
125-
"--spectrum-border-width-100",
12689
"--spectrum-component-height-100",
12790
"--spectrum-component-height-200",
12891
"--spectrum-component-height-300",
12992
"--spectrum-component-height-75",
130-
"--spectrum-corner-radius-100",
93+
"--spectrum-component-size-difference-down",
94+
"--spectrum-component-size-minimum-perspective-down",
95+
"--spectrum-component-size-width-ratio-down",
96+
"--spectrum-corner-radius-small-size-extra-large",
97+
"--spectrum-corner-radius-small-size-large",
98+
"--spectrum-corner-radius-small-size-medium",
99+
"--spectrum-corner-radius-small-size-small",
131100
"--spectrum-disabled-background-color",
132101
"--spectrum-disabled-content-color",
102+
"--spectrum-downstate-height",
103+
"--spectrum-downstate-width",
104+
"--spectrum-field-edge-to-disclosure-icon-100",
105+
"--spectrum-field-edge-to-disclosure-icon-200",
106+
"--spectrum-field-edge-to-disclosure-icon-300",
107+
"--spectrum-field-edge-to-disclosure-icon-75",
108+
"--spectrum-field-edge-to-icon-100",
109+
"--spectrum-field-edge-to-icon-200",
110+
"--spectrum-field-edge-to-icon-300",
111+
"--spectrum-field-edge-to-icon-75",
133112
"--spectrum-gray-100",
134113
"--spectrum-gray-200",
135-
"--spectrum-gray-50",
136114
"--spectrum-neutral-content-color-default",
137115
"--spectrum-neutral-content-color-down",
138-
"--spectrum-neutral-content-color-hover",
139-
"--spectrum-neutral-content-color-key-focus"
116+
"--spectrum-neutral-content-color-hover"
140117
],
141118
"passthroughs": [],
142119
"high-contrast": [
143-
"--highcontrast-infield-button-border-color",
144-
"--highcontrast-infield-button-border-color-active"
120+
"--highcontrast-infield-button-background-color",
121+
"--highcontrast-infield-button-icon-color"
145122
]
146123
}

0 commit comments

Comments
 (0)