react-native-enriched 0.1.3 → 0.1.4

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.4",
   "description": "Rich Text Editor component for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",
@@ -48,14 +48,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/"
   },