Merge pull request #1943 from wordpress-mobile/issue/remove_block_model

Remove BlockModel var and prop.
WordPress · Feb 25, 2020 · d9f865c · d9f865c
2 parents d1a9166 + 8e8f8be
commit d9f865c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 82 deletions.
diff --git a/react-native-aztec/ios/RNTAztecView/BlockFormatHandler.swift b/react-native-aztec/ios/RNTAztecView/BlockFormatHandler.swift
diff --git a/react-native-aztec/ios/RNTAztecView/BlockModel.swift b/react-native-aztec/ios/RNTAztecView/BlockModel.swift
diff --git a/react-native-aztec/ios/RNTAztecView/HeadingBlockFormatHandler.swift b/react-native-aztec/ios/RNTAztecView/HeadingBlockFormatHandler.swift
diff --git a/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift b/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
@@ -14,14 +14,7 @@ class RCTAztecView: Aztec.TextView {
     @objc var onSelectionChange: RCTBubblingEventBlock? = nil
     @objc var minWidth: CGFloat = 0
     @objc var maxWidth: CGFloat = 0
-    @objc var blockType: NSDictionary? = nil {
-        didSet {
-            guard let block = blockType, let tag = block["tag"] as? String else {
-                return
-            }
-            blockModel = BlockModel(tag: tag)
-        }
-    }
+
     @objc var activeFormats: NSSet? = nil {
         didSet {
             let currentTypingAttributes = formattingIdentifiersForTypingAttributes()
@@ -46,13 +39,7 @@ class RCTAztecView: Aztec.TextView {
         get {
             return super.textAlignment
         }
-    }
-
-    var blockModel = BlockModel(tag: "") {
-        didSet {
-            forceTypingAttributesIfNeeded()
-        }
-    }
+    }    
 
     private var previousContentSize: CGSize = .zero
 
@@ -618,12 +605,6 @@ class RCTAztecView: Aztec.TextView {
         }
     }
 
-    func forceTypingAttributesIfNeeded() {
-        if let formatHandler = HeadingBlockFormatHandler(block: blockModel) {
-            formatHandler.forceTypingFormat(on: self)
-        }
-    }
-
     // MARK: - Event Propagation
 
     func propagateContentChanges() {
@@ -672,8 +653,7 @@ extension RCTAztecView: UITextViewDelegate {
         guard isInsertingDictationResult == false else {
             return
         }
-
-        forceTypingAttributesIfNeeded()
+
         propagateContentChanges()
         updatePlaceholderVisibility()
         //Necessary to send height information to JS after pasting text.

diff --git a/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m b/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m
@@ -11,7 +11,6 @@ @interface RCT_EXTERN_MODULE(RCTAztecViewManager, NSObject)
 RCT_EXPORT_VIEW_PROPERTY(onBlur, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onPaste, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onSelectionChange, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(blockType, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(activeFormats, NSSet)
 
 RCT_EXPORT_VIEW_PROPERTY(onActiveFormatsChange, RCTBubblingEventBlock)