react-native-enriched 0.1.3 → 0.1.5

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)];
   }
 }
 

package/ios/utils/OccurenceUtils.h

@@ -9,6 +9,12 @@
   withInput:(EnrichedTextInputView* _Nonnull)input
   inRange:(NSRange)range
   withCondition:(BOOL (NS_NOESCAPE ^_Nonnull)(id _Nullable value, NSRange range))condition;
++ (BOOL)detect
+  :(NSAttributedStringKey _Nonnull)key
+  withInput:(EnrichedTextInputView* _Nonnull)input
+  atIndex:(NSUInteger)index
+  checkPrevious:(BOOL)check
+  withCondition:(BOOL (NS_NOESCAPE ^_Nonnull)(id _Nullable value, NSRange range))condition;
 + (BOOL)detectMultiple
   :(NSArray<NSAttributedStringKey> *_Nonnull)keys
   withInput:(EnrichedTextInputView* _Nonnull)input

package/ios/utils/OccurenceUtils.mm

@@ -19,6 +19,37 @@
   return totalLength == range.length;
 }
 
+// checkPrevious flag is used for styles like lists or blockquotes
+// it means that first character of paragraph will be checked instead if the detection is not in input's selected range and at the end of the input
++ (BOOL)detect
+  :(NSAttributedStringKey _Nonnull)key
+  withInput:(EnrichedTextInputView* _Nonnull)input
+  atIndex:(NSUInteger)index
+  checkPrevious:(BOOL)checkPrev
+  withCondition:(BOOL (NS_NOESCAPE ^_Nonnull)(id _Nullable value, NSRange range))condition
+{
+  NSRange detectionRange = NSMakeRange(index, 0);
+  id attrValue;
+  if(NSEqualRanges(input->textView.selectedRange, detectionRange)) {
+    attrValue = input->textView.typingAttributes[key];
+  } else if(index == input->textView.textStorage.string.length) {
+    if(checkPrev) {
+      NSRange paragraphRange = [input->textView.textStorage.string paragraphRangeForRange:detectionRange];
+      if(paragraphRange.location == detectionRange.location) {
+        return NO;
+      } else {
+        return [self detect:key withInput:input inRange:NSMakeRange(paragraphRange.location, 1) withCondition:condition];
+      }
+    } else {
+      return NO;
+    }
+  } else {
+    NSRange attrRange = NSMakeRange(0, 0);
+    attrValue = [input->textView.textStorage attribute:key atIndex:index effectiveRange:&attrRange];
+  }
+  return condition(attrValue, detectionRange);
+}
+
 + (BOOL)detectMultiple
   :(NSArray<NSAttributedStringKey> *_Nonnull)keys
   withInput:(EnrichedTextInputView* _Nonnull)input

package/ios/utils/ParagraphAttributesUtils.h

@@ -0,0 +1,6 @@
+#import <UIKit/UIKit.h>
+#pragma once
+
+@interface ParagraphAttributesUtils : NSObject
++ (BOOL)handleBackspaceInRange:(NSRange)range replacementText:(NSString *)text input:(id)input;
+@end

package/ios/utils/ParagraphAttributesUtils.mm

@@ -0,0 +1,67 @@
+#import "ParagraphAttributesUtils.h"
+#import "EnrichedTextInputView.h"
+#import "StyleHeaders.h"
+#import "ParagraphsUtils.h"
+#import "TextInsertionUtils.h"
+
+@implementation ParagraphAttributesUtils
+
+// if the user backspaces the last character in a line, the iOS applies typing attributes from the previous line
+// in the case of some paragraph styles it works especially bad when a list point just appears
+// hence the solution - reset typing attributes
++ (BOOL)handleBackspaceInRange:(NSRange)range replacementText:(NSString *)text input:(id)input {
+  EnrichedTextInputView *typedInput = (EnrichedTextInputView *)input;
+  UnorderedListStyle *ulStyle = typedInput->stylesDict[@([UnorderedListStyle getStyleType])];
+  OrderedListStyle *olStyle = typedInput->stylesDict[@([OrderedListStyle getStyleType])];
+  BlockQuoteStyle *bqStyle = typedInput->stylesDict[@([BlockQuoteStyle getStyleType])];
+  
+  if(typedInput == nullptr) {
+    return NO;
+  }
+  
+  // we make sure it was a backspace (text with 0 length) and it deleted something (range longer than 0)
+  if(text.length > 0 || range.length == 0) {
+    return NO;
+  }
+  
+  // find a non-newline range of the paragraph
+  NSRange paragraphRange = [typedInput->textView.textStorage.string paragraphRangeForRange:range];
+  
+  NSArray *paragraphs = [ParagraphsUtils getNonNewlineRangesIn:typedInput->textView range:paragraphRange];
+  if(paragraphs.count == 0) {
+    return NO;
+  }
+  
+  NSRange nonNewlineRange = [(NSValue *)paragraphs.firstObject rangeValue];
+  
+  // if the backspace removes the whole content of a paragraph (possibly more but has to start where the paragraph starts), we remove the typing attributes
+  if(range.location == nonNewlineRange.location && range.length >= nonNewlineRange.length) {
+    // for lists and quotes we want to remove the characters but keep attribtues so that a zero width space appears here
+    // so we do the removing manually and reapply attributes
+    if([ulStyle detectStyle:nonNewlineRange]) {
+      [TextInsertionUtils replaceText:text at:range additionalAttributes:nullptr input:typedInput withSelection:YES];
+      [ulStyle addAttributes:NSMakeRange(range.location, 0)];
+      return YES;
+    }
+    if([olStyle detectStyle:nonNewlineRange]) {
+      [TextInsertionUtils replaceText:text at:range additionalAttributes:nullptr input:typedInput withSelection:YES];
+      [olStyle addAttributes:NSMakeRange(range.location, 0)];
+      return YES;
+    }
+    if([bqStyle detectStyle:nonNewlineRange]) {
+      [TextInsertionUtils replaceText:text at:range additionalAttributes:nullptr input:typedInput withSelection:YES];
+      [bqStyle addAttributes:NSMakeRange(range.location, 0)];
+      return YES;
+    }
+  
+    // do the replacement manually
+    [TextInsertionUtils replaceText:text at:range additionalAttributes:nullptr input:typedInput withSelection:YES];
+    // reset typing attribtues
+    typedInput->textView.typingAttributes = typedInput->defaultTypingAttributes;
+    return YES;
+  }
+
+  return NO;
+}
+
+@end

package/ios/utils/StyleHeaders.h

@@ -47,6 +47,8 @@
 }
 - (CGFloat)getHeadingFontSize;
 - (BOOL)isHeadingBold;
+- (BOOL)handleNewlinesInRange:(NSRange)range replacementText:(NSString *)text;
+- (void)handleImproperHeadings;
 @end
 
 @interface H1Style : HeadingStyleBase

package/ios/utils/ZeroWidthSpaceUtils.mm

@@ -52,19 +52,23 @@
   
   // do the removing
   NSInteger offset = 0;
-  NSInteger postRemoveOffset = 0;
+  NSInteger postRemoveLocationOffset = 0;
+  NSInteger postRemoveLengthOffset = 0;
   for(NSNumber *index in indexesToBeRemoved) {
     NSRange replaceRange = NSMakeRange([index integerValue] + offset, 1);
     [TextInsertionUtils replaceText:@"" at:replaceRange additionalAttributes:nullptr input:input withSelection:NO];
     offset -= 1;
     if([index integerValue] < preRemoveSelection.location) {
-      postRemoveOffset -= 1;
+      postRemoveLocationOffset -= 1;
+    }
+    if([index integerValue] >= preRemoveSelection.location && [index integerValue] < NSMaxRange(preRemoveSelection)) {
+      postRemoveLengthOffset -= 1;
     }
   }
   
   // fix the selection if needed
   if([input->textView isFirstResponder]) {
-    input->textView.selectedRange = NSMakeRange(preRemoveSelection.location + postRemoveOffset, preRemoveSelection.length);
+    input->textView.selectedRange = NSMakeRange(preRemoveSelection.location + postRemoveLocationOffset, preRemoveSelection.length + postRemoveLengthOffset);
   }
 }
 
@@ -93,13 +97,17 @@
   
   // do the replacing
   NSInteger offset = 0;
-  NSInteger postAddOffset = 0;
+  NSInteger postAddLocationOffset = 0;
+  NSInteger postAddLengthOffset = 0;
   for(NSNumber *index in indexesToBeInserted) {
     NSRange replaceRange = NSMakeRange([index integerValue] + offset, 1);
     [TextInsertionUtils replaceText:@"\u200B\n" at:replaceRange additionalAttributes:nullptr input:input withSelection:NO];
     offset += 1;
     if([index integerValue] < preAddSelection.location) {
-      postAddOffset += 1;
+      postAddLocationOffset += 1;
+    }
+    if([index integerValue] >= preAddSelection.location && [index integerValue] < NSMaxRange(preAddSelection)) {
+      postAddLengthOffset += 1;
     }
   }
   
@@ -112,7 +120,7 @@
   
   // fix the selection if needed
   if([input->textView isFirstResponder]) {
-    input->textView.selectedRange = NSMakeRange(preAddSelection.location + postAddOffset, preAddSelection.length);
+    input->textView.selectedRange = NSMakeRange(preAddSelection.location + postAddLocationOffset, preAddSelection.length + postAddLengthOffset);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-enriched",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Rich Text Editor component for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",
@@ -39,7 +39,8 @@
     "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
     "prepare": "bob build",
     "release": "release-it",
-    "android-studio": "open -a 'Android Studio' example/android"
+    "android-studio": "open -a 'Android Studio' example/android",
+    "xcode": "open -a 'Xcode' example/ios/EnrichedTextInputExample.xcworkspace"
   },
   "keywords": [
     "react-native",
@@ -48,14 +49,14 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/software-mansion-labs/react-native-enriched.git"
+    "url": "git+https://github.com/software-mansion/react-native-enriched.git"
   },
   "author": "Software Mansion <contact@swmansion.com> (https://swmansion.com)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/software-mansion-labs/react-native-enriched/issues"
+    "url": "https://github.com/software-mansion/react-native-enriched/issues"
   },
-  "homepage": "https://github.com/software-mansion-labs/react-native-enriched#readme",
+  "homepage": "https://github.com/software-mansion/react-native-enriched#readme",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },