Update package

Author: vmanot

Sources/SwiftUIX/Intramodular/Text/_PlatformTextView.swift

@@ -13,6 +13,8 @@ import SwiftUI
 public protocol _PlatformTextViewType: _AppKitOrUIKitRepresented, _AnyPlatformTextView {
     associatedtype Label: View
 
+    var textKitVersion: _TextKitVersion { get }
+    
     var _SwiftUIX_textViewConfiguration: _TextViewConfiguration { get }
 
     var _textEditorProxyBase: _TextEditorProxy._Base? { get }
@@ -46,13 +48,27 @@ public enum _AnyPlatformTextViewState {
 
 }
 
+/// The TextKit generation that a text view instance is using.
+public enum _TextKitVersion {
+    case v1   // NSTextStorage + NSLayoutManager + NSTextContainer
+    case v2   // NSTextContentStorage + NSTextLayoutManager + NSTextContainer
+}
+
 open class _AnyPlatformTextView: AppKitOrUIKitTextView, AppKitOrUIKitTextInputDelegate {
     public var representatableStateFlags: _AppKitOrUIKitRepresentableStateFlags = []
     public var representableCache: _AppKitOrUIKitRepresentableCache = nil
     public var representableUpdater = EmptyObservableObject()
 
     public let _wantsTextKit1: Bool?
 
+    public var isUsingTextKit2: Bool {
+        (_wantsTextKit1 ?? true) == false
+    }
+    
+    public var textKitVersion: _TextKitVersion {
+        self.isUsingTextKit2 == true ? .v2 : .v1
+    }
+
     public internal(set) var _customTextStorage: NSTextStorage?
 
     @_spi(Internal)
@@ -431,6 +447,28 @@ open class _PlatformTextView<Label: View>: _AnyPlatformTextView, NSLayoutManager
         _lazy_observableTextCursor?.update()
     }
 
+    @available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+    open func representableSizeThatFits(
+        _ proposal: ProposedViewSize,
+        textViewConfiguration: _TextViewConfiguration,
+        context: some _AppKitOrUIKitViewRepresentableContext
+    ) -> CGSize? {
+        guard !representatableStateFlags.contains(.dismantled) else {
+            return nil
+        }
+        
+        let proposal = AppKitOrUIKitLayoutSizeProposal(
+            proposal,
+            fixedSize: textViewConfiguration._fixedSize?.value
+        )
+        
+        guard let size: CGSize = self._sizeThatFits(proposal: proposal) else {
+            return nil
+        }
+        
+        return size
+    }
+    
     #if os(iOS) || os(tvOS) || os(visionOS) || targetEnvironment(macCatalyst)
     override open func layoutSubviews() {
         super.layoutSubviews()

Sources/SwiftUIX/Intramodular/Text/_TextView-Sizing.swift

@@ -20,20 +20,11 @@ extension _TextView {
             return nil // TODO: Implement sizing for custom text views as well
         }
 
-        guard !view.representatableStateFlags.contains(.dismantled) else {
-            return nil
-        }
-        
-        let proposal = AppKitOrUIKitLayoutSizeProposal(
+        return view.representableSizeThatFits(
             proposal,
-            fixedSize: resolvedTextViewConfiguration._fixedSize?.value
+            textViewConfiguration: resolvedTextViewConfiguration,
+            context: context
         )
-        
-        guard let size: CGSize = view._sizeThatFits(proposal: proposal) else {
-            return nil
-        }
-        
-        return size
     }
 }