Bump to v3.0.0

stleamist · Oct 29, 2023 · 275f2cb · 275f2cb
2 parents 8845337 + 7bd079a
commit 275f2cb
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [v3.0.0](https://github.com/stleamist/BetterSafariView/releases/tag/v3.0.0) (2023-10-30)
+### Removed
+- Removed public `Identifiable` conformance from `Bool` & `URL`.
+
 ## [v2.4.2](https://github.com/stleamist/BetterSafariView/releases/tag/v2.4.2) (2023-10-30)
 ### Fixed
 - Fixed an issue where the `SafariViewPresenter` fails to find a view controller to presented from (#41 & #46). Thanks, @Tunous and @SongJiyeon!

diff --git a/Demo/iOS/Views/RootView.swift b/Demo/iOS/Views/RootView.swift
@@ -62,10 +62,15 @@ struct RootView: View {
                         }
                         .prefersEphemeralWebBrowserSession(webAuthenticationSessionOptions.prefersEphemeralWebBrowserSession)
                     }
-                    .alert(item: $webAuthenticationSessionCallbackURL) { callbackURL in
+                    .alert(
+                        isPresented: Binding(
+                            get: { webAuthenticationSessionCallbackURL != nil },
+                            set: { if !$0 { webAuthenticationSessionCallbackURL = nil } }
+                        )
+                    ) {
                         Alert(
                             title: Text("Session Completed with Callback URL"),
-                            message: Text(callbackURL.absoluteString),
+                            message: (webAuthenticationSessionCallbackURL?.absoluteString).flatMap(Text.init(_:)),
                             dismissButton: nil
                         )
                     }

diff --git a/README.md b/README.md
@@ -285,7 +285,7 @@ func prefersEphemeralWebBrowserSession(_ prefersEphemeralWebBrowserSession: Bool
 Add the following line to the `dependencies` in your [`Package.swift`](https://developer.apple.com/documentation/swift_packages/package) file:
 
 ```swift
-.package(url: "https://github.com/stleamist/BetterSafariView.git", .upToNextMajor(from: "2.4.2"))
+.package(url: "https://github.com/stleamist/BetterSafariView.git", .upToNextMajor(from: "3.0.0"))
 ```
 
 Next, add `BetterSafariView` as a dependency for your targets:
@@ -304,7 +304,7 @@ import PackageDescription
 let package = Package(
     name: "MyPackage",
     dependencies: [
-        .package(url: "https://github.com/stleamist/BetterSafariView.git", .upToNextMajor(from: "2.4.2"))
+        .package(url: "https://github.com/stleamist/BetterSafariView.git", .upToNextMajor(from: "3.0.0"))
     ],
     targets: [
         .target(name: "MyTarget", dependencies: ["BetterSafariView"])

diff --git a/Sources/BetterSafariView/SafariView/SafariViewPresentationModifier.swift b/Sources/BetterSafariView/SafariView/SafariViewPresentationModifier.swift
@@ -8,24 +8,19 @@ struct SafariViewPresentationModifier: ViewModifier {
     var onDismiss: (() -> Void)? = nil
     var representationBuilder: () -> SafariView
 
-    private var item: Binding<Bool?> {
+    private var item: Binding<Identified<Bool>?> {
         .init(
-            get: { self.isPresented ? true : nil },
+            get: { self.isPresented ? Identified(true) : nil },
             set: { self.isPresented = ($0 != nil) }
         )
     }
 
-    // Converts `() -> Void` closure to `(Bool) -> Void`
-    private func itemRepresentationBuilder(bool: Bool) -> SafariView {
-        return representationBuilder()
-    }
-
     func body(content: Content) -> some View {
         content.background(
             SafariViewPresenter(
                 item: item,
                 onDismiss: onDismiss,
-                representationBuilder: itemRepresentationBuilder
+                representationBuilder: { _ in representationBuilder() }
             )
         )
     }

diff --git a/Sources/BetterSafariView/Shared/Identifiables.swift b/Sources/BetterSafariView/Shared/Identifiables.swift
diff --git a/Sources/BetterSafariView/Shared/Identified.swift b/Sources/BetterSafariView/Shared/Identified.swift
@@ -0,0 +1,8 @@
+struct Identified<Wrapped: Hashable>: Identifiable {
+
+    var id: Wrapped
+
+    init(_ id: Wrapped) {
+        self.id = id
+    }
+}
diff --git a/...ces/BetterSafariView/WebAuthenticationSession/WebAuthenticationPresentationModifier.swift b/...ces/BetterSafariView/WebAuthenticationSession/WebAuthenticationPresentationModifier.swift
@@ -7,23 +7,18 @@ struct WebAuthenticationPresentationModifier: ViewModifier {
     @Binding var isPresented: Bool
     var representationBuilder: () -> WebAuthenticationSession
 
-    private var item: Binding<Bool?> {
+    private var item: Binding<Identified<Bool>?> {
         .init(
-            get: { self.isPresented ? true : nil },
+            get: { self.isPresented ? Identified(true) : nil },
             set: { self.isPresented = ($0 != nil) }
         )
     }
 
-    // Converts `() -> Void` closure to `(Bool) -> Void`
-    private func itemRepresentationBuilder(bool: Bool) -> WebAuthenticationSession {
-        return representationBuilder()
-    }
-
     func body(content: Content) -> some View {
         content.background(
             WebAuthenticationPresenter(
                 item: item,
-                representationBuilder: itemRepresentationBuilder
+                representationBuilder: { _ in representationBuilder() }
             )
         )
     }