better activation behavior when move notes

src/public/javascripts/widgets/note_tree.js

@@ -460,6 +460,10 @@ export default class NoteTreeWidget extends TabAwareWidget {
     }
 
     async entitiesReloadedEvent({loadResults}) {
+        const activeNode = this.getActiveNode();
+        const activeNotePath = activeNode ? treeService.getNotePath(activeNode) : null;
+        const activeNoteId = activeNode ? activeNode.data.noteId : null;
+
         const noteIdsToUpdate = new Set();
         const noteIdsToReload = new Set();
 
@@ -515,9 +519,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
             }
         }
 
-        const activeNode = this.getActiveNode();
-        const activeNotePath = activeNode ? treeService.getNotePath(activeNode) : null;
-
         for (const noteId of loadResults.getNoteIds()) {
             noteIdsToUpdate.add(noteId);
         }
@@ -554,11 +555,22 @@ export default class NoteTreeWidget extends TabAwareWidget {
         }
 
         if (activeNotePath) {
-            const node = await this.expandToNote(activeNotePath);
+            let node = await this.expandToNote(activeNotePath);
 
+            if (node.data.noteId !== activeNoteId) {
+                // if the active note has been moved elsewhere then it won't be found by the path
+                // so we switch to the alternative of trying to find it by noteId
+                const notesById = this.getNodesByNoteId(activeNoteId);
+
+                // if there are multiple clones then we'd rather not activate any one
+                node = notesById.length === 1 ? notesById[0] : null;
+            }
+
+            if (node) {
                 node.setActive(true, {noEvents: true});
             }
         }
+    }
 
     async setExpandedToServer(branchId, isExpanded) {
         utils.assertArguments(branchId);

src/routes/api/branches.js

@@ -32,6 +32,7 @@ async function moveBranchToParent(req) {
     const newNotePos = maxNotePos === null ? 0 : maxNotePos + 10;
 
     const newBranch = branchToMove.createClone(parentNoteId, newNotePos);
+    newBranch.isExpanded = true;
     await newBranch.save();
 
     branchToMove.isDeleted = true;