Merge branch 'develop' into main

AlexGladkov · Jun 14, 2022 · 04d4952 · 04d4952
2 parents b070d7c + a7e4e67
commit 04d4952
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,6 +1,6 @@
 object Dependencies {
 
-    val odyssey = "1.0.0-beta07"
+    val odyssey = "1.0.0-beta11"
     val odysseyPackage = "io.github.alexgladkov"
 
     object DI {

diff --git a/documentation/GETTING_STARTED.md b/documentation/GETTING_STARTED.md
@@ -4,8 +4,8 @@ Add dependencies to gradle
 ```kotlin
 named("commonMain") {
     dependencies {
-        implementation("io.github.alexgladkov:odyssey-core:1.0.0-beta07") // For core classes
-        implementation("io.github.alexgladkov:odyssey-compose:1.0.0-beta07") // For compose extensions
+        implementation("io.github.alexgladkov:odyssey-core:1.0.0-beta11") // For core classes
+        implementation("io.github.alexgladkov:odyssey-compose:1.0.0-beta11") // For compose extensions
     }
 }
 ```
diff --git a/...e/src/commonMain/kotlin/ru/alexgladkov/odyssey/compose/controllers/ModalRootController.kt b/...e/src/commonMain/kotlin/ru/alexgladkov/odyssey/compose/controllers/ModalRootController.kt
@@ -160,7 +160,7 @@ open class ModalController {
         _backStack.clear()
     }
 
-    fun isEmpty() = _backStack.isEmpty()
+    fun isEmpty() = _backStack.none { it.dialogState !is ModalDialogState.Close }
 
     private fun redrawStack() {
         val newStack = ArrayList<ModalBundle>().apply {

diff --git a/.../ru/alexgladkov/odyssey/compose/navigation/modal_navigation/views/BottomSheetModalView.kt b/.../ru/alexgladkov/odyssey/compose/navigation/modal_navigation/views/BottomSheetModalView.kt
@@ -57,7 +57,7 @@ internal fun BoxScope.BottomModalSheet(
         bundle.backContent.invoke()
     } else {
         Screamer(backdropAlpha) {
-            if (bundle.closeOnBackdropClick) {
+            if (bundle.closeOnBackdropClick && bundle.dialogState !is ModalDialogState.Close) {
                 modalController.popBackStack()
             }
         }