Skip to content

Commit

Permalink
Bugfix/#2867 Fixes popup disappearing in Input Autocompete (#2937)
Browse files Browse the repository at this point in the history
  • Loading branch information
nullpointerexceptionkek authored Dec 17, 2024
1 parent 430d9c2 commit 74505a6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .changeset/seven-avocados-clean.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@skeletonlabs/skeleton": patch
---

bugfix: fix popup disappearing when dragging mouse out of the input box
12 changes: 11 additions & 1 deletion packages/skeleton/src/lib/utilities/Popup/popup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,22 @@ export function popup(triggerNode: HTMLElement, args: PopupSettings) {
function toggle(): void {
popupState.open === false ? open() : close();
}

function handleMouseUp(event: MouseEvent) {
if (!triggerNode.contains(event.target as Node)) close();
}

function onWindowClick(event: any): void {
// Return if the popup is not yet open
if (popupState.open === false) return;
// Return if click is the trigger element
if (triggerNode.contains(event.target)) return;
// If click it outside the popup
if (elemPopup && elemPopup.contains(event.target) === false) {
close();
const selection = window.getSelection();
if (selection && selection.toString().length == 0) {
close();
}
return;
}
// Handle Close Query State
Expand Down Expand Up @@ -187,6 +195,7 @@ export function popup(triggerNode: HTMLElement, args: PopupSettings) {
switch (args.event) {
case 'click':
triggerNode.addEventListener('click', toggle, true);
window.addEventListener('mouseup', handleMouseUp, true);
window.addEventListener('click', onWindowClick, true);
break;
case 'hover':
Expand Down Expand Up @@ -228,6 +237,7 @@ export function popup(triggerNode: HTMLElement, args: PopupSettings) {
triggerNode.removeEventListener('blur', () => close(), true);
// Window Events
window.removeEventListener('click', onWindowClick, true);
window.removeEventListener('mouseup', handleMouseUp, true);
window.removeEventListener('keydown', onWindowKeyDown, true);
}
};
Expand Down
2 changes: 1 addition & 1 deletion packages/skeleton/src/lib/utilities/Toast/Toast.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ describe('Toast.svelte', () => {
const [wrapperVisibilityOnAToBChange, wrapperVisibilityAfterAOutroFinishes, wrapperVisibilityAfterBOutroFinishes] = await Promise.all([
getWrapperElementAfterTimeout(10),
getWrapperElementAfterTimeout(16),
getWrapperElementAfterTimeout(50)
getWrapperElementAfterTimeout(80)
]);

expect(wrapperVisibilityOnAToBChange).toBeTruthy();
Expand Down

0 comments on commit 74505a6

Please sign in to comment.