Merge pull request #1275 from wordpress-mobile/issue/fix_underline_bug

Fix underline bug

Author: SergioEstevao

Aztec/Classes/TextKit/LayoutManager.swift

@@ -363,9 +363,15 @@ private extension LayoutManager {
 extension LayoutManager {
 
     override func underlineGlyphRange(_ glyphRange: NSRange, underlineType underlineVal: NSUnderlineStyle, lineFragmentRect lineRect: CGRect, lineFragmentGlyphRange lineGlyphRange: NSRange, containerOrigin: CGPoint) {
-
+        guard let textStorage = textStorage else {
+            return
+        }
+        let underlinedString = textStorage.attributedSubstring(from: glyphRange).string
         var updatedGlyphRange = glyphRange
-        if glyphRange.endLocation == lineGlyphRange.endLocation {
+        if glyphRange.endLocation == lineGlyphRange.endLocation,
+           underlinedString.contains(String.init(.nonBreakingSpace)),
+            underlinedString.hasSuffix(String.init(.paragraphSeparator))
+        {
             updatedGlyphRange = NSRange(location: glyphRange.location, length: glyphRange.length - 1)
         }
         drawUnderline(forGlyphRange: updatedGlyphRange, underlineType: underlineVal, baselineOffset: 0, lineFragmentRect: lineRect, lineFragmentGlyphRange: lineGlyphRange, containerOrigin: containerOrigin)

CHANGELOG.md

@@ -1,3 +1,7 @@
+1.17.1
+-----
+* Fix drawing of underlines when they include the last character of content.
+
 1.17.0
 -----
  * Fix drawing of underlines when they have a nbsp and span to the end of a line

Example/Example/SampleContent/underline.html

@@ -2,3 +2,4 @@
 <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>
+Link at end of text<a href="www.jetpack.com">Link&nbsp;to&nbsp;Jetpack</a>

WordPress-Aztec-iOS.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Aztec-iOS'
-  s.version          = '1.17.0'
+  s.version          = '1.17.1'
   s.summary          = 'The native HTML Editor.'
 
 # This description is used to generate tags and improve search results.

WordPress-Editor-iOS.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Editor-iOS'
-  s.version          = '1.17.0'
+  s.version          = '1.17.1'
   s.summary          = 'The WordPress HTML Editor.'
 
 # This description is used to generate tags and improve search results.