Modularize Image Provider Implementation for Improved Flexibility

Examples/Demo/Demo/ImageProvidersView.swift

@@ -1,6 +1,8 @@
 import MarkdownUI
 import SDWebImageSwiftUI
 import SwiftUI
+import ImageProviders
+import NetworkImageProvider
 
 struct ImageProvidersView: View {
   private let content = """

Examples/Demo/Demo/ImagesView.swift

@@ -1,5 +1,7 @@
 import MarkdownUI
 import SwiftUI
+import ImageProviders
+import NetworkImageProvider
 
 struct ImagesView: View {
   private let content = """

Examples/Demo/Demo/LazyLoadingView.swift

@@ -1,3 +1,4 @@
+import ImageProviders
 import MarkdownUI
 import SwiftUI
 

Package.swift

@@ -15,6 +15,14 @@ let package = Package(
     .library(
       name: "MarkdownUI",
       targets: ["MarkdownUI"]
+    ),
+    .library(
+      name: "ImageProviders",
+      targets: ["ImageProviders"]
+    ),
+    .library(
+      name: "NetworkImageProvider",
+      targets: ["NetworkImageProvider"]
     )
   ],
   dependencies: [
@@ -26,9 +34,21 @@ let package = Package(
     .target(
       name: "MarkdownUI",
       dependencies: [
+        "ImageProviders",
+        "NetworkImageProvider",
         .product(name: "cmark-gfm", package: "swift-cmark"),
         .product(name: "cmark-gfm-extensions", package: "swift-cmark"),
-        .product(name: "NetworkImage", package: "NetworkImage"),
+      ]
+    ),
+    .target(
+      name: "ImageProviders",
+      dependencies: []
+    ),
+    .target(
+      name: "NetworkImageProvider",
+      dependencies: [
+        "ImageProviders",
+        .product(name: "NetworkImage", package: "NetworkImage")
       ]
     ),
     .testTarget(

Sources/MarkdownUI/Extensibility/ImageProvider.swift → Sources/ImageProviders/ImageProvider.swift

@@ -26,16 +26,16 @@ public protocol ImageProvider {
   @ViewBuilder func makeImage(url: URL?) -> Body
 }
 
-struct AnyImageProvider: ImageProvider {
+public struct AnyImageProvider: ImageProvider {
   private let _makeImage: (URL?) -> AnyView
 
-  init<I: ImageProvider>(_ imageProvider: I) {
+  public init<I: ImageProvider>(_ imageProvider: I) {
     self._makeImage = {
       AnyView(imageProvider.makeImage(url: $0))
     }
   }
 
-  func makeImage(url: URL?) -> some View {
+  public func makeImage(url: URL?) -> some View {
     self._makeImage(url)
   }
-}
+} 

Sources/ImageProviders/InlineImageProvider.swift

@@ -0,0 +1,14 @@
+import SwiftUI
+
+/// A type that provides an image for an inline image in a Markdown view.
+///
+/// To configure the current inline image provider for a view hierarchy,
+/// use the `markdownInlineImageProvider(_:)` modifier.
+public protocol InlineImageProvider {
+  /// Returns an image for the given URL and label.
+  ///
+  /// - Parameters:
+  ///   - url: The URL of the image to load.
+  ///   - label: The accessibility label for the image.
+  func image(with url: URL, label: String) async throws -> Image
+}

Sources/MarkdownUI/Utility/ResizeToFit.swift → Sources/ImageProviders/Utils/ResizeToFit.swift

@@ -1,15 +1,15 @@
 import SwiftUI
 
-struct ResizeToFit<Content>: View where Content: View {
+public struct ResizeToFit<Content>: View where Content: View {
   private let idealSize: CGSize
   private let content: Content
 
-  init(idealSize: CGSize, @ViewBuilder content: () -> Content) {
+  public init(idealSize: CGSize, @ViewBuilder content: () -> Content) {
     self.idealSize = idealSize
     self.content = content()
   }
 
-  var body: some View {
+  public var body: some View {
     if #available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *) {
       ResizeToFit2 { self.content }
     } else {

Sources/MarkdownUI/Utility/Deprecations.swift

@@ -1,21 +1,5 @@
 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 {

Sources/MarkdownUI/Views/Environment/Environment+ImageProvider.swift

@@ -1,4 +1,6 @@
 import SwiftUI
+import ImageProviders
+import NetworkImageProvider
 
 extension View {
   /// Sets the image provider for the Markdown images in a view hierarchy.

Sources/MarkdownUI/Views/Environment/Environment+InlineImageProvider.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import ImageProviders
 
 extension View {
   /// Sets the inline image provider for the Markdown inline images in a view hierarchy.

Sources/MarkdownUI/Views/Inlines/ImageView.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import ImageProviders
 
 struct ImageView: View {
   @Environment(\.theme.image) private var image

Sources/MarkdownUI/Views/Inlines/InlineText.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import ImageProviders
 
 struct InlineText: View {
   @Environment(\.inlineImageProvider) private var inlineImageProvider

Sources/MarkdownUI/Extensibility/DefaultImageProvider.swift → Sources/NetworkImageProvider/DefaultImageProvider.swift

@@ -1,5 +1,6 @@
 import NetworkImage
 import SwiftUI
+import ImageProviders
 
 /// The default image provider, which loads images from the network.
 public struct DefaultImageProvider: ImageProvider {
@@ -26,3 +27,12 @@ extension ImageProvider where Self == DefaultImageProvider {
     .init()
   }
 }
+
+// MARK: - Deprecated after 2.1.0:
+
+extension DefaultImageProvider {
+  @available(*, deprecated, message: "Use the 'default' static property")
+  public init(urlSession: URLSession = .shared) {
+    self.init()
+  }
+} 

Sources/MarkdownUI/Extensibility/DefaultInlineImageProvider.swift → Sources/NetworkImageProvider/DefaultInlineImageProvider.swift

@@ -1,5 +1,6 @@
 import NetworkImage
 import SwiftUI
+import ImageProviders
 
 /// The default inline image provider, which loads images from the network.
 public struct DefaultInlineImageProvider: InlineImageProvider {
@@ -21,3 +22,12 @@ extension InlineImageProvider where Self == DefaultInlineImageProvider {
     .init()
   }
 }
+
+// MARK: - Deprecated after 2.1.0:
+
+extension DefaultInlineImageProvider {
+  @available(*, deprecated, message: "Use the 'default' static property")
+  public init(urlSession: URLSession = .shared) {
+    self.init()
+  }
+} 

Tests/MarkdownUITests/MarkdownImageTests.swift

@@ -4,6 +4,7 @@
   import XCTest
 
   import MarkdownUI
+  import ImageProviders
 
   final class MarkdownImageTests: XCTestCase {
     private let layout = SwiftUISnapshotLayout.device(config: .iPhone8)

Tests/MarkdownUITests/MarkdownTableTests.swift

@@ -4,6 +4,7 @@
   import XCTest
 
   import MarkdownUI
+  import ImageProviders
 
   final class MarkdownTableTests: XCTestCase {
     private let layout = SwiftUISnapshotLayout.device(config: .iPhone8)

Tests/MarkdownUITests/ThemeDocCTests.swift

@@ -4,6 +4,7 @@
   import XCTest
 
   import MarkdownUI
+  import ImageProviders
 
   final class ThemeDocCTests: XCTestCase {
     private let layout = SwiftUISnapshotLayout.device(config: .iPhone8)