From ae85e0b2efb7965ad35dd9a1701db9de2bd151d8 Mon Sep 17 00:00:00 2001 From: Evan Simkowitz Date: Fri, 3 Jan 2025 12:00:58 -0500 Subject: [PATCH 1/2] Fix keybindings not working for ephemeral nodes --- frontend/layout/lib/layoutModel.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/layout/lib/layoutModel.ts b/frontend/layout/lib/layoutModel.ts index 7f8479c0aa..9fbc7a8ef8 100644 --- a/frontend/layout/lib/layoutModel.ts +++ b/frontend/layout/lib/layoutModel.ts @@ -283,6 +283,10 @@ export class LayoutModel { this.magnifiedNodeSizeAtom = getSettingsKeyAtom("window:magnifiedblocksize"); this.focusedNode = atom((get) => { + const ephemeralNode = get(this.ephemeralNode); + if (ephemeralNode) { + return ephemeralNode; + } const treeState = get(this.treeStateAtom); if (treeState.focusedNodeId == null) { return null; From ffe3243e8055439745c371aacf55cb258c0266e0 Mon Sep 17 00:00:00 2001 From: Evan Simkowitz Date: Fri, 3 Jan 2025 12:01:46 -0500 Subject: [PATCH 2/2] move after get --- frontend/layout/lib/layoutModel.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/layout/lib/layoutModel.ts b/frontend/layout/lib/layoutModel.ts index 9fbc7a8ef8..e10cab4ae8 100644 --- a/frontend/layout/lib/layoutModel.ts +++ b/frontend/layout/lib/layoutModel.ts @@ -284,10 +284,10 @@ export class LayoutModel { this.focusedNode = atom((get) => { const ephemeralNode = get(this.ephemeralNode); + const treeState = get(this.treeStateAtom); if (ephemeralNode) { return ephemeralNode; } - const treeState = get(this.treeStateAtom); if (treeState.focusedNodeId == null) { return null; }