Merge branch 'develop' into rc/release-1.0.0-beta

AlexGladkov · Apr 29, 2022 · 6f5c503 · 6f5c503
2 parents afe4748 + 77d0641
commit 6f5c503
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.../ru/alexgladkov/odyssey/compose/navigation/modal_navigation/views/BottomSheetModalView.kt b/.../ru/alexgladkov/odyssey/compose/navigation/modal_navigation/views/BottomSheetModalView.kt
@@ -64,7 +64,7 @@ internal fun BoxScope.BottomModalSheet(
     }
 
     Box(modifier = Modifier.fillMaxSize()) {
-        if (bundle.closeOnSwipe){
+        if (bundle.closeOnSwipe) {
             modifier = modifier.swipeable(
                 state = swipeableState,
                 anchors = anchors,
@@ -89,7 +89,7 @@ internal fun BoxScope.BottomModalSheet(
     }
 
     LaunchedEffect(bundle.dialogState, swipeableState.offset.value) {
-        if (swipeableState.offset.value == viewHeight) {
+        if (swipeableState.offset.value == viewHeight && bundle.dialogState !is ModalDialogState.Close) {
             modalController.setTopDialogState(ModalDialogState.Close())
         }