Fixed attachment recursive crash (#252)

rajdeep · Nov 15, 2023 · f188a89 · f188a89
1 parent 7d72127
commit f188a89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Proton/Sources/Swift/Attachment/Attachment.swift b/Proton/Sources/Swift/Attachment/Attachment.swift
@@ -363,7 +363,8 @@ open class Attachment: NSTextAttachment, BoundsObserving {
     /// `BoundsObserving`
     public func didChangeBounds(_ bounds: CGRect, oldBounds: CGRect) {
         // check how view.bounds can be checked against attachment.bounds
-        guard oldBounds != .zero else { return }
+        // Check for zero bounds required so that rendering attachment does not go recursive in `relayoutAttachments`
+        guard bounds != .zero, oldBounds != .zero else { return }
         invalidateLayout()
     }
 
@@ -586,7 +587,9 @@ extension Attachment {
               let range = rangeInContainer()
         else { return }
         cachedBounds = nil
-        let needsInvalidation = bounds.integral.size != contentView?.bounds.integral.size
+        // Check for zero bounds required so that rendering attachment does not go recursive in `relayoutAttachments`
+        let needsInvalidation = bounds.integral.size != .zero
+        && bounds.integral.size != contentView?.bounds.integral.size
         editor.invalidateLayout(for: range)
 
         if containerTextView?.isScrollEnabled == false, needsInvalidation {

diff --git a/Proton/Sources/Swift/Editor/EditorView.swift b/Proton/Sources/Swift/Editor/EditorView.swift
@@ -1402,7 +1402,6 @@ extension EditorView {
                     self.delegate?.editor(self, didRenderAttachment: attachment)
                 }
             }
-
             attachment.frame = frame
         }
         attachmentRenderingScheduler.executeNext()
-Original file line number
+Diff line change
@@ Expand Up / @@ -1402,7 +1402,6 @@ extension EditorView { @@
                         self.delegate?.editor(self, didRenderAttachment: attachment)
                     }
                 }
                 attachment.frame = frame
             }
             attachmentRenderingScheduler.executeNext()
@@ Expand Down @@