Skip to content

fix: should hide popup when set alignPoint after scrolling #417

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 1 commit into from
Aug 9, 2023
Merged

fix: should hide popup when set alignPoint after scrolling #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/hooks/useWatch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default function useWatch(
target: HTMLElement,
popup: HTMLElement,
onAlign: VoidFunction,
onScroll: VoidFunction,
) {
useLayoutEffect(() => {
if (open && target && popup) {
Expand All @@ -24,6 +25,7 @@ export default function useWatch(

function notifyScroll() {
onAlign();
onScroll();
}

mergedList.forEach((scroller) => {
Expand Down
30 changes: 18 additions & 12 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,13 +387,30 @@ export function generateTrigger(
onPopupAlign,
);

const [showActions, hideActions] = useAction(
mobile,
action,
showAction,
hideAction,
);

const clickToShow = showActions.has('click');
const clickToHide =
hideActions.has('click') || hideActions.has('contextMenu');

const triggerAlign = useEvent(() => {
if (!inMotion) {
onAlign();
}
});

useWatch(mergedOpen, targetEle, popupEle, triggerAlign);
const onScroll = () => {
if (openRef.current && alignPoint && clickToHide) {
triggerOpen(false);
}
};

useWatch(mergedOpen, targetEle, popupEle, triggerAlign, onScroll);

useLayoutEffect(() => {
triggerAlign();
Expand Down Expand Up @@ -463,13 +480,6 @@ export function generateTrigger(
};

// =========================== Action ===========================
const [showActions, hideActions] = useAction(
mobile,
action,
showAction,
hideAction,
);

/**
* Util wrapper for trigger action
*/
Expand All @@ -489,10 +499,6 @@ export function generateTrigger(
}

// ======================= Action: Click ========================
const clickToShow = showActions.has('click');
const clickToHide =
hideActions.has('click') || hideActions.has('contextMenu');

if (clickToShow || clickToHide) {
cloneProps.onClick = (
event: React.MouseEvent<HTMLElement>,
Expand Down
37 changes: 29 additions & 8 deletions tests/point.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,21 @@ describe('Trigger.Point', () => {

render() {
return (
<Trigger
ref={this.props.triggerRef}
popup={this.popup}
popupAlign={{ points: ['tl'] }}
alignPoint
{...this.props}
<div
className="scroll"
// Jest can not get calculated style in jsdom. So we need to set it manually
style={{ overflowX: 'hidden', overflowY: 'hidden' }}
>
<div className="point-region" />
</Trigger>
<Trigger
ref={this.props.triggerRef}
popup={this.popup}
popupAlign={{ points: ['tl'] }}
alignPoint
{...this.props}
>
<div className="point-region" />
</Trigger>
</div>
);
}
}
Expand Down Expand Up @@ -120,6 +126,21 @@ describe('Trigger.Point', () => {
done();
})();
});

it('should hide popup when set alignPoint after scrolling', async () => {
const { container } = render(<Demo action={['contextMenu']} />);
await trigger(container, 'contextmenu', { clientX: 10, clientY: 20 });

const popup = document.querySelector('.rc-trigger-popup');
expect(popup.style).toEqual(
expect.objectContaining({ left: '10px', top: '20px' }),
);

const scrollDiv = container.querySelector('.scroll');
fireEvent.scroll(scrollDiv);

expect(document.querySelector('.rc-trigger-popup-hidden')).toBeTruthy();
});
});

describe('placement', () => {
Expand Down