feat: add "isTrusted" property to Slider "change" event (#11717)

Fixes TIMOB-27977
tidev · Jul 1, 2020 · 8e96445 · 8e96445
1 parent d2db8cf
commit 8e96445
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 7 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUISlider.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUISlider.java
@@ -243,7 +243,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
 			pos = TiConvert.toFloat(newValue);
 			int curPos = (int) Math.floor(scaleFactor * (pos + offset));
 			seekBar.setProgress(curPos);
-			onProgressChanged(seekBar, curPos, true);
+			onProgressChanged(seekBar, curPos, false);
 		} else if (key.equals("min")) {
 			min = TiConvert.toInt(newValue);
 			minRange = min;
@@ -253,7 +253,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
 			}
 			updateControl();
 			int curPos = (int) Math.floor(scaleFactor * (pos + offset));
-			onProgressChanged(seekBar, curPos, true);
+			onProgressChanged(seekBar, curPos, false);
 		} else if (key.equals("minRange")) {
 			minRange = TiConvert.toInt(newValue);
 			updateRange();
@@ -262,7 +262,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
 			}
 			updateControl();
 			int curPos = (int) Math.floor(scaleFactor * (pos + offset));
-			onProgressChanged(seekBar, curPos, true);
+			onProgressChanged(seekBar, curPos, false);
 		} else if (key.equals("max")) {
 			max = TiConvert.toInt(newValue);
 			maxRange = max;
@@ -272,7 +272,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
 			}
 			updateControl();
 			int curPos = (int) Math.floor(scaleFactor * (pos + offset));
-			onProgressChanged(seekBar, curPos, true);
+			onProgressChanged(seekBar, curPos, false);
 		} else if (key.equals("maxRange")) {
 			maxRange = TiConvert.toInt(newValue);
 			updateRange();
@@ -281,7 +281,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
 			}
 			updateControl();
 			int curPos = (int) Math.floor(scaleFactor * (pos + offset));
-			onProgressChanged(seekBar, curPos, true);
+			onProgressChanged(seekBar, curPos, false);
 		} else if (key.equals(TiC.PROPERTY_TINT_COLOR)) {
 			String stringValue = TiConvert.toString(newValue);
 			if (stringValue != null) {
@@ -356,6 +356,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser)
 		data.put(TiC.PROPERTY_VALUE, scaledValue);
 		data.put(TiC.EVENT_PROPERTY_THUMB_OFFSET, offset);
 		data.put(TiC.EVENT_PROPERTY_THUMB_SIZE, size);
+		data.put("isTrusted", fromUser);
 		proxy.setProperty(TiC.PROPERTY_VALUE, scaledValue);
 
 		fireEvent(TiC.EVENT_CHANGE, data);

diff --git a/apidoc/Titanium/UI/Slider.yml b/apidoc/Titanium/UI/Slider.yml
@@ -130,6 +130,11 @@ events:
         type: Point
         platforms: [android]
 
+      - name: isTrusted
+        summary: True if change was made by the user. False if change was made programmatically.
+        type: Boolean
+        since: 9.1.0
+
   - name: click
     summary: Fired when the device detects a click against the view.
     description: |

diff --git a/iphone/Classes/TiUISlider.m b/iphone/Classes/TiUISlider.m
@@ -245,7 +245,7 @@ - (void)_setValue:(id)value
     [[self sliderView] setValue:newValue animated:[TiUtils boolValue:@"animated" properties:properties def:NO]];
   }
 
-  [self sliderChanged:[self sliderView]];
+  [self sliderChanged:[self sliderView] isTrusted:NO];
 }
 
 - (void)setEnabled_:(id)value
@@ -275,12 +275,17 @@ - (CGFloat)verifyHeight:(CGFloat)suggestedHeight
 #pragma mark Delegates
 
 - (void)sliderChanged:(id)sender
+{
+  [self sliderChanged:sender isTrusted:YES];
+}
+
+- (void)sliderChanged:(id)sender isTrusted:(BOOL)isTrusted
 {
   NSNumber *newValue = [NSNumber numberWithFloat:[(UISlider *)sender value]];
   [self.proxy replaceValue:newValue forKey:@"value" notification:NO];
 
   if ([self.proxy _hasListeners:@"change"]) {
-    [self.proxy fireEvent:@"change" withObject:[NSDictionary dictionaryWithObject:newValue forKey:@"value"]];
+    [self.proxy fireEvent:@"change" withObject:[NSDictionary dictionaryWithObjectsAndKeys:newValue, @"value", NUMBOOL(isTrusted), @"isTrusted", nil]];
   }
 }
 

diff --git a/tests/Resources/ti.ui.slider.addontest.js b/tests/Resources/ti.ui.slider.addontest.js
@@ -0,0 +1,61 @@
+/*
+ * Appcelerator Titanium Mobile
+ * Copyright (c) 2015-Present by Axway, Inc. All Rights Reserved.
+ * Licensed under the terms of the Apache Public License
+ * Please see the LICENSE included with this distribution for details.
+ */
+/* eslint-env mocha */
+/* eslint no-unused-expressions: "off" */
+'use strict';
+const should = require('./utilities/assertions');
+
+describe('Titanium.UI.Slider', function () {
+	let win;
+
+	this.timeout(5000);
+
+	afterEach((done) => {
+		if (win) {
+			let t = setTimeout(function () {
+				if (win) {
+					win = null;
+					done();
+				}
+			}, 3000);
+			win.addEventListener('close', function listener () {
+				clearTimeout(t);
+				if (win) {
+					win.removeEventListener('close', listener);
+				}
+				win = null;
+				done();
+			});
+			win.close();
+		} else {
+			win = null;
+			done();
+		}
+	});
+
+	it('change event', (finish) => {
+		win = Ti.UI.createWindow();
+		const slider = Ti.UI.createSlider({ min: 0, max: 100, value: 50 });
+		win.add(slider);
+		win.addEventListener('open', () => {
+			slider.addEventListener('change', (e) => {
+				try {
+					should(e.value).be.a.Number();
+					should(e.value).be.eql(75);
+					should(e.isTrusted).be.a.Boolean();
+					should(e.isTrusted).be.false();
+					should(e.source).be.eql(slider);
+					finish();
+				} catch (err) {
+					finish(err);
+				}
+			});
+			slider.value = 75;
+		});
+		win.open();
+	});
+});