Remove configuration struct

Sources/SafariView/Environment.swift

@@ -28,23 +28,6 @@ import SwiftUI
 @available(iOS 15.0, macCatalyst 15.0, *)
 public extension EnvironmentValues {
 
-    /// The configuration value used by a ``SafariView``
-    ///
-    /// You can retrieve this value for the currnet scope using the `@Environment` property wrapper
-    ///
-    /// ```swift
-    /// struct MyView: View {
-    ///
-    ///     @Environment(\.safariViewConfiguration)
-    ///     var safariViewConfiguration
-    ///
-    /// }
-    /// ```
-    var safariViewConfiguration: SafariView.Configuration {
-        get { self[SafariViewConfigurationEnvironmentKey.self] }
-        set { self[SafariViewConfigurationEnvironmentKey.self] = newValue }
-    }
-
     /// The additional activies to include the share sheet displayed inside a ``SafariView``
     ///
     /// You can retrieve this value for the currnet scope using the `@Environment` property wrapper
@@ -83,6 +66,16 @@ public extension EnvironmentValues {
 
 extension EnvironmentValues {
 
+    var safariViewEntersReaderIfAvailable: Bool {
+        get { self[SafariViewEntersReaderIfAvailableEnvironmentKey.self] }
+        set { self[SafariViewEntersReaderIfAvailableEnvironmentKey.self] = newValue }
+    }
+
+    var safariViewBarCollapsingEnabled: Bool {
+        get { self[SafariViewBarCollapsingEnabledEnvironmentKey.self] }
+        set { self[SafariViewBarCollapsingEnabledEnvironmentKey.self] = newValue }
+    }
+
     var safariViewControlTintColor: Color {
         get { self[SafariViewControlTintColorEnvironmentKey.self] }
         set { self[SafariViewControlTintColorEnvironmentKey.self] = newValue }
@@ -100,13 +93,23 @@ extension EnvironmentValues {
 
 }
 
-private struct SafariViewConfigurationEnvironmentKey: EnvironmentKey {
+private struct SafariViewEntersReaderIfAvailableEnvironmentKey: EnvironmentKey {
+
+    // MARK: - EnvironmentKey
+
+    typealias Value = Bool
+
+    static let defaultValue: Value = false
+
+}
+
+private struct SafariViewBarCollapsingEnabledEnvironmentKey: EnvironmentKey {
 
     // MARK: - EnvironmentKey
 
-    typealias Value = SafariView.Configuration
+    typealias Value = Bool
 
-    static var defaultValue: SafariView.Configuration { .init() }
+    static let defaultValue: Value = false
 
 }
 

Sources/SafariView/Modifiers.swift

@@ -28,12 +28,25 @@ import SwiftUI
 @available(iOS 15.0, macCatalyst 15.0, *)
 public extension View {
 
-    /// Set the configuration of safari views within this view
+    /// Set the automatic reader behavior of safari views within this view
     ///
-    /// - Parameter configuration: The configuration to use
+    /// This modifier is the equivelent of the of the [`entersReaderIfAvailable`](https://developer.apple.com/documentation/safariservices/sfsafariviewcontroller/configuration/1648471-entersreaderifavailable) property of a [`SFSafariViewController.Configuration`](https://developer.apple.com/documentation/safariservices/sfsafariviewcontroller/configuration)
+    ///
+    /// - Parameter entersReaderIfAvailable: Whether or not the safari view should automatically enter reader mode if available.
+    /// - Returns: The modified view
+    func safariEntersReaderIfAvailable(_ entersReaderIfAvailable: Bool = true) -> some View {
+        let modifier = SafariViewEntersReaderIfAvailableModifier(entersReaderIfAvailable: entersReaderIfAvailable)
+        return ModifiedContent(content: self, modifier: modifier)
+    }
+
+    /// Set the bar collapsing behavior of safari views within this view
+    ///
+    /// This modifier is the equivelent of the of the [`barCollapsingEnabled`](https://developer.apple.com/documentation/safariservices/sfsafariviewcontroller/configuration/2887469-barcollapsingenabled) property of a [`SFSafariViewController.Configuration`](https://developer.apple.com/documentation/safariservices/sfsafariviewcontroller/configuration)
+    ///
+    /// - Parameter barCollapsingEnabled: Whether or not bar collpasing should be enabled.
     /// - Returns: The modified view
-    func safariConfiguration(_ configuration: SafariView.Configuration) -> some View {
-        let modifier = SafariViewConfigurationModifier(configuration: configuration)
+    func safariBarCollapsingEnabled(_ barCollapsingEnabled: Bool = true) -> some View {
+        let modifier = SafariViewBarCollapsingEnabledModifier(barCollapsingEnabled: barCollapsingEnabled)
         return ModifiedContent(content: self, modifier: modifier)
     }
 
@@ -191,24 +204,47 @@ public extension View {
 
 }
 
-private struct SafariViewConfigurationModifier: ViewModifier {
+private struct SafariViewEntersReaderIfAvailableModifier: ViewModifier {
 
     // MARK: - Initializers
 
-    init(configuration: SafariView.Configuration) {
-        self.configuration = configuration
+    init(entersReaderIfAvailable: Bool) {
+        self.entersReaderIfAvailable = entersReaderIfAvailable
     }
 
+    // MARK: - ViewModifier
+
     @ViewBuilder
     func body(content: Content) -> some View {
         content
-            .environment(\.safariViewConfiguration, configuration)
+            .environment(\.safariViewEntersReaderIfAvailable, entersReaderIfAvailable)
     }
 
     // MARK: - Private
 
-    private let configuration: SafariView.Configuration
+    private let entersReaderIfAvailable: Bool
+
+}
+
+private struct SafariViewBarCollapsingEnabledModifier: ViewModifier {
+
+    // MARK: - Initializers
+
+    init(barCollapsingEnabled: Bool) {
+        self.barCollapsingEnabled = barCollapsingEnabled
+    }
+
+    // MARK: - ViewModifier
+
+    @ViewBuilder
+    func body(content: Content) -> some View {
+        content
+            .environment(\.safariViewBarCollapsingEnabled, barCollapsingEnabled)
+    }
+
+    // MARK: - Private
 
+    private let barCollapsingEnabled: Bool
 }
 
 private struct SafariViewControlTintColorModifier: ViewModifier {

Sources/SafariView/Presentation.swift

@@ -312,11 +312,11 @@ public extension View {
     /// }
     /// ```
     ///
-    /// - Parameter url: A binding to an optional source of truth for the ``SafariView``. When the URL is non-nil, the system passes the URL to the modifier’s closure. You display this content in a ``SafariView`` that you create that the system displays to the user. If the URL changes, the system dismisses the ``SafariView`` and replaces it with a new one using the same process.
+    /// - Parameters:
+    ///   - url: A binding to an optional source of truth for the ``SafariView``. When the URL is non-nil, the system passes the URL to the modifier’s closure. You display this content in a ``SafariView`` that you create that the system displays to the user. If the URL changes, the system dismisses the ``SafariView`` and replaces it with a new one using the same process.
+    ///   - onDismiss: The closure to execute when dismissing the ``SafariView``
     /// - Returns: The modified view
-    func safari(url: Binding<URL?>) -> some View {
-        safari(item: url, id: \.hashValue) { url in
-            SafariView(url: url)
-        }
+    func safari(url: Binding<URL?>, onDismiss: (() -> Void)? = nil) -> some View {
+        safari(url: url, onDismiss: onDismiss) { url in SafariView(url: url) }
     }
 }

Sources/SafariView/SafariView.docc/Environment.md

@@ -6,6 +6,5 @@ Environment Values used by Safari View
 
 ### Values
 
-- ``safariViewConfiguration``
 - ``safariViewIncludedActivities``
 - ``safariViewExcludedActivityTypes``

Sources/SafariView/SafariView.docc/Modifiers.md

@@ -6,7 +6,8 @@ View modifiers used to configure and present Safari Views.
 
 ### Configuration
 
-- ``safariConfiguration(_:)``
+- ``safariEntersReaderIfAvailable(_:)``
+- ``safariBarCollapsingEnabled(_:)``
 
 ### Appearance
 
@@ -20,7 +21,6 @@ View modifiers used to configure and present Safari Views.
 - ``safari(url:onDismiss:safariView:)``
 - ``safari(item:onDismiss:safariView:)``
 - ``safari(item:id:onDismiss:safariView:)``
-- ``safari(url:)``
 
 ### Activities
 

Sources/SafariView/SafariView.docc/View.md

@@ -10,11 +10,11 @@ A SafariView is best presented by using one the `safari` view modifiers, or via
 
 ### Creating a Safari View
 
-- ``init(url:onInitialLoad:onInitialRedirect:onOpenInBrowser:)``
+- ``init(url:activityButton:onInitialLoad:onInitialRedirect:onOpenInBrowser:)``
+- ``init(url:activityButton:eventAttribution:onInitialLoad:onInitialRedirect:onOpenInBrowser:)``
 
 ### Configuring the View
 
-- ``Configuration``
 - ``ActivityButton``
 - ``DismissButtonStyle``