fix(ios): fixed setSelection issue of textfield (#12654)

Fixes TIMOB-28404
tidev · Mar 26, 2021 · 4316f54 · 4316f54
1 parent 42691e2
commit 4316f54
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 20 deletions.
diff --git a/apidoc/Titanium/UI/TabGroup.yml b/apidoc/Titanium/UI/TabGroup.yml
@@ -252,11 +252,6 @@ methods:
     platforms: [android]
     since: 3.6.0
 
-  - name: getActiveTab
-    summary: Gets the currently-active tab.
-    returns:
-        type: Titanium.UI.Tab
-
   - name: open
     summary: Opens the tab group and makes it visible.
 
@@ -268,13 +263,6 @@ methods:
         summary: Tab to remove.
         type: Titanium.UI.Tab
 
-  - name: setActiveTab
-    summary: Selects the currently active tab in a tab group.
-    parameters:
-      - name: indexOrObject
-        summary: Index or object of the tab to switch to.
-        type: [Number, Titanium.UI.Tab]
-
   - name: getTabs
     summary: Gets all tabs that are managed by the tab group.
     returns:

diff --git a/iphone/Classes/TiUITextWidget.h b/iphone/Classes/TiUITextWidget.h
@@ -34,7 +34,7 @@
 - (void)textWidget:(UIView<UITextInputTraits> *)tw didFocusWithText:(NSString *)value;
 - (void)textWidget:(UIView<UITextInputTraits> *)tw didBlurWithText:(NSString *)value;
 - (void)setValue_:(id)text;
-- (void)setSelectionFrom:(id)start to:(id)end;
+- (void)setSelectionFrom:(NSInteger)start to:(NSInteger)end;
 #pragma mark - Titanium Internal Use Only
 - (void)updateKeyboardStatus;
 - (NSDictionary *)selectedRange;

diff --git a/iphone/Classes/TiUITextWidget.m b/iphone/Classes/TiUITextWidget.m
@@ -240,14 +240,14 @@ - (NSDictionary *)selectedRange
   return nil;
 }
 
-- (void)setSelectionFrom:(id)start to:(id)end
+- (void)setSelectionFrom:(NSInteger)start to:(NSInteger)end
 {
   UIView<UITextInput> *textView = (UIView<UITextInput> *)[self textWidgetView];
   if ([textView conformsToProtocol:@protocol(UITextInput)]) {
     if ([textView becomeFirstResponder] || [textView isFirstResponder]) {
       UITextPosition *beginning = textView.beginningOfDocument;
-      UITextPosition *startPos = [textView positionFromPosition:beginning offset:[TiUtils intValue:start]];
-      UITextPosition *endPos = [textView positionFromPosition:beginning offset:[TiUtils intValue:end]];
+      UITextPosition *startPos = [textView positionFromPosition:beginning offset:start];
+      UITextPosition *endPos = [textView positionFromPosition:beginning offset:end];
       UITextRange *textRange;
       textRange = [textView textRangeFromPosition:startPos toPosition:endPos];
       [textView setSelectedTextRange:textRange];

diff --git a/iphone/Classes/TiUITextWidgetProxy.m b/iphone/Classes/TiUITextWidgetProxy.m
@@ -304,10 +304,11 @@ - (NSDictionary *)selection
   return nil;
 }
 
-- (void)setSelection:(id)arg withObject:(id)property
+- (void)setSelection:(id)args
 {
-  NSInteger start = [TiUtils intValue:arg def:-1];
-  NSInteger end = [TiUtils intValue:property def:-1];
+  ENSURE_ARG_COUNT(args, 2);
+  NSInteger start = [TiUtils intValue:args[0] def:-1];
+  NSInteger end = [TiUtils intValue:args[1] def:-1];
   NSString *curValue = [TiUtils stringValue:[self valueForKey:@"value"]];
   NSInteger textLength = [curValue length];
   if ((start < 0) || (start > textLength) || (end < 0) || (end > textLength)) {
@@ -316,7 +317,7 @@ - (void)setSelection:(id)arg withObject:(id)property
   }
   TiThreadPerformOnMainThread(
       ^{
-        [(TiUITextWidget *)[self view] setSelectionFrom:arg to:property];
+        [(TiUITextWidget *)[self view] setSelectionFrom:start to:end];
       },
       NO);
 }

diff --git a/tests/Resources/ti.ui.textfield.test.js b/tests/Resources/ti.ui.textfield.test.js
@@ -398,6 +398,32 @@ describe('Titanium.UI.TextField', () => {
 			should(textFieldA.hasText()).be.true();
 			should(textFieldB.hasText()).be.true();
 		});
+
+		it('#setSelection', function (finish) {
+			this.timeout(5000);
+			const textField = Ti.UI.createTextField({
+				value: 'Lorem ipsum dolor sit amet.',
+				width: Ti.UI.SIZE
+			});
+			win = Ti.UI.createWindow({
+				backgroundColor: '#ddd'
+			});
+			win.add(textField);
+			win.addEventListener('postlayout', function listener () {
+				win.removeEventListener('postlayout', listener);
+				textField.setSelection(0, 5);
+				setTimeout(function (e) {
+					try {
+						should(textField.selection.length).eql(5);
+						should(textField.selection.location).eql(0);
+					} catch (err) {
+						return finish(err);
+					}
+					finish();
+				}, 1000);
+			});
+			win.open();
+		});
 	});
 
 	describe('events', () => {