Skip to content

Commit f3ee89d

Browse files
authored
Merge pull request #3993 from element-hq/feature/fga/fix_keyboard_dismiss
fix(composer) : use HideKeyboardWhenDisposed only in MessagesView
2 parents 77d44f8 + a81392d commit f3ee89d

File tree

2 files changed

+3
-2
lines changed
  • features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl
  • libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer

2 files changed

+3
-2
lines changed

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ import io.element.android.libraries.designsystem.theme.components.BottomSheetDra
9090
import io.element.android.libraries.designsystem.theme.components.Scaffold
9191
import io.element.android.libraries.designsystem.theme.components.Text
9292
import io.element.android.libraries.designsystem.theme.components.TopAppBar
93+
import io.element.android.libraries.designsystem.utils.HideKeyboardWhenDisposed
9394
import io.element.android.libraries.designsystem.utils.KeepScreenOn
9495
import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
9596
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
@@ -124,6 +125,8 @@ fun MessagesView(
124125

125126
KeepScreenOn(state.voiceMessageComposerState.keepScreenOn)
126127

128+
HideKeyboardWhenDisposed()
129+
127130
val snackbarHostState = rememberSnackbarHostState(snackbarMessage = state.snackbarMessage)
128131

129132
// This is needed because the composer is inside an AndroidView that can't be affected by the FocusManager in Compose

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
4747
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
4848
import io.element.android.libraries.designsystem.theme.components.Icon
4949
import io.element.android.libraries.designsystem.theme.components.Text
50-
import io.element.android.libraries.designsystem.utils.HideKeyboardWhenDisposed
5150
import io.element.android.libraries.matrix.api.core.EventId
5251
import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
5352
import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
@@ -324,7 +323,6 @@ fun TextComposer(
324323
}
325324
}
326325
}
327-
HideKeyboardWhenDisposed()
328326
}
329327

330328
@Composable

0 commit comments

Comments
 (0)