Merge pull request #151 from kishikawakatsumi/fix

Fix expanding directory
kishikawakatsumi · Sep 23, 2024 · aa9491e · aa9491e
2 parents 549a2a3 + d431fdd
commit aa9491e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Examples/FileBrowser/FileBrowser (macOS)/DirectoryStructure.swift b/Examples/FileBrowser/FileBrowser (macOS)/DirectoryStructure.swift
@@ -78,13 +78,13 @@ class DirectoryStructure {
     let children = children(of: fileNode)
 
     let (deleted, inserted) = nodeDelta(oldNodes: children, newNodes: nodes)
+
     tree.nodes = Array(
       Set(nodes)
         .union(
-          Set(tree.nodes).subtracting(tree.rootNodes())
+          Set(tree.nodes).subtracting(children)
         )
     )
-
     viewTree = viewTree(tree)
 
     outlineView.beginUpdates()

diff --git a/Examples/FileBrowser/FileBrowser (macOS)/FilesViewController.swift b/Examples/FileBrowser/FileBrowser (macOS)/FilesViewController.swift
@@ -128,6 +128,9 @@ class FilesViewController: NSViewController {
       tabGroupObserving = tabGroup.observe(\.selectedWindow) { [weak self] (tabGroup, change) in
         guard let self = self else { return }
         if window == tabGroup.selectedWindow {
+          guard self == navigationController()?.topViewController else {
+            return
+          }
           dirTree.update(outlineView)
           self.updateItemCount()
         }