Skip to content

Commit 97ac681

Browse files
committed
fix: preserve overflow-y: auto when isMultiselectable
1 parent 079a187 commit 97ac681

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

packages/dropdowns.next/src/elements/combobox/Combobox.spec.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,14 @@ describe('Combobox', () => {
194194
});
195195

196196
it('renders `isBare` styling as expected', () => {
197-
const { getByTestId } = render(<TestCombobox isBare />);
197+
const { getByTestId, rerender } = render(<TestCombobox isBare />);
198198
const combobox = getByTestId('combobox');
199199

200200
expect(combobox.firstChild).toHaveStyleRule('border', 'none');
201201
expect(combobox.firstChild).toHaveStyleRule('overflow-y', 'visible');
202+
203+
rerender(<TestCombobox isBare isMultiselectable />);
204+
expect(combobox.firstChild).toHaveStyleRule('overflow-y', 'auto');
202205
});
203206

204207
it('renders `isCompact` styling as expected', () => {

packages/dropdowns.next/src/views/combobox/StyledTrigger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export const StyledTrigger = styled.div.attrs({
138138
'data-garden-id': COMPONENT_ID,
139139
'data-garden-version': PACKAGE_VERSION
140140
})<IStyledTriggerProps>`
141-
overflow-y: ${props => (props.isBare ? 'visible' : 'auto')};
141+
overflow-y: ${props => (props.isBare && !props.isMultiselectable ? 'visible' : 'auto')};
142142
/* prettier-ignore */
143143
transition:
144144
border-color 0.25s ease-in-out,

0 commit comments

Comments
 (0)