golia-expo-utils 1.0.0 → 1.0.2

package/android/build.gradle

@@ -57,10 +57,15 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.12.01')
+    def composeBom = platform('androidx.compose:compose-bom:2026.01.00')
     implementation composeBom
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-tooling-preview'
     implementation 'androidx.compose.material3:material3'
     implementation 'io.github.kyant0:backdrop:1.0.0'
+    implementation "androidx.appcompat:appcompat:1.7.1"
+    implementation "androidx.activity:activity-ktx:1.12.2"
+    implementation "androidx.savedstate:savedstate-ktx:1.4.0"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.10.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0"
 }

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

@@ -2,11 +2,18 @@ package expo.modules.goliaexpoutils.segmentedControl
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.ContextWrapper
+import androidx.appcompat.app.AppCompatActivity
 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.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
@@ -27,30 +34,12 @@ 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)
-        clipChildren = false
-        clipToPadding = false
-
-        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,
-            )
-        }
+        // 确保 View 卸载时清理 Compose 资源
+        setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
     }
 
     init {
@@ -58,4 +47,55 @@ class ReactSegmentedControl(context: Context, appContext: AppContext) :
         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)
+            }
+        }
+
+        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
+        }
+    }
+}
+
+// ✅ 辅助扩展函数：从 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,9 +2,11 @@ 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
@@ -17,6 +19,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
@@ -53,29 +59,14 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
     private val onPressOut by EventDispatcher()
     private val commandChannel = Channel<WaterCommand>(Channel.BUFFERED)
     private val childContainer = FrameLayout(context).apply {
-        layoutParams = ViewGroup.LayoutParams(
-            LayoutParams.MATCH_PARENT,
-            LayoutParams.MATCH_PARENT
-        )
+        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
-        )
-        clipChildren = false
-        clipToPadding = false
-        setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool)
-        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()) }
-            )
-        }
+        layoutParams = ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
     }
 
     init {
@@ -84,6 +75,34 @@ class ReactWaterView(context: Context, appContext: AppContext) : ExpoView(contex
         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)
+            }
+        }
+
+        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
+        }
+    }
+
     override fun addView(child: View?, index: Int) {
         if (child == composeView) super.addView(child, index)
         else childContainer.addView(child)
@@ -111,6 +130,18 @@ 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/build/ReactWaterView.d.ts

@@ -53,7 +53,7 @@ declare const WaterViewEffect: React.ForwardRefExoticComponent<ViewProps & {
     onPressIn?: (event: NativeSyntheticEvent<WaterViewEventData>) => void;
     onPressOut?: (event: NativeSyntheticEvent<WaterViewEventData>) => void;
 } & React.RefAttributes<WaterViewRef>>;
-export declare const WaterView: React.FC<WaterViewProps> & {
+export declare const ReactWaterView: React.FC<WaterViewProps> & {
     Effect: typeof WaterViewEffect;
 };
 export {};

package/build/ReactWaterView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReactWaterView.d.ts","sourceRoot":"","sources":["../src/ReactWaterView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAmD,MAAM,OAAO,CAAA;AACvE,OAAO,EAAE,oBAAoB,EAAgC,SAAS,EAAE,MAAM,cAAc,CAAA;AAM5F,MAAM,MAAM,kBAAkB,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AACzD,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,QAAQ,CAAA;AAE5C,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClE,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACrE,CAAA;AAGD,KAAK,WAAW,GAAG,SAAS,GAAG;IAC7B,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;IACxC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI,CAAA;IAClE,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI,CAAA;IACrE,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI,CAAA;CACvE,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAA;AAE9C,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CAAA;AAOvE,QAAA,MAAM,eAAe;WA1BZ;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;cAC9B,MAAM;uBACG,OAAO;mBACX,YAAY;aAClB,OAAO;aACP,OAAO;WACT,MAAM;WACN,MAAM;WACN,MAAM;WACN,MAAM;qBACI,MAAM;qBACN,MAAM;aACd,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI;gBACtD,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI;iBACxD,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI;sCA6BvE,CAAA;AAqDD,eAAO,MAAM,SAAS,EAAoB,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,GAAG;IACnE,MAAM,EAAE,OAAO,eAAe,CAAA;CAC/B,CAAA"}
+{"version":3,"file":"ReactWaterView.d.ts","sourceRoot":"","sources":["../src/ReactWaterView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAmD,MAAM,OAAO,CAAA;AACvE,OAAO,EAAE,oBAAoB,EAAgC,SAAS,EAAE,MAAM,cAAc,CAAA;AAM5F,MAAM,MAAM,kBAAkB,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AACzD,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,QAAQ,CAAA;AAE5C,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClE,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACrE,CAAA;AAGD,KAAK,WAAW,GAAG,SAAS,GAAG;IAC7B,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;IACxC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI,CAAA;IAClE,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI,CAAA;IACrE,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI,CAAA;CACvE,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAA;AAE9C,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CAAA;AAOvE,QAAA,MAAM,eAAe;WA1BZ;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;cAC9B,MAAM;uBACG,OAAO;mBACX,YAAY;aAClB,OAAO;aACP,OAAO;WACT,MAAM;WACN,MAAM;WACN,MAAM;WACN,MAAM;qBACI,MAAM;qBACN,MAAM;aACd,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI;gBACtD,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI;iBACxD,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI;sCA6BvE,CAAA;AAqDD,eAAO,MAAM,cAAc,EAAoB,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,GAAG;IACxE,MAAM,EAAE,OAAO,eAAe,CAAA;CAC/B,CAAA"}

package/build/ReactWaterView.js

@@ -47,5 +47,5 @@ const WaterViewRoot = ({ children, style, ...props }) => {
 WaterViewRoot.displayName = 'WaterView';
 WaterViewRoot.Effect = WaterViewEffect;
 // 导出
-export const WaterView = WaterViewRoot;
+export const ReactWaterView = WaterViewRoot;
 //# sourceMappingURL=ReactWaterView.js.map

package/build/ReactWaterView.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReactWaterView.js","sourceRoot":"","sources":["../src/ReactWaterView.tsx"],"names":[],"mappings":"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","sourcesContent":["import { requireNativeViewManager } from 'expo-modules-core'\nimport React, { isValidElement, cloneElement, forwardRef } from 'react'\nimport { NativeSyntheticEvent, Platform, processColor, View, ViewProps } from 'react-native'\n\n// =============================================================================\n// 1. 类型定义\n// =============================================================================\n\nexport type WaterViewEventData = { x: number; y: number }\nexport type RestrictMode = 'edge' | 'center'\n\nexport type WaterViewRef = {\n  moveTo: (x: number, y: number, duration?: number) => Promise<void>\n  moveBy: (dx: number, dy: number, duration?: number) => Promise<void>\n}\n\n// Native Props\ntype NativeProps = ViewProps & {\n  size?: { width: number; height: number }\n  bgColor?: string\n  shouldSpringBack?: boolean\n  restrictMode?: RestrictMode\n  allowX?: boolean\n  allowY?: boolean\n  minX?: number\n  maxX?: number\n  minY?: number\n  maxY?: number\n  initialOffsetX?: number\n  initialOffsetY?: number\n  onMove?: (event: NativeSyntheticEvent<WaterViewEventData>) => void\n  onPressIn?: (event: NativeSyntheticEvent<WaterViewEventData>) => void\n  onPressOut?: (event: NativeSyntheticEvent<WaterViewEventData>) => void\n}\n\nexport type WaterViewEffectProps = NativeProps\n\nexport type WaterViewProps = ViewProps & { children?: React.ReactNode }\n\nconst NativeComponent = requireNativeViewManager('WaterViewModule', 'ReactWaterView')\n\n// =============================================================================\n// 2. 子组件: WaterView.Effect\n// =============================================================================\nconst WaterViewEffect = forwardRef<WaterViewRef, WaterViewEffectProps>(\n  ({ bgColor, children, ...props }, ref) => {\n    const nativeRef = React.useRef<any>(null)\n\n    React.useImperativeHandle(ref, () => ({\n      moveBy: async (dx, dy, duration) => nativeRef.current?.moveBy(dx, dy, duration),\n      moveTo: async (x, y, duration) => nativeRef.current?.moveTo(x, y, duration),\n    }))\n\n    const nativeProps = { ...props, bgColor: processColor(bgColor), collapsable: false }\n\n    return (\n      <NativeComponent ref={nativeRef} {...nativeProps} collapsable={false}>\n        {children}\n      </NativeComponent>\n    )\n  }\n)\nWaterViewEffect.displayName = 'WaterView.Effect'\n\n// =============================================================================\n// 3. 父组件: WaterView (容器)\n// =============================================================================\n\nconst WaterViewRoot = ({ children, style, ...props }: WaterViewProps) => {\n  // [修复]: 使用 React.Children.toArray + find，而不是 forEach 回调\n  // 这样 TypeScript 可以正确推断 effectNode 不为 null/never\n  const childrenArray = React.Children.toArray(children)\n\n  const effectNode = childrenArray.find(\n    (child): child is React.ReactElement<WaterViewEffectProps> =>\n      isValidElement(child) && child.type === WaterViewEffect\n  )\n\n  const contentChildren = childrenArray.filter((child) => child !== effectNode)\n\n  if (!effectNode) {\n    console.warn('<WaterView> requires a <WaterView.Effect> child to work correctly.')\n    return (\n      <View style={style} {...props} collapsable={false}>\n        {contentChildren}\n      </View>\n    )\n  }\n\n  // Android 渲染逻辑\n  if (Platform.OS === 'android') {\n    return cloneElement(\n      effectNode,\n      { ...effectNode.props },\n      <View style={style} {...props} collapsable={false}>\n        {contentChildren}\n      </View>\n    )\n  }\n\n  // iOS 渲染逻辑\n  return (\n    <View style={style} {...props} collapsable={false}>\n      {contentChildren}\n      {cloneElement(effectNode, { style: effectNode.props.style })}\n    </View>\n  )\n}\n\n// 挂载静态属性\n;(WaterViewRoot as any).displayName = 'WaterView'\n;(WaterViewRoot as any).Effect = WaterViewEffect\n\n// 导出\nexport const WaterView = WaterViewRoot as React.FC<WaterViewProps> & {\n  Effect: typeof WaterViewEffect\n}\n"]}
+{"version":3,"file":"ReactWaterView.js","sourceRoot":"","sources":["../src/ReactWaterView.tsx"],"names":[],"mappings":"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","sourcesContent":["import { requireNativeViewManager } from 'expo-modules-core'\nimport React, { isValidElement, cloneElement, forwardRef } from 'react'\nimport { NativeSyntheticEvent, Platform, processColor, View, ViewProps } from 'react-native'\n\n// =============================================================================\n// 1. 类型定义\n// =============================================================================\n\nexport type WaterViewEventData = { x: number; y: number }\nexport type RestrictMode = 'edge' | 'center'\n\nexport type WaterViewRef = {\n  moveTo: (x: number, y: number, duration?: number) => Promise<void>\n  moveBy: (dx: number, dy: number, duration?: number) => Promise<void>\n}\n\n// Native Props\ntype NativeProps = ViewProps & {\n  size?: { width: number; height: number }\n  bgColor?: string\n  shouldSpringBack?: boolean\n  restrictMode?: RestrictMode\n  allowX?: boolean\n  allowY?: boolean\n  minX?: number\n  maxX?: number\n  minY?: number\n  maxY?: number\n  initialOffsetX?: number\n  initialOffsetY?: number\n  onMove?: (event: NativeSyntheticEvent<WaterViewEventData>) => void\n  onPressIn?: (event: NativeSyntheticEvent<WaterViewEventData>) => void\n  onPressOut?: (event: NativeSyntheticEvent<WaterViewEventData>) => void\n}\n\nexport type WaterViewEffectProps = NativeProps\n\nexport type WaterViewProps = ViewProps & { children?: React.ReactNode }\n\nconst NativeComponent = requireNativeViewManager('WaterViewModule', 'ReactWaterView')\n\n// =============================================================================\n// 2. 子组件: WaterView.Effect\n// =============================================================================\nconst WaterViewEffect = forwardRef<WaterViewRef, WaterViewEffectProps>(\n  ({ bgColor, children, ...props }, ref) => {\n    const nativeRef = React.useRef<any>(null)\n\n    React.useImperativeHandle(ref, () => ({\n      moveBy: async (dx, dy, duration) => nativeRef.current?.moveBy(dx, dy, duration),\n      moveTo: async (x, y, duration) => nativeRef.current?.moveTo(x, y, duration),\n    }))\n\n    const nativeProps = { ...props, bgColor: processColor(bgColor), collapsable: false }\n\n    return (\n      <NativeComponent ref={nativeRef} {...nativeProps} collapsable={false}>\n        {children}\n      </NativeComponent>\n    )\n  }\n)\nWaterViewEffect.displayName = 'WaterView.Effect'\n\n// =============================================================================\n// 3. 父组件: WaterView (容器)\n// =============================================================================\n\nconst WaterViewRoot = ({ children, style, ...props }: WaterViewProps) => {\n  // [修复]: 使用 React.Children.toArray + find，而不是 forEach 回调\n  // 这样 TypeScript 可以正确推断 effectNode 不为 null/never\n  const childrenArray = React.Children.toArray(children)\n\n  const effectNode = childrenArray.find(\n    (child): child is React.ReactElement<WaterViewEffectProps> =>\n      isValidElement(child) && child.type === WaterViewEffect\n  )\n\n  const contentChildren = childrenArray.filter((child) => child !== effectNode)\n\n  if (!effectNode) {\n    console.warn('<WaterView> requires a <WaterView.Effect> child to work correctly.')\n    return (\n      <View style={style} {...props} collapsable={false}>\n        {contentChildren}\n      </View>\n    )\n  }\n\n  // Android 渲染逻辑\n  if (Platform.OS === 'android') {\n    return cloneElement(\n      effectNode,\n      { ...effectNode.props },\n      <View style={style} {...props} collapsable={false}>\n        {contentChildren}\n      </View>\n    )\n  }\n\n  // iOS 渲染逻辑\n  return (\n    <View style={style} {...props} collapsable={false}>\n      {contentChildren}\n      {cloneElement(effectNode, { style: effectNode.props.style })}\n    </View>\n  )\n}\n\n// 挂载静态属性\n;(WaterViewRoot as any).displayName = 'WaterView'\n;(WaterViewRoot as any).Effect = WaterViewEffect\n\n// 导出\nexport const ReactWaterView = WaterViewRoot as React.FC<WaterViewProps> & {\n  Effect: typeof WaterViewEffect\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "golia-expo-utils",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "expo utils provided by golia.jp",
   "main": "build/index.js",
   "homepage": "https://expo.golia.jp/golia-expo-utils",
@@ -19,23 +19,32 @@
   },
   "keywords": ["react-native", "expo", "golia-expo-utils", "GoliaExpoUtils"],
   "repository": "https://github.com/goliajp/golia-expo-utils",
-  "bugs": { "url": "https://github.com/goliajp/golia-expo-utils/issues" },
-  "author": "doracawl <lihao@golia.jp> (doracawl)",
-  "license": "MIT",
-  "dependencies": { "fs-extra": "^11.3.3", "svg2vectordrawable": "^2.9.1" },
-  "app.plugin": "./plugin/build/index.js",
-  "devDependencies": {
-    "@types/fs-extra": "^11.0.4",
-    "@types/node": "^25.0.3",
-    "@types/react": "~19.1.0",
-    "eslint-config-expo": "^10.0.0",
-    "eslint-plugin-perfectionist": "^5.3.1",
-    "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-unused-imports": "^4.3.0",
-    "expo": "^54.0.31",
-    "expo-module-scripts": "^5.0.8",
-    "prettier": "^3.7.4",
-    "react-native": "0.81.5"
-  },
-  "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" }
+  "bugs": {
+  "url": "https://github.com/goliajp/golia-expo-utils/issues"
+},
+"author": "doracawl <lihao@golia.jp> (doracawl)",
+"license": "MIT",
+"dependencies": {
+"fs-extra": "^11.3.3",
+"svg2vectordrawable": "^2.9.1"
+},
+"app.plugin": "./plugin/build/index.js",
+"devDependencies": {
+  "@types/fs-extra": "^11.0.4",
+  "@types/node": "^25.0.3",
+  "@types/react": "~19.1.0",
+  "eslint-config-expo": "^10.0.0",
+  "eslint-plugin-perfectionist": "^5.3.1",
+  "eslint-plugin-react": "^7.37.5",
+  "eslint-plugin-unused-imports": "^4.3.0",
+  "expo": "^54.0.31",
+  "expo-module-scripts": "^5.0.8",
+  "prettier": "^3.7.4",
+  "react-native": "0.81.5"
+},
+"peerDependencies": {
+"expo": "*",
+"react": "*",
+"react-native": "*"
+}
 }

package/src/ReactWaterView.tsx

@@ -112,6 +112,6 @@ const WaterViewRoot = ({ children, style, ...props }: WaterViewProps) => {
 ;(WaterViewRoot as any).Effect = WaterViewEffect
 
 // 导出
-export const WaterView = WaterViewRoot as React.FC<WaterViewProps> & {
+export const ReactWaterView = WaterViewRoot as React.FC<WaterViewProps> & {
   Effect: typeof WaterViewEffect
 }