Skip to content

Android: Remove subviews before modal dismissal #7

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 1 commit into from
Nov 3, 2024
Merged

Android: Remove subviews before modal dismissal #7

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions android/src/main/java/com/multiplemodals/RNTModalView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,15 @@ class RNTModalView(context: Context): ViewGroup(context), LifecycleEventListener
}
}

fun dismiss() {
reactContext.removeLifecycleEventListener(this)

// Should be call before 'modalDialog.dismiss' to ensure reanimated children are removed correctly
modalView.removeAllViews()

modalDialog.dismiss()
}

private fun attackBackHandler() {
// Prevent closing from native part as this is handled by JS
modalDialog.setOnKeyListener(object : DialogInterface.OnKeyListener {
Expand Down Expand Up @@ -97,23 +106,22 @@ class RNTModalView(context: Context): ViewGroup(context), LifecycleEventListener

override fun removeAllViews() {
super.removeAllViews()
modalView.removeAllViews()
dismiss()
}

// Layout

override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
modalDialog.dismiss()
dismiss()
}

override fun onLayout(p0: Boolean, p1: Int, p2: Int, p3: Int, p4: Int) {
// Handled by Yoga
}

override fun onHostDestroy() {
reactContext.removeLifecycleEventListener(this)
modalDialog.dismiss()
dismiss()
}

override fun onHostPause() {
Expand Down