From 7b70cac7c5ddcd4554124d76b14ce7df3cfd2a88 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Apr 2024 11:34:49 +0200
Subject: [PATCH] Rework Modifier.applyIf. It was using `Modifier.composed`
 which is not good for performance and detekt is warning about this.

---
 .../impl/search/RoomListSearchView.kt         | 11 ++++---
 .../designsystem/modifiers/ApplyIf.kt         | 32 ++++++++-----------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt
index a18dd6607f..8190c8078e 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt
@@ -87,10 +87,13 @@ internal fun RoomListSearchView(
     ) {
         Column(
             modifier = modifier
-                .applyIf(state.isSearchActive, ifTrue = {
-                    // Disable input interaction to underlying views
-                    pointerInput(Unit) {}
-                })
+                .applyIf(
+                    condition = state.isSearchActive,
+                    ifTrue = {
+                        // Disable input interaction to underlying views
+                        pointerInput(Unit) {}
+                    }
+                )
         ) {
             if (state.isSearchActive) {
                 RoomListSearchContent(
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ApplyIf.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ApplyIf.kt
index a18d0ef3ed..3a4a433821 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ApplyIf.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ApplyIf.kt
@@ -16,30 +16,26 @@
 
 package io.element.android.libraries.designsystem.modifiers
 
-import android.annotation.SuppressLint
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
 import androidx.compose.ui.platform.debugInspectorInfo
+import androidx.compose.ui.platform.inspectable
 
 /**
  * Applies the [ifTrue] modifier when the [condition] is true, [ifFalse] otherwise.
  */
-@SuppressLint("UnnecessaryComposedModifier") // It's actually necessary due to the `@Composable` lambdas
 fun Modifier.applyIf(
     condition: Boolean,
-    ifTrue: @Composable Modifier.() -> Modifier,
-    ifFalse: @Composable (Modifier.() -> Modifier)? = null
-): Modifier =
-    composed(
-        inspectorInfo = debugInspectorInfo {
-            name = "applyIf"
-            value = condition
-        }
-    ) {
-        when {
-            condition -> then(ifTrue(Modifier))
-            ifFalse != null -> then(ifFalse(Modifier))
-            else -> this
-        }
+    ifTrue: Modifier.() -> Modifier,
+    ifFalse: (Modifier.() -> Modifier)? = null
+): Modifier = this then inspectable(
+    inspectorInfo = debugInspectorInfo {
+        name = "applyIf"
+        value = condition
     }
+) {
+    this then when {
+        condition -> ifTrue(Modifier)
+        ifFalse != null -> ifFalse(Modifier)
+        else -> Modifier
+    }
+}