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.

feat(outliner): draggable folders — nest a folder into another or re-root it

esenginef4f90ed98fa0
diff --git a/desktop/src/panels/Outliner.tsx b/desktop/src/panels/Outliner.tsx
index c7d708060..260961e4f 100644
--- a/desktop/src/panels/Outliner.tsx
+++ b/desktop/src/panels/Outliner.tsx
@@ -15,7 +15,7 @@ import { VirtualTree } from '@/components/VirtualTree';
import { buildOutlinerItems, collectExpandableKeys, entityKey, folderKey, parseQuery, type OutlinerItem } from '@/outliner/OutlinerModel';
import { useOutliner } from '@/outliner/OutlinerController';
import { OutlinerRow } from '@/outliner/OutlinerRow';
-import { joinFolder, folderParent } from '@/outliner/folders';
+import { joinFolder, folderParent, folderName, normalizeFolder, isFolderUnder } from '@/outliner/folders';
import type { EntityId } from '@/types';
// Must match .row height in outliner.css — the fixed row size the virtual list windows by.
@@ -78,6 +78,7 @@ export function Outliner() {
const setInspectWorld = useEditorStore((s) => s.setInspectWorld);
const initRef = useRef(false);
const dragIds = useRef<EntityId[] | null>(null);
+ const dragFolder = useRef<string | null>(null); // the folder path being dragged (vs entities)
const [renaming, setRenaming] = useState<string | null>(null); // item key
const [drop, setDrop] = useState<{ key: string; pos: 'before' | 'on' | 'after' } | null>(null);
@@ -292,18 +293,25 @@ export function Outliner() {
return true;
};
const onDragStartRow = (item: OutlinerItem, e: React.DragEvent) => {
- if (item.kind !== 'entity') return;
- dragIds.current = selectionOrTarget(item.id);
e.dataTransfer.effectAllowed = 'move';
- e.dataTransfer.setData('text/plain', String(item.id));
+ if (item.kind === 'folder') {
+ dragFolder.current = item.path;
+ dragIds.current = null;
+ e.dataTransfer.setData('text/plain', item.path);
+ } else {
+ dragIds.current = selectionOrTarget(item.id);
+ dragFolder.current = null;
+ e.dataTransfer.setData('text/plain', String(item.id));
+ }
};
const onDragOverRow = (item: OutlinerItem, e: React.DragEvent) => {
- if (dragIds.current) e.dataTransfer.dropEffect = 'move';
+ if (dragIds.current || dragFolder.current) e.dataTransfer.dropEffect = 'move';
else if (isAssetDrag(e)) e.dataTransfer.dropEffect = 'copy';
else return;
e.preventDefault();
- // Hovering the top/bottom quarter of an entity row (manual sort, entity drag)
- // is a between-rows reorder; the middle is a reparent. Folders are always 'on'.
+ // Entity drag, manual sort: the top/bottom quarter of an entity row is a
+ // between-rows reorder, the middle a reparent. A folder drag is always 'on'
+ // (nest into the target; folders sort by name, so no manual reorder).
let pos: 'before' | 'on' | 'after' = 'on';
if (dragIds.current && item.kind === 'entity' && sortMode === 'manual') {
const rect = e.currentTarget.getBoundingClientRect();
@@ -312,6 +320,19 @@ 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;
+ const dest = normalizeFolder(destParent);
+ if (dest === src || isFolderUnder(dest, src)) return; // into itself / its own subtree
+ const next = joinFolder(dest, folderName(src));
+ if (next === src) return;
+ SceneCommands.renameFolder(src, next);
+ useOutliner.getState().rebaseFolderKeys(src, next);
+ };
const reparent = (target: EntityId | null) => {
const ids = dragIds.current;
dragIds.current = null;
@@ -330,6 +351,11 @@ export function Outliner() {
e.stopPropagation();
const pos = drop?.pos ?? 'on';
setDrop(null);
+ // A folder being dragged → nest it under the target's folder.
+ if (dragFolder.current != null) {
+ moveFolderInto(item.kind === 'folder' ? item.path : SceneModel.folderOf(item.id));
+ return;
+ }
if (item.kind === 'folder') {
if (dropPrefabAsset(e, null)) return; // prefab onto a folder → instantiate at root
moveToFolder(item.path);
@@ -350,12 +376,17 @@ export function Outliner() {
}
};
- // Empty-space drop = move to the scene root (un-parent + clear folder).
+ // Empty-space drop = move to the scene root (un-parent + clear folder, or, for
+ // a dragged folder, re-root it).
const onBodyDragOver = (e: React.DragEvent) => {
- if (dragIds.current || isAssetDrag(e)) e.preventDefault();
+ if (dragIds.current || dragFolder.current || isAssetDrag(e)) e.preventDefault();
};
const onBodyDrop = (e: React.DragEvent) => {
e.preventDefault();
+ if (dragFolder.current != null) {
+ moveFolderInto('');
+ return;
+ }
if (dropPrefabAsset(e, null)) return;
moveToFolder(null);
};
@@ -429,7 +460,7 @@ export function Outliner() {
renaming={renaming === it.key}
dropPos={drop?.key === it.key ? drop.pos : undefined}
prefab={it.kind === 'entity' && SceneModel.prefabTag(it.id) != null}
- draggable={it.kind === 'entity'}
+ draggable
onToggle={toggleExpanded}
onClick={onRowClick}
onContextMenu={onContextMenu}
diff --git a/desktop/tests/outliner-folders.test.ts b/desktop/tests/outliner-folders.test.ts
index 4dc866032..e23a5ef8e 100644
--- a/desktop/tests/outliner-folders.test.ts
+++ b/desktop/tests/outliner-folders.test.ts
@@ -87,6 +87,18 @@ describe('SceneCommands folders (undoable)', () => {
expect(S.model.sceneFolders()).toContain('A/Empty');
});
+ it('moving a folder under another = rename to the new parent path (the drag op)', () => {
+ S.commands.createFolder('Tools/Gizmos'); // explicit folder (a draggable row)
+ S.commands.moveToFolder([1], 'Tools/Gizmos');
+ S.commands.createFolder('Lib');
+ // Dragging "Tools/Gizmos" into "Lib" is renameFolder → "Lib/Gizmos"; contents follow.
+ S.commands.renameFolder('Tools/Gizmos', 'Lib/Gizmos');
+ expect(S.model.folderOf(1)).toBe('Lib/Gizmos');
+ expect(S.model.sceneFolders()).toContain('Lib/Gizmos');
+ S.history.undo();
+ expect(S.model.folderOf(1)).toBe('Tools/Gizmos');
+ });
+
it('deleteFolder moves contents up to the parent (entities survive); undo reverts', () => {
S.commands.moveToFolder([1], 'A/B');
S.commands.createFolder('A/B/C');