Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,14 @@ final class RootViewController: UIViewController {
let viewController = ResizeViewController(initialHeight: 300)
presentBottomSheetInsideNavigationController(
viewController: viewController,
configuration: .default
configuration: .default,
canBeDismissed: {
// return `true` or `false` based on your business logic
true
},
dismissCompletion: {
// handle dismiss completion if user closed bottom sheet by a gesture
}
)
}
}
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,14 @@ presentBottomSheet(
cornerRadius: 10,
pullBarConfiguration: .visible(.init(height: 20)),
shadowConfiguration: .init(backgroundColor: UIColor.black.withAlphaComponent(0.6))
)
),
canBeDismissed: {
// return `true` or `false` based on your business logic
true
},
dismissCompletion: {
// handle dismiss completion if user closed bottom sheet by a gesture
}
)
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,12 @@ public final class DefaultBottomSheetModalDismissalHandler: BottomSheetModalDism
}

public func performDismissal(animated: Bool) {
presentingViewController?.presentedViewController?.dismiss(animated: animated, completion: dismissCompletion)
if let presentedViewController = presentingViewController {
presentedViewController.dismiss(animated: animated, completion: dismissCompletion)
} else {
// User dismissed view controller by swipe-gesture, dismiss handler wasn't invoked
dismissCompletion?()
}
}
}

Expand Down Expand Up @@ -106,8 +111,18 @@ public extension UIViewController {
present(viewController, animated: true, completion: nil)
}

func presentBottomSheetInsideNavigationController(viewController: UIViewController, configuration: BottomSheetConfiguration) {
func presentBottomSheetInsideNavigationController(
viewController: UIViewController,
configuration: BottomSheetConfiguration,
canBeDismissed: @escaping (() -> Bool) = { true },
dismissCompletion: (() -> Void)? = nil
) {
let navigationController = BottomSheetNavigationController(rootViewController: viewController, configuration: configuration)
presentBottomSheet(viewController: navigationController, configuration: configuration)
presentBottomSheet(
viewController: navigationController,
configuration: configuration,
canBeDismissed: canBeDismissed,
dismissCompletion: dismissCompletion
)
}
}