Change typingAttributesBeforeInsertion to dictationRecordingDidEnd

Expensify · May 23, 2023 · 4df9132 · 4df9132
1 parent 4e86f50
commit 4df9132
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 11 deletions.
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.h b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
@@ -24,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, assign) BOOL contextMenuHidden;
 @property (nonatomic, assign, readonly) BOOL textWasPasted;
+@property (nonatomic, assign, readonly) BOOL dictationRecognizing;
 @property (nonatomic, copy, nullable) NSString *placeholder;
 @property (nonatomic, strong, nullable) UIColor *placeholderColor;
 

diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
@@ -257,6 +257,17 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
   return [super canPerformAction:action withSender:sender];
 }
 
+#pragma mark - Dictation
+
+- (void)dictationRecordingDidEnd {
+    _dictationRecognizing = YES;
+}
+
+- (void)removeDictationResultPlaceholder:(id)placeholder willInsertResult:(BOOL)willInsertResult {
+    [super removeDictationResultPlaceholder:placeholder willInsertResult:willInsertResult];
+    _dictationRecognizing = NO;
+}
+
 #pragma mark - Placeholder
 
 - (void)_invalidatePlaceholderVisibility

diff --git a/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h b/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
@@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy, nullable) NSString *placeholder;
 @property (nonatomic, strong, nullable) UIColor *placeholderColor;
 @property (nonatomic, assign, readonly) BOOL textWasPasted;
+@property (nonatomic, assign, readonly) BOOL dictationRecognizing;
 @property (nonatomic, assign) UIEdgeInsets textContainerInset;
 @property (nonatomic, strong, nullable) UIView *inputAccessoryView;
 @property (nonatomic, strong, nullable) UIView *inputView;

diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -108,25 +108,20 @@ - (BOOL)textOf:(NSAttributedString*)newText equals:(NSAttributedString*)oldText{
   // If the user added an emoji, the system adds a font attribute for the emoji and stores the original font in
   // NSOriginalFont. Lastly, when entering a password, etc., there will be additional styling on the field as the native
   // text view handles showing the last character for a split second.
-  __block BOOL isDictationRunning = false;
-  [oldText enumerateAttribute:NSAttachmentAttributeName
-                      inRange:NSMakeRange(0, oldText.length)
-                      options:kNilOptions
-                   usingBlock:^(id  _Nullable value, NSRange range, BOOL * _Nonnull stop) {
-                      if ([value respondsToSelector:NSSelectorFromString(@"typingAttributesBeforeInsertion")]) {
-                        isDictationRunning = true;
-                        *stop = true;
-                      }
-                   }];
   __block BOOL fontHasBeenUpdatedBySystem = false;
   [oldText enumerateAttribute:@"NSOriginalFont" inRange:NSMakeRange(0, oldText.length) options:0 usingBlock:^(id value, NSRange range, BOOL *stop) {
     if (value){
       fontHasBeenUpdatedBySystem = true;
     }
   }];
 
+  BOOL shouldFallbackDictation = [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"];
+  if (@available(iOS 16.0, *)) {
+    shouldFallbackDictation = self.backedTextInputView.dictationRecognizing;
+  }
+
   BOOL shouldFallbackToBareTextComparison =
-      isDictationRunning ||
+      shouldFallbackDictation ||
       [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"ko-KR"] ||
       self.backedTextInputView.markedTextRange || self.backedTextInputView.isSecureTextEntry ||
       fontHasBeenUpdatedBySystem;

diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.h b/Libraries/Text/TextInput/Singleline/RCTUITextField.h
@@ -24,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL caretHidden;
 @property (nonatomic, assign) BOOL contextMenuHidden;
 @property (nonatomic, assign, readonly) BOOL textWasPasted;
+@property (nonatomic, assign, readonly) BOOL dictationRecognizing;
 @property (nonatomic, strong, nullable) UIColor *placeholderColor;
 @property (nonatomic, assign) UIEdgeInsets textContainerInset;
 @property (nonatomic, assign, getter=isEditable) BOOL editable;

diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.m b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
@@ -140,6 +140,17 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
   return [super canPerformAction:action withSender:sender];
 }
 
+#pragma mark - Dictation
+
+- (void)dictationRecordingDidEnd {
+    _dictationRecognizing = YES;
+}
+
+- (void)removeDictationResultPlaceholder:(id)placeholder willInsertResult:(BOOL)willInsertResult {
+    [super removeDictationResultPlaceholder:placeholder willInsertResult:willInsertResult];
+    _dictationRecognizing = NO;
+}
+
 #pragma mark - Caret Manipulation
 
 - (CGRect)caretRectForPosition:(UITextPosition *)position