From 17ddbbb9c1551b79658179770d3030f7063c326c Mon Sep 17 00:00:00 2001
From: Martin Guillon <martin.guillon@akylas.fr>
Date: Wed, 30 Sep 2020 09:19:31 +0200
Subject: [PATCH] fix(android): make findPageForFragment with fragmen
 add/remove

---
 packages/core/ui/frame/index.android.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/core/ui/frame/index.android.ts b/packages/core/ui/frame/index.android.ts
index be1d68013..f9298d9a5 100644
--- a/packages/core/ui/frame/index.android.ts
+++ b/packages/core/ui/frame/index.android.ts
@@ -774,6 +774,12 @@ function findPageForFragment(fragment: androidx.fragment.app.Fragment, frame: Fr
 		entry = current;
 	} else if (executingContext && executingContext.entry && executingContext.entry.fragmentTag === fragmentTag) {
 		entry = executingContext.entry;
+	} else {
+		frame.backStack.forEach(e=>{
+			if (e && e.fragmentTag === fragmentTag) {
+				entry = e;
+			}
+		})
 	}
 
 	let page: Page;