Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

TextEditingDelta Support for the Web #28527

Merged
Renzo-Olivares merged 72 commits into from
Feb 10, 2022
Merged

TextEditingDelta Support for the Web #28527

Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
86885dd
Initial implementation of TextEditingDeltaState for the web
Renzo-Olivares Sep 8, 2021
9ef2c43
Capture composing region through compositionupdate and handle cases w…
Renzo-Olivares Sep 9, 2021
b93b043
clean up unused code
Renzo-Olivares Sep 9, 2021
d3201a1
clean up rest of logs
Renzo-Olivares Sep 9, 2021
9f99a66
Make sure we initialize oldText in beforeInput
Renzo-Olivares Sep 9, 2021
8d69317
Clean up comments
Renzo-Olivares Sep 9, 2021
3ba145c
more defaults
Renzo-Olivares Sep 9, 2021
728055a
Add more comments
Renzo-Olivares Sep 9, 2021
efbdf5b
Move delta inferrence logic to TextEditingDeltaState
Renzo-Olivares Sep 9, 2021
1c330f3
Add new listeners to rest of strategies
Renzo-Olivares Sep 9, 2021
0dd249a
Fix existing tests
Renzo-Olivares Sep 13, 2021
37b757e
Fix tests
Renzo-Olivares Sep 13, 2021
fd1396f
Add lastTextEditingDeltaState to test
Renzo-Olivares Sep 13, 2021
cb6ef96
fix tests
Renzo-Olivares Sep 13, 2021
4f610e0
Add some preliminary tests for TextEditingDeltaState
Renzo-Olivares Sep 13, 2021
f772bf1
Send as list to framework
Renzo-Olivares Sep 13, 2021
f6e4d32
Add composing region test
Renzo-Olivares Sep 13, 2021
704d4f9
Address nits
Renzo-Olivares Sep 13, 2021
577aa59
Update tests
Renzo-Olivares Sep 13, 2021
0dcf1f2
Try to fix tests
Renzo-Olivares Sep 13, 2021
a2e5525
Prefer const with constant constructors
Renzo-Olivares Sep 13, 2021
95fe97b
Clean up comments
Renzo-Olivares Sep 13, 2021
5921215
Specify types
Renzo-Olivares Sep 13, 2021
a2a8b9d
fix tests
Renzo-Olivares Sep 14, 2021
1fbab86
Specify type annotations
Renzo-Olivares Sep 14, 2021
928f186
Merge branch 'main' of github.com:flutter/engine into text_editing_de…
Renzo-Olivares Jan 11, 2022
03d63c3
batchDeltas -> deltas
Renzo-Olivares Jan 12, 2022
51eabc8
Make eventData nullable so we dont compare with a 'null' string
Renzo-Olivares Jan 12, 2022
125580e
Make TextEditingDeltaState mutable to avoid multiple copies
Renzo-Olivares Jan 12, 2022
26668cb
Fix analyzer
Renzo-Olivares Jan 12, 2022
5a33dbf
Fix test
Renzo-Olivares Jan 13, 2022
e47a3ed
Use safe browser api instead of directly accessing js_util
Renzo-Olivares Jan 13, 2022
04020c2
remove last prefix from editingDeltaState
Renzo-Olivares Jan 19, 2022
13ca351
Remove logs
Renzo-Olivares Jan 19, 2022
73c1411
Merge branch 'main' of github.com:flutter/engine into text_editing_de…
Renzo-Olivares Jan 19, 2022
be578c3
fix merge
Renzo-Olivares Jan 22, 2022
2df95b0
fix whitespace
Renzo-Olivares Jan 22, 2022
5e2b294
Merge branch 'main' of github.com:flutter/engine into text_editing_de…
Renzo-Olivares Jan 22, 2022
ac3407b
revert composing changes
Renzo-Olivares Jan 24, 2022
fa1d886
Merge branch 'main' of github.com:flutter/engine into text_editing_de…
Renzo-Olivares Jan 24, 2022
6ced401
update comments
Renzo-Olivares Jan 25, 2022
15868f6
remove trailing whitespace
Renzo-Olivares Jan 25, 2022
059fe74
Add docs for TextEditingDeltaState
Renzo-Olivares Jan 26, 2022
26e676a
Normalize delta naming and use a copy instead of modifying function a…
Renzo-Olivares Jan 26, 2022
9196226
Update selection of delta in inferDeltaState instead of onChange
Renzo-Olivares Jan 26, 2022
38bc244
Fix tests, previously the selection was not set in inferDeltaState, n…
Renzo-Olivares Jan 26, 2022
cc0bb16
Make a copy of delta instead of modifying function arguments
Renzo-Olivares Jan 26, 2022
b7a91da
remove whitespace
Renzo-Olivares Jan 26, 2022
a600e9e
Move some logic into inferDeltaState
Renzo-Olivares Jan 26, 2022
98fad47
whitespace
Renzo-Olivares Jan 26, 2022
786a528
analyzer fix
Renzo-Olivares Jan 26, 2022
3f260ce
Revert "analyzer fix"
Renzo-Olivares Jan 27, 2022
b9db35a
Revert "whitespace"
Renzo-Olivares Jan 27, 2022
41765f8
Revert "Move some logic into inferDeltaState"
Renzo-Olivares Jan 27, 2022
8ff4f2d
pass _editingDeltaState instead of editingDeltaState to onChange for …
Renzo-Olivares Jan 27, 2022
f4a858a
Add docs for beforeinput
Renzo-Olivares Jan 27, 2022
cbb6b6b
Add docs for inferDeltaState
Renzo-Olivares Jan 27, 2022
b596600
whitespace
Renzo-Olivares Jan 27, 2022
5a8a5f7
Add more docs
Renzo-Olivares Jan 27, 2022
6645a0b
update docs
Renzo-Olivares Jan 27, 2022
da90e99
update docs
Renzo-Olivares Jan 27, 2022
6217ea9
Merge branch 'main' of github.com:flutter/engine into text_editing_de…
Renzo-Olivares Jan 27, 2022
b5e0b55
Fix for insertion of a period following a double space within old tex…
Renzo-Olivares Jan 29, 2022
7a5aff9
Fix accent insertion
Jan 31, 2022
c4c9cf6
Merge branch 'main' of github.com:flutter/engine into text_editing_de…
Jan 31, 2022
9d97c88
clean up comments
Jan 31, 2022
0fc279d
Address comments for clarity aand regexp
Feb 9, 2022
fc823e9
Make composing and selection nullable
Feb 10, 2022
6bf2ca7
update docs
Feb 10, 2022
acbc0de
whitespace
Feb 10, 2022
7722380
Merge branch 'main' of github.com:flutter/engine into text_editing_de…
Feb 10, 2022
0bb7f30
address comments
Feb 10, 2022
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
Prev Previous commit
Next Next commit
Fix accent insertion
  • Loading branch information
Renzo Olivares committed Jan 31, 2022
commit 7a5aff94fb78ff2dab44b0b0089a9027912b29e3
7 changes: 5 additions & 2 deletions lib/web_ui/lib/src/engine/text_editing/text_editing.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,10 @@ class TextEditingDeltaState {
// 1. Find all matches for deltaText.
// 2. Apply matches/replacement to oldText until oldText matches the
// new editing state's text value.
final RegExp deltaTextPattern = RegExp(r'' + newTextEditingDeltaState.deltaText + r'');
final bool isPeriodInsertion = newTextEditingDeltaState.deltaText == '. ';
final RegExp deltaTextPattern = isPeriodInsertion?
RegExp(r'\' + newTextEditingDeltaState.deltaText + r'')
Copy link
Contributor

@yjbanov yjbanov Feb 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does deltaText contain unescaped user-supplied text? If so, then RegExp will parse it like a regular expression. For example, what happens if the user enters .*?

Copy link
Contributor Author

@Renzo-Olivares Renzo-Olivares Feb 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it does contain unescaped text. I think a better solution here would be to use RegExp.escape(deltaText) which will give us an escaped version of the given text.

: RegExp(r'' + newTextEditingDeltaState.deltaText + r'');
Copy link
Contributor

@yjbanov yjbanov Feb 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's something wrong with formatting. Consider putting ? before the output expression, same as :, e.g.:

final RegExp deltaTextPattern = isPeriodInsertion
  ? case1
  : case2

for (final Match match in deltaTextPattern.allMatches(newEditingState.text!)) {
Copy link
Contributor

@justinmc justinmc Sep 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So in the example of double space inserting a period, the matches here will be all periods in the text, and you're trying to find the one that is new?

Copy link
Contributor Author

@Renzo-Olivares Renzo-Olivares Sep 9, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the case of double space inserting a period the deltaText we receive from beforeinput is actually . . So we search for a period followed by a whitespace in the new editing state. The new editing state comes directly from the DOM so it can be seen as the source of truth.

When we have the matched ranges we iterate through them and apply the deltaText to the oldText using these matched ranges as the deltaRange. The range that results in our oldText being equal to the value of the new editing state is the correct deltaRange that we should send to the framework.

String textAfterMatch;
int actualEnd;
Expand All @@ -547,7 +550,7 @@ class TextEditingDeltaState {
),
);
} else {
actualEnd = match.end - 1;
actualEnd = actualEnd = isPeriodInsertion? match.end - 1 : match.end;
textAfterMatch = _replace(
newTextEditingDeltaState.oldText,
newTextEditingDeltaState.deltaText,
Expand Down