Adopt the NetworkImage package for image loading (#258)

Author: gonzalezreal

Package.resolved

@@ -17,13 +17,17 @@ let package = Package(
     )
   ],
   dependencies: [
-    .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.10.0")
+    .package(url: "https://github.com/gonzalezreal/NetworkImage", from: "6.0.0"),
+    .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.10.0"),
   ],
   targets: [
     .target(name: "cmark-gfm"),
     .target(
       name: "MarkdownUI",
-      dependencies: ["cmark-gfm"]
+      dependencies: [
+        "cmark-gfm",
+        .product(name: "NetworkImage", package: "NetworkImage"),
+      ]
     ),
     .testTarget(
       name: "MarkdownUITests",

Package.swift

@@ -58,3 +58,19 @@ extension ImageProvider where Self == AssetImageProvider {
     .init()
   }
 }
+
+#if canImport(UIKit)
+  private typealias PlatformImage = UIImage
+#elseif os(macOS)
+  private typealias PlatformImage = NSImage
+#endif
+
+extension Image {
+  fileprivate init(platformImage: PlatformImage) {
+    #if canImport(UIKit)
+      self.init(uiImage: platformImage)
+    #elseif os(macOS)
+      self.init(nsImage: platformImage)
+    #endif
+  }
+}

Sources/MarkdownUI/Extensibility/AssetImageProvider.swift

@@ -1,17 +1,20 @@
+import NetworkImage
 import SwiftUI
 
 /// The default image provider, which loads images from the network.
 public struct DefaultImageProvider: ImageProvider {
-  private let urlSession: URLSession
-
-  /// Creates a default image provider.
-  /// - Parameter urlSession: An `URLSession` instance to load images.
-  public init(urlSession: URLSession = .shared) {
-    self.urlSession = urlSession
-  }
-
   public func makeImage(url: URL?) -> some View {
-    DefaultImageView(url: url, urlSession: self.urlSession)
+    NetworkImage(url: url) { state in
+      switch state {
+      case .empty, .failure:
+        Color.clear
+          .frame(width: 0, height: 0)
+      case .success(let image, let idealSize):
+        ResizeToFit(idealSize: idealSize) {
+          image.resizable()
+        }
+      }
+    }
   }
 }
 

Sources/MarkdownUI/Extensibility/DefaultImageProvider.swift

@@ -1,19 +1,13 @@
+import NetworkImage
 import SwiftUI
 
 /// The default inline image provider, which loads images from the network.
 public struct DefaultInlineImageProvider: InlineImageProvider {
-  private let urlSession: URLSession
-
-  /// Creates a default inline image provider.
-  /// - Parameter urlSession: An `URLSession` instance to load images.
-  public init(urlSession: URLSession = .shared) {
-    self.urlSession = urlSession
-  }
-
   public func image(with url: URL, label: String) async throws -> Image {
     try await Image(
-      platformImage: DefaultImageLoader.shared
-        .image(with: url, urlSession: self.urlSession)
+      DefaultNetworkImageLoader.shared.image(from: url),
+      scale: 1,
+      label: Text(label)
     )
   }
 }

Sources/MarkdownUI/Extensibility/DefaultImageView/DefaultImageLoader.swift

@@ -1,5 +1,21 @@
 import SwiftUI
 
+// MARK: - Deprecated after 2.1.0:
+
+extension DefaultImageProvider {
+  @available(*, deprecated, message: "Use the 'default' static property")
+  public init(urlSession: URLSession = .shared) {
+    self.init()
+  }
+}
+
+extension DefaultInlineImageProvider {
+  @available(*, deprecated, message: "Use the 'default' static property")
+  public init(urlSession: URLSession = .shared) {
+    self.init()
+  }
+}
+
 // MARK: - Deprecated after 2.0.2:
 
 extension BlockStyle where Configuration == BlockConfiguration {