Merge pull request #49 from contentful/fix_non-full-screen-issues

Fix non full screen issues

Author: mariuskatcontentful

ContentfulRichTextRenderer.podspec

@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |spec|
   spec.name             = "ContentfulRichTextRenderer"
-  spec.version          = "0.3.0"
+  spec.version          = "0.3.1"
   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'

RichTextRenderer.xcodeproj/project.pbxproj

@@ -821,7 +821,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.3.0;
+				MARKETING_VERSION = 0.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.contentful.RichTextRenderer;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -850,7 +850,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.3.0;
+				MARKETING_VERSION = 0.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.contentful.RichTextRenderer;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Sources/RichTextRenderer/ViewController/RichTextViewController.swift

@@ -213,19 +213,25 @@ open class RichTextViewController: UIViewController, NSLayoutManagerDelegate {
                 // In cases if table row or cell has to be rendered on its own in the future, more if cases have to be added here
 
                 if let blockAttachment = attrView as? ResourceLinkBlockViewRepresentable {
-                    layoutEmbedElementResourceBlock(attrView: blockAttachment,  attributes: attributes, range: range, containerSize: containerSize)
+                    // Async is needed as if there are multiple tables, the starting positions of each will get calculated wrong, so they have to be recalculated after everything else is drawn, and has to be done one after the other instead of concurrently.
+                    DispatchQueue.main.async { [weak self] in
+                        self?.layoutEmbedElementResourceBlock(attrView: blockAttachment,  attributes: attributes, range: range, containerSize: containerSize)
+                    }
                 } else if let tableAttachment = attrView as? SimpleTableView {
-                    // Async is needed as if there are multiple tables, the starting positions of each will get calculated wrong, so they have to be recalculated after everything else is drawn, and has to be done one after the other instead of concurrently. This could possibly be needed also for the other views in this block so if any issues happens in the future with custom views layout this might be the solution in other if statements as well.
-                    DispatchQueue.main.async {
-                        self.layoutEmbedElementTable(attrView: tableAttachment, attributes: attributes, range: range, containerSize: containerSize)
+                    // Async is needed as if there are multiple tables, the starting positions of each will get calculated wrong, so they have to be recalculated after everything else is drawn, and has to be done one after the other instead of concurrently.
+                    DispatchQueue.main.async { [weak self] in
+                        self?.layoutEmbedElementTable(attrView: tableAttachment, attributes: attributes, range: range, containerSize: containerSize)
                     }
 
                 } else {
                     attrView.isHidden = true
                 }
 
             } else if attributes.keys.contains(.horizontalRule) {
-                layoutHorizontalRuleElement(attributes: attributes, range: range, containerSize: containerSize)
+                // Async is needed as if there are multiple tables, the starting positions of each will get calculated wrong, so they have to be recalculated after everything else is drawn, and has to be done one after the other instead of concurrently.
+                DispatchQueue.main.async { [weak self] in
+                    self?.layoutHorizontalRuleElement(attributes: attributes, range: range, containerSize: containerSize)
+                }
             }
         }
     }