Merge pull request #91 from contentful/layout-fixes

Layout fixes

Author: mariuskatcontentful

ContentfulRichTextRenderer.podspec

@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |spec|
   spec.name             = "ContentfulRichTextRenderer"
-  spec.version          = "0.4.5"
+  spec.version          = "0.4.6"
   spec.summary          = "Swift library for rendering Contentful RichTextDocument."
   spec.homepage         = "https://github.com/contentful-labs/rich-text-renderer.swift"
   spec.social_media_url = 'https://twitter.com/contentful'
@@ -15,7 +15,7 @@ Pod::Spec.new do |spec|
   spec.requires_arc = true
 
   spec.swift_version = "5.2"
-  spec.ios.deployment_target = "12.4"
+  spec.ios.deployment_target = "13.0"
 
   spec.source_files = "Sources/RichTextRenderer/**/*.swift"
 

Package.swift

@@ -4,7 +4,7 @@ import PackageDescription
 let package = Package(
     name: "ContentfulRichTextRenderer",
     platforms: [
-        .iOS(.v10)
+        .iOS(.v13)
     ],
     products: [
         .library(

RichTextRenderer.xcodeproj/project.pbxproj

@@ -819,7 +819,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Sources/RichTextRenderer/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -848,7 +848,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Sources/RichTextRenderer/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

Sources/RichTextRenderer/NodeRenderers/Table/SimpleImplementation/SimpleTableViewCell.swift

@@ -57,6 +57,10 @@ class SimpleTableViewCell: UIView, ResourceLinkBlockViewRepresentable {
             richTextViewController.view.trailingAnchor.constraint(equalTo: trailingAnchor)
         ])
 
+        if isHeader {
+            richTextViewController.view.overrideUserInterfaceStyle = .light
+        }
+
         richTextViewController.richTextDocument = RichTextDocument(content: nodes)
         richTextViewController.updateTextViewBackground(color: .clear)
     }

Sources/RichTextRenderer/Renderer/Default/DefaultStyleProvider.swift

@@ -75,7 +75,7 @@ public final class DefaultStyleProvider: StyleProviding {
 
     public init(
         baseFont: UIFont = UIFont.systemFont(ofSize: UIFont.systemFontSize),
-        baseColor: UIColor = UIColor.black, // Base color initialization
+        baseColor: UIColor = UIColor.rtrLabel, // Base color initialization - adapts to dark mode
         monospacedFont: UIFont? = UIFont(name: "Menlo-Regular", size: UIFont.systemFontSize),
         hyperlinkColor: UIColor? = UIColor.systemBlue
     ) {

Sources/RichTextRenderer/ViewController/RichTextViewController.swift

@@ -172,6 +172,8 @@ open class RichTextViewController: UIViewController, NSLayoutManagerDelegate, UI
         self.textStorage.beginEditing()
         self.textStorage.setAttributedString(output)
         self.textStorage.endEditing()
+        
+        layoutElementsOnTextView(containerSize: textView.bounds.size)
 
         self.calculateAndSetPreferredContentSize()
         self.applyTextViewStyles()
@@ -182,8 +184,35 @@ open class RichTextViewController: UIViewController, NSLayoutManagerDelegate, UI
     }
 
     private func calculateAndSetPreferredContentSize() {
-        let newContentSize = textView.sizeThatFits(textView.bounds.size)
-        guard newContentSize != preferredContentSize else {
+        // Base size from text content
+        var newContentSize = textView.sizeThatFits(textView.bounds.size)
+
+        // If there are attachment views (like embedded resources) that sit below the text
+        // they should be accounted for in preferredContentSize. Compute the bottom-most
+        // point of all attachment subviews we've added and expand the height if needed.
+        if !attachmentViews.isEmpty {
+            // Convert attachment subviews' frames to textView coordinate space and find max bottom
+            let maxAttachmentBottom = attachmentViews.values
+                .compactMap { $0.superview == textView ? $0.frame.maxY : nil }
+                .max() ?? 0
+
+            // textView content is inset by textView.textContainerInset; preferredContentSize
+            // should be at least the bottom of the attachments plus bottom inset.
+            let contentInsetBottom = textView.textContainerInset.bottom
+            let attachmentsRequiredHeight = maxAttachmentBottom + contentInsetBottom
+
+            if attachmentsRequiredHeight > newContentSize.height {
+                newContentSize.height = attachmentsRequiredHeight
+            }
+        }
+
+        // Avoid triggering tiny layout changes which could lead to layout loops. Only update
+        // preferredContentSize if the change is meaningful (epsilon threshold).
+        let epsilon: CGFloat = 0.5
+        let heightDelta = abs(preferredContentSize.height - newContentSize.height)
+        let widthDelta = abs(preferredContentSize.width - newContentSize.width)
+
+        guard heightDelta > epsilon || widthDelta > epsilon else {
             return
         }
 
@@ -213,8 +242,6 @@ open class RichTextViewController: UIViewController, NSLayoutManagerDelegate, UI
             return
         }
 
-        layoutElementsOnTextView(containerSize: textView.bounds.size)
-
         expectedTextViewSizeAfterOrientationChange = nil
     }
 
@@ -274,37 +301,39 @@ open class RichTextViewController: UIViewController, NSLayoutManagerDelegate, UI
             - contentInset.left
             - contentInset.right
 
-        let scaleFactor = newWidth > 0 && attrView.frame.width > 0 ?  newWidth / attrView.frame.width : max(attrView.frame.width, newWidth)
-        let newHeight = scaleFactor * attrView.frame.height
+        // Compute the origin inside the text container using glyph location and line fragment rect
+        let fragmentOriginX = floor(lineFragmentRect.minX + glyphLocation.x)
+        let fragmentOriginY = floor(lineFragmentRect.minY + glyphLocation.y)
 
-        // Rect specifying an area where text should not be rendered.
+        // Rect specifying an area where text should not be rendered (in text container coordinates).
         // The rect is being updated right before the exclusion path is created.
         var boundingRect = CGRect(
-            x: lineFragmentRect.minX + glyphLocation.x + contentInset.left - 1,
-            y: lineFragmentRect.minY + glyphLocation.y + contentInset.top,
-            width: containerSize.width,
-            height: newHeight
+            x: fragmentOriginX,
+            y: fragmentOriginY + contentInset.top,
+            width: newWidth,
+            height: 0 // does not matter now as will ask to calculate height below in layout method
         )
 
-        // Rect specifying an area where the attachment is rendered. This can differ from the `boundingRect`.
-        let attachmentRect = CGRect(
-            x: lineFragmentRect.minX + glyphLocation.x + contentInset.left - 1,
-            y: lineFragmentRect.minY + glyphLocation.y + contentInset.top,
+        // Rect specifying an area where the attachment is rendered (in text view coordinates).
+        // Must add content inset to convert from text container coords to text view coords.
+        var attachmentRect = CGRect(
+            x: contentInset.left + fragmentOriginX,
+            y: contentInset.top + fragmentOriginY,
             width: newWidth,
-            height: newHeight
+            height: 0 // does not matter now as will ask to calculate height below in layout method
         )
-
+              
         if attrView.superview == nil {
-            attrView.frame = attachmentRect
-
             attachmentCastedView.layout(with: attachmentRect.width)
 
             let exclusionKey = String(range.hashValue) + Constant.embedSuffix
 
             // Update bounding rect after laying out the view.
             let updatedRect = attachmentCastedView.frame
-            boundingRect.size.height = updatedRect.height
-
+            boundingRect.size.height = floor(updatedRect.height)
+            attachmentRect.size.height = floor(updatedRect.height)
+            attrView.frame = attachmentRect
+            
             addExclusionPath(for: boundingRect, key: exclusionKey)
 
             textView.addSubview(attrView)