golia-expo-utils 1.0.2 → 1.0.3

package/android/src/main/java/expo/modules/goliaexpoutils/segmentedControl/ReactSegmentedControl.kt

@@ -2,8 +2,8 @@ package expo.modules.goliaexpoutils.segmentedControl
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.ContextWrapper
-import androidx.appcompat.app.AppCompatActivity
+import android.util.Log
+import android.view.ViewGroup
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -34,68 +34,73 @@ class ReactSegmentedControl(context: Context, appContext: AppContext) :
     val hapticEnabledState = mutableStateOf(true)
     val enabledState = mutableStateOf(true)
 
-    private var isContentSet = false
-
     private val composeView = ComposeView(context).apply {
-        layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
-        // 确保 View 卸载时清理 Compose 资源
+        layoutParams = ViewGroup.LayoutParams(
+            LayoutParams.MATCH_PARENT,
+            LayoutParams.MATCH_PARENT
+        )
         setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
     }
 
     init {
-        clipChildren = false
-        clipToPadding = false
-        addView(composeView)
+        // ❌ 不要在这里 addView(composeView)
     }
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
 
-        // ✅ 核心修复：查找 Activity 并强行注入 Lifecycle
-        val activity = context.lookupActivity()
+        // 1. 保底注入 Lifecycle
+        val activity = appContext.currentActivity
         if (activity != null) {
-            if (composeView.findViewTreeLifecycleOwner() == null) {
-                composeView.setViewTreeLifecycleOwner(activity)
-            }
-            if (composeView.findViewTreeSavedStateRegistryOwner() == null) {
-                composeView.setViewTreeSavedStateRegistryOwner(activity)
+            try {
+                if (composeView.findViewTreeLifecycleOwner() == null && activity is androidx.lifecycle.LifecycleOwner) {
+                    composeView.setViewTreeLifecycleOwner(activity)
+                }
+                if (composeView.findViewTreeSavedStateRegistryOwner() == null && activity is androidx.savedstate.SavedStateRegistryOwner) {
+                    composeView.setViewTreeSavedStateRegistryOwner(activity)
+                }
+            } catch (e: Exception) {
+                Log.e("ReactSegmentedControl", "Lifecycle injection failed", e)
             }
         }
 
-        if (!isContentSet) {
-            composeView.setContent {
-                SegmentedControl(
-                    items = itemsState.value,
-                    selectedIndex = selectedIndexState.intValue,
-                    onValueChange = { index ->
-                        selectedIndexState.intValue = index
-                        val title = itemsState.value.getOrNull(index)?.title ?: ""
-                        onValueChange(mapOf("value" to title, "index" to index))
-                    },
-                    modifier = Modifier.fillMaxSize(),
-                    activeColor = activeColorState.value,
-                    ctrlBackgroundColor = ctrlBgColorState.value,
-                    textColor = textColorState.value,
-                    autoWidth = autoWidthState.value,
-                    hapticEnabled = hapticEnabledState.value,
-                    enabled = enabledState.value,
-                    glassExpansion = Config.Common.Glass.DEFAULT_EXPANSION,
-                )
-            }
-            isContentSet = true
+        // 2. 动态挂载
+        if (composeView.parent == null) {
+            addView(composeView)
+        }
+
+        // 3. 设置内容
+        composeView.setContent {
+            SegmentedControl(
+                items = itemsState.value,
+                selectedIndex = selectedIndexState.intValue,
+                onValueChange = { index ->
+                    selectedIndexState.intValue = index
+                    val title = itemsState.value.getOrNull(index)?.title ?: ""
+                    if (appContext.reactContext !== null) {
+                        try {
+                            onValueChange(mapOf("value" to title, "index" to index))
+                        } catch (_: Throwable) {
+                        }
+                    }
+                },
+                modifier = Modifier.fillMaxSize(),
+                activeColor = activeColorState.value,
+                ctrlBackgroundColor = ctrlBgColorState.value,
+                textColor = textColorState.value,
+                autoWidth = autoWidthState.value,
+                hapticEnabled = hapticEnabledState.value,
+                enabled = enabledState.value,
+                glassExpansion = Config.Common.Glass.DEFAULT_EXPANSION,
+            )
         }
     }
-}
 
-// ✅ 辅助扩展函数：从 ContextWrapper 中剥离出 Activity
-// (虽然代码重复了，但这样解耦，避免跨包依赖问题)
-private fun Context.lookupActivity(): AppCompatActivity? {
-    var ctx = this
-    while (ctx is ContextWrapper) {
-        if (ctx is AppCompatActivity) {
-            return ctx
+    override fun onDetachedFromWindow() {
+        // 4. 动态卸载
+        if (composeView.parent == this) {
+            removeView(composeView)
         }
-        ctx = ctx.baseContext
+        super.onDetachedFromWindow()
     }
-    return null
 }

package/android/src/main/java/expo/modules/goliaexpoutils/waterView/ReactWaterView.kt

@@ -2,11 +2,10 @@ package expo.modules.goliaexpoutils.waterView
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.ContextWrapper
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
@@ -58,70 +57,117 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
     private val onPressIn by EventDispatcher()
     private val onPressOut by EventDispatcher()
     private val commandChannel = Channel<WaterCommand>(Channel.BUFFERED)
+    private val TAG = "ReactWaterView"
+
+    // 仅仅作为容器，初始化时不添加 ComposeView
     private val childContainer = FrameLayout(context).apply {
         layoutParams = ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
     }
 
-    private var isContentSet = false
-
+    // ComposeView 懒加载，并且只在 Attached 状态下存在于 ViewTree 中
     private val composeView = ComposeView(context).apply {
         layoutParams = ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        // 关键策略：Detach 时立即销毁 Composition，防止内存泄漏和重绘崩溃
         setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
     }
 
     init {
         clipChildren = false
         clipToPadding = false
-        addView(composeView)
+        // ❌ 以前这里有 addView(composeView)，现在删掉！
+        // 保持 View 树干净，Fabric 测量时不会触发 Compose 逻辑
     }
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
 
-        val activity = context.lookupActivity()
+        // 1. 再次尝试获取 Activity (为了保底)
+        val activity = appContext.currentActivity
         if (activity != null) {
-            if (composeView.findViewTreeLifecycleOwner() == null) {
-                composeView.setViewTreeLifecycleOwner(activity)
-            }
-            if (composeView.findViewTreeSavedStateRegistryOwner() == null) {
-                composeView.setViewTreeSavedStateRegistryOwner(activity)
+            // 2. 注入 Lifecycle (如果 ReactActivity 还没给它的话)
+            try {
+                if (composeView.findViewTreeLifecycleOwner() == null && activity is androidx.lifecycle.LifecycleOwner) {
+                    composeView.setViewTreeLifecycleOwner(activity)
+                }
+                if (composeView.findViewTreeSavedStateRegistryOwner() == null && activity is androidx.savedstate.SavedStateRegistryOwner) {
+                    composeView.setViewTreeSavedStateRegistryOwner(activity)
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Lifecycle injection failed", e)
             }
         }
 
-        if (!isContentSet) {
-            composeView.setContent {
-                WaterViewEntry(
-                    childContainer = childContainer,
-                    props = props,
-                    commandFlow = commandChannel.receiveAsFlow(),
-                    onMoveDispatch = { x, y -> onMove(mapOf("x" to x, "y" to y)) },
-                    onPressInDispatch = { onPressIn(mapOf()) },
-                    onPressOutDispatch = { onPressOut(mapOf()) }
-                )
-            }
-            isContentSet = true
+        // 3. ✅ 核心修复：只有在真正 Attach 到窗口时，才把 ComposeView 加进去
+        // 这样 Fabric 在后台测量这个 View 时，它只是一个空的 ViewGroup，不会触发 Compose
+        if (composeView.parent == null) {
+            addView(composeView)
+        }
+
+        // 4. 设置内容 (Compose 会自己判断是否需要重新 Composition)
+        composeView.setContent {
+            WaterViewEntry(
+                childContainer = childContainer,
+                props = props,
+                commandFlow = commandChannel.receiveAsFlow(),
+                onMoveDispatch = { x, y ->
+                    if (appContext.reactContext !== null) {
+                        try {
+                            onMove(mapOf("x" to x, "y" to y))
+                        } catch (_: Throwable) {
+                        }
+                    }
+                },
+                onPressInDispatch = { onPressIn(mapOf()) },
+                onPressOutDispatch = { onPressOut(mapOf()) }
+            )
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        // 5. ✅ 核心修复：Detach 时立即移除 ComposeView
+        // 确保 View 被回收或离屏测量时，ComposeView 不在 ViewTree 里
+        if (composeView.parent == this) {
+            removeView(composeView)
         }
+        super.onDetachedFromWindow()
     }
 
+    // 下面处理 RN 子 View 的挂载 (Keep standard logic)
     override fun addView(child: View?, index: Int) {
-        if (child == composeView) super.addView(child, index)
-        else childContainer.addView(child)
+        if (child == composeView) {
+            super.addView(child, index)
+        } else {
+            // RN 的子 View (比如 Text/Image) 放到 childContainer 里
+            // 注意：childContainer 需要被 NativeChildrenContainer (AndroidView) 渲染
+            // 这一步逻辑通过 WaterViewEntry -> NativeChildrenContainer 实现
+            if (child != null) {
+                // 如果 child 已经有父节点，先移除 (Fabric 有时会重用 View)
+                (child.parent as? ViewGroup)?.removeView(child)
+                childContainer.addView(child)
+            }
+        }
     }
 
     override fun removeView(view: View?) {
-        if (view == composeView) super.removeView(view)
-        else childContainer.removeView(view)
+        if (view == composeView) {
+            super.removeView(view)
+        } else {
+            childContainer.removeView(view)
+        }
     }
 
     override fun removeViewAt(index: Int) {
+        // 这是一个 tricky 的 override，因为 RN 有时候通过 index 删除
+        // 我们要确保删的是 childContainer 里的东西，而不是把 composeView 删了
         if (childContainer.isNotEmpty()) {
             try {
-                childContainer.removeViewAt(0)
+                childContainer.removeViewAt(0) // 通常 RN 只是顺序删除
             } catch (_: Exception) {
-                super.removeViewAt(index)
+                // 忽略
             }
         } else {
-            super.removeViewAt(index)
+            // 如果 childContainer 空了，那可能是在操作 ComposeView，虽然 RN 不应该直接操作它
+            // 保持 safe
         }
     }
 
@@ -130,18 +176,7 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
     }
 }
 
-// ✅ 辅助扩展函数：从 ContextWrapper 中剥离出 Activity
-private fun Context.lookupActivity(): AppCompatActivity? {
-    var ctx = this
-    while (ctx is ContextWrapper) {
-        if (ctx is AppCompatActivity) {
-            return ctx
-        }
-        ctx = ctx.baseContext
-    }
-    return null
-}
-
+// Composable 部分保持不变 (WaterViewEntry, NativeChildrenContainer)
 @Composable
 private fun WaterViewEntry(
     childContainer: FrameLayout,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "golia-expo-utils",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "expo utils provided by golia.jp",
   "main": "build/index.js",
   "homepage": "https://expo.golia.jp/golia-expo-utils",