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.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
fix(outliner): dropping a folder onto an entity moves the entity into the folder
esengine5ec6df3bc3db
diff --git a/desktop/src/panels/Outliner.tsx b/desktop/src/panels/Outliner.tsxindex b2d1ee962..0652a8278 100644--- a/desktop/src/panels/Outliner.tsx+++ b/desktop/src/panels/Outliner.tsx@@ -330,16 +330,12 @@ export function Outliner() {}if (drop?.key !== item.key || drop?.pos !== pos) setDrop({ key: item.key, pos });};- /** Move the dragged folder into `destParent` (or root). Rejects self/descendant. */- const moveFolderInto = (destParent: string) => {- const src = dragFolder.current;- dragFolder.current = null;- setDrop(null);- if (src == null) return;+ /** Nest folder `src` under `destParent` (or root). Rejects self/descendant/no-op. */+ const moveFolderInto = (src: string, destParent: string) => {const dest = normalizeFolder(destParent);if (dest === src || isFolderUnder(dest, src)) return; // into itself / its own subtreeconst next = joinFolder(dest, folderName(src));- if (next === src) return;+ if (next === src) return; // already thereSceneCommands.renameFolder(src, next);useOutliner.getState().rebaseFolderKeys(src, next);};@@ -361,14 +357,17 @@ export function Outliner() {e.stopPropagation();const pos = drop?.pos ?? 'on';setDrop(null);- // A folder being dragged → reorder among siblings (between-rows) or nest (on).+ // A folder is being dragged.if (dragFolder.current != null) {const src = dragFolder.current;- if (item.kind === 'folder' && pos !== 'on' && folderParent(src) === folderParent(item.path)) {- dragFolder.current = null;- SceneCommands.reorderFolder(src, item.path, pos === 'before');+ dragFolder.current = null;+ if (item.kind === 'folder') {+ // sibling between-rows → reorder; else → nest under the target folder+ if (pos !== 'on' && folderParent(src) === folderParent(item.path)) SceneCommands.reorderFolder(src, item.path, pos === 'before');+ else moveFolderInto(src, item.path);} else {- moveFolderInto(item.kind === 'folder' ? item.path : SceneModel.folderOf(item.id));+ // dropped onto an entity → that entity (+ any selection) joins the folder+ SceneCommands.moveToFolder(selectionOrTarget(item.id), src);}return;}@@ -400,7 +399,10 @@ export function Outliner() {const onBodyDrop = (e: React.DragEvent) => {e.preventDefault();if (dragFolder.current != null) {- moveFolderInto('');+ const src = dragFolder.current;+ dragFolder.current = null;+ setDrop(null);+ moveFolderInto(src, ''); // re-root the folderreturn;}if (dropPrefabAsset(e, null)) return;