Merge pull request #619 from wordpress-mobile/issue/559_Shift_Enter_fix

Avoid sending invalid caret rect information.
wordpress-mobile · Feb 20, 2019 · b28b394 · b28b394
2 parents 163d04f + 0807763
commit b28b394
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift b/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
@@ -258,8 +258,11 @@ class RCTAztecView: Aztec.TextView {
 
         if let selectedTextRange = selectedTextRange {
             let caretEndRect = caretRect(for: selectedTextRange.end)
-            result["selectionEndCaretX"] = caretEndRect.origin.x
-            result["selectionEndCaretY"] = caretEndRect.origin.y
+            // Sergio Estevao: Sometimes the carectRect can be invalid so we need to check before sending this to JS.
+            if !(caretEndRect.isInfinite || caretEndRect.isEmpty || caretEndRect.isNull) {
+                result["selectionEndCaretX"] = caretEndRect.origin.x
+                result["selectionEndCaretY"] = caretEndRect.origin.y
+            }
         }
 
         return result