Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt iOS16+ dictation #37188

Closed
wants to merge 7 commits into from
+31 −1
Closed

Adapt iOS16+ dictation #37188

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9a0f02e
Convert TextInput dictation \uFFFC to _UITextPlaceholderAttachment
hellohublot May 2, 2023
8cef9da
Replace newAttributedString to newMutableAttributedString
hellohublot May 2, 2023
4073de9
Adapt iOS16+ dictation
hellohublot May 3, 2023
e511582
Replace \uFFFC to typingAttributesBeforeInsertion
hellohublot May 3, 2023
74df991
Remove additional semicolon
hellohublot May 4, 2023
5053462
Merge branch 'main' into Fix_iOS_Dictation_Extra_Character
hellohublot May 4, 2023
c890034
Change typingAttributesBeforeInsertion to dictationRecordingDidEnd
hellohublot May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,16 @@ - (BOOL)textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldTex
// 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)
Expand All @@ -120,7 +130,7 @@ - (BOOL)textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldTex
}];

BOOL shouldFallbackToBareTextComparison =
[self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] ||
isDictationRunning ||
[self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"ko-KR"] ||
self.backedTextInputView.markedTextRange || self.backedTextInputView.isSecureTextEntry ||
fontHasBeenUpdatedBySystem;
Expand Down