iOS. ComposeUIViewController. Dispose composition on viewDidDisappear

compose/mpp/demo/src/uikitMain/kotlin/NativePopupExample.kt

@@ -37,15 +37,11 @@ private fun NativeModalWithNavigation() {
     Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
         val viewController = LocalUIViewController.current
         Button(onClick = {
-            viewController.get()?.presentViewController(
-                UINavigationController(
-                    rootViewController = ComposeUIViewController {
-                        NativeNavigationPage()
-                    }
-                ),
-                animated = true,
-                completion = null
-            )
+            val navigationController = UINavigationController(rootViewController = ComposeUIViewController {
+                NativeNavigationPage()
+            })
+
+            viewController.presentViewController(navigationController, true, null)
         }) {
             Text("Present popup")
         }
@@ -54,11 +50,11 @@ private fun NativeModalWithNavigation() {
 
 @Composable
 private fun NativeNavigationPage() {
-    val viewController = LocalUIViewController.current
-
     Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally) {
+        val navigationController = LocalUIViewController.current.navigationController
+
         Button(onClick = {
-            viewController.get()?.navigationController?.pushViewController(
+            navigationController?.pushViewController(
                 ComposeUIViewController {
                     NativeNavigationPage()
                 }, true

compose/ui/ui/src/jsNativeMain/kotlin/androidx/compose/ui/native/ComposeLayer.jsNative.kt

@@ -126,12 +126,10 @@ internal class ComposeLayer(
 
     fun dispose() {
         check(!isDisposed)
-
-        isDisposed = true
-
-        scene.close()
         layer.detach()
+        scene.close()
         _initContent = null
+        isDisposed = true
     }
 
     fun setSize(width: Int, height: Int) {
@@ -166,6 +164,7 @@ internal class ComposeLayer(
                 content = content
             )
         }
+
         initContent()
     }
 

compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/interop/LocalUIViewController.uikit.kt

@@ -17,36 +17,13 @@
 package androidx.compose.ui.interop
 
 import androidx.compose.runtime.staticCompositionLocalOf
-import kotlin.native.ref.WeakReference
 import platform.UIKit.UIViewController
 
 /**
  * public value to get UIViewController of Compose window for library authors.
  * Maybe useful for features, like VideoPlayer and Bottom menus.
  * Please use it careful and don't remove another views.
- *
- * _IMPORTANT NOTE_:
- *
- * Never capture the unwrapped strong reference in any closure inside Composition. Doing so will cause
- * a memory leak.
- *
- * Unwrap it only in the place of usage, for example:
- * ```
- * @Composable
- * private fun Foo() {
- *     // can't use LocalUIViewController.current inside onClick because onClick is not @Composable
- *     val viewController = LocalUIViewController.current
- *
- *     Column {
- *         Button(onClick = {
- *             viewController.get()?.presentViewController(...)
- *         }) {
- *             Text("Push")
- *         }
- *     }
- * }
- * ```
  */
-val LocalUIViewController = staticCompositionLocalOf<WeakReference<UIViewController>> {
+val LocalUIViewController = staticCompositionLocalOf<UIViewController> {
     error("CompositionLocal UIViewController not provided")
 }