Merge pull request #1292 from wordpress-mobile/release/1.19.2

Release 1.19.2
wordpress-mobile · May 26, 2020 · 93f0a5a · 93f0a5a
2 parents be24064 + 23e4090
commit 93f0a5a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/Aztec/Classes/TextKit/LayoutManager.swift b/Aztec/Classes/TextKit/LayoutManager.swift
@@ -369,8 +369,7 @@ extension LayoutManager {
         let underlinedString = textStorage.attributedSubstring(from: glyphRange).string
         var updatedGlyphRange = glyphRange
         if glyphRange.endLocation == lineGlyphRange.endLocation,
-           underlinedString.contains(String.init(.nonBreakingSpace)),
-            underlinedString.hasSuffix(String.init(.paragraphSeparator))
+            underlinedString.hasSuffix(String.init(.paragraphSeparator)) || underlinedString.hasSuffix(String.init(.lineSeparator)) || underlinedString.hasSuffix(String.init(.carriageReturn)) || underlinedString.hasSuffix(String.init(.lineFeed))
         {
             updatedGlyphRange = NSRange(location: glyphRange.location, length: glyphRange.length - 1)
         }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+1.19.2
+-------
+* Fix drawing of underlines when they include newlines.
+
 1.19.1
 -------
 * Fix a bug where collapse of whitespaces was happening for empty HTML nodes.

diff --git a/Example/Example/SampleContent/underline.html b/Example/Example/SampleContent/underline.html
@@ -1,4 +1,5 @@
-<p><u>Hello&nbsp;world</u></p>
+<p><u>No NBSP</u></p>
+<p><u>With&nbsp;NBSP</u></p>
 <p><span style="text-decoration: underline;">Alternative&nbsp;underline&nbsp;text</span></p>
 <p>Before link <a href="www.wordpress.com">Link&nbsp;to&nbsp;WordPress</a></p>
 <p>Before link <a href="www.jetpack.com">Link&nbsp;to&nbsp;Jetpack</a> After link</p>

diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Aztec-iOS'
-  s.version          = '1.19.1'
+  s.version          = '1.19.2'
   s.summary          = 'The native HTML Editor.'
 
 # This description is used to generate tags and improve search results.

diff --git a/WordPress-Editor-iOS.podspec b/WordPress-Editor-iOS.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Editor-iOS'
-  s.version          = '1.19.1'
+  s.version          = '1.19.2'
   s.summary          = 'The WordPress HTML Editor.'
 
 # This description is used to generate tags and improve search results.