golia-expo-utils 1.0.5 → 1.0.7

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

@@ -1,5 +1,6 @@
 package expo.modules.goliaexpoutils.segmentedControl
 
+// 引入扩展
 import android.annotation.SuppressLint
 import android.content.Context
 import android.view.ViewGroup
@@ -33,10 +34,7 @@ class ReactSegmentedControl(context: Context, appContext: AppContext) :
     private var isContentSet = false
 
     private val composeView = ComposeView(context).apply {
-        layoutParams = ViewGroup.LayoutParams(
-            LayoutParams.MATCH_PARENT,
-            LayoutParams.MATCH_PARENT
-        )
+        layoutParams = ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
         setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
     }
 
@@ -56,7 +54,7 @@ class ReactSegmentedControl(context: Context, appContext: AppContext) :
             addView(composeView)
         }
 
-        // 3. 设置内容
+        // 3. 设置内容 (或复活)
         if (!isContentSet) {
             composeView.setContent {
                 SegmentedControl(
@@ -85,17 +83,31 @@ class ReactSegmentedControl(context: Context, appContext: AppContext) :
             isContentSet = true
         }
 
+        composeView.visibility = VISIBLE
         requestLayout()
+        post {
+            measure(
+                MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+            )
+            layout(left, top, right, bottom)
+            invalidate()
+        }
     }
 
     override fun onDetachedFromWindow() {
+        // 4. 必须移除，防止后台 Crash
         if (composeView.parent == this) {
             removeView(composeView)
         }
+
+        // 5. 标记复活
+        isContentSet = false
+
         super.onDetachedFromWindow()
     }
 
-    // ✅ 终极修正：手动接管布局
+    // 6. 手动布局修正
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
         super.onLayout(changed, left, top, right, bottom)
 

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

@@ -1,6 +1,6 @@
 package expo.modules.goliaexpoutils.waterView
 
-// 引入扩展
+// 引入扩展函数
 import android.annotation.SuppressLint
 import android.content.Context
 import android.view.View
@@ -55,6 +55,7 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
     private val onPressOut by EventDispatcher()
     private val commandChannel = Channel<WaterCommand>(Channel.BUFFERED)
 
+    // 标记 Compose 内容是否已设置
     private var isContentSet = false
 
     private val childContainer = FrameLayout(context).apply {
@@ -63,6 +64,7 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
 
     private val composeView = ComposeView(context).apply {
         layoutParams = ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        // 策略：Detach 时自动销毁 Composition 释放资源
         setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
     }
 
@@ -74,15 +76,15 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
 
-        // 1. 注入生命周期
+        // 1. 注入生命周期 (防崩关键)
         composeView.enforceLifecycle(context)
 
-        // 2. 动态挂载 View
+        // 2. 动态挂载 View (此时 Activity 肯定存在)
         if (composeView.parent == null) {
             addView(composeView)
         }
 
-        // 3. 设置内容
+        // 3. 设置内容 (或复活)
         if (!isContentSet) {
             composeView.setContent {
                 WaterViewEntry(
@@ -90,6 +92,7 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
                     props = props,
                     commandFlow = commandChannel.receiveAsFlow(),
                     onMoveDispatch = { x, y ->
+                        // 空安全保护，防止 Bridgeless 模式下 NPE
                         if (appContext.reactContext != null) {
                             try {
                                 onMove(mapOf("x" to x, "y" to y))
@@ -104,38 +107,50 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
             isContentSet = true
         }
 
-        // 4. 强制请求重新布局
+        // 4. 请求布局刷新
+        composeView.visibility = VISIBLE
         requestLayout()
+        post {
+            measure(
+                MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+            )
+            layout(left, top, right, bottom)
+            invalidate()
+        }
     }
 
     override fun onDetachedFromWindow() {
-        // 必须移除，防止 Fabric 对离屏 View 进行测量导致崩溃
+        // 5. 必须移除！防止 RNSAC 等库导致 View 处于 detached 状态时被 Fabric 测量从而引发 Crash
         if (composeView.parent == this) {
             removeView(composeView)
         }
+
+        // 6. 标记复活：重置状态，允许下次 Attach 时重新 setContent (因为 DisposeOnDetached 已经销毁了引擎)
+        isContentSet = false
+
         super.onDetachedFromWindow()
     }
 
-    // ✅ 终极修正：手动接管布局
-    // 解决“View加上去了但是宽高为0不显示”的问题
+    // ✅ 7. 终极修正：手动接管布局
+    // 解决“View加上去了但是宽高为0不显示”的问题，无视 Fabric 的测量延迟
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
         super.onLayout(changed, left, top, right, bottom)
 
-        // 如果 composeView 已经挂载，强行设置它的尺寸等于父容器
         if (composeView.parent == this) {
             val width = right - left
             val height = bottom - top
 
-            // 1. 手动测量
+            // 强行设置 ComposeView 的大小等于父容器
             composeView.measure(
                 MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
             )
-            // 2. 手动布局 (放在 (0,0) 位置)
             composeView.layout(0, 0, width, height)
         }
     }
 
+    // View 管理：确保 composeView 在底部，RN 子 View 在 childContainer 中
     override fun addView(child: View?, index: Int) {
         if (child == composeView) {
             super.addView(child, index)
@@ -157,7 +172,7 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
         if (childContainer.isNotEmpty()) {
             try {
                 childContainer.removeViewAt(0)
-            } catch (_: Throwable) {
+            } catch (_: Exception) {
             }
         }
     }
@@ -167,6 +182,7 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
     }
 }
 
+// ... 下面的 Composable 代码保持不变 ...
 @Composable
 private fun WaterViewEntry(
     childContainer: FrameLayout,

package/package.json

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