🩹: optimization

Author: junerver

app/src/main/java/xyz/junerver/composehooks/route/routes.kt

@@ -1,7 +1,7 @@
 package xyz.junerver.composehooks.route
 
 import androidx.compose.runtime.Composable
-import xyz.junerver.composehooks.HomeScreen
+import xyz.junerver.composehooks.example.HomeScreen
 import xyz.junerver.composehooks.example.RequestExampleList
 import xyz.junerver.composehooks.example.UseAsyncExample
 import xyz.junerver.composehooks.example.UseAutoResetExample

hooks/src/main/kotlin/xyz/junerver/compose/hooks/useEffect.kt

@@ -1,8 +1,8 @@
 package xyz.junerver.compose.hooks
 
-import android.annotation.SuppressLint
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import xyz.junerver.compose.hooks.utils.unwrap
 
 /*
   Description: Alias for [LaunchedEffect]
@@ -12,7 +12,7 @@ import androidx.compose.runtime.LaunchedEffect
   Version: v1.0
 */
 
-@SuppressLint("ComposableNaming")
 @Composable
-fun useEffect(vararg deps: Any?, block: SuspendAsyncFn) =
-    LaunchedEffect(keys = deps, block = block)
+fun useEffect(vararg deps: Any?, block: SuspendAsyncFn) {
+    LaunchedEffect(keys = unwrap(deps), block = block)
+}

hooks/src/main/kotlin/xyz/junerver/compose/hooks/useState.kt

@@ -76,7 +76,7 @@ fun <T> useState(default: T & Any): MutableState<T & Any> {
  * @receiver
  */
 @Composable
-fun <T> useState(vararg keys: Any, factory: () -> T): State<T> = remember(keys = keys) {
+fun <T> useState(vararg keys: Any?, factory: () -> T): State<T> = remember(keys = keys) {
     derivedStateOf(factory)
 }
 

hooks/src/main/kotlin/xyz/junerver/compose/hooks/utils/ext.kt

@@ -1,7 +1,12 @@
 package xyz.junerver.compose.hooks.utils
 
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.snapshots.SnapshotStateList
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
+import xyz.junerver.compose.hooks.Ref
+import xyz.junerver.compose.hooks.observeAsState
 
 /*
   Description:
@@ -13,3 +18,19 @@ import kotlinx.datetime.Instant
 
 internal val currentTime: Instant
     get() = Clock.System.now()
+
+/**
+ * 直接使用[State]、[Ref] 作为依赖项无法触发副作用闭包执行，只有状态值、props入参变化才能正常触发，
+ * 所以需要执行解包装操作，简化对副作用使用时的心智负担。
+ *
+ * 注意：只能监听 [Ref] 实例，如果你使用 `by` 关键字进行了对 [Ref] 的委托，将无法通过 [useEffect] 监听。
+ */
+@Composable
+internal inline fun unwrap(deps: Array<out Any?>) = deps.map {
+    when (it) {
+        is State<*> -> it.value
+        is Ref<*> -> it.observeAsState().value
+        is SnapshotStateList<*> -> it.toList()
+        else -> it
+    }
+}.toTypedArray()