feat: bugfix

Author: duom青源

.gitignore

@@ -67,4 +67,4 @@ android/keystores/debug.keystore
 .turbo/
 
 # generated by bob
-lib/
+# lib/

android/src/main/java/com/variabletextinput/VariableTextInputViewManager.java

@@ -256,11 +256,11 @@ public void setUnderlineColor(VariableTextInput view, @Nullable Integer underlin
   }
   @ReactProp(name = "onSelectionChange", defaultBoolean = false)
   public void setOnSelectionChange(final VariableTextInput view, boolean onSelectionChange) {
-    if (onSelectionChange) {
-      view.setSelectionWatcher(new ReactSelectionWatcher(view));
-    } else {
-      view.setSelectionWatcher(null);
-    }
+//    if (onSelectionChange) {
+//      view.setSelectionWatcher(new ReactSelectionWatcher(view));
+//    } else {
+//      view.setSelectionWatcher(null);
+//    }
   }
   @ReactProp(name = "keyboardType")
   public void setKeyboardType(VariableTextInput view, String keyboardType) {
@@ -351,6 +351,6 @@ public Map<String, Object> getConstants() {
       "onAndroidChange",
       MapBuilder.of("registrationName", "onAndroidChange")
     ).put( "onAndroidContentSizeChange",
-      MapBuilder.of("registrationName", "onAndroidContentSizeChange")).put("onAndroidSubmitEditing",MapBuilder.of("registrationName","onAndroidSubmitEditing")).build();
+      MapBuilder.of("registrationName", "onAndroidTextInput")).put("onAndroidTextInput",MapBuilder.of("registrationName","onAndroidTextInput")).build();
   }
 }

android/src/main/java/com/variabletextinput/view/VariableTextInput.java

@@ -138,6 +138,17 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
         }
         String newText = s.toString().substring(start, start + count);
         String oldText = mPreviousText.substring(start, start + before);
+        WritableMap onTextInputEvent = Arguments.createMap();
+        if (newText.length()>oldText.length()){
+          String t = newText.replace(oldText,"");
+          onTextInputEvent.putString("text", t);
+        }else {
+          onTextInputEvent.putString("text", "");
+        }
+        final Context context = getContext();
+        if (context instanceof ReactContext) {
+          ((ReactContext) context).getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "onAndroidTextInput", onTextInputEvent);
+        }
         // Don't send same text changes
         if (count == before && newText.equals(oldText)) {
           return;
@@ -153,7 +164,6 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
         }
         WritableMap event = Arguments.createMap();
         event.putString("text", s.toString());
-        final Context context = getContext();
         if (context instanceof ReactContext) {
           ((ReactContext) context).getJSModule(RCTEventEmitter.class).receiveEvent(getId(), "onAndroidChange", event);
         }

example/src/App.tsx

@@ -12,6 +12,7 @@ import {
   IATTextViewBase,
   IInserTextAttachmentItem,
   ITextType,
+  IVTTextInputData,
   VariableTextInputView,
 } from 'react-native-variable-text-input';
 export const App = () => {
@@ -91,6 +92,10 @@ export const App = () => {
   const sub = (e: any) => {
     console.log('rrrrr===>', e);
   };
+  const onTextInput = (event: IVTTextInputData) => {
+    //todo
+    console.log('=====>', event);
+  };
   return (
     <ScrollView contentContainerStyle={styles.container}>
       <VariableTextInputView
@@ -103,6 +108,7 @@ export const App = () => {
         blurOnSubmit={true}
         onSubmitEditing={sub}
         keyboardAppearance={'dark'}
+        onTextInput={onTextInput}
       />
       <View style={{ flexDirection: 'row', marginTop: 40 }}>
         <TouchableOpacity onPress={blur} style={{ marginLeft: 20 }}>

ios/VariableTextInput.h

@@ -45,10 +45,12 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, copy) RCTBubblingEventBlock onChange;
 @property (nonatomic, copy, nullable) RCTDirectEventBlock onContentSizeChange;
 @property(nonatomic, copy) RCTBubblingEventBlock onSubmitEditing;
+@property(nonatomic,copy, nullable)RCTDirectEventBlock onTag;
 @property(nonatomic, copy, nullable) RCTDirectEventBlock onTextInput;
 @property(nonatomic, strong) NSDictionary *defultTypingAttributes;
 @property(nonatomic, strong) NSArray *tags;
 @property(nonatomic, strong) NSString *keyWord;
+@property(nonatomic,strong)NSString *tagStr;
 @property(nonatomic, assign) Boolean startKeyWord;
 @property (nonatomic, strong) NSLayoutConstraint *heightConstraint;
 @property (nonatomic, assign) CGFloat paddingTop;

ios/VariableTextInput.m

@@ -328,6 +328,22 @@ - (void)textViewDidChange:(UITextView *)textView {
 - (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
   NSString *oldStr =  [self getStrContentInRange:NSMakeRange(0, [self.attributedText length])];
   NSString *newStr =  [NSString stringWithFormat:@"%@%@",oldStr,text];
+    [self handleTags:text];
+    if(self.tagStr != nil && ![self.tagStr isEqualToString:@""]){
+        if(self.keyWord == nil){
+            self.keyWord = @"";
+        }else{
+            self.keyWord = [NSString stringWithFormat:@"%@%@",self.keyWord,text];
+            self.keyWord = [self.keyWord stringByReplacingOccurrencesOfString:self.tagStr withString:@""];
+            
+        }
+        if (_onTag) {
+            _onTag(@{
+            @"tag": _tagStr,
+            @"keyWord": _keyWord,
+          });
+        }
+    }
   if (self.max_TextLength>0 && newStr.length>self.max_TextLength) {
     return NO;
   }
@@ -347,7 +363,20 @@ - (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range r
     }
   return YES;
  }
-
+-(void)handleTags:(NSString *)text {
+   __block Boolean istags =NO;
+    __block NSString *tagStr = @"";
+    [self.tags enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+         NSLog(@"%@----%@",self.tags[idx],[NSThread currentThread]);
+        NSString *str = self.tags[idx];
+        if([str isEqualToString:text]){
+            istags = YES;
+            tagStr = text;
+            self.tagStr = tagStr;
+            self.keyWord = @"";
+        }
+     }];
+}
 - (void)textViewDidBeginEditing:(UITextView *)textView {
   //todo
 }

ios/VariableTextInputViewManager.m

@@ -30,10 +30,10 @@ @implementation VariableTextInputViewManager
     [view setValue: [RCTConvert UIColor:json] forKeyPath: @"placeholderTextColor"];
 }
 RCT_EXPORT_VIEW_PROPERTY(onTextInput, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onTag, RCTDirectEventBlock)
 
 RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onContentSizeChange, RCTBubblingEventBlock)
-
 RCT_CUSTOM_VIEW_PROPERTY(textAlign, NSTextAlignment, VariableTextInput)
 {
     [view setTextAlignment:[RCTConvert NSTextAlignment:json]];
@@ -92,11 +92,20 @@ @implementation VariableTextInputViewManager
     [self insertTextEmoji:rnImageData];
     });
 }
+RCT_EXPORT_METHOD(dismissTag)
+{
+  dispatch_async(dispatch_get_main_queue(), ^{
+      self.textInput.tagStr = @"";
+      self.textInput.keyWord = @"";
+    });
+}
 - (UIView *)view
 {
     _textInput = [[VariableTextInput alloc]init];
     _textInput.textContainerInset = UIEdgeInsetsZero;
     _textInput.textContainer.lineFragmentPadding = 0;
+    _textInput.tagStr = @"";
+    _textInput.keyWord = @"";
     _textInput.blurOnSubmit = true;
     return  _textInput;
 }
@@ -221,7 +230,14 @@ -(void)insertTagText:(NSDictionary *)mention{
   [dic setObject:color forKey:@"NSColor"];
   CGSize textSize = [showStr sizeWithAttributes:self.textInput.typingAttributes];
   UIImage *image =  [self drawImageWithColor:[UIColor clearColor] size:textSize text:[NSString stringWithFormat:@"%@",showStr] textAttributes:dic circular:NO];
+    if(_textInput.tagStr != nil && ![_textInput.tagStr isEqualToString:@""]){
+        _textInput.text = [_textInput.text stringByReplacingOccurrencesOfString:[NSString stringWithFormat:@"%@%@",_textInput.tagStr,_textInput.keyWord] withString:@""];
+        NSAttributedString *attString = _textInput.attributedText;
+        _textInput.tagStr = @"";
+        _textInput.keyWord = @"";
+    }
   [self setTextAttachment:image tag:emojiTag size:textSize copyStr:copyStr];
+  
 }
 -(void)setAttributedText:(NSArray *)arr{
   NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]init];