Skip to content
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

Jump to bottom

fix a crash in <Modal /> component #44277

Closed
wants to merge 1 commit into from
Closed

fix a crash in <Modal /> component #44277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 9 additions & 7 deletions ...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,19 @@ public class ReactModalHostView(context: ThemedReactContext) :
public var statusBarTranslucent: Boolean = false
set(value) {
field = value
propertyRequiresNewDialog = true
createNewDialog = true
}

public var animationType: String? = null
set(value) {
field = value
propertyRequiresNewDialog = true
createNewDialog = true
}

public var hardwareAccelerated: Boolean = false
set(value) {
field = value
propertyRequiresNewDialog = true
createNewDialog = true
}

public var stateWrapper: StateWrapper?
Expand All @@ -105,9 +105,10 @@ public class ReactModalHostView(context: ThemedReactContext) :
private var hostView: DialogRootViewGroup

// Set this flag to true if changing a particular property on the view requires a new Dialog to
// be created. For instance, animation does since it affects Dialog creation through the theme
// be created or Dialog was destroyed. For instance, animation does since it affects Dialog
// creation through the theme
// but transparency does not since we can access the window to update the property.
private var propertyRequiresNewDialog = false
private var createNewDialog = false

init {
context.addLifecycleEventListener(this)
Expand Down Expand Up @@ -176,6 +177,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
}
}
dialog = null
createNewDialog = true

// We need to remove the mHostView from the parent
// It is possible we are dismissing this dialog and reattaching the hostView to another
Expand Down Expand Up @@ -210,15 +212,15 @@ public class ReactModalHostView(context: ThemedReactContext) :

// If the existing Dialog is currently up, we may need to redraw it or we may be able to update
// the property without having to recreate the dialog
if (propertyRequiresNewDialog) {
if (createNewDialog) {
dismiss()
} else {
updateProperties()
return
}

// Reset the flag since we are going to create a new dialog
propertyRequiresNewDialog = false
createNewDialog = false
val theme: Int =
when (animationType) {
"fade" -> R.style.Theme_FullScreenDialogAnimatedFade
Expand Down