Merge remote-tracking branch 'refs/remotes/origin/main'

Conflicts:
	Sources/FlexibleAttributedText/FlexibleAttributedTextImpl+iOS.swift

Author: developerfromjokela

README.md

@@ -2,6 +2,7 @@
 
 FlexibleAttributedText is a Swift µpackage that provides `NSAttributedString` rendering in SwiftUI by wrapping either an `NSTextView` or a `UITextView` depending on the platform, which supports flexible views.
 
+
 ## Supported Platforms
 
 * macOS 11.0+
@@ -10,12 +11,12 @@ FlexibleAttributedText is a Swift µpackage that provides `NSAttributedString` r
 
 ## Usage
 ```swift
-import AttributedText
+import FlexibleAttributedText
 import SwiftUI
 
 struct ContentView: View {
   var body: some View {
-    AttributedText {
+    FlexibleAttributedText {
       let result = NSMutableAttributedString(
         string: """
           After the Big Bang
@@ -63,14 +64,14 @@ struct ContentView: View {
 }
 ```
 
-An `AttributedText` view takes all the available width and adjusts its height to fit the contents.
+An `FlexibleAttributedText` view takes all the available width and adjusts its height to fit the contents.
 
 To use dynamic width, pass down an argument `flexibleWidth` with value `true` to enable flexible width.
 
 To change the text alignment or line break mode, you need to add a `.paragraphStyle` attribute to the attributed string.
 
 ## Installation
-You can add AttributedText to an Xcode project by adding it as a package dependency.
+You can add FlexibleAttributedText to an Xcode project by adding it as a package dependency.
 1. From the **File** menu, select **Swift Packages › Add Package Dependency…**
-1. Enter `https://github.com/gonzalezreal/AttributedText` into the package repository URL text field
-1. Link **AttributedText** to your application target
+1. Enter `https://github.com/wilmaplus/FlexibleAttributedText` into the package repository URL text field
+1. Link **FlexibleAttributedText** to your application target

Sources/FlexibleAttributedText/FlexibleAttributedText.swift

@@ -14,10 +14,13 @@ public struct FlexibleAttributedText: View {
   ///   - onOpenLink: The action to perform when the user opens a link in the text. When not specified,
   ///                 the  view opens the links using the `OpenURLAction` from the environment.
   ///   - flexibleWidth: Flexible Width
-  public init(_ attributedText: NSAttributedString, onOpenLink: ((URL) -> Void)? = nil, flexibleWidth: Bool = false) {
+  public init(
+    _ attributedText: NSAttributedString, onOpenLink: ((URL) -> Void)? = nil,
+    flexibleWidth: Bool = false
+  ) {
     self.attributedText = attributedText
     self.onOpenLink = onOpenLink
-        self.flexibleWidth = flexibleWidth
+    self.flexibleWidth = flexibleWidth
   }
 
   /// Creates an attributed text view.
@@ -26,7 +29,10 @@ public struct FlexibleAttributedText: View {
   ///   - onOpenLink: The action to perform when the user opens a link in the text. When not specified,
   ///                 the  view opens the links using the `OpenURLAction` from the environment.
   ///   - flexibleWidth: Flexible Width
-    public init(attributedText: () -> NSAttributedString, onOpenLink: ((URL) -> Void)? = nil, flexibleWidth: Bool = false) {
+  public init(
+    attributedText: () -> NSAttributedString, onOpenLink: ((URL) -> Void)? = nil,
+    flexibleWidth: Bool = false
+  ) {
     self.init(attributedText(), onOpenLink: onOpenLink, flexibleWidth: flexibleWidth)
   }
 

Sources/FlexibleAttributedText/FlexibleAttributedTextImpl+iOS.swift

@@ -13,6 +13,7 @@
       uiView.textContainer.lineBreakMode = NSLineBreakMode(
         truncationMode: context.environment.truncationMode
       )
+
       uiView.openLink = onOpenLink ?? { context.environment.openURL($0) }
       uiView.invalidateIntrinsicContentSize()
       uiView.updateFrame()
@@ -61,9 +62,10 @@
 
       override var intrinsicContentSize: CGSize {
         guard maxLayoutWidth > 0 else {
-            let fixedWidth = frame.size.width
-            let newSize = self.sizeThatFits(CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude))
-            return CGSize(width: max(newSize.width, fixedWidth), height: newSize.height)
+          let fixedWidth = frame.size.width
+          let newSize = self.sizeThatFits(
+            CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude))
+          return CGSize(width: max(newSize.width, fixedWidth), height: newSize.height)
         }
 
         return sizeThatFits(CGSize(width: maxLayoutWidth, height: .greatestFiniteMagnitude))

Sources/FlexibleAttributedText/FlexibleAttributedTextImpl+macOS.swift

@@ -12,7 +12,7 @@
       nsView.textContainer?.lineFragmentPadding = 0
       // we are setting the container's width manually
       nsView.textContainer?.widthTracksTextView = false
-        nsView.delegate = context.coordinator
+      nsView.delegate = context.coordinator
 
       return nsView
     }
@@ -34,45 +34,46 @@
     }
   }
 
-extension FlexibleAttributedTextImpl {
+  extension FlexibleAttributedTextImpl {
     final class TextView: NSTextView {
-        var maxLayoutWidth: CGFloat {
-            get { textContainer?.containerSize.width ?? 0 }
-            set {
-                guard textContainer?.containerSize.width != newValue else { return }
-                textContainer?.containerSize.width = newValue
-                invalidateIntrinsicContentSize()
-            }
+      var maxLayoutWidth: CGFloat {
+        get { textContainer?.containerSize.width ?? 0 }
+        set {
+          guard textContainer?.containerSize.width != newValue else { return }
+          textContainer?.containerSize.width = newValue
+          invalidateIntrinsicContentSize()
         }
-        
-        override var intrinsicContentSize: CGSize {
-            guard maxLayoutWidth > 0,
-                  let textContainer = self.textContainer,
-                  let layoutManager = self.layoutManager
-            else {
-                let fixedWidth = frame.size.width
-                let newSize = self.sizeThatFits(CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude))
-                return CGSize(width: max(newSize.width, fixedWidth), height: newSize.height)
-            }
-            
-            layoutManager.ensureLayout(for: textContainer)
-            return layoutManager.usedRect(for: textContainer).size
+      }
+
+      override var intrinsicContentSize: CGSize {
+        guard maxLayoutWidth > 0,
+          let textContainer = self.textContainer,
+          let layoutManager = self.layoutManager
+        else {
+          let fixedWidth = frame.size.width
+          let newSize = self.sizeThatFits(
+            CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude))
+          return CGSize(width: max(newSize.width, fixedWidth), height: newSize.height)
         }
-        
-        final class Coordinator: NSObject, NSTextViewDelegate {
-            var openLink: ((URL) -> Void)?
-            
-            func textView(_: NSTextView, clickedOnLink link: Any, at _: Int) -> Bool {
-                guard let openLink = self.openLink,
-                      let url = (link as? URL) ?? (link as? String).flatMap(URL.init(string:))
-                else {
-                    return false
-                }
-                
-                openLink(url)
-                return true
-            }
+
+        layoutManager.ensureLayout(for: textContainer)
+        return layoutManager.usedRect(for: textContainer).size
+      }
+
+      final class Coordinator: NSObject, NSTextViewDelegate {
+        var openLink: ((URL) -> Void)?
+
+        func textView(_: NSTextView, clickedOnLink link: Any, at _: Int) -> Bool {
+          guard let openLink = self.openLink,
+            let url = (link as? URL) ?? (link as? String).flatMap(URL.init(string:))
+          else {
+            return false
+          }
+
+          openLink(url)
+          return true
         }
+      }
     }
-}
+  }
 #endif

Sources/FlexibleAttributedText/FlexibleAttributedTextImpl+tvOS.swift

@@ -42,7 +42,8 @@
 
       override var intrinsicContentSize: CGSize {
         guard maxLayoutWidth > 0 else {
-            return sizeThatFits(CGSize(width: self.frame.size.width, height: CGFloat.greatestFiniteMagnitude))
+          return sizeThatFits(
+            CGSize(width: self.frame.size.width, height: CGFloat.greatestFiniteMagnitude))
         }
 
         return sizeThatFits(CGSize(width: maxLayoutWidth, height: .greatestFiniteMagnitude))

Tests/FlexibleAttributedTextTests/FlexibleAttributedTextTests.swift

@@ -7,26 +7,28 @@
 
   final class FlexibleAttributedTextTests: XCTestCase {
     struct TestView: View {
-        var flexible: Bool = false
+      var flexible: Bool = false
       var body: some View {
-          FlexibleAttributedText(attributedText: {
-          let result = NSMutableAttributedString(
-            string: """
-              Sherlock Holmes
-              I had called upon my friend, Mr. Sherlock Holmes.
-              """
-          )
+        FlexibleAttributedText(
+          attributedText: {
+            let result = NSMutableAttributedString(
+              string: """
+                Sherlock Holmes
+                I had called upon my friend, Mr. Sherlock Holmes.
+                """
+            )
 
-          result.addAttributes(
-            [.font: UIFont.preferredFont(forTextStyle: .title2)],
-            range: NSRange(location: 0, length: 15)
-          )
-          result.addAttributes(
-            [.font: UIFont.preferredFont(forTextStyle: .body)],
-            range: NSRange(location: 15, length: 49)
-          )
-          return result
-          }, onOpenLink: nil, flexibleWidth: flexible)
+            result.addAttributes(
+              [.font: UIFont.preferredFont(forTextStyle: .title2)],
+              range: NSRange(location: 0, length: 15)
+            )
+            result.addAttributes(
+              [.font: UIFont.preferredFont(forTextStyle: .body)],
+              range: NSRange(location: 15, length: 49)
+            )
+            return result
+          }, onOpenLink: nil, flexibleWidth: flexible
+        )
         .background(Color.gray.opacity(0.5))
         .padding()
       }
@@ -62,21 +64,21 @@
       assertSnapshot(
         matching: view, as: .image(precision: precision, layout: layout), named: platformName)
     }
-      
-      func testFlexible() {
-          let view = TestView(flexible: true)
-              .frame(minWidth: 0, maxWidth: .infinity).background(Color.red)
-        assertSnapshot(
-          matching: view, as: .image(precision: precision, layout: layout), named: platformName)
-      }
-      
-      func testFlexibleWidthWithAlignment() {
-          let view = VStack(alignment: .leading) {
-              TestView(flexible: true)
-          }.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading).background(Color.red)
 
-        assertSnapshot(
-          matching: view, as: .image(precision: precision, layout: layout), named: platformName)
-      }
+    func testFlexible() {
+      let view = TestView(flexible: true)
+        .frame(minWidth: 0, maxWidth: .infinity).background(Color.red)
+      assertSnapshot(
+        matching: view, as: .image(precision: precision, layout: layout), named: platformName)
+    }
+
+    func testFlexibleWidthWithAlignment() {
+      let view = VStack(alignment: .leading) {
+        TestView(flexible: true)
+      }.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading).background(Color.red)
+
+      assertSnapshot(
+        matching: view, as: .image(precision: precision, layout: layout), named: platformName)
+    }
   }
 #endif