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

don't allow setSelection on invalid range #835

Closed
wants to merge 5 commits into from
+2,987 −3,015
Closed

don't allow setSelection on invalid range #835

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af73702
Update package version.
SergioEstevao Apr 5, 2019
57b2e58
Merge branch 'develop' into release/1.2
SergioEstevao Apr 5, 2019
f551dc6
Update JS bundles for 1.2 release
jtreanor Apr 5, 2019
2cb8891
don't allow setSelection on invalid range
mzorz Apr 5, 2019
7b8955a
added equality operator as suggested by @hypest and a comment explain…
mzorz Apr 5, 2019
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
2,989 changes: 1,486 additions & 1,503 deletions bundle/android/App.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/App.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2,999 changes: 1,491 additions & 1,508 deletions bundle/ios/App.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/App.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gutenberg-mobile",
"version": "1.1.2",
"version": "1.2.0",
"private": true,
"config": {
"jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",
Expand Down
4 changes: 3 additions & 1 deletion ...-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,9 @@ private void updateSelectionIfNeeded(ReactAztecText view, @Nullable ReadableMap
if ( selection != null ) {
int start = selection.getInt("start");
int end = selection.getInt("end");
view.setSelection(start, end);
if (view.getText().length() > end && start >= 0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can add the equality to end in the condition since the caret can actually be placed right after the last char.

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, let's add a line comment about why we're doing this here, wdyt?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

both addressed in 7b8955a

view.setSelection(start, end);
}
}
}

Expand Down