Fix issue with animations caused by primary navigation setting cancel…

…ling animations in Fragment 1.7.0
isaac-udy · Apr 30, 2024 · 409e08b · 409e08b
1 parent 258f762
commit 409e08b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...core/src/main/java/dev/enro/destination/fragment/container/FragmentNavigationContainer.kt b/...core/src/main/java/dev/enro/destination/fragment/container/FragmentNavigationContainer.kt
@@ -212,8 +212,10 @@ public class FragmentNavigationContainer internal constructor(
                     }
                 }
             }
-            val activeFragmentAndInstruction =
-                toPresent.lastOrNull() ?: activePushed ?: return@commitNow
+            val activeFragmentAndInstruction = toPresent.lastOrNull()
+                ?: activePushed
+                ?: return@commitNow
+
             val activeFragment = activeFragmentAndInstruction.fragment
             setPrimaryNavigationFragment(activeFragment)
         }
@@ -223,6 +225,7 @@ public class FragmentNavigationContainer internal constructor(
                 fragmentManager.findFragmentByTag(it.instructionId)
             }
             ?.let { primaryFragment ->
+                if (fragmentManager.primaryNavigationFragment != primaryFragment)
                 fragmentManager.commitNow {
                     setPrimaryNavigationFragment(primaryFragment)
                 }