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.

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

[RNMobile] Fix dictation regression on iOS #49452

Merged
merged 23 commits into from
Jun 5, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
889a3c1
fix: Ensure dictated text is alway propagated
Mar 29, 2023
a5b67dc
Merge branch 'trunk' into rnmobile/fix/dictation-regression-ios
Mar 30, 2023
ec8e8a9
docs: Update CHANGELOG with details of fix
Mar 30, 2023
4237064
docs: Fix CHANGELOG entry's grouping
Mar 30, 2023
8157447
Merge branch 'trunk' into rnmobile/fix/dictation-regression-ios
Mar 31, 2023
fd2ef19
Merge branch 'trunk' into rnmobile/fix/dictation-regression-ios
May 11, 2023
0416ca7
fix: Ensure objectPlaceholder is always replaced
May 12, 2023
2df979a
Merge branch 'trunk' into rnmobile/fix/dictation-regression-ios
May 12, 2023
bc2a630
docs: Reformat/update CHANGELOG with fix details
May 12, 2023
5debaec
reformat: Add new line at end of CHANGELOG file
May 12, 2023
5409ec2
Merge branch 'trunk' into rnmobile/fix/dictation-regression-ios
May 18, 2023
3a0d386
fix: Ensure text is added at cursor point
May 19, 2023
84e527d
Revert "fix: Ensure text is added at cursor point"
May 19, 2023
58e99e1
fix: Ensure text is added at cursor point
May 29, 2023
96da5bc
Merge branch 'trunk' into rnmobile/fix/dictation-regression-ios
May 29, 2023
c4c40e0
fix: Ensure objectPlaceholder is always replaced
May 29, 2023
316276d
refactor: Remove redundant code for replacing obj
May 29, 2023
ff0162a
refactor: Ensure obj symbol is always replaced
May 30, 2023
c832e82
refactor: Remove all dictation hacks
May 30, 2023
7cd7a0f
fix: Prevent 'obj' being added following dictation
May 30, 2023
fe957c3
fix: Ensure cursor position is set after dictation
May 31, 2023
88f5056
Merge branch 'trunk' into rnmobile/fix/dictation-regression-ios
May 31, 2023
ff64c55
refactor: Remove unwanted spacing
May 31, 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
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,12 @@ class RCTAztecView: Aztec.TextView {
let objectPlaceholder = "\u{FFFC}"
SiobhyB marked this conversation as resolved.
Show resolved Hide resolved
let dictationText = dictationResult.reduce("") { $0 + $1.text }
isInsertingDictationResult = false
self.text = self.text?.replacingOccurrences(of: objectPlaceholder, with: dictationText)
SiobhyB marked this conversation as resolved.
Show resolved Hide resolved

if let text = self.text {
self.text = text.replacingOccurrences(of: objectPlaceholder, with: "")
}

self.insertText(dictationText)
}

// MARK: - Custom Edit Intercepts
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native-editor/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ For each user feature we should also add a importance categorization label to i

## Unreleased

- [**] [iOS] Fix dictation regression, in which typing/dictating at the same time caused content loss. [#49452]

## 1.95.0
- [*] Fix crash when trying to convert to regular blocks an undefined/deleted reusable block [#50475]
- [**] Tapping on a nested block now gets focus directly instead of having to tap multiple times depeding on the nesting levels. [#50108]
Expand Down