Allow async loading. Refactor.

Author: colinc86

Package.resolved

@@ -15,7 +15,7 @@ let package = Package(
       targets: ["LaTeXSwiftUI"]),
   ],
   dependencies: [
-     .package(url: "https://github.com/colinc86/MathJaxSwift", from: "3.2.2"),
+     .package(url: "https://github.com/colinc86/MathJaxSwift", from: "3.3.0"),
      .package(url: "https://github.com/exyte/SVGView", from: "1.0.4"),
      .package(url: "https://github.com/kean/Nuke", from: "12.1.0"),
      .package(url: "https://github.com/Kitura/swift-html-entities", from: "4.0.1")

Package.swift

@@ -62,6 +62,14 @@ private struct EquationNumberOffsetKey: EnvironmentKey {
   static let defaultValue: CGFloat = 0.0
 }
 
+private struct RenderingStyleKey: EnvironmentKey {
+  static let defaultValue: LaTeX.RenderingStyle = .wait
+}
+
+private struct AnimatedKey: EnvironmentKey {
+  static let defaultValue: Bool = false
+}
+
 extension EnvironmentValues {
 
   /// The image rendering mode of this environment.
@@ -118,4 +126,16 @@ extension EnvironmentValues {
     set { self[EquationNumberOffsetKey.self] = newValue }
   }
 
+  /// The rendering style of this environment.
+  var renderingStyle: LaTeX.RenderingStyle {
+    get { self[RenderingStyleKey.self] }
+    set { self[RenderingStyleKey.self] = newValue }
+  }
+  
+  /// Whether or not rendering should be animated.
+  var animated: Bool {
+    get { self[AnimatedKey.self] }
+    set { self[AnimatedKey.self] = newValue }
+  }
+  
 }

Sources/LaTeXSwiftUI/Extensions/EnvironmentValues+Extensions.swift

@@ -0,0 +1,53 @@
+//
+//  TeXInputProcessorOptions+Extensions.swift
+//  LaTeXSwiftUI
+//
+//  Copyright (c) 2023 Colin Campbell
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to
+//  deal in the Software without restriction, including without limitation the
+//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+//  sell copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+//  IN THE SOFTWARE.
+//
+
+import Foundation
+import MathJaxSwift
+
+extension TeXInputProcessorOptions {
+  
+  /// Initializes a set of options with the correct properties set for rendering
+  /// a `LaTeX` view.
+  ///
+  /// - Parameters:
+  ///   - processEscapes: Whether or not escapes should be processed.
+  ///   - errorMode: The view's error mode.
+  convenience init(processEscapes: Bool, errorMode: LaTeX.ErrorMode) {
+    self.init()
+    self.processEscapes = processEscapes
+    
+    var packages = TeXInputProcessorOptions.Packages.all
+    if errorMode != .rendered {
+      if let noErrorsIndex = packages.firstIndex(of: TeXInputProcessorOptions.Packages.noerrors) {
+        packages.remove(at: noErrorsIndex)
+      }
+      if let noUndefinedIndex = packages.firstIndex(of: TeXInputProcessorOptions.Packages.noundefined) {
+        packages.remove(at: noUndefinedIndex)
+      }
+    }
+    loadPackages = packages
+  }
+  
+}

Sources/LaTeXSwiftUI/Extensions/TeXInputProcessorOptions+Extensions.swift

@@ -28,31 +28,6 @@ import SwiftUI
 
 public extension View {
 
-  /// Preloads a `LaTeX` view's SVG and image data.
-  ///
-  /// This method should be called last in the view's modifier chain (if at
-  /// all).
-  ///
-  /// - Example:
-  ///
-  /// ```
-  /// LaTeX("Hello, $\\LaTeX$!")
-  ///   .font(.title)
-  ///   .processEscapes()
-  ///   .preload()
-  /// ```
-  ///
-  /// - Note: If the receiver isn't a `LaTeX` view, then this method does
-  ///   nothing.
-  ///
-  /// - Returns: A preloaded view.
-  @MainActor func preload() -> some View {
-    if let latex = self as? LaTeX {
-      latex.preload()
-    }
-    return self
-  }
-  
   /// Sets the image rendering mode for images rendered by MathJax.
   ///
   /// - Parameter mode: The template rendering mode.
@@ -137,4 +112,20 @@ public extension View {
     environment(\.equationNumberOffset, offset)
   }
 
+  /// Sets the view rendering style.
+  ///
+  /// - Parameter style: The rendering style to use.
+  /// - Returns: A view that renders its content.
+  func renderingStyle(_ style: LaTeX.RenderingStyle) -> some View {
+    environment(\.renderingStyle, style)
+  }
+  
+  /// Sets whether or not the view will animate its render state changes.
+  ///
+  /// - Parameter animate: Whether animations are enabled.
+  /// - Returns: A view that animates its rendering.
+  func animated(_ animate: Bool = true) -> some View {
+    environment(\.animated, animate)
+  }
+  
 }