Skip to content

fix(Android): use reactApplicationContext in onScreenChanged #2046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 23, 2024
Merged

fix(Android): use reactApplicationContext in onScreenChanged #2046

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef2c646
fix: use reactApplicationContext
WoLewicki Feb 21, 2024
1cdd5ac
fix: restore comment
WoLewicki Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion android/src/main/java/com/swmansion/rnscreens/ScreenContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import com.facebook.react.ReactRootView
import com.facebook.react.bridge.ReactContext
import com.facebook.react.modules.core.ChoreographerCompat
import com.facebook.react.modules.core.ReactChoreographer
import com.facebook.react.uimanager.ThemedReactContext
import com.facebook.react.uimanager.UIManagerHelper
import com.swmansion.rnscreens.Screen.ActivityState
import com.swmansion.rnscreens.events.ScreenDismissedEvent
Expand Down Expand Up @@ -318,14 +319,15 @@ open class ScreenContainer(context: Context?) : ViewGroup(context) {
// The exception to this rule is `updateImmediately` which is triggered by actions
// not connected to React view hierarchy changes, but rather internal events
needsUpdate = true
(context.applicationContext as? ReactContext)?.runOnUiQueueThread {
(context as ThemedReactContext).reactApplicationContext.runOnUiQueueThread {
// We schedule the update here because LayoutAnimations of `react-native-reanimated`
// sometimes attach/detach screens after the layout block of `ScreensShadowNode` has
// already run, and we want to update the container then too. In the other cases,
// this code will do nothing since it will run after the UIBlock when `mNeedUpdate`
// will already be false.
performUpdates()
}

}

protected fun performUpdatesNow() {
Expand Down