Merge pull request #46 from BottleRocketStudios/containerFixes

Another fix for pre-load transitions
BottleRocketStudios · Dec 20, 2018 · 8df63ec · 8df63ec
2 parents 05e5e8f + f6b3804
commit 8df63ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,9 @@
 
 ##### Bug Fixes
 
-* None.
+* Handle another case of transitioning pre-load.
+[Will McGinty](https://github.com/willmcginty)
+[#46](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/46)
 
 
 ## 1.3.4 (2018-12-19)

diff --git a/Sources/UtiliKit/Container/ContainerViewController.swift b/Sources/UtiliKit/Container/ContainerViewController.swift
@@ -58,6 +58,11 @@ extension ContainerViewController {
             managedChildren.insert(child, at: managedChildren.startIndex)
         }
 
+        if !isViewLoaded, managedChildren.first?.identifier != child.identifier {
+            managedChildren.removeAll { $0.identifier == child.identifier }
+            managedChildren.insert(child, at: managedChildren.startIndex)
+        }
+
         transition(to: child.viewController, completion: completion)
     }