react-native-enriched 0.1.3 → 0.1.4

package/ReactNativeEnriched.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
 
   s.platforms    = { :ios => min_ios_version_supported }
-  s.source       = { :git => "https://github.com/software-mansion-labs/react-native-rich-text-editor.git", :tag => "#{s.version}" }
+  s.source       = { :git => "https://github.com/software-mansion/react-native-enriched.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,cpp}"
   s.private_header_files = "ios/**/*.h"

package/android/src/main/java/com/swmansion/enriched/EnrichedTextInputView.kt

@@ -51,7 +51,10 @@ class EnrichedTextInputView : AppCompatEditText {
   val paragraphStyles: ParagraphStyles? = ParagraphStyles(this)
   val listStyles: ListStyles? = ListStyles(this)
   val parametrizedStyles: ParametrizedStyles? = ParametrizedStyles(this)
-  var isSettingValue: Boolean = false
+  // Sometimes setting up style triggers many changes in sequence
+  // Eg. removing conflicting styles -> changing text -> applying spans
+  // In such scenario we want to prevent from handling side effects (eg. onTextChanged)
+  var isDuringTransaction: Boolean = false
   var isRemovingMany: Boolean = false
 
   val mentionHandler: MentionHandler? = MentionHandler(this)
@@ -233,7 +236,7 @@ class EnrichedTextInputView : AppCompatEditText {
 
   fun setValue(value: CharSequence?) {
     if (value == null) return
-    isSettingValue = true
+    isDuringTransaction = true
 
     val newText = parseText(value)
     setText(newText)
@@ -244,7 +247,7 @@ class EnrichedTextInputView : AppCompatEditText {
     // Scroll to the last line of text
     setSelection(text?.length ?: 0)
 
-    isSettingValue = false
+    isDuringTransaction = false
   }
 
   fun setAutoFocus(autoFocus: Boolean) {
@@ -452,13 +455,13 @@ class EnrichedTextInputView : AppCompatEditText {
       val end = selection?.end ?: 0
       val lengthBefore = text?.length ?: 0
 
-      isSettingValue = true
+      isDuringTransaction = true
       val targetRange = getTargetRange(name)
       val removed = removeStyle(style, targetRange.first, targetRange.second)
       if (removed) {
         spanState?.setStart(style, null)
       }
-      isSettingValue = false
+      isDuringTransaction = false
 
       val lengthAfter = text?.length ?: 0
       val charactersRemoved = lengthBefore - lengthAfter

package/android/src/main/java/com/swmansion/enriched/events/MentionHandler.kt

@@ -8,6 +8,11 @@ class MentionHandler(private val view: EnrichedTextInputView) {
   private var previousText: String? = null
   private var previousIndicator: String? = null
 
+  fun reset() {
+    previousText = null
+    previousIndicator = null
+  }
+
   fun endMention() {
     val indicator = previousIndicator
     if (indicator == null) return

package/android/src/main/java/com/swmansion/enriched/styles/ParametrizedStyles.kt

@@ -201,6 +201,7 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     }
 
     val start = mentionStart ?: return
+    view.isDuringTransaction = true
     spannable.replace(start, selectionEnd, text)
 
     val span = EnrichedMentionSpan(text, indicator, attributes, view.htmlStyle)
@@ -213,6 +214,8 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
       spannable.insert(safeEnd, " ")
     }
 
+    view.isDuringTransaction = false
+    view.mentionHandler?.reset()
     view.selection.validateStyles()
   }
 

package/android/src/main/java/com/swmansion/enriched/utils/EnrichedSelection.kt

@@ -39,7 +39,7 @@ class EnrichedSelection(private val view: EnrichedTextInputView) {
     val finalStart = newStart.coerceAtMost(newEnd).coerceAtLeast(0).coerceAtMost(textLength)
     val finalEnd = newEnd.coerceAtLeast(newStart).coerceAtLeast(0).coerceAtMost(textLength)
 
-    if (isZeroWidthSelection(finalStart, finalEnd) && !view.isSettingValue) {
+    if (isZeroWidthSelection(finalStart, finalEnd) && !view.isDuringTransaction) {
       view.setSelection(finalStart + 1)
       shouldValidateStyles = false
     }

package/android/src/main/java/com/swmansion/enriched/watchers/EnrichedTextWatcher.kt

@@ -18,14 +18,14 @@ class EnrichedTextWatcher(private val view: EnrichedTextInputView) : TextWatcher
   override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
     endCursorPosition = start + count
     view.layoutManager.measureSize(s ?: "")
-    view.isRemovingMany = !view.isSettingValue && before > count + 1
+    view.isRemovingMany = !view.isDuringTransaction && before > count + 1
   }
 
   override fun afterTextChanged(s: Editable?) {
     if (s == null) return
     emitEvents(s)
 
-    if (view.isSettingValue) return
+    if (view.isDuringTransaction) return
     applyStyles(s)
   }
 

package/android/src/main/new_arch/CMakeLists.txt

@@ -39,15 +39,19 @@ target_link_libraries(
         ReactAndroid::reactnative
 )
 
-target_compile_options(
-        ${LIB_TARGET_NAME}
-        PRIVATE
-        -DLOG_TAG=\"ReactNative\"
-        -fexceptions
-        -frtti
-        -Wall
-        -std=c++20
-)
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
+  target_compile_reactnative_options(${LIB_TARGET_NAME} PRIVATE)
+else()
+  target_compile_options(
+          ${LIB_TARGET_NAME}
+          PRIVATE
+          -DLOG_TAG=\"ReactNative\"
+          -fexceptions
+          -frtti
+          -Wall
+          -std=c++20
+  )
+endif()
 
 target_include_directories(
         ${CMAKE_PROJECT_NAME}

package/android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/EnrichedTextInputMeasurementManager.h

@@ -11,7 +11,7 @@ namespace facebook::react {
     class EnrichedTextInputMeasurementManager {
     public:
         EnrichedTextInputMeasurementManager(
-                const ContextContainer::Shared& contextContainer)
+                const std::shared_ptr<const ContextContainer>& contextContainer)
                 : contextContainer_(contextContainer) {}
 
         Size measure(
@@ -20,7 +20,7 @@ namespace facebook::react {
                 LayoutConstraints layoutConstraints) const;
 
     private:
-        const ContextContainer::Shared contextContainer_;
+        const std::shared_ptr<const ContextContainer> contextContainer_;
     };
 
 } // namespace facebook::react

package/ios/EnrichedTextInputView.mm

@@ -14,6 +14,7 @@
 #import "WordsUtils.h"
 #import "LayoutManagerExtension.h"
 #import "ZeroWidthSpaceUtils.h"
+#import "ParagraphAttributesUtils.h"
 
 using namespace facebook::react;
 
@@ -422,7 +423,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   }
   
   // editable
-  if(newViewProps.editable != oldViewProps.editable) {
+  if(newViewProps.editable != textView.editable) {
     textView.editable = newViewProps.editable;
   }
   
@@ -564,7 +565,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     unichar lastChar = [currentStr.string characterAtIndex:currentStr.length-1];
     if([[NSCharacterSet newlineCharacterSet] characterIsMember:lastChar]) {
       [currentStr appendAttributedString:
-        [[NSAttributedString alloc] initWithString:@"I" attributes:textView.typingAttributes]
+        [[NSAttributedString alloc] initWithString:@"I" attributes:defaultTypingAttributes]
       ];
     }
   }
@@ -977,6 +978,22 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     [mentionStyleClass manageMentionTypingAttributes];
     [mentionStyleClass manageMentionEditing];
   }
+  
+  // typing attributes for empty lines selection reset
+  NSString *currentString = [textView.textStorage.string copy];
+  if(textView.selectedRange.length == 0 && [_recentlyEmittedString isEqualToString:currentString]) {
+    // no string change means only a selection changed with no character changes
+    NSRange paragraphRange = [textView.textStorage.string paragraphRangeForRange:textView.selectedRange];
+    if(
+      paragraphRange.length == 0 ||
+      (paragraphRange.length == 1 &&
+      [[NSCharacterSet newlineCharacterSet] characterIsMember:[textView.textStorage.string characterAtIndex:paragraphRange.location]])
+    ) {
+      // user changed selection to an empty line (or empty line with a newline)
+      // typing attributes need to be reset
+      textView.typingAttributes = defaultTypingAttributes;
+    }
+  }
 }
 
 - (void)handleWordModificationBasedChanges:(NSString*)word inRange:(NSRange)range {
@@ -995,15 +1012,15 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     return;
   }
   
+  // zero width space adding or removal
+  [ZeroWidthSpaceUtils handleZeroWidthSpacesInInput:self];
+  
   // emptying input typing attributes management
   if(textView.textStorage.string.length == 0 && _recentlyEmittedString.length > 0) {
     // reset typing attribtues
     textView.typingAttributes = defaultTypingAttributes;
   }
   
-  // zero width space removal
-  [ZeroWidthSpaceUtils handleZeroWidthSpacesInInput:self];
-  
   // inline code on newlines fix
   InlineCodeStyle *codeStyle = stylesDict[@([InlineCodeStyle getStyleType])];
   if(codeStyle != nullptr) {
@@ -1016,6 +1033,16 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     [bqStyle manageBlockquoteColor];
   }
   
+  // improper headings fix
+  H1Style *h1Style = stylesDict[@([H1Style getStyleType])];
+  H2Style *h2Style = stylesDict[@([H2Style getStyleType])];
+  H3Style *h3Style = stylesDict[@([H3Style getStyleType])];
+  if(h1Style != nullptr && h2Style != nullptr && h3Style != nullptr) {
+    [h1Style handleImproperHeadings];
+    [h2Style handleImproperHeadings];
+    [h3Style handleImproperHeadings];
+  }
+  
   // placholder management
   if(!_placeholderLabel.hidden && textView.textStorage.string.length > 0) {
     [self setPlaceholderLabelShown:NO];
@@ -1102,61 +1129,37 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
 - (bool)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
   recentlyChangedRange = NSMakeRange(range.location, text.length);
   
-  BOOL rejectTextChanges = NO;
-  
   UnorderedListStyle *uStyle = stylesDict[@([UnorderedListStyle getStyleType])];
-  if(uStyle != nullptr) {
-    // removing first line list fix
-    BOOL removedFirstLineList = [uStyle handleBackspaceInRange:range replacementText:text];
-    
-    // creating unordered list from "- "
-    BOOL addedShortcutList = [uStyle tryHandlingListShorcutInRange:range replacementText:text];
-    
-    // any of these changes make us reject text changes
-    rejectTextChanges = rejectTextChanges || removedFirstLineList || addedShortcutList;
-  }
-  
   OrderedListStyle *oStyle = stylesDict[@([OrderedListStyle getStyleType])];
-  if(oStyle != nullptr) {
-    // removing first line list fix
-    BOOL removedFirstLineList = [oStyle handleBackspaceInRange:range replacementText:text];
-    
-    // creating ordered list from "1."
-    BOOL addedShortcutList = [oStyle tryHandlingListShorcutInRange:range replacementText:text];
-    
-    // any of these changes make us reject text changes
-    rejectTextChanges = rejectTextChanges || removedFirstLineList || addedShortcutList;
-  }
-  
   BlockQuoteStyle *bqStyle = stylesDict[@([BlockQuoteStyle getStyleType])];
-  if(bqStyle != nullptr) {
-    // removing first line quote fix
-    BOOL removedFirstLineQuote = [bqStyle handleBackspaceInRange:range replacementText:text];
-    rejectTextChanges = rejectTextChanges || removedFirstLineQuote;
-  }
-  
   LinkStyle *linkStyle = stylesDict[@([LinkStyle getStyleType])];
-  if(linkStyle != nullptr) {
-    // persisting link attributes fix
-    BOOL fixedLeadingAttributes = [linkStyle handleLeadingLinkReplacement:range replacementText:text];
-    rejectTextChanges = rejectTextChanges || fixedLeadingAttributes;
-  }
-  
   MentionStyle *mentionStyle = stylesDict[@([MentionStyle getStyleType])];
-  if(mentionStyle != nullptr) {
-    // persisting mention attributes fix
-    BOOL fixedLeadingAttributes = [mentionStyle handleLeadingMentionReplacement:range replacementText:text];
-    rejectTextChanges = rejectTextChanges || fixedLeadingAttributes;
-  }
-  
-  // zero width space removal fix
-  rejectTextChanges = rejectTextChanges || [ZeroWidthSpaceUtils handleBackspaceInRange:range replacementText:text input:self];
-
-  if(rejectTextChanges) {
+  H1Style *h1Style = stylesDict[@([H1Style getStyleType])];
+  H2Style *h2Style = stylesDict[@([H2Style getStyleType])];
+  H3Style *h3Style = stylesDict[@([H3Style getStyleType])];
+  
+  // some of the changes these checks do could interfere with later checks and cause a crash
+  // so here I rely on short circuiting evaluation of the logical expression
+  // either way it's not possible to have two of them come off at the same time
+  if(
+    [uStyle handleBackspaceInRange:range replacementText:text] ||
+    [uStyle tryHandlingListShorcutInRange:range replacementText:text] ||
+    [oStyle handleBackspaceInRange:range replacementText:text] ||
+    [oStyle tryHandlingListShorcutInRange:range replacementText:text] ||
+    [bqStyle handleBackspaceInRange:range replacementText:text] ||
+    [linkStyle handleLeadingLinkReplacement:range replacementText:text] ||
+    [mentionStyle handleLeadingMentionReplacement:range replacementText:text] ||
+    [h1Style handleNewlinesInRange:range replacementText:text] ||
+    [h2Style handleNewlinesInRange:range replacementText:text] ||
+    [h3Style handleNewlinesInRange:range replacementText:text] ||
+    [ZeroWidthSpaceUtils handleBackspaceInRange:range replacementText:text input:self] ||
+    [ParagraphAttributesUtils handleBackspaceInRange:range replacementText:text input:self]
+  ) {
     [self anyTextMayHaveBeenModified];
+    return NO;
   }
-  
-  return !rejectTextChanges;
+
+  return YES;
 }
 
 - (void)textViewDidChangeSelection:(UITextView *)textView {

package/ios/internals/EnrichedTextInputViewShadowNode.mm

@@ -55,7 +55,10 @@ Size EnrichedTextInputViewShadowNode::measureContent(const LayoutContext& layout
         });
       }
       
-      return {estimatedSize.width, estimatedSize.height};
+      return {
+        estimatedSize.width,
+        MIN(estimatedSize.height, layoutConstraints.maximumSize.height)
+      };
     }
   } else {
     // on the very first call there is no componentView that we can query for the component height

package/ios/styles/BlockQuoteStyle.mm

@@ -118,16 +118,22 @@
   [self removeAttributes:_input->textView.selectedRange];
 }
 
-// removing first quote line by backspacing doesn't remove typing attributes because it doesn't run textViewDidChange
-// so we try guessing that a point should be deleted here
 - (BOOL)handleBackspaceInRange:(NSRange)range replacementText:(NSString *)text {
-  if([self detectStyle:_input->textView.selectedRange] &&
-     NSEqualRanges(_input->textView.selectedRange, NSMakeRange(0, 0)) &&
-     [text isEqualToString:@""]
-  ) {
+  if([self detectStyle:_input->textView.selectedRange] && text.length == 0) {
+    // backspace while the style is active
+    
     NSRange paragraphRange = [_input->textView.textStorage.string paragraphRangeForRange:_input->textView.selectedRange];
-    [self removeAttributes:paragraphRange];
-    return YES;
+    
+    if(NSEqualRanges(_input->textView.selectedRange, NSMakeRange(0, 0))) {
+      // a backspace on the very first input's line quote
+      // it doesn't run textVieDidChange so we need to manually remove attributes
+      [self removeAttributes:paragraphRange];
+      return YES;
+    } else if(range.location == paragraphRange.location - 1) {
+      // same case in other lines; here, the removed range location will be exactly 1 less than paragraph range location
+      [self removeAttributes:paragraphRange];
+      return YES;
+    }
   }
   return NO;
 }
@@ -145,22 +151,11 @@
       }
     ];
   } else {
-    NSInteger searchLocation = range.location;
-    if(searchLocation == _input->textView.textStorage.length) {
-      NSParagraphStyle *pStyle = _input->textView.typingAttributes[NSParagraphStyleAttributeName];
-      return [self styleCondition:pStyle :NSMakeRange(0, 0)];
-    }
-    
-    NSRange paragraphRange = NSMakeRange(0, 0);
-    NSRange inputRange = NSMakeRange(0, _input->textView.textStorage.length);
-    NSParagraphStyle *paragraph = [_input->textView.textStorage
-      attribute:NSParagraphStyleAttributeName
-      atIndex:searchLocation
-      longestEffectiveRange: &paragraphRange
-      inRange:inputRange
+    return [OccurenceUtils detect:NSParagraphStyleAttributeName withInput:_input atIndex:range.location checkPrevious:YES
+      withCondition:^BOOL(id  _Nullable value, NSRange range) {
+        return [self styleCondition:value :range];
+      }
     ];
-    
-    return [self styleCondition:paragraph :NSMakeRange(0, 0)];
   }
 }
 

package/ios/styles/BoldStyle.mm

@@ -98,8 +98,11 @@
       }
     ];
   } else {
-    UIFont *currentFontAttr = (UIFont *)_input->textView.typingAttributes[NSFontAttributeName];
-    return [self styleCondition:currentFontAttr :range];
+    return [OccurenceUtils detect:NSFontAttributeName withInput:_input atIndex:range.location checkPrevious:NO
+      withCondition:^BOOL(id  _Nullable value, NSRange range) {
+        return [self styleCondition:value :range];
+      }
+    ];
   }
 }
 

package/ios/styles/HeadingStyleBase.mm

@@ -2,6 +2,7 @@
 #import "EnrichedTextInputView.h"
 #import "FontExtension.h"
 #import "OccurenceUtils.h"
+#import "TextInsertionUtils.h"
 
 @implementation HeadingStyleBase
 
@@ -116,11 +117,11 @@
       }
     ];
   } else {
-    UIFont *currentFontAttr = (UIFont *)[self typedInput]->textView.typingAttributes[NSFontAttributeName];
-    if(currentFontAttr == nullptr) {
-      return false;
-    }
-    return currentFontAttr.pointSize == [self getHeadingFontSize];
+    return [OccurenceUtils detect:NSFontAttributeName withInput:[self typedInput] atIndex:range.location checkPrevious:YES
+      withCondition:^BOOL(id  _Nullable value, NSRange range) {
+        return [self styleCondition:value :range];
+      }
+    ];
   }
 }
 
@@ -140,5 +141,36 @@
   ];
 }
 
+// used to make sure headings dont persist after a newline is placed
+- (BOOL)handleNewlinesInRange:(NSRange)range replacementText:(NSString *)text {
+  // in a heading and a new text ends with a newline
+  if(
+    [self detectStyle:[self typedInput]->textView.selectedRange] &&
+    text.length > 0 &&
+    [[NSCharacterSet newlineCharacterSet] characterIsMember: [text characterAtIndex:text.length-1]]
+  ) {
+    // do the replacement manually
+    [TextInsertionUtils replaceText:text at:range additionalAttributes:nullptr input:[self typedInput] withSelection:YES];
+    // remove the attribtues at the new selection
+    [self removeAttributes:[self typedInput]->textView.selectedRange];
+    return YES;
+  }
+  return NO;
+}
+
+// backspacing a line after a heading "into" a heading will not result in the text attaining heading attributes
+// so, we do it manually
+- (void)handleImproperHeadings {
+  NSArray *occurences = [self findAllOccurences:NSMakeRange(0, [self typedInput]->textView.textStorage.string.length)];
+  for(StylePair *pair in occurences) {
+    NSRange occurenceRange = [pair.rangeValue rangeValue];
+    NSRange paragraphRange = [[self typedInput]->textView.textStorage.string paragraphRangeForRange:occurenceRange];
+    if(!NSEqualRanges(occurenceRange, paragraphRange)) {
+      // we have a heading but it does not span its whole paragraph - let's fix it
+      [self addAttributes:paragraphRange];
+    }
+  }
+}
+
 @end
 

package/ios/styles/InlineCodeStyle.mm

@@ -140,8 +140,11 @@
   
     return detected;
   } else {
-    UIColor *currentBgColorAttr = (UIColor *)_input->textView.typingAttributes[NSBackgroundColorAttributeName];
-    return [self styleCondition:currentBgColorAttr :range];
+    return [OccurenceUtils detect:NSBackgroundColorAttributeName withInput:_input atIndex:range.location checkPrevious:NO
+      withCondition:^BOOL(id  _Nullable value, NSRange range) {
+        return [self styleCondition:value :range];
+      }
+    ];
   }
 }
 

package/ios/styles/ItalicStyle.mm

@@ -83,11 +83,11 @@
       }
     ];
   } else {
-    UIFont *currentFontAttr = (UIFont *)_input->textView.typingAttributes[NSFontAttributeName];
-    if(currentFontAttr == nullptr) {
-      return false;
-    }
-    return [currentFontAttr isItalic];
+    return [OccurenceUtils detect:NSFontAttributeName withInput:_input atIndex:range.location checkPrevious:NO
+      withCondition:^BOOL(id  _Nullable value, NSRange range) {
+        return [self styleCondition:value :range];
+      }
+    ];
   }
 }
 

package/ios/styles/OrderedListStyle.mm

@@ -130,16 +130,22 @@
   [self removeAttributes:_input->textView.selectedRange];
 }
 
-// removing first list point by backspacing doesn't remove typing attributes because it doesn't run textViewDidChange
-// so we try guessing that a point should be deleted here
 - (BOOL)handleBackspaceInRange:(NSRange)range replacementText:(NSString *)text {
-  if([self detectStyle:_input->textView.selectedRange] &&
-     NSEqualRanges(_input->textView.selectedRange, NSMakeRange(0, 0)) &&
-     [text isEqualToString:@""]
-  ) {
+  if([self detectStyle:_input->textView.selectedRange] && text.length == 0) {
+    // backspace while the style is active
+    
     NSRange paragraphRange = [_input->textView.textStorage.string paragraphRangeForRange:_input->textView.selectedRange];
-    [self removeAttributes:paragraphRange];
-    return YES;
+    
+    if(NSEqualRanges(_input->textView.selectedRange, NSMakeRange(0, 0))) {
+      // a backspace on the very first input's line list point
+      // it doesn't run textVieDidChange so we need to manually remove attributes
+      [self removeAttributes:paragraphRange];
+      return YES;
+    } else if(range.location == paragraphRange.location - 1) {
+      // same case in other lines; here, the removed range location will be exactly 1 less than paragraph range location
+      [self removeAttributes:paragraphRange];
+      return YES;
+    }
   }
   return NO;
 }
@@ -187,22 +193,11 @@
       }
     ];
   } else {
-    NSInteger searchLocation = range.location;
-    if(searchLocation == _input->textView.textStorage.length) {
-      NSParagraphStyle *pStyle = _input->textView.typingAttributes[NSParagraphStyleAttributeName];
-      return [self styleCondition:pStyle :NSMakeRange(0, 0)];
-    }
-    
-    NSRange paragraphRange = NSMakeRange(0, 0);
-    NSRange inputRange = NSMakeRange(0, _input->textView.textStorage.length);
-    NSParagraphStyle *paragraph = [_input->textView.textStorage
-      attribute:NSParagraphStyleAttributeName
-      atIndex:searchLocation
-      longestEffectiveRange: &paragraphRange
-      inRange:inputRange
+    return [OccurenceUtils detect:NSParagraphStyleAttributeName withInput:_input atIndex:range.location checkPrevious:YES
+      withCondition:^BOOL(id  _Nullable value, NSRange range) {
+        return [self styleCondition:value :range];
+      }
     ];
-    
-    return [self styleCondition:paragraph :NSMakeRange(0, 0)];
   }
 }
 

package/ios/styles/StrikethroughStyle.mm

@@ -56,8 +56,11 @@
       }
     ];
   } else {
-    NSNumber *currenStrikethroughAttr = (NSNumber *)_input->textView.typingAttributes[NSStrikethroughStyleAttributeName];
-    return currenStrikethroughAttr != nullptr;
+    return [OccurenceUtils detect:NSStrikethroughStyleAttributeName withInput:_input atIndex:range.location checkPrevious:NO
+      withCondition:^BOOL(id  _Nullable value, NSRange range) {
+        return [self styleCondition:value :range];
+      }
+    ];
   }
 }
 

package/ios/styles/UnderlineStyle.mm

@@ -88,8 +88,11 @@
       }
     ];
   } else {
-    NSNumber *currentUnderlineAttr = (NSNumber *)_input->textView.typingAttributes[NSUnderlineStyleAttributeName];
-    return [self styleCondition:currentUnderlineAttr :range];
+    return [OccurenceUtils detect:NSUnderlineStyleAttributeName withInput:_input atIndex:range.location checkPrevious:NO
+      withCondition:^BOOL(id  _Nullable value, NSRange range) {
+        return [self styleCondition:value :range];
+      }
+    ];
   }
 }
 

package/ios/styles/UnorderedListStyle.mm

@@ -130,16 +130,22 @@
   [self removeAttributes:_input->textView.selectedRange];
 }
 
-// removing first list point by backspacing doesn't remove typing attributes because it doesn't run textViewDidChange
-// so we try guessing that a point should be deleted here
 - (BOOL)handleBackspaceInRange:(NSRange)range replacementText:(NSString *)text {
-  if([self detectStyle:_input->textView.selectedRange] &&
-     NSEqualRanges(_input->textView.selectedRange, NSMakeRange(0, 0)) &&
-     [text isEqualToString:@""]
-  ) {
+  if([self detectStyle:_input->textView.selectedRange] && text.length == 0) {
+    // backspace while the style is active
+    
     NSRange paragraphRange = [_input->textView.textStorage.string paragraphRangeForRange:_input->textView.selectedRange];
-    [self removeAttributes:paragraphRange];
-    return YES;
+    
+    if(NSEqualRanges(_input->textView.selectedRange, NSMakeRange(0, 0))) {
+      // a backspace on the very first input's line list point
+      // it doesn't run textVieDidChange so we need to manually remove attributes
+      [self removeAttributes:paragraphRange];
+      return YES;
+    } else if(range.location == paragraphRange.location - 1) {
+      // same case in other lines; here, the removed range location will be exactly 1 less than paragraph range location
+      [self removeAttributes:paragraphRange];
+      return YES;
+    }
   }
   return NO;
 }
@@ -187,22 +193,11 @@
       }
     ];
   } else {
-    NSInteger searchLocation = range.location;
-    if(searchLocation == _input->textView.textStorage.length) {
-      NSParagraphStyle *pStyle = _input->textView.typingAttributes[NSParagraphStyleAttributeName];
-      return [self styleCondition:pStyle :NSMakeRange(0, 0)];
-    }
-    
-    NSRange paragraphRange = NSMakeRange(0, 0);
-    NSRange inputRange = NSMakeRange(0, _input->textView.textStorage.length);
-    NSParagraphStyle *paragraph = [_input->textView.textStorage
-      attribute:NSParagraphStyleAttributeName
-      atIndex:searchLocation
-      longestEffectiveRange: &paragraphRange
-      inRange:inputRange
+    return [OccurenceUtils detect:NSParagraphStyleAttributeName withInput:_input atIndex:range.location checkPrevious:YES
+      withCondition:^BOOL(id  _Nullable value, NSRange range) {
+        return [self styleCondition:value :range];
+      }
     ];
-    
-    return [self styleCondition:paragraph :NSMakeRange(0, 0)];
   }
 }