Make all tests work and fix all deprecation warnings

Author: danielsaidi

Sources/RichTextKit/Format/RichTextFormat+Sidebar.swift

@@ -11,33 +11,30 @@ import SwiftUI
 
 public extension RichTextFormat {
 
-    /**
-     This sidebar view provides various text format options, and
-     is meant to be used on macOS, in a trailing sidebar.
-
-     You can configure and style the view by applying its config
-     and style view modifiers to your view hierarchy:
-
-     ```swift
-     VStack {
-     ...
-     }
-     .richTextFormatSidebarStyle(...)
-     .richTextFormatSidebarConfig(...)
-     ```
-
-     > Note: The sidebar is currently designed for macOS, but it
-     should also be made to look good on iPadOS in landscape, to
-     let us use it instead of the ``RichTextFormat/Sheet``.
-     */
+    /// This view has various format options and is meant to
+    /// be used on macOS, in a trailing sidebar.
+    ///
+    /// You can configure and style the view by applying its
+    /// config & style view modifiers to your view hierarchy:
+    ///
+    /// ```swift
+    /// VStack {
+    ///     ...
+    /// }
+    /// .richTextFormatSidebarStyle(...)
+    /// .richTextFormatSidebarConfig(...)
+    /// ```
+    ///
+    /// > Note: This sidebar is currently designed for macOS,
+    /// but it should also be made to look good on iPadOS in
+    /// landscape, to let us use this sidebar instead of the
+    /// ``RichTextFormat/Sheet``.
     struct Sidebar: RichTextFormatToolbarBase {
 
-        /**
-         Create a rich text format sheet.
-
-         - Parameters:
-         - context: The context to apply changes to.
-         */
+        /// Create a rich text format sheet.
+        ///
+        /// - Parameters:
+        ///   - context: The context to apply changes to.
         public init(
             context: RichTextContext
         ) {

Sources/RichTextKit/_Essential/RichTextContext.swift

@@ -120,11 +120,9 @@ public class RichTextContext: ObservableObject {
 
     @available(*, deprecated, message: "Use paragraphStyle instead.")
     public var textAlignment: RichTextAlignment {
-        get { .init(textAlignmentInternal) }
-        set { textAlignmentInternal = newValue.nativeAlignment }
+        get { .init(paragraphStyleValue(for: \.alignment)) }
+        set { paragraphStyle[keyPath: \.alignment] = newValue.nativeAlignment }
     }
-    
-    @Published public var textAlignmentInternal: NSTextAlignment = .left
 }
 
 public extension RichTextContext {

Sources/RichTextKit/_Foundation/RichTextCoordinator.swift

@@ -179,7 +179,7 @@ extension RichTextCoordinator {
         sync(&context.fontName, with: font.fontName)
         sync(&context.fontSize, with: font.pointSize)
         sync(&context.isEditingText, with: textView.isFirstResponder)
-        sync(&context.textAlignmentInternal, with: (textView.richTextParagraphStyleValue(\.alignment) ?? .left))
+        sync(&context.paragraphStyle, with: textView.richTextParagraphStyle ?? .defaultMutable)
 
         RichTextColor.allCases.forEach {
             if let color = textView.richTextColor($0) {

Tests/RichTextKitTests/RichTextViewRepresentable+AlignmentTests.swift

@@ -124,11 +124,9 @@ final class RichTextCoordinator_SubscriptionsTests: XCTestCase {
         XCTAssertEqual(textView.selectedRange, range)
     }
 
-    func testTextAlignmentUpdatesTextView() {
-        textView.setRichTextAlignment(.left)
-        XCTAssertEqual(textView.richTextAlignment, .left)
-        textContext.textAlignment = .right
-        XCTAssertEqual(textView.richTextAlignment, .right)
+    func testSettingParagraphStyleValueUpdatesTheParagraphStyle() {
+        textView.setRichTextParagraphStyleValue(\.alignment, .left)
+        XCTAssertEqual(textView.richTextParagraphStyleValue(\.alignment), .left)
     }
 }
 #endif

Tests/RichTextKitTests/_Foundation/RichTextCoordinator+SubscriptionsTests.swift

@@ -32,7 +32,7 @@ final class RichTextCoordinatorTests: XCTestCase {
             richTextContext: context)
         coordinator.shouldDelaySyncContextWithTextView = false
         view.selectedRange = NSRange(location: 0, length: 1)
-        view.setRichTextAlignment(.justified)
+        view.setRichTextParagraphStyleValue(\.alignment, .justified)
     }
 
     override func tearDown() {
@@ -83,14 +83,14 @@ final class RichTextCoordinatorTests: XCTestCase {
         XCTAssertEqual(context.fontSize, view.richTextFont?.pointSize)
         XCTAssertEqual(context.isEditingText, view.isFirstResponder)
         // XCTAssertEqual(context.lineSpacing, view.richTextLineSpacing) TODO: Not done yet
-        XCTAssertEqual(context.textAlignment, view.richTextAlignment)
+        XCTAssertEqual(context.paragraphStyleValue(for: \.alignment), view.richTextParagraphStyleValue(\.alignment))
     }
 
     func testChangingOtherViewPropertiesUpdatesContextAfterExplicitUpdate() {
 
     }
 
-    func assertIsSyncedWithContext(macOSAlignment: RichTextAlignment = .left) {
+    func assertIsSyncedWithContext(macOSAlignment: NSTextAlignment = .left) {
         let styles = view.richTextStyles
         XCTAssertEqual(context.fontName, view.richTextFont?.fontName)
         XCTAssertEqual(context.fontSize, view.richTextFont?.pointSize)
@@ -99,7 +99,7 @@ final class RichTextCoordinatorTests: XCTestCase {
         XCTAssertEqual(context.styles[.underlined], styles.hasStyle(.underlined))
         XCTAssertEqual(context.selectedRange, view.selectedRange)
         #if iOS || os(tvOS)
-        XCTAssertEqual(context.textAlignment, view.richTextAlignment)
+        XCTAssertEqual(context.paragraphStyleValue(for: \.alignment), view.richTextParagraphStyleValue(\.alignment))
         #elseif macOS
         XCTAssertEqual(context.textAlignment, macOSAlignment)
         #endif