kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-10 17:23:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix mounting nested fragments in the same transaction

Browse Source
This commit is contained in:
Krzysztof Magiera
2018-08-21 11:02:39 +02:00
parent 3743eb2a22
commit 70c022c628
5 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/src/main/java/com/swmansion/rnscreens/Screen.java
View File

@@ -60,6 +60,9 @@ public class Screen extends ViewGroup {
}
public void setActive(boolean active) {
if (active == mActive) {
return;
}
mActive = active;
if (mContainer != null) {
mContainer.notifyChildUpdate();

18
android/src/main/java/com/swmansion/rnscreens/ScreenContainer.java
View File

@@ -26,6 +26,7 @@ public class ScreenContainer extends ViewGroup {
private @Nullable FragmentTransaction mCurrentTransaction;
private boolean mNeedUpdate;
private boolean mIsAttached;
private ChoreographerCompat.FrameCallback mFrameCallback = new ChoreographerCompat.FrameCallback() {
@Override
@@ -95,7 +96,7 @@ public class ScreenContainer extends ViewGroup {
private void tryCommitTransaction() {
if (mCurrentTransaction != null) {
mCurrentTransaction.commitNow();
mCurrentTransaction.commit();
mCurrentTransaction = null;
}
}
@@ -121,8 +122,21 @@ public class ScreenContainer extends ViewGroup {
return screen.isActive();
}
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
mIsAttached = true;
updateIfNeeded();
}
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
mIsAttached = false;
}
private void updateIfNeeded() {
if (!mNeedUpdate || mFragmentManager.isDestroyed()) {
if (!mNeedUpdate || mFragmentManager.isDestroyed() || !mIsAttached) {
return;
}
mNeedUpdate = false;