Skip to content

Commit 91c7534

Browse files
authored
Fix where dialog don't have restrictDismissal configuration (#98)
1 parent 2f3c429 commit 91c7534

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

Sources/CorePermissionsSwiftUI/Store/PermissionSchemaStore.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ public class PermissionSchemaStore: ObservableObject {
3232
if configStore.restrictDismissal ||
3333
((permissionViewStyle == .modal && store.restrictModalDismissal) ||
3434
(permissionViewStyle == .alert && store.restrictAlertDismissal)) {
35-
//Empty means all permissions interacted, so should no longer stay in presentation
35+
// number of interacted permissions equal to number
36+
// of all permissions means means everything has been
37+
// interacted with, thus if so, shouldStayInPresentation
38+
// will be false and dismissal is allowed
3639
return !(interactedPermissions.count == permissions.count)
3740
}
3841
return false

Sources/CorePermissionsSwiftUI/SwiftUI/Dialog-style/DialogStyleViews.swift

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,15 @@ public extension View {
113113

114114
*/
115115

116-
func JMAlert(showModal: Binding<Bool>, for permissions: [PermissionType.PermissionManager], autoDismiss: Bool?=nil, autoCheckAuthorization: Bool?=nil) -> some CustomizableView {
117-
initializeJMAlert(showModal: showModal, for: permissions, autoDismiss: autoDismiss, autoCheckAuthorization: autoCheckAuthorization)
116+
func JMAlert(showModal: Binding<Bool>, for permissions: [PermissionType.PermissionManager],
117+
restrictDismissal: Bool?=nil,
118+
autoDismiss: Bool?=nil,
119+
autoCheckAuthorization: Bool?=nil) -> some CustomizableView {
120+
initializeJMAlert(showModal: showModal,
121+
for: permissions,
122+
autoDismiss: autoDismiss,
123+
autoCheckAuthorization: autoCheckAuthorization,
124+
restrictDismissal: restrictDismissal)
118125
}
119126

120127
/**

0 commit comments

Comments
 (0)