Skip to content

fix: auto dropdown placement #710

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
Jan 19, 2022
Merged

fix: auto dropdown placement #710

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
8bbfd7b
chore: auto dropdown placement
zombieJ Jan 19, 2022
08c25cb
fix: dropdownMatchWidth logic
zombieJ Jan 19, 2022
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
7 changes: 5 additions & 2 deletions assets/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,15 @@
}

&-slide-up-enter&-slide-up-enter-active&-placement-bottomLeft,
&-slide-up-appear&-slide-up-appear-active&-placement-bottomLeft {
&-slide-up-appear&-slide-up-appear-active&-placement-bottomLeft,
&-slide-up-enter&-slide-up-enter-active&-placement-bottomRight,
&-slide-up-appear&-slide-up-appear-active&-placement-bottomRight {
animation-name: rcSelectDropdownSlideUpIn;
animation-play-state: running;
}

&-slide-up-leave&-slide-up-leave-active&-placement-bottomLeft {
&-slide-up-leave&-slide-up-leave-active&-placement-bottomLeft,
&-slide-up-leave&-slide-up-leave-active&-placement-bottomRight {
animation-name: rcSelectDropdownSlideUpOut;
animation-play-state: running;
}
Expand Down
5 changes: 4 additions & 1 deletion docs/examples/single-animation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@ const Test = () => (
allowClear
placeholder="placeholder"
defaultValue="lucy"
style={{ width: 500 }}
style={{ width: '100%' }}
animation="slide-up"
showSearch
onChange={onChange}
dropdownStyle={{
width: 'auto',
}}
>
<Option value="jack">
<b
Expand Down
2 changes: 1 addition & 1 deletion src/Select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ const Select = React.forwardRef(
// Select
onSelect,
onDeselect,
dropdownMatchSelectWidth,
dropdownMatchSelectWidth = true,

// Options
filterOption,
Expand Down
22 changes: 6 additions & 16 deletions src/SelectTrigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import Trigger from 'rc-trigger';
import classNames from 'classnames';
import type { Placement, RenderDOMFunc } from './BaseSelect';

const getBuiltInPlacements = (adjustX: number) => {
const getBuiltInPlacements = (dropdownMatchSelectWidth: number | boolean) => {
// Enable horizontal overflow auto-adjustment when a custom dropdown width is provided
const adjustX = dropdownMatchSelectWidth === true ? 0 : 1;
return {
bottomLeft: {
points: ['tl', 'bl'],
Expand Down Expand Up @@ -40,13 +42,6 @@ const getBuiltInPlacements = (adjustX: number) => {
};
};

const getAdjustX = (adjustXDependencies: Pick<SelectTriggerProps, 'autoAdjustOverflow' | 'dropdownMatchSelectWidth'>) => {
const { autoAdjustOverflow, dropdownMatchSelectWidth } = adjustXDependencies;
if(!!autoAdjustOverflow) return 1;
// Enable horizontal overflow auto-adjustment when a custom dropdown width is provided
return typeof dropdownMatchSelectWidth !== 'number' ? 0 : 1
}

export interface RefTriggerProps {
getPopupElement: () => HTMLDivElement;
}
Expand All @@ -70,7 +65,6 @@ export interface SelectTriggerProps {
getPopupContainer?: RenderDOMFunc;
dropdownAlign: object;
empty: boolean;
autoAdjustOverflow?: boolean;

getTriggerDOMNode: () => HTMLElement;
onPopupVisibleChange?: (visible: boolean) => void;
Expand All @@ -95,15 +89,14 @@ const SelectTrigger: React.RefForwardingComponent<RefTriggerProps, SelectTrigger
dropdownClassName,
direction = 'ltr',
placement,
dropdownMatchSelectWidth = true,
dropdownMatchSelectWidth,
dropdownRender,
dropdownAlign,
getPopupContainer,
empty,
getTriggerDOMNode,
onPopupVisibleChange,
onPopupMouseEnter,
autoAdjustOverflow,
...restProps
} = props;

Expand All @@ -115,11 +108,8 @@ const SelectTrigger: React.RefForwardingComponent<RefTriggerProps, SelectTrigger
}

const builtInPlacements = React.useMemo(
() => getBuiltInPlacements(getAdjustX({
autoAdjustOverflow,
dropdownMatchSelectWidth,
})),
[dropdownMatchSelectWidth, autoAdjustOverflow],
() => getBuiltInPlacements(dropdownMatchSelectWidth),
[dropdownMatchSelectWidth],
);

// ===================== Motion ======================
Expand Down
8 changes: 6 additions & 2 deletions tests/Select.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,7 +1300,9 @@ describe('Select.Basic', () => {
<Option value={1}>1</Option>
</Select>,
);
expect(wrapper.find('Trigger').props().builtinPlacements.bottomLeft.overflow.adjustX).toBe(1);
expect(
(wrapper.find('Trigger').prop('builtinPlacements') as any).bottomLeft.overflow.adjustX,
).toBe(1);
});

it('dropdown should not auto-adjust horizontally when dropdownMatchSelectWidth is true', () => {
Expand All @@ -1310,7 +1312,9 @@ describe('Select.Basic', () => {
<Option value={1}>1</Option>
</Select>,
);
expect(wrapper.find('Trigger').props().builtinPlacements.bottomLeft.overflow.adjustX).toBe(0);
expect(
(wrapper.find('Trigger').prop('builtinPlacements') as any).bottomLeft.overflow.adjustX,
).toBe(0);
});

it('if loading, arrow should show loading icon', () => {
Expand Down