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: Click Popup dom should not close the popup #1037

Merged
merged 4 commits into from Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/SelectTrigger.tsx
@@ -1,4 +1,4 @@
import Trigger from '@rc-component/trigger';
import Trigger, { type TriggerRef } from '@rc-component/trigger';
import type { AlignType, BuildInPlacements } from '@rc-component/trigger/lib/interface';
import classNames from 'classnames';
import * as React from 'react';
Expand Down Expand Up @@ -143,10 +143,10 @@ const SelectTrigger: React.ForwardRefRenderFunction<RefTriggerProps, SelectTrigg
}

// ======================= Ref =======================
const popupRef = React.useRef<HTMLDivElement>(null);
const triggerPopupRef = React.useRef<TriggerRef>(null);

React.useImperativeHandle(ref, () => ({
getPopupElement: () => popupRef.current,
getPopupElement: () => triggerPopupRef.current?.popupElement,
}));

return (
Expand All @@ -158,11 +158,8 @@ const SelectTrigger: React.ForwardRefRenderFunction<RefTriggerProps, SelectTrigg
builtinPlacements={mergedBuiltinPlacements}
prefixCls={dropdownPrefixCls}
popupTransitionName={mergedTransitionName}
popup={
<div ref={popupRef} onMouseEnter={onPopupMouseEnter}>
{popupNode}
</div>
}
popup={<div onMouseEnter={onPopupMouseEnter}>{popupNode}</div>}
ref={triggerPopupRef}
stretch={stretch}
popupAlign={dropdownAlign}
popupVisible={visible}
Expand Down
29 changes: 29 additions & 0 deletions tests/Popup.test.tsx
@@ -0,0 +1,29 @@
import { fireEvent, render } from '@testing-library/react';
import React from 'react';
import Select from '../src';
import { injectRunAllTimers } from './utils/common';

// Mock Trigger. Since `__mocks__` already mock the trigger, we should back of origin one.
jest.mock('@rc-component/trigger', () => {
const OriTrigger = jest.requireActual('@rc-component/trigger').default;
return OriTrigger;
});

describe('Select.Popup', () => {
injectRunAllTimers(jest);

it('click popup should not trigger close', () => {
const onDropdownVisibleChange = jest.fn();
render(
<Select
open
options={[{ value: 'bamboo' }]}
onDropdownVisibleChange={onDropdownVisibleChange}
getPopupContainer={() => document.body}
/>,
);

fireEvent.mouseDown(document.querySelector('.rc-select-dropdown'));
expect(onDropdownVisibleChange).not.toHaveBeenCalled();
});
});
12 changes: 0 additions & 12 deletions tests/SelectTrigger.spec.tsx
Expand Up @@ -2,18 +2,6 @@ import React from 'react';
import SelectTrigger from '../src/SelectTrigger';
import { render } from '@testing-library/react';

// Mock Trigger module
jest.mock('@rc-component/trigger', () => {
const OriTrigger = jest.requireActual('@rc-component/trigger').default;

const MockTrigger = (props: any) => {
global.triggerProps = props;
return <OriTrigger {...props} />;
};

return MockTrigger;
});

describe('Select.Trigger', () => {
it('set popupTransitionName if animation given', () => {
const SimpleSelectTrigger = SelectTrigger as any;
Expand Down
1 change: 0 additions & 1 deletion tests/Tags.test.tsx
Expand Up @@ -424,7 +424,6 @@ describe('Select.Tags', () => {
expect(container.querySelectorAll('.rc-select-item-option-content')).toHaveLength(1);

keyDown(container.querySelector('input'), KeyCode.ENTER);
console.log(container.innerHTML);
expect(container.querySelectorAll('.rc-select-item')).toHaveLength(5);
});

Expand Down
6 changes: 3 additions & 3 deletions tests/__mocks__/@rc-component/trigger.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import Trigger from '@rc-component/trigger/lib/mock';

export default (props) => {
export default React.forwardRef((props, ref) => {
global.triggerProps = props;
return <Trigger {...props} />;
};
return <Trigger {...props} ref={ref} />;
});