Skip to content

Commit 770fd5a

Browse files
RocssrmanoleMelissa Thompson
authored
fix(picker): spinner position in RTL direction (#2567)
* fix(picker): spinner position in RTL direction * chore(picker): apply styles only to is-loading and is-invalid * chore(picker): commit mods.md * chore(picker): add deprecation Co-authored-by: Melissa Thompson <[email protected]> * chore(picker): renamed variable --------- Co-authored-by: rmanole <[email protected]> Co-authored-by: Melissa Thompson <[email protected]>
1 parent 7b67bff commit 770fd5a

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

components/picker/index.css

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ governing permissions and limitations under the License.
3535
--spectrum-picker-spacing-label-to-picker: var(--spectrum-field-label-to-component);
3636

3737
--spectrum-picker-spacing-text-to-icon: var(--spectrum-text-to-visual-100);
38-
--spectrum-picker-spacing-text-to-alert-icon-inline-start: var(--spectrum-field-text-to-alert-icon-medium);
38+
--spectrum-picker-spacing-text-to-icon-inline-end: var(--spectrum-field-text-to-alert-icon-medium);
3939
--spectrum-picker-spacing-icon-to-disclosure-icon: var(--spectrum-picker-visual-to-disclosure-icon-medium);
4040
--spectrum-picker-spacing-label-to-picker-quiet: var(--spectrum-field-label-to-component-quiet-medium);
4141
--spectrum-picker-spacing-top-to-alert-icon: var(--spectrum-field-top-to-alert-icon-medium);
@@ -93,7 +93,7 @@ governing permissions and limitations under the License.
9393
--spectrum-picker-spacing-bottom-to-text: var(--spectrum-component-bottom-to-text-75);
9494
--spectrum-picker-spacing-edge-to-text: var(--spectrum-component-edge-to-text-75);
9595
--spectrum-picker-spacing-text-to-icon: var(--spectrum-text-to-visual-75);
96-
--spectrum-picker-spacing-text-to-alert-icon-inline-start: var(--spectrum-field-text-to-alert-icon-small);
96+
--spectrum-picker-spacing-text-to-icon-inline-end: var(--spectrum-field-text-to-alert-icon-small);
9797
--spectrum-picker-spacing-icon-to-disclosure-icon: var(--spectrum-picker-visual-to-disclosure-icon-small);
9898
--spectrum-picker-spacing-label-to-picker-quiet: var(--spectrum-field-label-to-component-quiet-small);
9999
--spectrum-picker-spacing-top-to-alert-icon: var(--spectrum-field-top-to-alert-icon-small);
@@ -114,7 +114,7 @@ governing permissions and limitations under the License.
114114
--spectrum-picker-spacing-bottom-to-text: var(--spectrum-component-bottom-to-text-200);
115115
--spectrum-picker-spacing-edge-to-text: var(--spectrum-component-edge-to-text-200);
116116
--spectrum-picker-spacing-text-to-icon: var(--spectrum-text-to-visual-200);
117-
--spectrum-picker-spacing-text-to-alert-icon-inline-start: var(--spectrum-field-text-to-alert-icon-large);
117+
--spectrum-picker-spacing-text-to-icon-inline-end: var(--spectrum-field-text-to-alert-icon-large);
118118
--spectrum-picker-spacing-icon-to-disclosure-icon: var(--spectrum-picker-visual-to-disclosure-icon-large);
119119
--spectrum-picker-spacing-label-to-picker-quiet: var(--spectrum-field-label-to-component-quiet-large);
120120
--spectrum-picker-spacing-top-to-alert-icon: var(--spectrum-field-top-to-alert-icon-large);
@@ -135,7 +135,7 @@ governing permissions and limitations under the License.
135135
--spectrum-picker-spacing-bottom-to-text: var(--spectrum-component-bottom-to-text-300);
136136
--spectrum-picker-spacing-edge-to-text: var(--spectrum-component-edge-to-text-300);
137137
--spectrum-picker-spacing-text-to-icon: var(--spectrum-text-to-visual-300);
138-
--spectrum-picker-spacing-text-to-alert-icon-inline-start: var(--spectrum-field-text-to-alert-icon-extra-large);
138+
--spectrum-picker-spacing-text-to-icon-inline-end: var(--spectrum-field-text-to-alert-icon-extra-large);
139139
--spectrum-picker-spacing-icon-to-disclosure-icon: var(--spectrum-picker-visual-to-disclosure-icon-extra-large);
140140
--spectrum-picker-spacing-label-to-picker-quiet: var(--spectrum-field-label-to-component-quiet-extra-large);
141141
--spectrum-picker-spacing-top-to-alert-icon: var(--spectrum-field-top-to-alert-icon-extra-large);
@@ -320,6 +320,14 @@ governing permissions and limitations under the License.
320320
}
321321
}
322322

323+
&.is-loading, &.is-invalid {
324+
.spectrum-Picker-label {
325+
/* @deprecation --mod-picker-spacing-text-to-alert-icon-inline-start has been renamed to --mod-picker-spacing-text-to-icon-inline-end
326+
and will be removed in a future version. */
327+
margin-inline-end: var(--mod-picker-spacing-text-to-icon-inline-end, var(--mod-picker-spacing-text-to-alert-icon-inline-start, var(--spectrum-picker-spacing-text-to-icon-inline-end)));
328+
}
329+
}
330+
323331
&:disabled,
324332
&.is-disabled {
325333
cursor: default;
@@ -416,10 +424,6 @@ governing permissions and limitations under the License.
416424
}
417425
}
418426

419-
.spectrum-Picker-validationIcon, .spectrum-Picker .spectrum-ProgressCircle {
420-
margin-inline-start: var(--mod-picker-spacing-text-to-alert-icon-inline-start, var(--spectrum-picker-spacing-text-to-alert-icon-inline-start));
421-
}
422-
423427
.spectrum-Picker-validationIcon {
424428
margin-block-start: calc(var(--mod-picker-spacing-top-to-alert-icon, var(--spectrum-picker-spacing-top-to-alert-icon)) - var(--mod-picker-border-width, var(--spectrum-picker-border-width)));
425429
margin-block-end: calc(var(--mod-picker-spacing-top-to-alert-icon, var(--spectrum-picker-spacing-top-to-alert-icon)) - var(--mod-picker-border-width, var(--spectrum-picker-border-width)));

components/picker/metadata/mods.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
| `--mod-picker-spacing-picker-to-popover` |
6464
| `--mod-picker-spacing-text-to-alert-icon-inline-start` |
6565
| `--mod-picker-spacing-text-to-icon` |
66+
| `--mod-picker-spacing-text-to-icon-inline-end` |
6667
| `--mod-picker-spacing-top-to-alert-icon` |
6768
| `--mod-picker-spacing-top-to-disclosure-icon` |
6869
| `--mod-picker-spacing-top-to-progress-circle` |

0 commit comments

Comments
 (0)