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
feat(outliner): folders are first-class selectable (blue) + Details + no entity-absorb
esengine914cc52ff38d
diff --git a/desktop/src/outliner/OutlinerController.ts b/desktop/src/outliner/OutlinerController.tsindex 9f7f9b266..045583833 100644--- a/desktop/src/outliner/OutlinerController.ts+++ b/desktop/src/outliner/OutlinerController.ts@@ -27,6 +27,9 @@ interface OutlinerState {query: string;/** Keyboard-focus row (item key) — drives ↑↓←→ navigation; null = none. */cursor: string | null;+ /** The selected folder path (folders aren't entities; mutually exclusive with the+ * entity selection — the panel clears one when setting the other). */+ selectedFolder: string | null;/** Sibling sort: `manual` (scene order) / `name` / `type`. View-only. */sortMode: SortMode;@@ -43,6 +46,8 @@ interface OutlinerState {setQuery: (query: string) => void;/** Move the keyboard-focus row. */setCursor: (key: string | null) => void;+ /** Select a folder (or clear with null). */+ selectFolder: (path: string | null) => void;setSortMode: (mode: SortMode) => void;/** Prune a removed entity's key (self-heal on the model's `entityRemoved`). */@@ -57,6 +62,7 @@ export function createOutlinerStore(model: SceneModelImpl) {expanded: new Set<string>(),query: '',cursor: null,+ selectedFolder: null,sortMode: 'manual',toggleExpanded: (key) =>@@ -105,6 +111,7 @@ export function createOutlinerStore(model: SceneModelImpl) {}),setQuery: (query) => set({ query }),setCursor: (cursor) => set({ cursor }),+ selectFolder: (selectedFolder) => set({ selectedFolder }),setSortMode: (sortMode) => set({ sortMode }),dropId: (id) =>@@ -116,7 +123,7 @@ export function createOutlinerStore(model: SceneModelImpl) {next.delete(k);return { expanded: next, cursor };}),- reset: () => set({ expanded: new Set(), query: '', cursor: null }),+ reset: () => set({ expanded: new Set(), query: '', cursor: null, selectedFolder: null }),}));model.subscribe((ev) => {diff --git a/desktop/src/panels/Details.tsx b/desktop/src/panels/Details.tsxindex 602a253af..c55a133ed 100644--- a/desktop/src/panels/Details.tsx+++ b/desktop/src/panels/Details.tsx@@ -30,6 +30,8 @@ import { Toasts } from '@/store/Toasts';import { baseName, assetTypeOf, TYPE_CODE, IMAGE_RE } from '@/project/assetMeta';import { useSelection } from '@/store/selectionStore';import { useEditorStore } from '@/store/editorStore';+import { useOutliner } from '@/outliner/OutlinerController';+import { isFolderUnder, folderName } from '@/outliner/folders';import { EngineHost } from '@/engine/EngineHost';import { SceneStore } from '@/engine/SceneStore';import { SceneQuery, buildEntityInfo, buildInspector } from '@/engine/SceneQuery';@@ -1376,6 +1378,40 @@ function AssetInspector({ path }: { path: string }) {);}+// A selected outliner folder (folders aren't entities — no components): just its+// name, path, and how many entities it organizes (recursive).+function FolderInspector({ path }: { path: string }) {+ useSyncExternalStore(SceneStore.subscribe, SceneStore.getStructureRevision);+ const entities = SceneModel.current?.entities ?? [];+ const count = entities.reduce((n, e) => (isFolderUnder(SceneModel.folderOf(e.id), path) ? n + 1 : n), 0);+ return (+ <div className="insp">+ <div className="ent-head">+ <div className="ent-row1">+ <div className="ent-name">{folderName(path)}</div>+ </div>+ <div className="ent-meta">+ <span className="pill">+ <span className="pk">Folder</span>+ {path}+ </span>+ <span className="pill">+ <span className="pk">Items</span>+ {count}+ </span>+ </div>+ </div>+ <div className="insp-empty" style={{ flex: 1 }}>+ <div className="ei">+ <FolderOpen size={22} strokeWidth={1.4} />+ </div>+ <div className="et">{count === 1 ? '1 entity' : `${count} entities`} in this folder</div>+ <div className="es">Folders organize the outliner; they aren't part of the scene.</div>+ </div>+ </div>+ );+}+// Dispatcher: the live game inspector during PIE, the edit inspector otherwise.export function Details() {const inspectWorld = useEditorStore((s) => s.inspectWorld);@@ -1390,6 +1426,7 @@ function EditorDetails() {const selectedId = useSelection((s) => s.selectedId);const selectedIds = useSelection((s) => s.selectedIds);const selectedAsset = useSelection((s) => s.selectedAsset);+ const selectedFolder = useOutliner((s) => s.selectedFolder);const ready = engine.status === 'ready' && selectedId != null;// Selection targets, primary (the active id) first. Edits fan out across all.@@ -1442,6 +1479,10 @@ function EditorDetails() {if (selectedAsset) {return <AssetInspector path={selectedAsset} />;}+ // A selected outliner folder (no entity/asset selected) shows the folder view.+ if (selectedFolder != null && selectedId == null) {+ return <FolderInspector path={selectedFolder} />;+ }if (!entity || selectedId == null) {return (diff --git a/desktop/src/panels/Outliner.tsx b/desktop/src/panels/Outliner.tsxindex 34c350d63..9b31f7860 100644--- a/desktop/src/panels/Outliner.tsx+++ b/desktop/src/panels/Outliner.tsx@@ -70,9 +70,11 @@ export function Outliner() {const setQuery = useOutliner((s) => s.setQuery);const toggleExpanded = useOutliner((s) => s.toggleExpanded);const cursor = useOutliner((s) => s.cursor);+ const selectedFolder = useOutliner((s) => s.selectedFolder);const sortMode = useOutliner((s) => s.sortMode);const selectedIds = useSelection((s) => s.selectedIds);const selectedId = useSelection((s) => s.selectedId);+ const selectedAsset = useSelection((s) => s.selectedAsset);const isPlaying = useEditorStore((s) => s.isPlaying);const inspectWorld = useEditorStore((s) => s.inspectWorld);const setInspectWorld = useEditorStore((s) => s.setInspectWorld);@@ -125,6 +127,12 @@ export function Outliner() {const select = (id: EntityId | null) => useSelection.getState().select(id);+ // An entity / asset selection from anywhere (viewport pick, content browser)+ // clears the folder selection — they're mutually exclusive.+ useEffect(() => {+ if (selectedId != null || selectedAsset != null) useOutliner.getState().selectFolder(null);+ }, [selectedId, selectedAsset]);+// Reveal-on-select: when the primary selection changes (e.g. a viewport pick),// expand its ancestors + folder and scroll it into view. If it isn't in the flat// list yet (ancestors collapsed), expand once — items rebuild and this re-runs.@@ -154,7 +162,13 @@ export function Outliner() {const it = items[idx];if (!it) return;useOutliner.getState().setCursor(it.key);- if (it.kind === 'entity') select(it.id);+ if (it.kind === 'entity') {+ useOutliner.getState().selectFolder(null);+ select(it.id);+ } else {+ useOutliner.getState().selectFolder(it.path);+ useSelection.getState().select(null);+ }scrollToIndex(idx);};const moveCursor = (delta: number) => {@@ -211,13 +225,14 @@ export function Outliner() {const onRowClick = (item: OutlinerItem, e: React.MouseEvent) => {useOutliner.getState().setCursor(item.key);if (item.kind === 'folder') {- // Selecting a folder clears the entity selection (single-selection model), so- // the previously-selected entity stops looking selected; the folder's cursor- // highlight is now the only one. The twist still toggles expansion.+ // Selecting a folder is mutually exclusive with the entity selection: the+ // folder gets the blue selection, entities clear, Details shows the folder.+ useOutliner.getState().selectFolder(item.path);useSelection.getState().select(null);toggleExpanded(item.key);return;}+ useOutliner.getState().selectFolder(null); // an entity selection clears the folder oneconst id = item.id;const store = useSelection.getState();if (e.metaKey || e.ctrlKey) {@@ -260,6 +275,7 @@ export function Outliner() {if (next !== item.path) {SceneCommands.renameFolder(item.path, next);useOutliner.getState().rebaseFolderKeys(item.path, next);+ if (useOutliner.getState().selectedFolder === item.path) useOutliner.getState().selectFolder(next);}} else {SceneCommands.renameEntity(item.id, trimmed);@@ -330,11 +346,12 @@ export function Outliner() {const rel = (e.clientY - rect.top) / rect.height;pos = rel < 0.25 ? 'before' : rel > 0.75 ? 'after' : 'on';} else if (dragFolder.current && sortMode === 'manual' && folderDropLevel(item) === folderParent(dragFolder.current)) {- // Folder over a same-level sibling (folder OR root entity) → top/bottom third- // places the folder before/after it (interleaved); the middle nests/absorbs.+ // Folder over a same-level sibling → place it before/after (interleave). Over a+ // FOLDER the middle nests; over an ENTITY there's no middle (a folder never+ // absorbs an entity — that's confusing; drag entities INTO a folder instead).const rect = e.currentTarget.getBoundingClientRect();const rel = (e.clientY - rect.top) / rect.height;- pos = rel < 0.33 ? 'before' : rel > 0.66 ? 'after' : 'on';+ pos = item.kind === 'folder' ? (rel < 0.33 ? 'before' : rel > 0.66 ? 'after' : 'on') : rel < 0.5 ? 'before' : 'after';}if (drop?.key !== item.key || drop?.pos !== pos) setDrop({ key: item.key, pos });};@@ -374,9 +391,8 @@ export function Outliner() {SceneCommands.placeFolder(src, item.sortKey + (pos === 'before' ? -0.5 : 0.5));} else if (item.kind === 'folder') {moveFolderInto(src, item.path); // middle of a folder → nest- } else {- SceneCommands.moveToFolder(selectionOrTarget(item.id), src); // middle of an entity → absorb it}+ // middle of an entity → nothing (folders don't absorb entities)return;}if (item.kind === 'folder') {@@ -437,7 +453,13 @@ export function Outliner() {{ label: 'New Subfolder', onClick: () => newFolder(path, null) },...(sel.length ? [{ label: 'Move Selection Here', onClick: () => SceneCommands.moveToFolder(sel, path) } as MenuItem] : []),{ sep: true },- { label: 'Delete Folder', onClick: () => SceneCommands.deleteFolder(path) },+ {+ label: 'Delete Folder',+ onClick: () => {+ SceneCommands.deleteFolder(path);+ if (useOutliner.getState().selectedFolder === path) useOutliner.getState().selectFolder(null);+ },+ },];}const id = ctx.item.id;@@ -480,7 +502,7 @@ export function Outliner() {const renderRow = (it: OutlinerItem) => (<OutlinerRowitem={it}- selected={it.kind === 'entity' && selectedIds.has(it.id)}+ selected={it.kind === 'folder' ? selectedFolder === it.path : selectedIds.has(it.id)}cursored={cursor === it.key}highlight={highlight}renaming={renaming === it.key}diff --git a/desktop/src/theme/outliner.css b/desktop/src/theme/outliner.cssindex c1f2bba16..e5f45781b 100644--- a/desktop/src/theme/outliner.css+++ b/desktop/src/theme/outliner.css@@ -114,6 +114,7 @@.row.folder .ricon { color: var(--info-warm); }.row.sel.folder .ricon { color: #fff; }.row.folder .rname { color: var(--text); }+.row.sel.folder .rname { color: #fff; } /* selected folder reads white on the blue fill *//* World picker (UE5): switch the Outliner/Details between edit + live game. */.world-pick { display: flex; gap: 2px; padding: 6px 8px; border-bottom: 1px solid var(--border); flex-shrink: 0; }diff --git a/desktop/tests/outliner-controller.test.ts b/desktop/tests/outliner-controller.test.tsindex 220b099f4..812b777a1 100644--- a/desktop/tests/outliner-controller.test.ts+++ b/desktop/tests/outliner-controller.test.ts@@ -68,13 +68,22 @@ describe('OutlinerController', () => {expect(store.getState().expanded.has(entityKey(2))).toBe(false);});- it('reset clears expansion + query + cursor', () => {+ it('selectFolder sets/clears the selected folder', () => {+ store.getState().selectFolder('A/B');+ expect(store.getState().selectedFolder).toBe('A/B');+ store.getState().selectFolder(null);+ expect(store.getState().selectedFolder).toBeNull();+ });++ it('reset clears expansion + query + cursor + selected folder', () => {store.getState().setExpanded([entityKey(1)]);store.getState().setQuery('x');store.getState().setCursor(entityKey(1));+ store.getState().selectFolder('A/B');store.getState().reset();expect(store.getState().expanded.size).toBe(0);expect(store.getState().query).toBe('');expect(store.getState().cursor).toBeNull();+ expect(store.getState().selectedFolder).toBeNull();});});