Merge branch 'main' into main

Author: danielsaidi

Demo/iOS/EditorScreen.swift

@@ -40,7 +40,11 @@ struct EditorScreen: View {
 private extension EditorScreen {
 
     var editor: some View {
-        RichTextEditor(text: $text, context: context) {
+        RichTextEditor(
+            text: $text,
+            context: context,
+            config: .init(isScrollingEnabled: false)
+        ) {
             $0.textContentInset = CGSize(width: 10, height: 20)
         }
         .background(Material.regular)

Demo/macOS/EditorScreen.swift

@@ -45,7 +45,11 @@ struct EditorScreen: View {
 private extension EditorScreen {
 
     var editor: some View {
-        RichTextEditor(text: $text, context: context) {
+        RichTextEditor(
+            text: $text,
+            context: context,
+            config: .init(isScrollingEnabled: false)
+        ) {
             $0.textContentInset = CGSize(width: 10, height: 20)
         }
         .frame(minWidth: 400)

RELEASE_NOTES.md

@@ -11,9 +11,13 @@ Until then, minor updates may remove deprecated features and introduce breaking
 
 Thanks to [@ropellanda][ropellanda], RichTextKit now supports Vision OS.
 
+Thanks to [@screenworker][screenworker], RichTextEditor now has a `config` that can disable scrolling.
+
 ### ✨ Features
 
 * `Image` has a new rich text-specific image builders.
+* `RichTextEditor` has a new `config` value parameter that can disable scrolling.
+* `RichTextView` has a new `configuration` property that can disable scrolling.
 
 ### 🗑️ Deprecations 
 
@@ -481,3 +485,4 @@ RichTextKit adds extensive support for a bunch of rich text features:
 [Mcrich23]: https://github.com/Mcrich23
 [msrutek-paylocity]: https://github.com/msrutek-paylocity
 [ropellanda]: https://github.com/ropellanda
+[screenworker]: https://github.com/screenworker

Sources/RichTextKit/Bundle/Bundle+RichTextKit.swift

@@ -69,7 +69,7 @@ extension Bundle {
     }
 
     func bundlePath(for locale: Locale) -> String? {
-        if #available(macOS 13, iOS 16, watchOS 9, tvOS 16, *) {
+        if #available(iOS 16, macOS 13, tvOS 16, watchOS 9, *) {
             bundlePath(named: locale.identifier) ?? bundlePath(named: locale.language.languageCode?.identifier)
         } else {
             bundlePath(named: locale.identifier) ?? bundlePath(named: locale.languageCode)

Sources/RichTextKit/Component/RichTextViewComponent+Pasting.swift

@@ -59,7 +59,9 @@ public extension RichTextViewComponent {
         at index: Int,
         moveCursorToPastedContent move: Bool = false
     ) {
-        #if iOS || os(tvOS) || os(macOS) || os(visionOS)
+        #if os(watchOS)
+        assertionFailure("Image pasting is not supported on this platform")
+        #else
         guard validateImageInsertion(for: imagePasteConfiguration) else { return }
         let items = images.count * 2 // The number of inserted "items" is the images and a newline for each
         let insertRange = NSRange(location: index, length: 0)
@@ -74,8 +76,6 @@ public extension RichTextViewComponent {
                 self.moveInputCursor(to: self.selectedRange.location)
             }
         }
-        #else
-        assertionFailure("Image pasting is not supported on this platform")
         #endif
     }
 
@@ -113,7 +113,7 @@ public extension RichTextViewComponent {
     }
 }
 
-#if iOS || os(tvOS) || os(macOS) || os(visionOS)
+#if iOS || macOS || os(tvOS) || os(visionOS)
 private extension RichTextViewComponent {
 
     func getAttachmentString(

Sources/RichTextKit/Context/RichTextContext.swift

@@ -185,14 +185,7 @@ public extension RichTextContext {
         highlightedRange = range
     }
 
-    /**
-     Paste an image into the text view, at a certain index.
-
-     - Parameters:
-       - image: The image to paste.
-       - index: The index to paste at, by default the `selectedRange` location.
-       - moveCursorToPastedContent: Whether or not to move the cursor to the end of the pasted content, by default `false`.
-     */
+    /// Paste an image into the editor, at a certain index.
     func pasteImage(
         _ image: ImageRepresentable,
         at index: Int? = nil,
@@ -202,15 +195,8 @@ public extension RichTextContext {
         shouldPasteImage = (image, index, moveCursorToPastedContent)
     }
 
-    /**
-     Paste images into the text view, at a certain index.
-
-     - Parameters:
-       - images: The images to paste.
-       - index: The index to paste at, by default the `selectedRange` location.
-       - moveCursorToPastedContent: Whether or not to move the cursor to the end of the pasted content, by default `false`.
-     */
-    func pasteImage(
+    /// Paste images into the editor, at a certain index.
+    func pasteImages(
         _ images: [ImageRepresentable],
         at index: Int? = nil,
         moveCursorToPastedContent: Bool = false
@@ -219,14 +205,7 @@ public extension RichTextContext {
         shouldPasteImages = (images, index, moveCursorToPastedContent)
     }
 
-    /**
-     Paste text into the text view, at a certain index.
-
-     - Parameters:
-       - text: The text to paste.
-       - index: The index to paste at, by default the `selectedRange` location.
-       - moveCursorToPastedContent: Whether or not to move the cursor to the end of the pasted content, by default `false`.
-     */
+    /// Paste text into the editor, at a certain index.
     func pasteText(
         _ text: String,
         at index: Int? = nil,

Sources/RichTextKit/Coordinator/RichTextCoordinator.swift

@@ -132,7 +132,7 @@ import UIKit
 
 extension RichTextCoordinator: UITextViewDelegate {}
 
-#elseif os(macOS)
+#elseif macOS
 import AppKit
 
 extension RichTextCoordinator: NSTextViewDelegate {}

Sources/RichTextKit/Images/RichTextImageAttachment.swift

@@ -14,7 +14,7 @@ import UIKit
 import AppKit
 #endif
 
-#if iOS || os(tvOS) || os(macOS) || os(visionOS)
+#if iOS || macOS || os(tvOS) || os(visionOS)
 import UniformTypeIdentifiers
 
 /**

Sources/RichTextKit/Pdf/RichTextPdfDataReader.swift

@@ -31,7 +31,7 @@ public extension RichTextPdfDataReader {
     func richTextPdfData(configuration: PdfPageConfiguration = .standard) throws -> Data {
         #if iOS || os(visionOS)
         try richText.iosPdfData(for: configuration)
-        #elseif os(macOS)
+        #elseif macOS
         try richText.macosPdfData(for: configuration)
         #else
         throw PdfDataError.unsupportedPlatform

Sources/RichTextKit/RichTextEditor.swift

@@ -18,9 +18,8 @@ import SwiftUI
 
  You can use the provided context to trigger and observe any
  changes to the text editor. Note that changing the value of
- the `text` binding will not (yet) update this editor. Until
- it is fixed, use `setAttributedString(to:)` to set the rich
- text or plain string to another value.
+ the `text` binding will not yet update the editor. Until it
+ is fixed, use `setAttributedString(to:)`.
 
  Since the view wraps a native `UIKit` or `AppKit` text view,
  you can't apply `.toolbar` modifiers to it, like you can do
@@ -51,33 +50,33 @@ public struct RichTextEditor: ViewRepresentable {
      - Parameters:
        - text: The rich text to edit.
        - context: The rich text context to use.
+       - config: The rich text configuration to use, by deafult `standard`.
        - format: The rich text data format, by default ``RichTextDataFormat/archivedData``.
      */
     public init(
         text: Binding<NSAttributedString>,
         context: RichTextContext,
+        config: RichTextView.Configuration = .standard,
         format: RichTextDataFormat = .archivedData,
         viewConfiguration: @escaping ViewConfiguration = { _ in }
     ) {
         self.text = text
-        self._richTextContext = ObservedObject(wrappedValue: context)
+        self.config = config
+        self._context = ObservedObject(wrappedValue: context)
         self.format = format
         self.viewConfiguration = viewConfiguration
     }
 
     public typealias ViewConfiguration = (RichTextViewComponent) -> Void
-
-
-    private var format: RichTextDataFormat
-
-    private var text: Binding<NSAttributedString>
-
+    
     @ObservedObject
-    private var richTextContext: RichTextContext
-
+    private var context: RichTextContext
+    
+    private var text: Binding<NSAttributedString>
+    private let config: RichTextView.Configuration
+    private var format: RichTextDataFormat
     private var viewConfiguration: ViewConfiguration
 
-
     #if iOS || os(tvOS) || os(visionOS)
     public let textView = RichTextView()
     #endif
@@ -95,24 +94,26 @@ public struct RichTextEditor: ViewRepresentable {
         RichTextCoordinator(
             text: text,
             textView: textView,
-            richTextContext: richTextContext
+            richTextContext: context
         )
     }
 
 
     #if iOS || os(tvOS) || os(visionOS)
     public func makeUIView(context: Context) -> some UIView {
         textView.setup(with: text.wrappedValue, format: format)
+        textView.configuration = config
         viewConfiguration(textView)
         return textView
     }
 
     public func updateUIView(_ view: UIViewType, context: Context) {}
-    #endif
-
-    #if macOS
+    
+    #else
+    
     public func makeNSView(context: Context) -> some NSView {
         textView.setup(with: text.wrappedValue, format: format)
+        textView.configuration = config
         viewConfiguration(textView)
         return scrollView
     }