Skip to content

Fix Picker custom menu widths #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 4, 2020
Merged

Fix Picker custom menu widths #386

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fd9e6e
Fix Picker custom menu widths
devongovett Apr 4, 2020
6a6f76a
Merge branch 'master' of github.com:adobe/react-spectrum-v3 into fix-…
devongovett Apr 4, 2020
5981b54
Add comment
devongovett Apr 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions packages/@react-spectrum/picker/src/Picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,18 @@ function Picker<T>(props: SpectrumPickerProps<T>, ref: DOMRef<HTMLDivElement>) {
} else {
// If quiet, use the default width, otherwise match the width of the button. This can be overridden by the menuWidth prop.
// Always have a minimum width of the button width. When quiet, there is an extra offset to add.
let btnWidth = isQuiet ? null : buttonWidth;
let width = menuWidth ? dimensionValue(menuWidth) : btnWidth;
let minWidth = isQuiet ? `calc(${buttonWidth}px + calc(2 * var(--spectrum-dropdown-quiet-offset)))` : buttonWidth;
// Not using style props for this because they don't support `calc`.
let width = isQuiet ? null : buttonWidth;
let style = {
...overlayProps.style,
width: menuWidth ? dimensionValue(menuWidth) : width,
minWidth: isQuiet ? `calc(${buttonWidth}px + calc(2 * var(--spectrum-dropdown-quiet-offset)))` : buttonWidth
};

overlay = (
<Popover
isOpen={state.isOpen}
UNSAFE_style={overlayProps.style}
minWidth={minWidth}
width={width}
UNSAFE_style={style}
UNSAFE_className={classNames(styles, 'spectrum-Dropdown-popover', {'spectrum-Dropdown-popover--quiet': isQuiet})}
ref={popoverRef}
placement={placement}
Expand Down