Skip to content

Commit ec1c97f

Browse files
fix(picker): update popover selector class
- with the new default position for popover, the selector class for the popover in picker also needed to be updated. (--bottom-start) - create changeset - update content arg to be popoverContent (just for clarification) - rebuild metadata.json
1 parent 5005307 commit ec1c97f

File tree

5 files changed

+23
-15
lines changed

5 files changed

+23
-15
lines changed

.changeset/itchy-shrimps-help.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@spectrum-css/picker": patch
3+
---
4+
5+
S2 Popover has an updated default position, bottom-start. The correct `.spectrum-Popover--bottom-start` class was added to the open popover selector blocks for picker so that the spacing from the picker to the popover is correctly adjusted.

components/picker/index.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
--spectrum-picker-spacing-top-to-disclosure-icon: var(--spectrum-field-top-to-disclosure-icon-100);
5353
--spectrum-picker-spacing-edge-to-disclosure-icon: var(--spectrum-field-end-edge-to-disclosure-icon-100);
5454

55-
& + .spectrum-Popover--bottom.is-open {
55+
& + .spectrum-Popover--bottom-start.is-open {
5656
--spectrum-picker-spacing-picker-to-popover: var(--spectrum-component-to-menu-medium);
5757
}
5858

@@ -124,7 +124,7 @@
124124
--spectrum-picker-spacing-top-to-disclosure-icon: var(--spectrum-field-top-to-disclosure-icon-75);
125125
--spectrum-picker-spacing-edge-to-disclosure-icon: var(--spectrum-field-end-edge-to-disclosure-icon-75);
126126

127-
& + .spectrum-Popover--bottom.is-open {
127+
& + .spectrum-Popover--bottom-start.is-open {
128128
--spectrum-picker-spacing-picker-to-popover: var(--spectrum-component-to-menu-small);
129129
}
130130
}
@@ -146,7 +146,7 @@
146146
--spectrum-picker-spacing-top-to-disclosure-icon: var(--spectrum-field-top-to-disclosure-icon-200);
147147
--spectrum-picker-spacing-edge-to-disclosure-icon: var(--spectrum-field-end-edge-to-disclosure-icon-200);
148148

149-
& + .spectrum-Popover--bottom.is-open {
149+
& + .spectrum-Popover--bottom-start.is-open {
150150
--spectrum-picker-spacing-picker-to-popover: var(--spectrum-component-to-menu-large);
151151
}
152152
}
@@ -168,7 +168,7 @@
168168
--spectrum-picker-spacing-top-to-disclosure-icon: var(--spectrum-field-top-to-disclosure-icon-300);
169169
--spectrum-picker-spacing-edge-to-disclosure-icon: var(--spectrum-field-end-edge-to-disclosure-icon-300);
170170

171-
& + .spectrum-Popover--bottom.is-open {
171+
& + .spectrum-Popover--bottom-start.is-open {
172172
--spectrum-picker-spacing-picker-to-popover: var(--spectrum-component-to-menu-extra-large);
173173
}
174174
}
@@ -409,7 +409,7 @@
409409
margin-inline-end: var(--mod-picker-spacing-icon-to-disclosure-icon, var(--spectrum-picker-spacing-icon-to-disclosure-icon));
410410
}
411411

412-
.spectrum-Picker + .spectrum-Popover--bottom.is-open {
412+
.spectrum-Picker + .spectrum-Popover--bottom-start.is-open {
413413
transform: translateY(var(--mod-picker-spacing-picker-to-popover, var(--spectrum-picker-spacing-picker-to-popover)));
414414
}
415415

components/picker/metadata/metadata.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"sourceFile": "index.css",
33
"selectors": [
44
".spectrum-Picker",
5-
".spectrum-Picker + .spectrum-Popover--bottom.is-open",
5+
".spectrum-Picker + .spectrum-Popover--bottom-start.is-open",
66
".spectrum-Picker .spectrum-Picker-icon",
77
".spectrum-Picker .spectrum-Picker-label",
88
".spectrum-Picker .spectrum-ProgressCircle",
@@ -13,11 +13,11 @@
1313
".spectrum-Picker--quiet:focus-visible:after",
1414
".spectrum-Picker--sideLabel",
1515
".spectrum-Picker--sizeL",
16-
".spectrum-Picker--sizeL + .spectrum-Popover--bottom.is-open",
16+
".spectrum-Picker--sizeL + .spectrum-Popover--bottom-start.is-open",
1717
".spectrum-Picker--sizeS",
18-
".spectrum-Picker--sizeS + .spectrum-Popover--bottom.is-open",
18+
".spectrum-Picker--sizeS + .spectrum-Popover--bottom-start.is-open",
1919
".spectrum-Picker--sizeXL",
20-
".spectrum-Picker--sizeXL + .spectrum-Popover--bottom.is-open",
20+
".spectrum-Picker--sizeXL + .spectrum-Popover--bottom-start.is-open",
2121
".spectrum-Picker-label",
2222
".spectrum-Picker-label.is-placeholder",
2323
".spectrum-Picker-label.is-placeholder:active",

components/picker/stories/picker.stories.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export default {
9797
},
9898
isHovered,
9999
isActive,
100-
content: { table: { disable: true } },
100+
popoverContent: { table: { disable: true } },
101101
},
102102
args: {
103103
rootClass: "spectrum-Picker",

components/picker/stories/template.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export const Template = ({
125125
// Helps ensure that Popover appears below the Picker, with side labels layout.
126126
display: "block",
127127
},
128-
content = [],
128+
popoverContent = [],
129129
} = {}, context = {}) => {
130130
const pickerMarkup = Picker({
131131
size,
@@ -134,19 +134,22 @@ export const Template = ({
134134
isInvalid,
135135
isDisabled,
136136
isLoading,
137-
content,
137+
popoverContent,
138138
labelPosition,
139139
ariaLabeledBy: fieldLabelId,
140140
}, context);
141141

142-
const popoverMarkup = content.length !== 0 ? Popover({
142+
const popoverMarkup = popoverContent.length !== 0 ? Popover({
143143
isOpen: isOpen && !isDisabled && !isLoading,
144144
withTip: false,
145-
position: "bottom",
145+
position: "bottom-start",
146146
isQuiet,
147-
content,
147+
content: popoverContent,
148148
size,
149149
customStyles: customPopoverStyles,
150+
popoverWrapperStyles: {
151+
"display": "block",
152+
},
150153
}, context) : "";
151154

152155
const helpTextMarkup = helpText ? HelpText({

0 commit comments

Comments
 (0)