Merge pull request #1347 from wordpress-mobile/release/1.19.7

Release 1.19.7
wordpress-mobile · Jan 5, 2022 · fc279aa · fc279aa
2 parents bd01a63 + 156cb9e
commit fc279aa
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 4 deletions.
diff --git a/Aztec/Classes/Formatters/Implementations/HeaderFormatter.swift b/Aztec/Classes/Formatters/Implementations/HeaderFormatter.swift
@@ -114,6 +114,10 @@ private extension HeaderFormatter {
     }
 
     func headerFontSize(for type: Header.HeaderType, defaultSize: Float?) -> Float {
+        if Configuration.useDefaultFont {
+            return defaultSize!
+        }
+
         guard type == .none, let defaultSize = defaultSize else {
             return type.fontSize
         }

diff --git a/Aztec/Classes/Formatters/Implementations/PreFormatter.swift b/Aztec/Classes/Formatters/Implementations/PreFormatter.swift
@@ -30,8 +30,10 @@ open class PreFormatter: ParagraphAttributeFormatter {
 
         newParagraphStyle.appendProperty(HTMLPre(with: representation))
 
+        let defaultFont = attributes[.font]
+
         resultingAttributes[.paragraphStyle] = newParagraphStyle
-        resultingAttributes[.font] = monospaceFont
+        resultingAttributes[.font] = Configuration.useDefaultFont ? defaultFont : monospaceFont
 
         return resultingAttributes
     }

diff --git a/Aztec/Classes/TextKit/Configuration.swift b/Aztec/Classes/TextKit/Configuration.swift
@@ -3,6 +3,7 @@ import Foundation
 public final class Configuration {
 
     public static var headersWithBoldTrait = false
+    public static var useDefaultFont = false
 
     static var defaultBoldFormatter: AttributeFormatter {
         get {

diff --git a/Aztec/Classes/TextKit/TextView.swift b/Aztec/Classes/TextKit/TextView.swift
@@ -178,6 +178,10 @@ open class TextView: UITextView {
     ///
     open var shouldNotifyOfNonUserChanges = true
 
+    /// If this is true the typing attributes will be recalculated when deleting backward
+    ///
+    open var shouldRecalculateTypingAttributesOnDeleteBackward = true
+
     // MARK: - Customizable Input VC
 
     private var customInputViewController: UIInputViewController?
@@ -738,7 +742,9 @@ open class TextView: UITextView {
         evaluateRemovalOfSingleLineParagraphAttributesAfterSelectionChange()
         ensureRemovalOfParagraphAttributesWhenPressingBackspaceAndEmptyingTheDocument()
         ensureCursorRedraw(afterEditing: deletedString.string)
-        recalculateTypingAttributes()
+        if shouldRecalculateTypingAttributesOnDeleteBackward {
+            recalculateTypingAttributes()
+        }
         notifyTextViewDidChange()
     }
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+1.19.7
+-------
+* Add variable to control whether typing attributes should be recalculated when deleting backward.
+* Allow using the default font for the PreFormatter/HeaderFormatter.
+
 1.19.6
 -------
 * Add support for Mark inline formatting.

diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = 'WordPress-Aztec-iOS'
-  s.version       = '1.19.6'
+  s.version       = '1.19.7'
 
   s.summary       = 'The native HTML Editor.'
   s.description   = <<-DESC

diff --git a/WordPress-Editor-iOS.podspec b/WordPress-Editor-iOS.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = 'WordPress-Editor-iOS'
-  s.version       = '1.19.6'
+  s.version       = '1.19.7'
 
   s.summary       = 'The WordPress HTML Editor.'
   s.description   = <<-DESC