Fix the QE recomposition when selecting an avatar (#534)

Automattic · Jan 15, 2025 · 886b673 · 886b673
1 parent fb62c50
commit 886b673
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/...r-quickeditor/src/main/java/com/gravatar/quickeditor/ui/editor/GravatarQuickEditorPage.kt b/...r-quickeditor/src/main/java/com/gravatar/quickeditor/ui/editor/GravatarQuickEditorPage.kt
@@ -54,9 +54,9 @@ internal fun GravatarQuickEditorPage(
         composable(route = QuickEditorPage.SPLASH.name) {
             SplashPage(email = gravatarQuickEditorParams.email) { isAuthorized ->
                 if (isAuthorized) {
-                    navController.navigateAndClean(QuickEditorPage.EDITOR.name)
+                    navController.navigateAndPopupTo(QuickEditorPage.EDITOR.name, QuickEditorPage.SPLASH.name)
                 } else {
-                    navController.navigateAndClean(QuickEditorPage.OAUTH.name)
+                    navController.navigateAndPopupTo(QuickEditorPage.OAUTH.name, QuickEditorPage.SPLASH.name)
                 }
             }
         }
@@ -66,7 +66,7 @@ internal fun GravatarQuickEditorPage(
                 email = gravatarQuickEditorParams.email,
                 onAuthError = { onDismiss(GravatarQuickEditorDismissReason.OauthFailed) },
                 onAuthSuccess = {
-                    navController.navigateAndClean(QuickEditorPage.EDITOR.name)
+                    navController.navigateAndPopupTo(QuickEditorPage.EDITOR.name, QuickEditorPage.OAUTH.name)
                 },
             )
         }
@@ -76,7 +76,7 @@ internal fun GravatarQuickEditorPage(
             navController = navController,
             onAvatarSelected = onAvatarSelected,
             onSessionExpired = {
-                navController.navigateAndClean(QuickEditorPage.OAUTH.name)
+                navController.navigateAndPopupTo(QuickEditorPage.OAUTH.name, QuickEditorPage.EDITOR.name)
             },
         )
     }
@@ -121,7 +121,7 @@ internal fun GravatarQuickEditorPage(
                 email = gravatarQuickEditorParams.email,
                 token = authToken,
             ) {
-                navController.navigateAndClean(QuickEditorPage.EDITOR.name)
+                navController.navigateAndPopupTo(QuickEditorPage.EDITOR.name, QuickEditorPage.SPLASH.name)
             }
         }
         addAvatarPickerGraph(
@@ -185,9 +185,8 @@ private fun NavGraphBuilder.addAvatarPickerGraph(
     }
 }
 
-private fun NavHostController.navigateAndClean(route: String) {
+private fun NavHostController.navigateAndPopupTo(route: String, popUpTo: String) {
     navigate(route = route) {
-        popUpTo(graph.startDestinationId) { inclusive = true }
+        popUpTo(popUpTo) { inclusive = true }
     }
-    graph.setStartDestination(route)
 }