Initial RichText integration

Package.swift

@@ -6,10 +6,10 @@ import PackageDescription
 let package = Package(
     name: "MarkdownView",
     platforms: [
-        .macOS(.v12),
-        .iOS(.v15),
-        .tvOS(.v15),
-        .watchOS(.v8),
+        .macOS(.v13),
+        .iOS(.v16),
+        .tvOS(.v16),
+        .watchOS(.v9),
         .visionOS(.v1),
     ],
     products: [
@@ -19,6 +19,7 @@ let package = Package(
         .package(url: "https://github.com/swiftlang/swift-markdown.git", from: "0.5.0"),
         .package(url: "https://github.com/raspu/Highlightr.git", from: "2.2.1"),
         .package(url: "https://github.com/colinc86/LaTeXSwiftUI.git", from: "1.4.1"),
+        .package(url: "https://github.com/LiYanan2004/RichText.git", branch: "main"),
     ],
     targets: [
         .target(
@@ -38,6 +39,11 @@ let package = Package(
                     package: "LaTeXSwiftUI",
                     condition: .when(platforms: [.iOS, .macOS])
                 ),
+                .product(
+                    name: "RichText",
+                    package: "RichText",
+                    condition: .when(platforms: [.iOS, .macOS])
+                ),
             ],
             swiftSettings: [.swiftLanguageMode(.v6)]
         ),

Sources/MarkdownView/Customizations/Block Quotes/DefaultBlockQuoteStyle.swift

@@ -21,9 +21,10 @@ extension BlockQuoteStyle where Self == DefaultBlockQuoteStyle {
 
 fileprivate struct DefaultBlockQuoteView: View {
     var configuration: BlockQuoteStyleConfiguration
-    @Environment(\.markdownFontGroup.blockQuote) private var font
-    @Environment(\.markdownRendererConfiguration.blockQuoteTintColor) private var tint
+    @Environment(\.markdownRendererConfiguration) private var rendererConfiguration
     var body: some View {
+        let tint = rendererConfiguration.preferredTintColors[.blockQuote] ?? .accentColor
+        let font = rendererConfiguration.fonts[.blockQuote] ?? .system(.body, design: .serif)
         configuration.content
             .padding(.vertical, 8)
             .frame(maxWidth: .infinity, alignment: .leading)

Sources/MarkdownView/Customizations/Code Blocks/DefaultCodeBlockStyle.swift

@@ -58,8 +58,7 @@ struct DefaultMarkdownCodeBlock: View {
 
     var theme: CodeHighlighterTheme
     @Environment(\.colorScheme) private var colorScheme
-
-    @Environment(\.markdownFontGroup) private var fontGroup
+    @Environment(\.markdownRendererConfiguration) private var rendererConfiguration
 
     @State private var attributedCode: AttributedString?
     @State private var codeHighlightTask: Task<Void, Error>?
@@ -83,7 +82,7 @@ struct DefaultMarkdownCodeBlock: View {
             debouncedHighlight()
         }
         .lineSpacing(4)
-        .font(fontGroup.codeBlock)
+        .font(rendererConfiguration.fonts[.codeBlock] ?? .system(.callout, design: .monospaced))
         .frame(maxWidth: .infinity, alignment: .leading)
         #if os(macOS) || os(iOS)
         .safeAreaInset(edge: .top, spacing: 0) {

Sources/MarkdownView/Customizations/Font/MarkdownComponent.swift

@@ -0,0 +1,18 @@
+import Foundation
+
+@_documentation(visibility: internal)
+public enum MarkdownComponent: Hashable, Sendable, CaseIterable {
+    case h1
+    case h2
+    case h3
+    case h4
+    case h5
+    case h6
+    case body
+    case codeBlock
+    case blockQuote
+    case tableHeader
+    case tableBody
+    case inlineMath
+    case displayMath
+}

Sources/MarkdownView/Customizations/Font/MarkdownFontGroup.swift

@@ -59,6 +59,7 @@ struct MarkdownFontGroupEnvironmentKey: EnvironmentKey {
 }
 
 extension EnvironmentValues {
+    @available(*, deprecated, message: "Use markdownRendererConfiguration.fonts via font modifiers instead.")
     var markdownFontGroup: AnyMarkdownFontGroup {
         get { self[MarkdownFontGroupEnvironmentKey.self] }
         set { self[MarkdownFontGroupEnvironmentKey.self] = newValue }

Sources/MarkdownView/Customizations/List/Ordered List Marker/AnyOrderedListMarkerProtocol.swift

@@ -7,13 +7,13 @@
 
 import Foundation
 
-struct AnyOrderedListMarkerProtocol: OrderedListMarkerProtocol {
+public struct AnyOrderedListMarkerProtocol: OrderedListMarkerProtocol {
     private var _marker: AnyHashable
-    var monospaced: Bool {
+    public var monospaced: Bool {
         (_marker as! (any OrderedListMarkerProtocol)).monospaced
     }
 
-    init<T: OrderedListMarkerProtocol>(_ marker: T) {
+    public init<T: OrderedListMarkerProtocol>(_ marker: T) {
         self._marker = AnyHashable(marker)
     }
 

Sources/MarkdownView/Customizations/List/Unordered List Marker/AnyUnorderedListMarkerProtocol.swift

@@ -7,13 +7,13 @@
 
 import Foundation
 
-struct AnyUnorderedListMarkerProtocol: UnorderedListMarkerProtocol {
+public struct AnyUnorderedListMarkerProtocol: UnorderedListMarkerProtocol {
     private var _marker: AnyHashable
-    var monospaced: Bool {
+    public var monospaced: Bool {
         (_marker as! (any UnorderedListMarkerProtocol)).monospaced
     }
 
-    init<T: UnorderedListMarkerProtocol>(_ marker: T) {
+    public init<T: UnorderedListMarkerProtocol>(_ marker: T) {
         self._marker = AnyHashable(marker)
     }
 

Sources/MarkdownView/Customizations/Table/Configuration/MarkdownTableStyleConfiguration.Table.Fallback.swift

@@ -13,8 +13,6 @@ extension MarkdownTableStyleConfiguration.Table {
     public struct Fallback: View {
         private var table: Markdown.Table
         @Environment(\.markdownRendererConfiguration) private var configuration
-        @Environment(\.markdownFontGroup.tableHeader) private var headerFont
-        @Environment(\.markdownFontGroup.tableBody) private var bodyFont
         @Environment(\.markdownTableCellPadding) private var padding
         private var showsRowSeparators: Bool = false
         private var horizontalSpacing: CGFloat = 0
@@ -26,6 +24,8 @@ extension MarkdownTableStyleConfiguration.Table {
 
         @_documentation(visibility: internal)
         public var body: some View {
+            let headerFont = configuration.fonts[.tableHeader] ?? .headline
+            let bodyFont = configuration.fonts[.tableBody] ?? .body
             AdaptiveGrid(
                 horizontalSpacing: horizontalSpacing,
                 verticalSpacing: verticalSpacing,

Sources/MarkdownView/Customizations/Table/Configuration/MarkdownTableStyleConfiguration.Table.Header.swift

@@ -14,14 +14,15 @@ extension MarkdownTableStyleConfiguration.Table {
     /// On platforms that does not supports `Grid`, it would be `EmptyView`.
     public struct Header: View {
         var head: Markdown.Table.Head
-        @Environment(\.markdownFontGroup.tableHeader) private var font
+        @Environment(\.markdownRendererConfiguration) private var configuration
 
         init(_ head: Markdown.Table.Head) {
             self.head = head
         }
 
         @_documentation(visibility: internal)
         public var body: some View {
+            let font = configuration.fonts[.tableHeader] ?? .headline
             MarkdownTableRow(
                 rowIndex: 0,
                 cells: Array(head.cells)

Sources/MarkdownView/Customizations/Table/Configuration/MarkdownTableStyleConfiguration.Table.Row.swift

@@ -14,14 +14,15 @@ extension MarkdownTableStyleConfiguration.Table {
     /// On platforms that does not supports `Grid`, it would be `EmptyView`.
     public struct Row: View {
         var row: Markdown.Table.Row
-        @Environment(\.markdownFontGroup.tableBody) private var font
+        @Environment(\.markdownRendererConfiguration) private var configuration
 
         init(_ row: Markdown.Table.Row) {
             self.row = row
         }
 
         @_documentation(visibility: internal)
         public var body: some View {
+            let font = configuration.fonts[.tableBody] ?? .body
             MarkdownTableRow(
                 rowIndex: row.indexInParent + 1 /* header */,
                 cells: Array(row.cells)

Sources/MarkdownView/Helpers/KeyPathModifiable.swift → Sources/MarkdownView/Helpers/KeyPathModifying.swift

@@ -1,15 +1,15 @@
 //
-//  KeyPathModifiable.swift
+//  KeyPathModifying.swift
 //  MarkdownView
 //
 //  Created by Yanan Li on 2025/2/9.
 //
 
 import Foundation
 
-protocol KeyPathModifiable { }
+protocol KeyPathModifying { }
 
-extension KeyPathModifiable {
+extension KeyPathModifying {
     public func with<T>(_ keyPath: WritableKeyPath<Self, T>, _ newValue: T) -> Self {
         var copy = self
         copy[keyPath: keyPath] = newValue

Sources/MarkdownView/Helpers/Markdown/BlockQuote.swift → Sources/MarkdownView/Helpers/Markdown/BlockMarkup++.swift

@@ -1,8 +1,8 @@
 //
-//  BlockQuote.swift
+//  BlockMarkup++.swift
 //  MarkdownView
 //
-//  Created by LiYanan2004 on 2024/12/11.
+//  Created by Yanan Li on 2026/1/18.
 //
 
 import Markdown
@@ -25,3 +25,22 @@ extension BlockQuote {
         return index
     }
 }
+
+
+extension ListItemContainer {
+    var listDepth: Int {
+        var index = 0
+
+        var currentElement = parent
+
+        while currentElement != nil {
+            if currentElement is ListItemContainer {
+                index += 1
+            }
+
+            currentElement = currentElement?.parent
+        }
+
+        return index
+    }
+}

Sources/MarkdownView/Helpers/Markdown/Markup.swift → Sources/MarkdownView/Helpers/Markdown/Markup++.swift

@@ -27,3 +27,13 @@ extension Markup {
         return false
     }
 }
+
+// MARK: - Sendable Assumptions
+
+// TODO: Remove these when swift-markdown adapted for swift 6.0
+extension Markdown.Table: @retroactive @unchecked Sendable { }
+extension Markdown.Table.Row: @retroactive @unchecked Sendable { }
+extension Markdown.OrderedList: @retroactive @unchecked Sendable { }
+extension Markdown.UnorderedList: @retroactive @unchecked Sendable { }
+extension Markdown.ParseOptions: @retroactive @unchecked Sendable { }
+extension Markdown.Heading: @retroactive @unchecked Sendable { }

Sources/MarkdownView/Helpers/Markdown/SourceLocation++.swift

@@ -0,0 +1,32 @@
+//
+//  SourceLocation++.swift
+//  MarkdownView
+//
+//  Created by Yanan Li on 2026/1/18.
+//
+
+import Markdown
+
+extension SourceLocation {
+    @available(*, deprecated, message: "Use `SourceLocation.offset(in:) -> String.Index` instead")
+    func offset(in text: String) -> Int {
+        let colIndex = column - 1
+        let previousLinesTotalChar = text
+            .split(separator: "\n", maxSplits: line - 1, omittingEmptySubsequences: false)
+            .dropLast()
+            .map { String($0) }
+            .joined(separator: "\n")
+            .count
+        return previousLinesTotalChar + colIndex + 1
+    }
+
+    func offset(in text: String) -> String.Index {
+        let colIndex = column - 1
+        let previousLinesTotalChar = text
+            .split(separator: "\n", maxSplits: line - 1, omittingEmptySubsequences: false)
+            .dropLast()
+            .joined(separator: "\n")
+            .count
+        return text.index(text.startIndex, offsetBy: previousLinesTotalChar + colIndex + 1)
+    }
+}

Sources/MarkdownView/Helpers/Markdown/Table++.swift

@@ -60,5 +60,4 @@ extension Markdown.Table.Cell {
             }
         }
     }
-
 }

Sources/MarkdownView/Helpers/Swift/Sequence++.swift

@@ -0,0 +1,17 @@
+//
+//  Sequence++.swift
+//  MarkdownView
+//
+//  Created by Yanan Li on 2026/1/19.
+//
+
+import Foundation
+
+extension Sequence {
+    @_spi(Internal)
+    public func first<T>(
+        byUnwrapping transform: @escaping (Element) throws -> T?
+    ) rethrows -> T? {
+        try self.lazy.compactMap(transform).first
+    }
+}