PointerEvents: Fix dispatch optimization
Summary: Changelog: [Internal] Fixing a recent optimization to prevent event dispatches for events that are not listened for. An incorrect hitpath was passed in for `leave` events. Refactored the PointerEvent optimization such that `filterByShouldDispatch` determines what views should dispatch a PointerEvent, and `dispatchEventForViewTargets` to actually dispatch them. We are separating this because the order of dispatch differs between `enter` and `leave` events. Reviewed By: vincentriemer Differential Revision: D37348726 fbshipit-source-id: a09a04df3ae027cce95e0d93a4163c2015fe3fe3
This commit is contained in:
Luna Wei
Facebook GitHub Bot
Родитель
15d9aa0cdb
Коммит
fa814d4875
|
|
@ -20,6 +20,7 @@ import com.facebook.react.uimanager.events.PointerEventHelper;
|
|||
import com.facebook.react.uimanager.events.PointerEventHelper.EVENT;
|
||||
import com.facebook.react.uimanager.events.TouchEvent;
|
||||
import com.facebook.react.uimanager.events.TouchEventCoalescingKeyHelper;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -110,14 +111,17 @@ public class JSPointerDispatcher {
|
|||
mTouchEventCoalescingKeyHelper.addCoalescingKey(mDownStartTime);
|
||||
|
||||
if (!supportsHover) {
|
||||
dispatchNonBubblingEventForPathWhenListened(
|
||||
EVENT.ENTER,
|
||||
EVENT.ENTER_CAPTURE,
|
||||
hitPath,
|
||||
List<ViewTarget> enterViewTargets =
|
||||
filterByShouldDispatch(hitPath, EVENT.ENTER, EVENT.ENTER_CAPTURE, false);
|
||||
|
||||
// Dispatch root -> target, we need to reverse order of enterViewTargets
|
||||
Collections.reverse(enterViewTargets);
|
||||
dispatchEventForViewTargets(
|
||||
PointerEventHelper.POINTER_ENTER,
|
||||
enterViewTargets,
|
||||
eventDispatcher,
|
||||
surfaceId,
|
||||
motionEvent,
|
||||
false);
|
||||
motionEvent);
|
||||
}
|
||||
|
||||
boolean listeningForDown =
|
||||
|
|
@ -201,14 +205,16 @@ public class JSPointerDispatcher {
|
|||
}
|
||||
|
||||
if (!supportsHover) {
|
||||
dispatchNonBubblingEventForPathWhenListened(
|
||||
EVENT.LEAVE,
|
||||
EVENT.LEAVE_CAPTURE,
|
||||
hitPath,
|
||||
List<ViewTarget> leaveViewTargets =
|
||||
filterByShouldDispatch(hitPath, EVENT.LEAVE, EVENT.LEAVE_CAPTURE, false);
|
||||
|
||||
// target -> root
|
||||
dispatchEventForViewTargets(
|
||||
PointerEventHelper.POINTER_LEAVE,
|
||||
leaveViewTargets,
|
||||
eventDispatcher,
|
||||
surfaceId,
|
||||
motionEvent,
|
||||
false);
|
||||
motionEvent);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
@ -240,43 +246,47 @@ public class JSPointerDispatcher {
|
|||
}
|
||||
|
||||
/**
|
||||
* Dispatch event only if ancestor is listening to relevant capture event. This should only be
|
||||
* relevant for ENTER/LEAVE events that need to be dispatched along every relevant view in the hit
|
||||
* path.
|
||||
* Returns list of view targets that we should be dispatching events from
|
||||
*
|
||||
* @param pointerEventType - Should only be ENTER/LEAVE events
|
||||
* @param hitPath - ViewTargets ordered from target -> root
|
||||
* @param dispatcher
|
||||
* @param surfaceId
|
||||
* @param motionEvent
|
||||
* @param forceDispatch - Ignore if ancestor is listening and force the event to be dispatched
|
||||
* @param viewTargets, ordered from target -> root
|
||||
* @param bubble, name of event that bubbles
|
||||
* @param capture, name of event that captures
|
||||
* @param forceDispatch, if true, all viewTargets should dispatch
|
||||
* @return list of viewTargets filtered from target -> root
|
||||
*/
|
||||
private static void dispatchNonBubblingEventForPathWhenListened(
|
||||
EVENT event,
|
||||
EVENT captureEvent,
|
||||
List<ViewTarget> hitPath,
|
||||
EventDispatcher dispatcher,
|
||||
int surfaceId,
|
||||
MotionEvent motionEvent,
|
||||
boolean forceDispatch) {
|
||||
|
||||
boolean ancestorListening = forceDispatch;
|
||||
String eventName = PointerEventHelper.getDispatchableEventName(event);
|
||||
if (eventName == null) {
|
||||
return;
|
||||
private static List<ViewTarget> filterByShouldDispatch(
|
||||
List<ViewTarget> viewTargets, EVENT bubble, EVENT capture, boolean forceDispatch) {
|
||||
if (forceDispatch) {
|
||||
return viewTargets;
|
||||
}
|
||||
|
||||
// iterate through hitPath from ancestor -> target
|
||||
for (int i = hitPath.size() - 1; i >= 0; i--) {
|
||||
View view = hitPath.get(i).getView();
|
||||
int viewId = hitPath.get(i).getViewId();
|
||||
if (ancestorListening
|
||||
|| (i == 0 && PointerEventHelper.isListening(view, event))
|
||||
|| PointerEventHelper.isListening(view, captureEvent)) {
|
||||
dispatcher.dispatchEvent(PointerEvent.obtain(eventName, surfaceId, viewId, motionEvent));
|
||||
boolean ancestorListening = false;
|
||||
List<ViewTarget> dispatchableViewTargets = new ArrayList<ViewTarget>(viewTargets);
|
||||
for (int i = viewTargets.size() - 1; i >= 0; i--) {
|
||||
ViewTarget viewTarget = viewTargets.get(i);
|
||||
View view = viewTarget.getView();
|
||||
if (!ancestorListening
|
||||
&& (PointerEventHelper.isListening(view, capture)
|
||||
|| (i == 0 && PointerEventHelper.isListening(view, bubble)))) {
|
||||
ancestorListening = true;
|
||||
} else if (!ancestorListening) {
|
||||
dispatchableViewTargets.remove(i);
|
||||
}
|
||||
}
|
||||
return dispatchableViewTargets;
|
||||
}
|
||||
|
||||
private static void dispatchEventForViewTargets(
|
||||
String eventName,
|
||||
List<ViewTarget> viewTargets,
|
||||
EventDispatcher dispatcher,
|
||||
int surfaceId,
|
||||
MotionEvent motionEvent) {
|
||||
|
||||
for (ViewTarget viewTarget : viewTargets) {
|
||||
int viewId = viewTarget.getViewId();
|
||||
dispatcher.dispatchEvent(PointerEvent.obtain(eventName, surfaceId, viewId, motionEvent));
|
||||
}
|
||||
}
|
||||
|
||||
// called on hover_move motion events only
|
||||
|
|
@ -360,31 +370,40 @@ public class JSPointerDispatcher {
|
|||
// If something has changed in either enter/exit, let's start a new coalescing key
|
||||
mTouchEventCoalescingKeyHelper.incrementCoalescingKey(mHoverInteractionKey);
|
||||
|
||||
// target -> root
|
||||
List<ViewTarget> enterViewTargets =
|
||||
hitPath.subList(0, hitPath.size() - firstDivergentIndexFromBack);
|
||||
filterByShouldDispatch(
|
||||
hitPath.subList(0, hitPath.size() - firstDivergentIndexFromBack),
|
||||
EVENT.ENTER,
|
||||
EVENT.ENTER_CAPTURE,
|
||||
nonDivergentListeningToEnter);
|
||||
|
||||
if (enterViewTargets.size() > 0) {
|
||||
dispatchNonBubblingEventForPathWhenListened(
|
||||
EVENT.ENTER,
|
||||
EVENT.ENTER_CAPTURE,
|
||||
// We want to iterate these from root -> target so we need to reverse
|
||||
Collections.reverse(enterViewTargets);
|
||||
dispatchEventForViewTargets(
|
||||
PointerEventHelper.POINTER_ENTER,
|
||||
enterViewTargets,
|
||||
eventDispatcher,
|
||||
surfaceId,
|
||||
motionEvent,
|
||||
nonDivergentListeningToEnter);
|
||||
motionEvent);
|
||||
}
|
||||
|
||||
List<ViewTarget> exitViewTargets =
|
||||
mLastHitPath.subList(0, mLastHitPath.size() - firstDivergentIndexFromBack);
|
||||
if (exitViewTargets.size() > 0) {
|
||||
// child -> root
|
||||
dispatchNonBubblingEventForPathWhenListened(
|
||||
EVENT.LEAVE,
|
||||
EVENT.LEAVE_CAPTURE,
|
||||
enterViewTargets,
|
||||
// target -> root
|
||||
List<ViewTarget> leaveViewTargets =
|
||||
filterByShouldDispatch(
|
||||
mLastHitPath.subList(0, mLastHitPath.size() - firstDivergentIndexFromBack),
|
||||
EVENT.LEAVE,
|
||||
EVENT.LEAVE_CAPTURE,
|
||||
nonDivergentListeningToLeave);
|
||||
if (leaveViewTargets.size() > 0) {
|
||||
// We want to dispatch from target -> root, so no need to reverse
|
||||
dispatchEventForViewTargets(
|
||||
PointerEventHelper.POINTER_LEAVE,
|
||||
leaveViewTargets,
|
||||
eventDispatcher,
|
||||
surfaceId,
|
||||
motionEvent,
|
||||
nonDivergentListeningToLeave);
|
||||
motionEvent);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -424,14 +443,16 @@ public class JSPointerDispatcher {
|
|||
PointerEventHelper.POINTER_CANCEL, surfaceId, targetTag, motionEvent));
|
||||
}
|
||||
|
||||
dispatchNonBubblingEventForPathWhenListened(
|
||||
EVENT.LEAVE,
|
||||
EVENT.LEAVE_CAPTURE,
|
||||
hitPath,
|
||||
List<ViewTarget> leaveViewTargets =
|
||||
filterByShouldDispatch(hitPath, EVENT.LEAVE, EVENT.LEAVE_CAPTURE, false);
|
||||
|
||||
// dispatch from target -> root
|
||||
dispatchEventForViewTargets(
|
||||
PointerEventHelper.POINTER_LEAVE,
|
||||
leaveViewTargets,
|
||||
eventDispatcher,
|
||||
surfaceId,
|
||||
motionEvent,
|
||||
false);
|
||||
motionEvent);
|
||||
|
||||
mTouchEventCoalescingKeyHelper.removeCoalescingKey(mDownStartTime);
|
||||
mDownStartTime = TouchEvent.UNSET;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче