Skip to content

Auto-adjust dropdown horizontally when dropdownMatchSelectWidth is false #461

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 2 commits into from
Mar 11, 2020
Merged

Auto-adjust dropdown horizontally when dropdownMatchSelectWidth is false #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b58a3c
Auto-adjust x when dropdownMatchSelectWidth=false
BTCameronHessler Mar 9, 2020
df1f470
Use memoization for builtInPlacements prop
BTCameronHessler Mar 10, 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
127 changes: 127 additions & 0 deletions examples/auto-adjust-dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
/* eslint-disable no-console */
import React from 'react';
import Select, { Option } from '../src';
import '../assets/index.less';

class Test extends React.Component {
state = {
value: '3',
};

onChange = e => {
let value;
if (e && e.target) {
({ value } = e.target);
} else {
value = e;
}
this.setState({
value,
});
};

render() {
const { value } = this.state;

return (
<div
style={{
display: 'flex',
flexDirection: 'column',
justifyContent: 'space-between',
height: 'calc(100vh - 16px)',
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<div>
<Select
onChange={this.onChange}
dropdownMatchSelectWidth={500}
value={value}
>
<Option value="1">
Jack Jack Jack Jack Jack Jack Jack Jack Jack Jack Jack
</Option>
<Option value="2">
Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy
</Option>
<Option value="3">Jill</Option>
</Select>
</div>
<div>
<Select
onChange={this.onChange}
dropdownMatchSelectWidth={500}
value={value}
>
<Option value="1">
Jack Jack Jack Jack Jack Jack Jack Jack Jack Jack Jack
</Option>
<Option value="2">
Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy
</Option>{' '}
<Option value="3">Jill</Option>
</Select>
</div>
</div>
<div style={{ display: 'flex', justifyContent: 'center' }}>
<div>
<Select
onChange={this.onChange}
dropdownMatchSelectWidth={500}
value={value}
>
<Option value="1">
Jack Jack Jack Jack Jack Jack Jack Jack Jack Jack Jack
</Option>
<Option value="2">
Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy
</Option>
<Option value="3">Jill</Option>
</Select>
</div>
</div>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
}}
>
<div>
<Select
onChange={this.onChange}
dropdownMatchSelectWidth={500}
value={value}
>
<Option value="1">
Jack Jack Jack Jack Jack Jack Jack Jack Jack Jack Jack
</Option>
<Option value="2">
Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy
</Option>
<Option value="3">Jill</Option>
</Select>
</div>
<div>
<Select
onChange={this.onChange}
dropdownMatchSelectWidth={500}
value={value}
>
<Option value="1">
Jack Jack Jack Jack Jack Jack Jack Jack Jack Jack Jack
</Option>
<Option value="2">
Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy Lucy
</Option>
<Option value="3">Jill</Option>
</Select>
</div>
</div>
</div>
);
}
}

export default Test;
/* eslint-enable */
42 changes: 26 additions & 16 deletions src/SelectTrigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,28 @@ import Trigger from 'rc-trigger';
import classNames from 'classnames';
import { RenderDOMFunc } from './interface';

const BUILT_IN_PLACEMENTS = {
bottomLeft: {
points: ['tl', 'bl'],
offset: [0, 4],
overflow: {
adjustX: 0,
adjustY: 1,
const getBuiltInPlacements = (dropdownMatchSelectWidth: number | true) => {
// Enable horizontal overflow auto-adjustment when a custom dropdown width is provided
const adjustX = typeof dropdownMatchSelectWidth !== 'number' ? 0 : 1;

return {
bottomLeft: {
points: ['tl', 'bl'],
offset: [0, 4],
overflow: {
adjustX,
adjustY: 1,
},
},
},
topLeft: {
points: ['bl', 'tl'],
offset: [0, -4],
overflow: {
adjustX: 0,
adjustY: 1,
topLeft: {
points: ['bl', 'tl'],
offset: [0, -4],
overflow: {
adjustX,
adjustY: 1,
},
},
},
};
};

export interface RefTriggerProps {
Expand Down Expand Up @@ -78,6 +83,11 @@ const SelectTrigger: React.RefForwardingComponent<
popupNode = dropdownRender(popupElement);
}

const builtInPlacements = React.useMemo(
() => getBuiltInPlacements(dropdownMatchSelectWidth),
[dropdownMatchSelectWidth],
);

// ===================== Motion ======================
const mergedTransitionName = animation
? `${dropdownPrefixCls}-${animation}`
Expand All @@ -96,7 +106,7 @@ const SelectTrigger: React.RefForwardingComponent<
showAction={[]}
hideAction={[]}
popupPlacement="bottomLeft"
builtinPlacements={BUILT_IN_PLACEMENTS}
builtinPlacements={builtInPlacements}
prefixCls={dropdownPrefixCls}
popupTransitionName={mergedTransitionName}
popup={<div ref={popupRef}>{popupNode}</div>}
Expand Down
26 changes: 26 additions & 0 deletions tests/Select.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,6 +1182,32 @@ describe('Select.Basic', () => {
).toBe(233);
});

it('dropdown should auto-adjust horizontally when dropdownMatchSelectWidth is false', () => {
const wrapper = mount(
<Select dropdownMatchSelectWidth={233}>
<Option value={0}>0</Option>
<Option value={1}>1</Option>
</Select>,
);
expect(
wrapper.find('Trigger').props().builtinPlacements.bottomLeft.overflow
.adjustX,
).toBe(1);
});

it('dropdown should not auto-adjust horizontally when dropdownMatchSelectWidth is true', () => {
const wrapper = mount(
<Select>
<Option value={0}>0</Option>
<Option value={1}>1</Option>
</Select>,
);
expect(
wrapper.find('Trigger').props().builtinPlacements.bottomLeft.overflow
.adjustX,
).toBe(0);
});

it('if loading, arrow should show loading icon', () => {
const wrapper = mount(
<Select style={{ width: 1000 }} loading>
Expand Down