fix(ios): scroll view setZoomScale()/setContentOffset() crash as of 1…

…0.0.0 Fixes TIMOB-28443
tidev · May 10, 2021 · e7c5ff3 · e7c5ff3
1 parent 8859403
commit e7c5ff3
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 0 deletions.
diff --git a/iphone/Classes/TiUIScrollViewProxy.m b/iphone/Classes/TiUIScrollViewProxy.m
@@ -349,6 +349,17 @@ - (void)scrollToTop:(id)unused
       YES);
 }
 
+- (void)setContentOffset:(id)args
+{
+  id arg1 = args;
+  id arg2 = nil;
+  if ([args isKindOfClass:[NSArray class]]) {
+    arg1 = VALUE_AT_INDEX_OR_NIL(args, 0);
+    arg2 = VALUE_AT_INDEX_OR_NIL(args, 1);
+  }
+  [self setContentOffset:arg1 withObject:arg2];
+}
+
 - (void)setContentOffset:(id)value withObject:(id)animated
 {
   TiThreadPerformOnMainThread(
@@ -358,6 +369,17 @@ - (void)setContentOffset:(id)value withObject:(id)animated
       YES);
 }
 
+- (void)setZoomScale:(id)args
+{
+  id arg1 = args;
+  id arg2 = nil;
+  if ([args isKindOfClass:[NSArray class]]) {
+    arg1 = VALUE_AT_INDEX_OR_NIL(args, 0);
+    arg2 = VALUE_AT_INDEX_OR_NIL(args, 1);
+  }
+  [self setZoomScale:arg1 withObject:arg2];
+}
+
 - (void)setZoomScale:(id)value withObject:(id)animated
 {
   TiThreadPerformOnMainThread(

diff --git a/tests/Resources/ti.ui.scrollview.test.js b/tests/Resources/ti.ui.scrollview.test.js
@@ -52,6 +52,22 @@ describe('Titanium.UI.ScrollView', function () {
 		should(bar.contentOffset.y).be.a.Number();
 	});
 
+	it.ios('#setContentOffset', function (finish) {
+		win = Ti.UI.createWindow();
+		const bar = Ti.UI.createScrollView({});
+		win.add(bar);
+		win.addEventListener('postlayout', function listener(e) {
+			win.removeEventListener(e.type, listener);
+			try {
+				bar.setContentOffset({ x: 0, y: 0 }, { animated: true });
+			} catch (err) {
+				return finish(err);
+			}
+			finish();
+		});
+		win.open();
+	});
+
 	it.androidAndIosBroken('contentWidth', function () {
 		const bar = Ti.UI.createScrollView({});
 		should(bar.contentWidth).be.a.String(); // defaults to undefined on Android and iOS
@@ -153,6 +169,22 @@ describe('Titanium.UI.ScrollView', function () {
 		should(bar.zoomScale).be.a.Number();
 	});
 
+	it.androidMissing('#setZoomScale', function (finish) {
+		win = Ti.UI.createWindow();
+		const bar = Ti.UI.createScrollView({});
+		win.add(bar);
+		win.addEventListener('postlayout', function listener(e) {
+			win.removeEventListener(e.type, listener);
+			try {
+				bar.setZoomScale(2, { animated: true });
+			} catch (err) {
+				return finish(err);
+			}
+			finish();
+		});
+		win.open();
+	});
+
 	it('#scrollTo()', function () {
 		const bar = Ti.UI.createScrollView({});
 		should(bar.scrollTo).be.a.Function();