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): make the tileset polygon editor Escape window-aware (popout)

yhhf3054a6c2f73
diff --git a/desktop/src/panels/TilesetEditor.tsx b/desktop/src/panels/TilesetEditor.tsx
index 0da76cdc6..2e6216157 100644
--- a/desktop/src/panels/TilesetEditor.tsx
+++ b/desktop/src/panels/TilesetEditor.tsx
@@ -24,6 +24,7 @@ import {
} from 'esengine';
import { Segmented } from '@/components/Segmented';
import { Select } from '@/components/Select';
+import { usePanelWindow } from '@/components/PanelWindow';
import { DirtyDot } from '@/components/DirtyDot';
import { GridField } from '@/components/GridField';
import { TilesetDocument } from '@/tileset/TilesetDocument';
@@ -53,6 +54,7 @@ function PolygonEditor(props: {
tileId: number; cols: number; onClose: () => void;
}) {
const { asset, texUrl, natural, tileId, cols, onClose } = props;
+ const win = usePanelWindow();
const { tileWidth: tw, tileHeight: th, margin: mg, spacing: sp } = asset;
const col = (tileId - 1) % cols;
const row = Math.floor((tileId - 1) / cols);
@@ -80,9 +82,9 @@ function PolygonEditor(props: {
const onKey = (e: KeyboardEvent) => {
if (e.key === 'Escape') onClose();
};
- window.addEventListener('keydown', onKey);
- return () => window.removeEventListener('keydown', onKey);
- }, [onClose]);
+ win.addEventListener('keydown', onKey);
+ return () => win.removeEventListener('keydown', onKey);
+ }, [onClose, win]);
return (
<div className="ts-pe-backdrop" onPointerDown={(e) => { if (e.target === e.currentTarget) onClose(); }}>