Update NaviSheetWebView

Author: tigi44

Package.swift

@@ -1,11 +1,11 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "SwiftComponents",
-    platforms: [.iOS(.v15), .macOS(.v12), .watchOS(.v8)],
+    platforms: [.iOS(.v16), .macOS(.v12), .watchOS(.v8)],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(

Sources/SwiftUIComponents/UIKitWrapper/WebView.swift

@@ -88,10 +88,10 @@ public struct NaviWebView: View {
 }
 
 
-// MARK: - NaviPopupWebView - with web navigation header
+// MARK: - NaviSheetWebView - with web navigation header
 
 
-public struct NaviPopupWebView: View {
+public struct NaviSheetWebView: View {
     @Environment(\.dismiss) private var dismiss
 
     let url: String
@@ -112,30 +112,58 @@ public struct NaviPopupWebView: View {
                           preferredContentMode: preferredContentMode,
                           webViewObject: webViewObject)
             .toolbar {
-                ToolbarItemGroup(placement: .topBarLeading) {
-                    HStack(spacing: 10) {
+                if #available(iOS 26.0, *) {
+                    ToolbarItem(placement: .topBarLeading) {
                         Button(action: {
                             dismiss()
                         }, label: {
                             Image(systemName: "xmark")
                         })
-                        
-                        Divider()
                     }
 
-                    Button {
-                        webViewObject.webView?.goBack()
-                    } label: {
-                        Image(systemName: "chevron.backward")
+                    ToolbarSpacer(.fixed, placement: .topBarLeading)
+                    
+                    if webViewObject.webView?.canGoBack ?? false {
+                        ToolbarItem(placement: .topBarLeading) {
+                            Button {
+                                webViewObject.webView?.goBack()
+                            } label: {
+                                Image(systemName: "chevron.backward")
+                            }
+                        }
                     }
-                    .disabled(!(webViewObject.webView?.canGoBack ?? false))
 
-                    Button {
-                        webViewObject.webView?.goForward()
-                    } label: {
-                        Image(systemName: "chevron.forward")
+                    if webViewObject.webView?.canGoForward ?? false {
+                        ToolbarItem(placement: .topBarLeading) {
+                            Button {
+                                webViewObject.webView?.goForward()
+                            } label: {
+                                Image(systemName: "chevron.forward")
+                            }
+                        }
+                    }
+                } else {
+                    ToolbarItemGroup(placement: .topBarLeading) {
+                        Button(action: {
+                            dismiss()
+                        }, label: {
+                            Image(systemName: "xmark")
+                        })
+                        
+                        Button {
+                            webViewObject.webView?.goBack()
+                        } label: {
+                            Image(systemName: "chevron.backward")
+                        }
+                        .disabled(!(webViewObject.webView?.canGoBack ?? false))
+                        
+                        Button {
+                            webViewObject.webView?.goForward()
+                        } label: {
+                            Image(systemName: "chevron.forward")
+                        }
+                        .disabled(!(webViewObject.webView?.canGoForward ?? false))
                     }
-                    .disabled(!(webViewObject.webView?.canGoForward ?? false))
                 }
 
                 ToolbarItemGroup(placement: .topBarTrailing) {
@@ -167,7 +195,7 @@ struct WebView_Previews: PreviewProvider {
         NaviWebView(url: "https://www.apple.com")
             .previewDisplayName("NaviWebView")
 
-        NaviPopupWebView(url: "https://www.apple.com")
+        NaviSheetWebView(url: "https://www.apple.com")
             .previewDisplayName("NaviPopupWebView")
     }
 }