Fix where dialog don't have restrictDismissal configuration (#98)

jevonmao · Sep 3, 2021 · 91c7534 · 91c7534
1 parent 2f3c429
commit 91c7534
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Sources/CorePermissionsSwiftUI/Store/PermissionSchemaStore.swift b/Sources/CorePermissionsSwiftUI/Store/PermissionSchemaStore.swift
@@ -32,7 +32,10 @@ public class PermissionSchemaStore: ObservableObject {
         if configStore.restrictDismissal ||
             ((permissionViewStyle == .modal && store.restrictModalDismissal) ||
                 (permissionViewStyle == .alert && store.restrictAlertDismissal)) {
-            //Empty means all permissions interacted, so should no longer stay in presentation
+            // number of interacted permissions equal to number
+            // of all permissions means means everything has been
+            // interacted with, thus if so, shouldStayInPresentation
+            // will be false and dismissal is allowed
             return !(interactedPermissions.count == permissions.count)
         }
         return false

diff --git a/Sources/CorePermissionsSwiftUI/SwiftUI/Dialog-style/DialogStyleViews.swift b/Sources/CorePermissionsSwiftUI/SwiftUI/Dialog-style/DialogStyleViews.swift
@@ -113,8 +113,15 @@ public extension View {
 
      */
 
-    func JMAlert(showModal: Binding<Bool>, for permissions: [PermissionType.PermissionManager], autoDismiss: Bool?=nil, autoCheckAuthorization: Bool?=nil) -> some CustomizableView {
-        initializeJMAlert(showModal: showModal, for: permissions, autoDismiss: autoDismiss, autoCheckAuthorization: autoCheckAuthorization)
+    func JMAlert(showModal: Binding<Bool>, for permissions: [PermissionType.PermissionManager],
+                 restrictDismissal: Bool?=nil,
+                 autoDismiss: Bool?=nil,
+                 autoCheckAuthorization: Bool?=nil) -> some CustomizableView {
+        initializeJMAlert(showModal: showModal,
+                          for: permissions,
+                          autoDismiss: autoDismiss,
+                          autoCheckAuthorization: autoCheckAuthorization,
+                          restrictDismissal: restrictDismissal)
     }
 
     /**