Refactor layout and fix macOS resize issue

gonzalezreal · Jan 7, 2021 · 8281bdb · 8281bdb
1 parent 3e51554
commit 8281bdb
Show file tree

Hide file tree

Showing 11 changed files with 214 additions and 293 deletions.
diff --git a/Sources/AttributedText/AttributedText.swift b/Sources/AttributedText/AttributedText.swift
@@ -1,10 +1,10 @@
-#if canImport(SwiftUI) && !os(watchOS)
+#if canImport(SwiftUI) && !os(watchOS) && !targetEnvironment(macCatalyst)
 
     import SwiftUI
 
     @available(macOS 11.0, iOS 14.0, tvOS 14.0, *)
     public struct AttributedText: View {
-        @StateObject private var store = AttributedTextStore()
+        @StateObject private var store = TextViewStore()
 
         private let attributedText: NSAttributedString
 
@@ -14,13 +14,17 @@
 
         public var body: some View {
             GeometryReader { proxy in
-                AttributedTextViewWrapper(attributedText: attributedText, store: store)
+                TextViewWrapper(attributedText: attributedText, store: store)
                     .preference(key: ContainerSizePreference.self, value: proxy.size)
             }
             .onPreferenceChange(ContainerSizePreference.self) { value in
                 store.onContainerSizeChange(value)
             }
-            .frame(height: store.height)
+            .frame(
+                idealWidth: store.intrinsicContentSize?.width,
+                idealHeight: store.intrinsicContentSize?.height
+            )
+            .fixedSize(horizontal: false, vertical: true)
         }
     }
 
@@ -29,7 +33,7 @@
         static var defaultValue: CGSize?
 
         static func reduce(value: inout CGSize?, nextValue: () -> CGSize?) {
-            value = value ?? nextValue()
+            value = nextValue()
         }
     }
 

diff --git a/Sources/AttributedText/AttributedTextStore.swift b/Sources/AttributedText/AttributedTextStore.swift
diff --git a/Sources/AttributedText/AttributedTextView+AppKit.swift b/Sources/AttributedText/AttributedTextView+AppKit.swift
diff --git a/Sources/AttributedText/AttributedTextView+UIKit.swift b/Sources/AttributedText/AttributedTextView+UIKit.swift
diff --git a/Sources/AttributedText/AttributedTextViewWrapper+AppKit.swift b/Sources/AttributedText/AttributedTextViewWrapper+AppKit.swift
diff --git a/Sources/AttributedText/AttributedTextViewWrapper+UIKit.swift b/Sources/AttributedText/AttributedTextViewWrapper+UIKit.swift
diff --git a/Sources/AttributedText/NSLineBreakMode+TruncationMode.swift b/Sources/AttributedText/NSLineBreakMode+TruncationMode.swift
@@ -1,4 +1,4 @@
-#if canImport(SwiftUI) && !os(watchOS)
+#if canImport(SwiftUI) && !os(watchOS) && !targetEnvironment(macCatalyst)
 
     import SwiftUI
 

diff --git a/Sources/AttributedText/TextViewStore.swift b/Sources/AttributedText/TextViewStore.swift
@@ -0,0 +1,25 @@
+#if canImport(SwiftUI) && !os(watchOS) && !targetEnvironment(macCatalyst)
+
+    import SwiftUI
+
+    @available(macOS 11.0, iOS 14.0, tvOS 14.0, *)
+    final class TextViewStore: ObservableObject {
+        @Published var intrinsicContentSize: CGSize?
+
+        weak var view: TextViewWrapper.View?
+
+        func onContainerSizeChange(_ containerSize: CGSize?) {
+            guard let containerSize = containerSize,
+                  let view = self.view else { return }
+
+            view.maxWidth = containerSize.width
+        }
+
+        func didInvalidateIntrinsicContentSize() {
+            guard let view = self.view else { return }
+
+            intrinsicContentSize = view.intrinsicContentSize
+        }
+    }
+
+#endif