Skip to content

Commit 9cc446a

Browse files
Revert "fix(textfield,numberfield): inline sizing"
This reverts commit 7ad1d8c.
1 parent a6d1136 commit 9cc446a

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

1st-gen/packages/number-field/src/number-field.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,18 @@
3939
/* TODO: added stepper-button-width multiplied by 2 just to give extra space to the input field.
4040
That "2" is a magic number and should be removed when we are able (possibly after S2 migration). */
4141
--spectrum-stepper-width: calc(var(--mod-stepper-height, var(--spectrum-stepper-height)) * var(--mod-stepper-min-width-multiplier, var(--spectrum-text-field-minimum-width-multiplier)) + var(--mod-stepper-button-width, var(--spectrum-stepper-button-width)) * 2 + var(--mod-stepper-border-width, var(--spectrum-stepper-border-width)) * 2);
42+
43+
/* resets the inline-size of sp-number-field to the newly defined stepper-width */
44+
inline-size: var(--mod-stepper-width, var(--spectrum-stepper-width));
4245
}
4346

4447
:host([hide-stepper]) {
4548
--spectrum-stepper-width: calc(var(--mod-stepper-height, var(--spectrum-stepper-height)) * var(--mod-stepper-min-width-multiplier, var(--spectrum-text-field-minimum-width-multiplier)) + var(--mod-stepper-button-width, var(--spectrum-stepper-button-width)) + var(--mod-stepper-border-width, var(--spectrum-stepper-border-width)) * 2);
4649
}
4750

51+
/* keeps the textfield 100% of the width of the sp-number-field so there isn't a gap between the containers */
4852
#textfield {
49-
inline-size: var(--mod-stepper-width, var(--spectrum-stepper-width));
53+
inline-size: 100%;
5054
}
5155

5256
.input {

1st-gen/packages/number-field/src/spectrum-number-field.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@
152152
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color-keyboard-focus, var(--mod-stepper-buttons-border-color-keyboard-focus, var(--spectrum-stepper-buttons-border-color-keyboard-focus)));
153153
--mod-textfield-focus-indicator-width: 0;
154154
--mod-textfield-border-color: var(--highcontrast-stepper-border-color-keyboard-focus, var(--mod-stepper-border-color-keyboard-focus, var(--spectrum-stepper-border-color-keyboard-focus)));
155-
156155
outline: var(--spectrum-stepper-focus-indicator-width) solid;
157156
outline-color: var(--spectrum-stepper-focus-indicator-color);
158157
outline-offset: var(--spectrum-stepper-focus-indicator-gap);
@@ -249,6 +248,8 @@
249248
}
250249

251250
#textfield {
251+
--spectrum-stepper-width: var(--mod-stepper-width, calc(var(--spectrum-stepper-height) * var(--mod-stepper-min-width-multiplier, var(--spectrum-text-field-minimum-width-multiplier)) + var(--spectrum-stepper-button-width) + var(--mod-stepper-border-width, var(--spectrum-stepper-border-width)) * 2));
252+
inline-size: var(--spectrum-stepper-width);
252253
block-size: var(--spectrum-stepper-height);
253254
border-radius: var(--spectrum-stepper-border-radius);
254255
flex-flow: row;

1st-gen/packages/textfield/src/textfield.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
:host {
1717
display: inline-flex;
1818
flex-direction: column;
19-
inline-size: auto;
19+
inline-size: var(--mod-textfield-width, var(--spectrum-textfield-width));
2020
}
2121

2222
:host([multiline]) {
@@ -32,7 +32,7 @@
3232
}
3333

3434
#textfield {
35-
inline-size: var(--mod-textfield-width, var(--spectrum-textfield-width));
35+
inline-size: 100%;
3636
}
3737

3838
#textfield,

0 commit comments

Comments
 (0)