Merge pull request #120 from ropellanda/main

danielsaidi · web-flow · commit f941f6b92273 · 2024-01-16T22:59:26.000+01:00
Add visionOS support
diff --git a/Sources/RichTextKit/Actions/RichTextActionButtonGroup.swift b/Sources/RichTextKit/Actions/RichTextActionButtonGroup.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS || macOS
+#if iOS || macOS || os(visionOS)
 import SwiftUI
 
 /**
diff --git a/Sources/RichTextKit/Actions/View+RichTextAction.swift b/Sources/RichTextKit/Actions/View+RichTextAction.swift
@@ -15,7 +15,7 @@ public extension View {
      */
     @ViewBuilder
     func keyboardShortcut(for action: RichTextAction) -> some View {
-        #if iOS || macOS
+        #if iOS || macOS || os(visionOS)
         switch action {
         case .copy: keyboardShortcut("c", modifiers: .command)
         case .dismissKeyboard: self
diff --git a/Sources/RichTextKit/Alignment/View+RichTextAlignment.swift b/Sources/RichTextKit/Alignment/View+RichTextAlignment.swift
@@ -18,7 +18,7 @@ public extension View {
      */
     @ViewBuilder
     func keyboardShortcut(for alignment: RichTextAlignment) -> some View {
-        #if iOS || macOS
+        #if iOS || macOS || os(visionOS)
         switch alignment {
         case .left: keyboardShortcut("Ö", modifiers: [.command, .shift])
         case .center: keyboardShortcut("*", modifiers: [.command])
diff --git a/Sources/RichTextKit/Bundle/Bundle+RichTextKit.swift b/Sources/RichTextKit/Bundle/Bundle+RichTextKit.swift
@@ -69,7 +69,7 @@ extension Bundle {
     }
 
     func bundlePath(for locale: Locale) -> String? {
-        bundlePath(named: locale.identifier) ?? bundlePath(named: locale.languageCode)
+        bundlePath(named: locale.identifier) ?? bundlePath(named: locale.language.languageCode?.identifier)
     }
 
     func bundlePath(named name: String?) -> String? {
diff --git a/Sources/RichTextKit/Colors/ColorRepresentable.swift b/Sources/RichTextKit/Colors/ColorRepresentable.swift
@@ -17,7 +17,7 @@ public typealias ColorRepresentable = NSColor
 #endif
 
 
-#if iOS || os(tvOS) || os(watchOS)
+#if iOS || os(tvOS) || os(watchOS) || os(visionOS)
 import UIKit
 
 /**
diff --git a/Sources/RichTextKit/Colors/RichTextColorPicker.swift b/Sources/RichTextKit/Colors/RichTextColorPicker.swift
@@ -104,7 +104,7 @@ private extension RichTextColorPicker {
 
     @ViewBuilder
     var picker: some View {
-        #if iOS || macOS
+        #if iOS || macOS || os(visionOS)
         ColorPicker("", selection: $value)
             .fixedSize()
             .padding(.horizontal, spacing)
diff --git a/Sources/RichTextKit/Commands/RichTextFormatCommandMenu.swift b/Sources/RichTextKit/Commands/RichTextFormatCommandMenu.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS || macOS
+#if iOS || macOS || os(visionOS)
 import SwiftUI
 
 /**
diff --git a/Sources/RichTextKit/Commands/RichTextShareCommandMenu.swift b/Sources/RichTextKit/Commands/RichTextShareCommandMenu.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS || macOS
+#if iOS || macOS || os(visionOS)
 import SwiftUI
 
 /**
diff --git a/Sources/RichTextKit/Component/RichTextViewComponent+Pasting.swift b/Sources/RichTextKit/Component/RichTextViewComponent+Pasting.swift
@@ -59,7 +59,7 @@ public extension RichTextViewComponent {
         at index: Int,
         moveCursorToPastedContent move: Bool = false
     ) {
-        #if iOS || os(tvOS) || os(macOS)
+        #if iOS || os(tvOS) || os(macOS) || os(visionOS)
         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)
@@ -113,7 +113,7 @@ public extension RichTextViewComponent {
     }
 }
 
-#if iOS || os(tvOS) || os(macOS)
+#if iOS || os(tvOS) || os(macOS) || os(visionOS)
 private extension RichTextViewComponent {
 
     func getAttachmentString(
diff --git a/Sources/RichTextKit/Coordinator/RichTextCoordinator+Subscriptions.swift b/Sources/RichTextKit/Coordinator/RichTextCoordinator+Subscriptions.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS || macOS || os(tvOS)
+#if iOS || macOS || os(tvOS) || os(visionOS)
 import SwiftUI
 
 extension RichTextCoordinator {
@@ -334,13 +334,13 @@ internal extension RichTextCoordinator {
     func setIsEditing(to newValue: Bool) {
         if newValue == textView.isFirstResponder { return }
         if newValue {
-#if iOS
+#if iOS || os(visionOS)
             textView.becomeFirstResponder()
 #else
             print("macOS currently doesn't resign first responder.")
 #endif
         } else {
-#if iOS
+#if iOS || os(visionOS)
             textView.resignFirstResponder()
 #else
             print("macOS currently doesn't resign first responder.")
@@ -362,7 +362,7 @@ internal extension RichTextCoordinator {
 
 private extension ColorRepresentable {
 
-    #if iOS || os(tvOS)
+    #if iOS || os(tvOS) || os(visionOS)
     static var textColor: ColorRepresentable { .label }
     #endif
 }
diff --git a/Sources/RichTextKit/Coordinator/RichTextCoordinator.swift b/Sources/RichTextKit/Coordinator/RichTextCoordinator.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS || macOS || os(tvOS)
+#if iOS || macOS || os(tvOS) || os(visionOS)
 import Combine
 import SwiftUI
 
@@ -127,7 +127,7 @@ open class RichTextCoordinator: NSObject {
 }
 
 
-#if iOS || os(tvOS)
+#if iOS || os(tvOS) || os(visionOS)
 import UIKit
 
 extension RichTextCoordinator: UITextViewDelegate {}
diff --git a/Sources/RichTextKit/Data/RichTextDataFormatMenu.swift b/Sources/RichTextKit/Data/RichTextDataFormatMenu.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS || macOS
+#if iOS || macOS || os(visionOS)
 import SwiftUI
 
 /**
diff --git a/Sources/RichTextKit/Export/RichTextExportMenu.swift b/Sources/RichTextKit/Export/RichTextExportMenu.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS || macOS
+#if iOS || macOS || os(visionOS)
 import SwiftUI
 
 /**
diff --git a/Sources/RichTextKit/Extensions/NSTextAttachment+Image.swift b/Sources/RichTextKit/Extensions/NSTextAttachment+Image.swift
@@ -14,7 +14,7 @@ import UIKit
 import AppKit
 #endif
 
-#if iOS || macOS || os(tvOS)
+#if iOS || macOS || os(tvOS) || os(visionOS)
 public extension NSTextAttachment {
 
     /**
diff --git a/Sources/RichTextKit/Fonts/RichTextFontForEachPicker.swift b/Sources/RichTextKit/Fonts/RichTextFontForEachPicker.swift
@@ -106,7 +106,7 @@ private extension View {
 
     @ViewBuilder
     func withTitle(_ title: String) -> some View {
-        #if iOS || os(tvOS) || os(watchOS)
+        #if iOS || os(tvOS) || os(watchOS) || os(visionOS)
         self.navigationBarTitle(title)
         #else
         self
diff --git a/Sources/RichTextKit/Fonts/RichTextFontListPicker.swift b/Sources/RichTextKit/Fonts/RichTextFontListPicker.swift
@@ -105,7 +105,7 @@ private extension View {
 
     @ViewBuilder
     func withTitle(_ title: String) -> some View {
-        #if iOS || os(tvOS) || os(watchOS)
+        #if iOS || os(tvOS) || os(watchOS) || os(visionOS)
         self.navigationBarTitle(title)
         #else
         self
diff --git a/Sources/RichTextKit/Fonts/RichTextFontPicker.swift b/Sources/RichTextKit/Fonts/RichTextFontPicker.swift
@@ -119,7 +119,7 @@ private extension View {
 
     @ViewBuilder
     func withStyle() -> some View {
-        #if iOS || macOS
+        #if iOS || macOS || os(visionOS)
         self.pickerStyle(.menu)
         #else
         self
diff --git a/Sources/RichTextKit/Fonts/RichTextFontSizePickerStack.swift b/Sources/RichTextKit/Fonts/RichTextFontSizePickerStack.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS || macOS
+#if iOS || macOS || os(visionOS)
 import SwiftUI
 
 /**
@@ -42,7 +42,7 @@ public struct RichTextFontSizePickerStack: View {
     private var context: RichTextContext
 
     public var body: some View {
-        #if iOS
+        #if iOS || os(visionOS)
         HStack(spacing: 2) {
             decreaseButton
             picker
diff --git a/Sources/RichTextKit/Fonts/StandardFontSizeProvider.swift b/Sources/RichTextKit/Fonts/StandardFontSizeProvider.swift
@@ -26,7 +26,7 @@ extension Double: StandardFontSizeProvider {}
 
 extension RichTextContext: StandardFontSizeProvider {}
 
-#if iOS || macOS || os(tvOS)
+#if iOS || macOS || os(tvOS) || os(visionOS)
 extension RichTextEditor: StandardFontSizeProvider {}
 
 extension RichTextView: StandardFontSizeProvider {}
diff --git a/Sources/RichTextKit/Format/RichTextFormatSheet.swift b/Sources/RichTextKit/Format/RichTextFormatSheet.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS
+#if iOS || os(visionOS)
 import SwiftUI
 
 /**
diff --git a/Sources/RichTextKit/Format/RichTextFormatSidebar.swift b/Sources/RichTextKit/Format/RichTextFormatSidebar.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS || macOS
+#if iOS || macOS || os(visionOS)
 import SwiftUI
 
 /**
diff --git a/Sources/RichTextKit/Images/RichTextImageAttachment.swift b/Sources/RichTextKit/Images/RichTextImageAttachment.swift
@@ -6,15 +6,15 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS || os(tvOS)
+#if iOS || os(tvOS) || os(visionOS)
 import UIKit
 #endif
 
 #if macOS
 import AppKit
 #endif
 
-#if iOS || os(tvOS) || os(macOS)
+#if iOS || os(tvOS) || os(macOS) || os(visionOS)
 import UniformTypeIdentifiers
 
 /**
@@ -156,7 +156,7 @@ open class RichTextImageAttachment: NSTextAttachment {
     public override class var supportsSecureCoding: Bool { true }
 
 
-    #if iOS || os(tvOS)
+    #if iOS || os(tvOS) || os(visionOS)
     /**
      Get or set the attachment image.
 
diff --git a/Sources/RichTextKit/Images/RichTextImageAttachmentManager.swift b/Sources/RichTextKit/Images/RichTextImageAttachmentManager.swift
@@ -9,7 +9,7 @@
 import CoreGraphics
 import Foundation
 
-#if iOS || os(tvOS)
+#if iOS || os(tvOS) || os(visionOS)
 import UIKit
 #endif
 
@@ -63,7 +63,7 @@ public extension RichTextImageAttachmentManager {
     }
 }
 
-#if iOS || macOS || os(tvOS)
+#if iOS || macOS || os(tvOS) || os(visionOS)
 public extension RichTextImageAttachmentManager {
 
     /**
diff --git a/Sources/RichTextKit/Keyboard/RichTextKeyboardToolbar.swift b/Sources/RichTextKit/Keyboard/RichTextKeyboardToolbar.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS
+#if iOS || os(visionOS)
 import SwiftUI
 
 /**
diff --git a/Sources/RichTextKit/Keyboard/RichTextKeyboardToolbarMenu.swift b/Sources/RichTextKit/Keyboard/RichTextKeyboardToolbarMenu.swift
@@ -6,8 +6,8 @@
 //  Copyright © 2022 Dnaiel Saidi. All rights reserved.
 //
 
-#if iOS
-import SwiftUI
+#if iOS || os(visionOS)
+import SwiftUI 
 
 /**
  This keyboard toolbar menu can be used to solve a UI glitch
diff --git a/Sources/RichTextKit/Localization/RTKL10n.swift b/Sources/RichTextKit/Localization/RTKL10n.swift
@@ -129,7 +129,7 @@ public extension RTKL10n {
     }
 }
 
-#if iOS || os(tvOS)
+#if iOS || os(tvOS) || os(visionOS)
 struct RTKL10n_Previews: PreviewProvider {
 
     static var locales: [Locale] = [
diff --git a/Sources/RichTextKit/Pasteboard/PasteboardImageReader.swift b/Sources/RichTextKit/Pasteboard/PasteboardImageReader.swift
@@ -33,7 +33,7 @@ public extension PasteboardImageReader {
     }
 }
 
-#if iOS
+#if iOS || os(visionOS)
 import UIKit
 
 extension UIPasteboard: PasteboardImageReader {}
diff --git a/Sources/RichTextKit/Pdf/RichTextPdfDataReader.swift b/Sources/RichTextKit/Pdf/RichTextPdfDataReader.swift
@@ -29,7 +29,7 @@ public extension RichTextPdfDataReader {
      a ``PdfDataError/unsupportedPlatform`` error.
      */
     func richTextPdfData(configuration: PdfPageConfiguration = .standard) throws -> Data {
-        #if iOS
+        #if iOS || os(visionOS)
         try richText.iosPdfData(for: configuration)
         #elseif os(macOS)
         try richText.macosPdfData(for: configuration)
@@ -100,7 +100,7 @@ private extension NSAttributedString {
 }
 #endif
 
-#if iOS
+#if iOS || os(visionOS)
 import UIKit
 
 private extension NSAttributedString {
diff --git a/Sources/RichTextKit/RichTextEditor.swift b/Sources/RichTextKit/RichTextEditor.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2022-2023 Daniel Saidi. All rights reserved.
 //
 
-#if iOS || macOS || os(tvOS)
+#if iOS || macOS || os(tvOS) || os(visionOS)
 import SwiftUI
 
 /**
@@ -78,7 +78,7 @@ public struct RichTextEditor: ViewRepresentable {
     private var viewConfiguration: ViewConfiguration
 
 
-    #if iOS || os(tvOS)
+    #if iOS || os(tvOS) || os(visionOS)
     public let textView = RichTextView()
     #endif
 
@@ -100,7 +100,7 @@ public struct RichTextEditor: ViewRepresentable {
     }
 
 
-    #if iOS || os(tvOS)
+    #if iOS || os(tvOS) || os(visionOS)
     public func makeUIView(context: Context) -> some UIView {
         textView.setup(with: text.wrappedValue, format: format)
         viewConfiguration(textView)
diff --git a/Sources/RichTextKit/RichTextView_UIKit.swift b/Sources/RichTextKit/RichTextView_UIKit.swift
diff --git a/Sources/RichTextKit/Sharing/RichTextShareMenu.swift b/Sources/RichTextKit/Sharing/RichTextShareMenu.swift
diff --git a/Sources/RichTextKit/Styles/RichTextStyleToggleGroup.swift b/Sources/RichTextKit/Styles/RichTextStyleToggleGroup.swift
diff --git a/Sources/RichTextKit/Styles/View+RichTextStyle.swift b/Sources/RichTextKit/Styles/View+RichTextStyle.swift
diff --git a/Sources/RichTextKit/Views/ViewRepresentable.swift b/Sources/RichTextKit/Views/ViewRepresentable.swift

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ extension Bundle {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`func bundlePath(for locale: Locale) -> String? {`
`72`		`- bundlePath(named: locale.identifier) ?? bundlePath(named: locale.languageCode)`
	`72`	`+ bundlePath(named: locale.identifier) ?? bundlePath(named: locale.language.languageCode?.identifier)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`func bundlePath(named name: String?) -> String? {`