react-native-typerich 2.2.2 → 2.2.4

package/README.md

@@ -1,7 +1,6 @@
 # react-native-typerich
 
 Drop in TextInput replacement with inbuilt support for Image Pasting and Gboard stickers
-currently available only for android
 
 ## Installation
 

package/ios/modules/commands/TypeRichTextInputCommands.mm

@@ -60,82 +60,77 @@
 /// setText(text) - diff-based with proper cursor tracking, non-undoable
 - (void)setText:(NSString *)text
 {
-  UITextView *tv = _textView;
-  TypeRichTextInputView *owner = _owner;
-  if (!tv || !owner) return;
-
-  dispatch_async(dispatch_get_main_queue(), ^{
-    // Never interrupt IME composition
-    if (tv.markedTextRange) return;
-    
-    NSString *newText = text ?: @"";
-    NSString *currentText = tv.text ?: @"";
-    
-    // commented for now as causing issues when textinput is blank
-    // if ([currentText isEqualToString:newText]) {
-    //    return;
-    // }
-
-    owner.blockEmitting = YES;
-    
-    NSRange oldSelection = tv.selectedRange;
-    
-    // Calculate minimal diff range
-    NSRange diffRange = [self calculateDiffRange:currentText newText:newText];
-    
-    // Calculate what text will be inserted
-    NSInteger newLength = newText.length - (currentText.length - diffRange.length);
-    NSString *replacementText = @"";
-    
-    if (newLength > 0) {
-      replacementText = [newText substringWithRange:NSMakeRange(diffRange.location, newLength)];
-    }
-    
-    // Convert NSRange to UITextRange
-    UITextPosition *start = [tv positionFromPosition:tv.beginningOfDocument
-                                              offset:diffRange.location];
-    UITextPosition *end = [tv positionFromPosition:tv.beginningOfDocument
-                                            offset:NSMaxRange(diffRange)];
-    
-    if (start && end) {
-      UITextRange *range = [tv textRangeFromPosition:start toPosition:end];
-      [tv replaceRange:range withText:replacementText];
-      
-      // Calculate cursor adjustment
-      NSInteger delta = replacementText.length - diffRange.length;
-      NSInteger newCursorPos = oldSelection.location;
-      
-      // If change happened before cursor, adjust cursor position
-      if (diffRange.location <= oldSelection.location) {
-        newCursorPos = oldSelection.location + delta;
-      }
-      
-      // Clamp to valid range
-      newCursorPos = MAX(0, MIN(newCursorPos, newText.length));
-      
-      // Restore cursor at adjusted position
-      tv.selectedRange = NSMakeRange(newCursorPos, 0);
-      
-    } else {
-      // Fallback: full replace with cursor clamping
-      tv.text = newText;
-      NSInteger safeLoc = MIN(oldSelection.location, newText.length);
-      tv.selectedRange = NSMakeRange(safeLoc, 0);
-    }
-    
-    owner.blockEmitting = NO;
-    
-    [owner updatePlaceholderVisibilityFromCommand];
-    
-    if (tv.scrollEnabled) {
-      [owner invalidateTextLayoutFromCommand];
-      
-      // scroll to cursor
-      [tv scrollRangeToVisible:tv.selectedRange];
-    }
-    
-    [owner dispatchSelectionChangeIfNeeded];
-  });
+    UITextView *tv = _textView;
+    TypeRichTextInputView *owner = _owner;
+    if (!tv || !owner) return;
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (tv.markedTextRange) return;
+        
+        NSString *newText = text ?: @"";
+        NSString *currentText = tv.text ?: @"";
+        
+        // if text is same, do nothing.
+        if ([currentText isEqualToString:newText]) {
+            return;
+        }
+
+        owner.blockEmitting = YES;
+        
+        NSRange oldSelection = tv.selectedRange;
+        NSRange diffRange = [self calculateDiffRange:currentText newText:newText];
+        
+        NSInteger newLength = newText.length - (currentText.length - diffRange.length);
+        NSString *replacementText = (newLength > 0)
+            ? [newText substringWithRange:NSMakeRange(diffRange.location, newLength)]
+            : @"";
+        
+        UITextPosition *start = [tv positionFromPosition:tv.beginningOfDocument offset:diffRange.location];
+        UITextPosition *end = [tv positionFromPosition:tv.beginningOfDocument offset:NSMaxRange(diffRange)];
+        
+        if (start && end) {
+            UITextRange *range = [tv textRangeFromPosition:start toPosition:end];
+            
+            // text replacement
+            [tv replaceRange:range withText:replacementText];
+            
+            // if the user is typing at the end of the selection,
+            // and we just inserted text that matches what the system expected,
+            // we should only jump the cursor if the JS-provided state differs
+            // from the current internal state.
+            
+            NSInteger delta = replacementText.length - diffRange.length;
+            BOOL cursorWasAtEnd = (oldSelection.location == currentText.length);
+            
+            if (cursorWasAtEnd) {
+                tv.selectedRange = NSMakeRange(newText.length, 0);
+            } else {
+                // If the change happened at or before the cursor, shift it
+                if (diffRange.location <= oldSelection.location) {
+                    NSInteger newPos = oldSelection.location + delta;
+                    newPos = MAX(0, MIN(newPos, newText.length));
+                    
+                    // IMPORTANT: Only set the range if it's actually different.
+                    // Setting selectedRange unnecessarily resets the keyboard's internal state.
+                    if (tv.selectedRange.location != newPos) {
+                        tv.selectedRange = NSMakeRange(newPos, 0);
+                    }
+                }
+            }
+        } else {
+            tv.text = newText;
+        }
+        
+        owner.blockEmitting = NO;
+        [owner updatePlaceholderVisibilityFromCommand];
+        
+        if (tv.scrollEnabled) {
+            [owner invalidateTextLayoutFromCommand];
+            [tv scrollRangeToVisible:tv.selectedRange];
+        }
+        
+        [owner dispatchSelectionChangeIfNeeded];
+    });
 }
 
 // Helper: Calculate minimal diff range between two strings

package/lib/module/TypeRichTextInput.js

@@ -24,6 +24,7 @@ const TypeRichTextInput = /*#__PURE__*/forwardRef((props, ref) => {
   const nativeRef = useRef(null);
   const {
     scrollEnabled = true,
+    editable = true,
     ...restProps
   } = props;
   useImperativeHandle(ref, () => ({
@@ -81,6 +82,7 @@ const TypeRichTextInput = /*#__PURE__*/forwardRef((props, ref) => {
     ref: nativeRef,
     ...restProps,
     scrollEnabled: scrollEnabled,
+    editable: editable,
     onInputFocus: () => props.onFocus?.(),
     onInputBlur: () => props.onBlur?.(),
     onChangeText: handleOnChangeTextEvent,

package/lib/module/TypeRichTextInput.js.map

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","useImperativeHandle","useRef","NativeTypeRichTextInput","Commands","jsx","_jsx","normalizeEvent","event","nativeEvent","TypeRichTextInput","props","ref","nativeRef","scrollEnabled","restProps","focus","current","blur","setText","text","setSelection","start","end","insertTextAt","getNativeRef","handlePasteImage","data","undefined","onPasteImageData","handleOnChangeTextEvent","e","onChangeText","value","handleonChangeSelectionEvent","onChangeSelection","onInputFocus","onFocus","onInputBlur","onBlur","onPasteImage"],"sourceRoot":"../../src","sources":["TypeRichTextInput.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["forwardRef","useImperativeHandle","useRef","NativeTypeRichTextInput","Commands","jsx","_jsx","normalizeEvent","event","nativeEvent","TypeRichTextInput","props","ref","nativeRef","scrollEnabled","editable","restProps","focus","current","blur","setText","text","setSelection","start","end","insertTextAt","getNativeRef","handlePasteImage","data","undefined","onPasteImageData","handleOnChangeTextEvent","e","onChangeText","value","handleonChangeSelectionEvent","onChangeSelection","onInputFocus","onFocus","onInputBlur","onBlur","onPasteImage"],"sourceRoot":"../../src","sources":["TypeRichTextInput.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/TypeRichTextInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypeRichTextInput.d.ts","sourceRoot":"","sources":["../../../src/TypeRichTextInput.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AAEnC,KAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,WAAW,EAAE,CAAC,CAAA;CAAE,CAAC;AAElD,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAK/D;AAED;;;;;;;;;GASG;AACH,QAAA,MAAM,iBAAiB,yHAuFtB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"TypeRichTextInput.d.ts","sourceRoot":"","sources":["../../../src/TypeRichTextInput.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AAEnC,KAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,WAAW,EAAE,CAAC,CAAA;CAAE,CAAC;AAElD,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAK/D;AAED;;;;;;;;;GASG;AACH,QAAA,MAAM,iBAAiB,yHAwFtB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-typerich",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "Drop in TextInput replacement with inbuilt support for Image Pasting and Gboard stickers",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/TypeRichTextInput.tsx

@@ -39,7 +39,7 @@ const TypeRichTextInput = forwardRef(
   (props: TypeRichTextInputProps, ref: Ref<TypeRichTextInputRef>) => {
     const nativeRef = useRef(null);
 
-    const { scrollEnabled = true, ...restProps } = props;
+    const { scrollEnabled = true, editable = true, ...restProps } = props;
 
     useImperativeHandle(ref, () => ({
       focus: () => {
@@ -114,6 +114,7 @@ const TypeRichTextInput = forwardRef(
         ref={nativeRef}
         {...restProps}
         scrollEnabled={scrollEnabled}
+        editable={editable}
         onInputFocus={() => props.onFocus?.()}
         onInputBlur={() => props.onBlur?.()}
         onChangeText={handleOnChangeTextEvent}