Add support for macCatalyst

Author: gonzalezreal

Examples/MarkdownUIDemo/MarkdownUIDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -34,7 +34,7 @@ let package = Package(
         .package(
             name: "AttributedText",
             url: "https://github.com/gonzalezreal/AttributedText",
-            from: "0.2.1"
+            from: "0.2.2"
         ),
         .package(
             name: "NetworkImage",

Package.resolved

@@ -1,4 +1,4 @@
-#if canImport(SwiftUI) && !os(watchOS) && !targetEnvironment(macCatalyst)
+#if canImport(SwiftUI) && !os(watchOS)
 
     import AttributedText
     import CommonMark
@@ -63,8 +63,7 @@
                     layoutDirection: layoutDirection,
                     multilineTextAlignment: multilineTextAlignment
                 ),
-                style: markdownStyle,
-                isSynchronous: false
+                style: markdownStyle
             )
         }
     }
@@ -78,16 +77,14 @@
             baseURL: URL?,
             writingDirection: NSWritingDirection,
             alignment: NSTextAlignment,
-            style: MarkdownStyle,
-            isSynchronous: Bool
+            style: MarkdownStyle
         ) {
             renderer = MarkdownRenderer(
                 document: document,
                 baseURL: baseURL,
                 writingDirection: writingDirection,
                 alignment: alignment,
-                style: style,
-                environment: isSynchronous ? .synchronous : .default
+                style: style
             )
         }
 

Package.swift

@@ -20,11 +20,6 @@
                 scheduler: DispatchQueue.main.eraseToAnyScheduler()
             )
 
-            static let synchronous = Environment(
-                textAttachments: syncTextAttachments(for:baseURL:),
-                scheduler: DispatchQueue.immediateScheduler.eraseToAnyScheduler()
-            )
-
             let textAttachments: (Set<String>, URL?) -> AnyPublisher<[String: NSTextAttachment], Never>
             let scheduler: AnySchedulerOf<DispatchQueue>
         }
@@ -37,7 +32,7 @@
             writingDirection: NSWritingDirection,
             alignment: NSTextAlignment,
             style: MarkdownStyle,
-            environment: Environment
+            environment: Environment = .default
         ) {
             attributedString = NSAttributedString(
                 document: document,
@@ -94,43 +89,4 @@
             .eraseToAnyPublisher()
     }
 
-    @available(macOS 10.15, iOS 13.0, tvOS 13.0, *)
-    private func syncTextAttachments(
-        for urls: Set<String>,
-        baseURL: URL?
-    ) -> AnyPublisher<[String: NSTextAttachment], Never> {
-        let attachmentURLs = urls.compactMap {
-            URL(string: $0, relativeTo: baseURL)
-        }
-
-        guard !attachmentURLs.isEmpty else {
-            return Just([:]).eraseToAnyPublisher()
-        }
-
-        var result: [String: NSTextAttachment] = [:]
-
-        for url in attachmentURLs {
-            guard let data = try? Data(contentsOf: url),
-                  let image = image(from: data) else { continue }
-
-            let attachment = ImageAttachment()
-            attachment.image = image
-
-            result[url.relativeString] = attachment
-        }
-
-        return Just(result).eraseToAnyPublisher()
-    }
-
-    #if os(macOS)
-        private func image(from data: Data) -> NSImage? {
-            NSImage(data: data)
-        }
-
-    #elseif canImport(UIKit)
-        private func image(from data: Data) -> UIImage? {
-            UIImage(data: data, scale: UIScreen.main.scale)
-        }
-    #endif
-
 #endif