DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make the text selection code more defensive (#4291)

Browse Source 
* Make the text selection code more defensive

* format

* Move validation to a method

* Fix math

* rename
This commit is contained in:
xster 2017-11-02 03:36:52 -07:00 committed by GitHub
parent 9a960f82f5
commit 8d8203ccb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm
View File

@ -191,9 +191,9 @@ static UITextAutocapitalizationType ToUITextAutocapitalizationType(NSString* inp
NSInteger selectionBase = [state[@"selectionBase"] intValue];
NSInteger selectionExtent = [state[@"selectionExtent"] intValue];
NSUInteger start = MIN(MAX(0, MIN(selectionBase, selectionExtent)), (NSInteger)self.text.length);
NSUInteger end = MIN(MAX(0, MAX(selectionBase, selectionExtent)), (NSInteger)self.text.length);
NSRange selectedRange = NSMakeRange(start, end - start);
NSRange selectedRange = [self clampSelection:NSMakeRange(MIN(selectionBase, selectionExtent),
ABS(selectionBase - selectionExtent))
forText:self.text];
NSRange oldSelectedRange = [(FlutterTextRange*)self.selectedTextRange range];
if (selectedRange.location != oldSelectedRange.location ||
selectedRange.length != oldSelectedRange.length) {
@ -214,6 +214,12 @@ static UITextAutocapitalizationType ToUITextAutocapitalizationType(NSString* inp
}
}
- (NSRange)clampSelection:(NSRange)range forText:(NSString*)text {
int start = MIN(MAX(range.location, 0), text.length);
int length = MIN(range.length, text.length - start);
return NSMakeRange(start, length);
}
#pragma mark - UIResponder Overrides
- (BOOL)canBecomeFirstResponder {
@ -268,8 +274,10 @@ static UITextAutocapitalizationType ToUITextAutocapitalizationType(NSString* inp
selectedRange.length -= intersectionRange.length;
}
[self.text replaceCharactersInRange:replaceRange withString:text];
[self setSelectedTextRange:[FlutterTextRange rangeWithNSRange:selectedRange]
[self.text replaceCharactersInRange:[self clampSelection:replaceRange forText:self.text]
withString:text];
[self setSelectedTextRange:[FlutterTextRange rangeWithNSRange:[self clampSelection:selectedRange
forText:self.text]]
updateEditingState:NO];
[self updateEditingState];
@ -309,7 +317,8 @@ static UITextAutocapitalizationType ToUITextAutocapitalizationType(NSString* inp
NSUInteger selectionLocation = markedSelectedRange.location + markedTextRange.location;
selectedRange = NSMakeRange(selectionLocation, markedSelectedRange.length);
[self setSelectedTextRange:[FlutterTextRange rangeWithNSRange:selectedRange]
[self setSelectedTextRange:[FlutterTextRange rangeWithNSRange:[self clampSelection:selectedRange
forText:self.text]]
updateEditingState:YES];
}