Skip to content
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.

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

fix: customized inputElement should not trigger close when mousedown trigger #761

Merged
merged 3 commits into from
May 19, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"rc-virtual-list": "^3.2.0"
},
"devDependencies": {
"@testing-library/react": "12",
"@types/enzyme": "^3.10.9",
"@types/jest": "^26.0.24",
"@types/react": "^17.0.15",
Expand Down
1 change: 1 addition & 0 deletions src/BaseSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@ const BaseSelect = React.forwardRef((props: BaseSelectProps, ref: React.Ref<Base
() => [containerRef.current, triggerRef.current?.getPopupElement()],
triggerOpen,
onToggleOpen,
!!customizeRawInputElement,
);

// ============================ Context =============================
Expand Down
7 changes: 7 additions & 0 deletions src/hooks/useSelectTriggerControl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,22 @@ export default function useSelectTriggerControl(
elements: () => (HTMLElement | undefined)[],
open: boolean,
triggerOpen: (open: boolean) => void,
customizedTrigger: boolean,
) {
const propsRef = React.useRef(null);
propsRef.current = {
open,
triggerOpen,
customizedTrigger,
};

React.useEffect(() => {
function onGlobalMouseDown(event: MouseEvent) {
// If trigger is customized, Trigger will take control of popupVisible
if (propsRef.current.customizedTrigger) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (propsRef.current.customizedTrigger) {
if (propsRef.current?.customizedTrigger) {

return;
}

let target = event.target as HTMLElement;

if (target.shadowRoot && event.composed) {
Expand Down
37 changes: 37 additions & 0 deletions tests/BaseSelect.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { fireEvent, render } from '@testing-library/react';
import BaseSelect from '../src/BaseSelect';
import { forwardRef } from 'react';
import type { OptionListProps, RefOptionListProps } from '@/OptionList';

const OptionList = forwardRef<RefOptionListProps, OptionListProps>(() => (
<div className="popup">Popup</div>
));

describe('BaseSelect', () => {
it('customized inputElement should trigger popup properly', () => {
const { container } = render(
<BaseSelect
prefixCls="rc-select"
getRawInputElement={() => (
<a className="trigger" href="#">
trigger
</a>
)}
OptionList={OptionList}
displayValues={[]}
emptyOptions
id="test"
onDisplayValuesChange={() => {}}
onSearch={() => {}}
searchValue=""
/>,
);
expect(container.querySelector('div.popup')).toBeFalsy();
fireEvent.click(container.querySelector('a.trigger'));
expect(container.querySelector('div.popup')).toBeTruthy();
fireEvent.mouseDown(container.querySelector('a.trigger'));
expect(container.querySelector('div.rc-select-dropdown-hidden')).toBeFalsy();
fireEvent.click(container.querySelector('a.trigger'));
expect(container.querySelector('div.rc-select-dropdown-hidden')).toBeTruthy();
});
});