Merge pull request #18 from cybozu/fix-hyperlink

Fixed a bug caused by hyperlinks

Author: Kyome22

Sources/LicenseList/LegacyLicenseView.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 
 public struct LegacyLicenseView: View {
-    @State private var sentences = [LegacyLicenseSentence]()
+    @State private var lines = [[LegacyLicenseSentence]]()
 
     private let library: Library
 
@@ -18,39 +18,45 @@ public struct LegacyLicenseView: View {
 
     public var body: some View {
         ScrollView {
-            VStack(spacing: 0) {
-                ForEach(sentences, id: \.body) { sentence in
-                    if sentence.isHyperLink {
-                        hyperLinkText(sentence.body)
-                    } else {
+            VStack(alignment: .leading, spacing: 0) {
+                ForEach(lines.indices, id: \.self) { index in
+                    if lines[index].count == 1,
+                       let sentence = lines[index].first {
                         Text(sentence.body)
                             .font(.caption)
+                    } else {
+                        lines[index].reduce(Text("")) { result, sentence in
+                            if sentence.isHyperLink {
+                                return result + Text(sentence.body)
+                                    .font(.caption)
+                                    .foregroundColor(Color.blue)
+                            } else {
+                                return result + Text(sentence.body)
+                                    .font(.caption)
+                            }
+                        }
+                        .onTapGesture {
+                            if let linkText = lines[index].first(where: { $0.isHyperLink })?.body,
+                               let url = URL(string: linkText),
+                               UIApplication.shared.canOpenURL(url) {
+                                UIApplication.shared.open(url)
+                            }
+                        }
                     }
                 }
             }
             .frame(maxWidth: .infinity, alignment: .leading)
             .padding()
         }
         .onAppear {
-            sentences = resolve(library.licenseBody)
+            lines = resolve(library.licenseBody)
         }
         .navigationBarTitleInlineIfPossible(library.name)
     }
 
-    private func hyperLinkText(_ linkText: String) -> some View {
-        Text(linkText)
-            .font(.caption)
-            .foregroundColor(Color.blue)
-            .onTapGesture {
-                if let url = URL(string: linkText),
-                   UIApplication.shared.canOpenURL(url) {
-                    UIApplication.shared.open(url)
-                }
-            }
-    }
-
-    private func resolve(_ inputText: String) -> [LegacyLicenseSentence] {
-        let pattern: String = "https?://[A-Za-z0-9\\.\\-\\[\\]!@#$%&=+/?:_]+"
-        return inputText.split(pattern)
+    private func resolve(_ inputText: String) -> [[LegacyLicenseSentence]] {
+        return inputText
+            .components(separatedBy: .newlines)
+            .map { $0.split(URL.regexPattern) }
     }
 }

Sources/LicenseList/LicenseView.swift

@@ -37,10 +37,9 @@ public struct LicenseView: View {
 
     private func attribute(_ inputText: String) -> AttributedString {
         var attributedText = AttributedString(inputText)
-        let pattern: String = "https?://[A-Za-z0-9-._~:/?#\\[\\]@!$&'()*+,;%=]+"
-        let urls: [URL?] = inputText.match(pattern)
+        let urls: [URL?] = inputText.match(URL.regexPattern)
             .map { URL(string: String(inputText[$0])) }
-        let ranges = attributedText.match(pattern)
+        let ranges = attributedText.match(URL.regexPattern)
         for case (let range, let url?) in zip(ranges, urls) {
             attributedText[range].link = url
         }

Sources/LicenseList/URL+Extension.swift

@@ -0,0 +1,12 @@
+//
+//  URL+Extension.swift
+//  
+//
+//  Created by ky0me22 on 2023/09/26.
+//
+
+import Foundation
+
+extension URL {
+    static let regexPattern = "https?://[A-Za-z0-9-.!@#$%&=+/?:_~]+"
+}