feat(android): fire bubbled-up events synchronously

tidev · Jan 19, 2021 · 7c8ebe6 · 7c8ebe6
1 parent 59280d2
commit 7c8ebe6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/android/runtime/common/src/js/events.js b/android/runtime/common/src/js/events.js
@@ -62,7 +62,7 @@ Object.defineProperty(EventEmitter.prototype, 'callHandler', {
 
 		// Bubble the events to the parent view if needed.
 		if (data.bubbles && !cancelBubble) {
-			handled = this._fireEventToParent(type, data) || handled;
+			handled = this._fireSyncEventToParent(type, data) || handled;
 		}
 
 		return handled;
@@ -92,7 +92,7 @@ Object.defineProperty(EventEmitter.prototype, 'emit', {
 
 		if (!this._events || !this._events[type] || !this.callHandler) {
 			if (data.bubbles && !data.cancelBubble) {
-				handled = this._fireEventToParent(type, data);
+				handled = this._fireSyncEventToParent(type, data);
 			}
 			return handled;
 		}
@@ -108,7 +108,7 @@ Object.defineProperty(EventEmitter.prototype, 'emit', {
 			}
 
 		} else if (data.bubbles && !data.cancelBubble) {
-			handled = this._fireEventToParent(type, data);
+			handled = this._fireSyncEventToParent(type, data);
 		}
 
 		return handled;

diff --git a/android/titanium/src/java/org/appcelerator/kroll/KrollProxy.java b/android/titanium/src/java/org/appcelerator/kroll/KrollProxy.java
@@ -858,6 +858,25 @@ public boolean fireSyncEvent(String event, Object data, long maxTimeout)
 		}
 	}
 
+	/**
+	 * Fires an event synchronously to the view who is next to receive the event.
+	 *
+	 * @param eventName event to send to the next view
+	 * @param data the data to include in the event
+	 * @return true if the event was handled
+	 */
+	@Kroll.method(name = "_fireSyncEventToParent")
+	public boolean fireSyncEventToParent(String eventName, Object data)
+	{
+		if (bubbleParent) {
+			KrollProxy parentProxy = getParentForBubbling();
+			if (parentProxy != null) {
+				return parentProxy.fireSyncEvent(eventName, data);
+			}
+		}
+		return false;
+	}
+
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public boolean doFireEvent(String event, Object data)
 	{