golia-expo-utils 1.0.2 → 1.0.4

package/android/src/main/java/expo/modules/goliaexpoutils/ViewExt.kt

@@ -0,0 +1,31 @@
+package expo.modules.goliaexpoutils
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.savedstate.findViewTreeSavedStateRegistryOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+
+fun View.enforceLifecycle(context: Context) {
+    val activity = context.findActivity() ?: return
+    if (this.findViewTreeLifecycleOwner() == null) {
+        this.setViewTreeLifecycleOwner(activity)
+    }
+    if (this.findViewTreeSavedStateRegistryOwner() == null) {
+        this.setViewTreeSavedStateRegistryOwner(activity)
+    }
+}
+
+private fun Context.findActivity(): AppCompatActivity? {
+    var ctx = this
+    while (ctx is ContextWrapper) {
+        if (ctx is AppCompatActivity) {
+            return ctx
+        }
+        ctx = ctx.baseContext
+    }
+    return null
+}

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

@@ -2,19 +2,15 @@ package expo.modules.goliaexpoutils.segmentedControl
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.ContextWrapper
-import androidx.appcompat.app.AppCompatActivity
+import android.view.ViewGroup
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.lifecycle.findViewTreeLifecycleOwner
-import androidx.lifecycle.setViewTreeLifecycleOwner
-import androidx.savedstate.findViewTreeSavedStateRegistryOwner
-import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import expo.modules.goliaexpoutils.Config
+import expo.modules.goliaexpoutils.enforceLifecycle
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -37,30 +33,18 @@ class ReactSegmentedControl(context: Context, appContext: AppContext) :
     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)
     }
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
 
-        // ✅ 核心修复：查找 Activity 并强行注入 Lifecycle
-        val activity = context.lookupActivity()
-        if (activity != null) {
-            if (composeView.findViewTreeLifecycleOwner() == null) {
-                composeView.setViewTreeLifecycleOwner(activity)
-            }
-            if (composeView.findViewTreeSavedStateRegistryOwner() == null) {
-                composeView.setViewTreeSavedStateRegistryOwner(activity)
-            }
-        }
+        composeView.enforceLifecycle(context)
 
         if (!isContentSet) {
             composeView.setContent {
@@ -70,7 +54,12 @@ class ReactSegmentedControl(context: Context, appContext: AppContext) :
                     onValueChange = { index ->
                         selectedIndexState.intValue = index
                         val title = itemsState.value.getOrNull(index)?.title ?: ""
-                        onValueChange(mapOf("value" to title, "index" to index))
+                        if (appContext.reactContext != null) {
+                            try {
+                                onValueChange(mapOf("value" to title, "index" to index))
+                            } catch (_: Throwable) {
+                            }
+                        }
                     },
                     modifier = Modifier.fillMaxSize(),
                     activeColor = activeColorState.value,
@@ -85,17 +74,4 @@ class ReactSegmentedControl(context: Context, appContext: AppContext) :
             isContentSet = true
         }
     }
-}
-
-// ✅ 辅助扩展函数：从 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
 }

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

@@ -2,11 +2,9 @@ package expo.modules.goliaexpoutils.waterView
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.ContextWrapper
 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
@@ -19,13 +17,10 @@ import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.view.isNotEmpty
-import androidx.lifecycle.findViewTreeLifecycleOwner
-import androidx.lifecycle.setViewTreeLifecycleOwner
-import androidx.savedstate.findViewTreeSavedStateRegistryOwner
-import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import com.kyant.backdrop.backdrops.layerBackdrop
 import com.kyant.backdrop.backdrops.rememberLayerBackdrop
 import expo.modules.goliaexpoutils.Config
+import expo.modules.goliaexpoutils.enforceLifecycle
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -58,12 +53,13 @@ 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 var isContentSet = false
+
     private val childContainer = FrameLayout(context).apply {
         layoutParams = ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
     }
 
-    private var isContentSet = false
-
     private val composeView = ComposeView(context).apply {
         layoutParams = ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
         setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
@@ -72,21 +68,14 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
     init {
         clipChildren = false
         clipToPadding = false
+
         addView(composeView)
     }
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
 
-        val activity = context.lookupActivity()
-        if (activity != null) {
-            if (composeView.findViewTreeLifecycleOwner() == null) {
-                composeView.setViewTreeLifecycleOwner(activity)
-            }
-            if (composeView.findViewTreeSavedStateRegistryOwner() == null) {
-                composeView.setViewTreeSavedStateRegistryOwner(activity)
-            }
-        }
+        composeView.enforceLifecycle(context)
 
         if (!isContentSet) {
             composeView.setContent {
@@ -94,7 +83,14 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
                     childContainer = childContainer,
                     props = props,
                     commandFlow = commandChannel.receiveAsFlow(),
-                    onMoveDispatch = { x, y -> onMove(mapOf("x" to x, "y" to y)) },
+                    onMoveDispatch = { x, y ->
+                        if (appContext.reactContext != null) {
+                            try {
+                                onMove(mapOf("x" to x, "y" to y))
+                            } catch (_: Throwable) {
+                            }
+                        }
+                    },
                     onPressInDispatch = { onPressIn(mapOf()) },
                     onPressOutDispatch = { onPressOut(mapOf()) }
                 )
@@ -104,13 +100,22 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
     }
 
     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 {
+            if (child != null) {
+                (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) {
@@ -118,10 +123,7 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
             try {
                 childContainer.removeViewAt(0)
             } catch (_: Exception) {
-                super.removeViewAt(index)
             }
-        } else {
-            super.removeViewAt(index)
         }
     }
 
@@ -130,18 +132,6 @@ 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
 private fun WaterViewEntry(
     childContainer: FrameLayout,

package/package.json

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