Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix detekt issue:

Browse source 
Lambda parameters in a @Composable that are referenced directly inside of restarting effects can cause issues or unpredictable behavior.

If restarting the effect is ok, you can add the reference to this parameter as a key in that effect, so when the parameter changes, a new effect is created.
However, if the effect is not to be restarted, you will need to use `rememberUpdatedState` on the parameter and use its result in the effect.

See https://mrmans0n.github.io/compose-rules/rules/#be-mindful-of-the-arguments-you-use-inside-of-a-restarting-effect for more information. [LambdaParameterInRestartableEffect]
This commit is contained in:
Benoit Marty 2024-01-19 20:44:43 +01:00 • committed by Benoit Marty
parent 1c1cf60ba0
commit 3ced570b3c
12 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/SoftKeyboardEffect.kt
View file

@ -18,6 +18,8 @@ package io.element.android.libraries.textcomposer
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.platform.LocalView
import androidx.compose.ui.viewinterop.AndroidView
import io.element.android.libraries.androidutils.ui.awaitWindowFocus
@ -40,7 +42,8 @@ internal fun <T> SoftKeyboardEffect(
predicate: (T) -> Boolean,
) {
val view = LocalView.current
LaunchedEffect(key) {
val latestOnRequestFocus by rememberUpdatedState(onRequestFocus)
LaunchedEffect(key, predicate) {
if (predicate(key)) {
// Await window focus in case returning from a dialog
view.awaitWindowFocus()
@ -49,7 +52,7 @@ internal fun <T> SoftKeyboardEffect(
view.showKeyboard(andRequestFocus = true)
// Refocus to the correct view
onRequestFocus()
latestOnRequestFocus()
}
}
}

6
libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
View file

@ -42,6 +42,7 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@ -274,12 +275,13 @@ fun TextComposer(
}
val menuAction = state.menuAction
val latestOnSuggestionReceived by rememberUpdatedState(onSuggestionReceived)
LaunchedEffect(menuAction) {
if (menuAction is MenuAction.Suggestion) {
val suggestion = Suggestion(menuAction.suggestionPattern)
onSuggestionReceived(suggestion)
latestOnSuggestionReceived(suggestion)
} else {
onSuggestionReceived(null)
latestOnSuggestionReceived(null)
}
}
}