diff --git a/packages/@react-spectrum/s2/src/Menu.tsx b/packages/@react-spectrum/s2/src/Menu.tsx index 2b7b608602e..2285e3f615f 100644 --- a/packages/@react-spectrum/s2/src/Menu.tsx +++ b/packages/@react-spectrum/s2/src/Menu.tsx @@ -103,6 +103,7 @@ export let menu = style({ gridTemplateColumns: menuItemGrid, boxSizing: 'border-box', maxHeight: '[inherit]', + width: 'full', overflow: { isPopover: 'auto' }, @@ -186,6 +187,7 @@ export let menuitem = style({ }, alignItems: 'baseline', minHeight: 'control', + height: 'min', textDecoration: 'none', cursor: { default: 'default', diff --git a/packages/@react-spectrum/s2/src/Picker.tsx b/packages/@react-spectrum/s2/src/Picker.tsx index 206a10a0c36..44549f4c21b 100644 --- a/packages/@react-spectrum/s2/src/Picker.tsx +++ b/packages/@react-spectrum/s2/src/Picker.tsx @@ -176,6 +176,7 @@ const quietFocusLine = style({ export let menu = style({ outlineStyle: 'none', display: 'grid', + width: 'full', gridTemplateColumns: { size: { S: [edgeToText(24), 'auto', 'auto', 'minmax(0, 1fr)', 'auto', 'auto', 'auto', edgeToText(24)], diff --git a/packages/@react-spectrum/s2/src/Popover.tsx b/packages/@react-spectrum/s2/src/Popover.tsx index 5738e0d30b6..cc14ad5ee79 100644 --- a/packages/@react-spectrum/s2/src/Popover.tsx +++ b/packages/@react-spectrum/s2/src/Popover.tsx @@ -79,6 +79,7 @@ let popover = style({ // Don't be larger than full screen minus 2 * containerPadding maxWidth: '[calc(100vw - 24px)]', boxSizing: 'border-box', + display: 'flex', opacity: { isEntering: 0, isExiting: 0 @@ -226,7 +227,7 @@ const dialogStyle = style({ borderRadius: '[inherit]', overflow: 'auto', position: 'relative', - size: 'full', + width: 'full', maxSize: '[inherit]' }, getAllowedOverrides({height: true}));