Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

fix(editor): scrolling a dropdown's own list no longer closes it

yhh2b900f073848
diff --git a/desktop/src/components/Menu.tsx b/desktop/src/components/Menu.tsx
index 9e6b24d7a..71b92acb9 100644
--- a/desktop/src/components/Menu.tsx
+++ b/desktop/src/components/Menu.tsx
@@ -12,6 +12,7 @@ import { createPortal } from 'react-dom';
import { Check, ChevronRight } from 'lucide-react';
import { usePanelWindow } from '@/components/PanelWindow';
import { overlayGuard } from '@/components/overlayGuard';
+import { useDismissOnPageMove } from './useDismissOnPageMove';
export type MenuItem =
| { sep: true }
@@ -171,20 +172,7 @@ export function ContextMenu({
ref.current?.querySelector<HTMLButtonElement>('.ctx-item:not(:disabled)')?.focus();
}, []);
- useEffect(() => {
- const close = () => onClose();
- const onKey = (e: KeyboardEvent) => {
- if (e.key === 'Escape') onClose();
- };
- win.addEventListener('mousedown', close);
- win.addEventListener('scroll', close, true);
- win.addEventListener('keydown', onKey);
- return () => {
- win.removeEventListener('mousedown', close);
- win.removeEventListener('scroll', close, true);
- win.removeEventListener('keydown', onKey);
- };
- }, [onClose, win]);
+ useDismissOnPageMove(ref, onClose, win);
return createPortal(
<div
diff --git a/desktop/src/components/Popover.tsx b/desktop/src/components/Popover.tsx
index f41ddb5ea..0d5e0b3f6 100644
--- a/desktop/src/components/Popover.tsx
+++ b/desktop/src/components/Popover.tsx
@@ -14,6 +14,7 @@ import { useEffect, useLayoutEffect, useRef, useState, type ReactNode } from 're
import { createPortal } from 'react-dom';
import { usePanelWindow } from '@/components/PanelWindow';
import { overlayGuard } from '@/components/overlayGuard';
+import { useDismissOnPageMove } from './useDismissOnPageMove';
export function Popover({
anchor,
@@ -71,22 +72,7 @@ export function Popover({
setPos({ left, top });
}, [anchor, win]);
- useEffect(() => {
- const close = () => onClose();
- const onKey = (e: KeyboardEvent) => {
- if (e.key === 'Escape') onClose();
- };
- win.addEventListener('mousedown', close);
- win.addEventListener('scroll', close, true);
- win.addEventListener('resize', close);
- win.addEventListener('keydown', onKey);
- return () => {
- win.removeEventListener('mousedown', close);
- win.removeEventListener('scroll', close, true);
- win.removeEventListener('resize', close);
- win.removeEventListener('keydown', onKey);
- };
- }, [onClose, win]);
+ useDismissOnPageMove(ref, onClose, win);
return createPortal(
<div
diff --git a/desktop/src/components/useDismissOnPageMove.ts b/desktop/src/components/useDismissOnPageMove.ts
new file mode 100644
index 000000000..8b4d4c5b0
--- /dev/null
+++ b/desktop/src/components/useDismissOnPageMove.ts
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright (c) 2024-present ESEngine Team
+/**
+ * @file useDismissOnPageMove.ts
+ * @brief Close a floating layer when the page moves under it, or the user
+ * clicks or escapes away.
+ *
+ * @details A popover and a context menu are placed from a rect captured when they
+ * opened, so the moment their anchor moves they are pointing at nothing —
+ * which is why scroll closes them, and why the listener is on the window
+ * in the CAPTURE phase: a scroll inside a panel never reaches the window
+ * any other way (scroll does not bubble).
+ *
+ * What that must not treat as the page moving is the layer's OWN list
+ * scrolling. Catching every scroll everywhere closed the dropdown the
+ * moment anyone scrolled its options — the list was unusable past the
+ * items that happened to fit. So a scroll from inside the layer is the
+ * one kind that is ignored.
+ *
+ * Shared because both layers had the same block, and a fix to one that
+ * the other never got is how they drift apart.
+ */
+import { useEffect, type RefObject } from 'react';
+
+export function useDismissOnPageMove(
+ /** The floating element — scrolls inside it are the layer being used, not moved. */
+ layer: RefObject<HTMLElement | null>,
+ onClose: () => void,
+ win: Window,
+): void {
+ useEffect(() => {
+ const close = () => onClose();
+ const onScroll = (e: Event) => {
+ const el = layer.current;
+ const target = e.target as Node | null;
+ if (el && target && (el === target || el.contains(target))) return;
+ onClose();
+ };
+ const onKey = (e: KeyboardEvent) => {
+ if (e.key === 'Escape') onClose();
+ };
+
+ win.addEventListener('mousedown', close);
+ win.addEventListener('scroll', onScroll, true);
+ win.addEventListener('resize', close);
+ win.addEventListener('keydown', onKey);
+ return () => {
+ win.removeEventListener('mousedown', close);
+ win.removeEventListener('scroll', onScroll, true);
+ win.removeEventListener('resize', close);
+ win.removeEventListener('keydown', onKey);
+ };
+ }, [layer, onClose, win]);
+}