mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Refactor findTargetPathAndCoordinatesForTouch to improve perf of event delivery
Summary: Refactor of TouchTargetHelper.findTargetPathAndCoordinatesForTouch to avoid unnecessary lookup of views during the dispatching of Hover Events changelog: [internal] internal Reviewed By: lunaleaps, mdvacca Differential Revision: D32296003 fbshipit-source-id: 93834c37331ad5d75645a5665a1c8c3d965765fb
This commit is contained in:
committed by
Facebook GitHub Bot
parent
6563c99c49
commit
f40976cd24
@@ -13,6 +13,7 @@ import android.view.ViewGroup;
|
||||
import com.facebook.common.logging.FLog;
|
||||
import com.facebook.infer.annotation.Assertions;
|
||||
import com.facebook.react.common.ReactConstants;
|
||||
import com.facebook.react.uimanager.TouchTargetHelper.ViewTarget;
|
||||
import com.facebook.react.uimanager.events.EventDispatcher;
|
||||
import com.facebook.react.uimanager.events.PointerEvent;
|
||||
import com.facebook.react.uimanager.events.PointerEventHelper;
|
||||
@@ -40,7 +41,7 @@ public class JSPointerDispatcher {
|
||||
|
||||
// Set globally for hover interactions, referenced for coalescing hover events
|
||||
private long mHoverInteractionKey = TouchEvent.UNSET;
|
||||
private List<Integer> mLastHitPath = Collections.emptyList();
|
||||
private List<ViewTarget> mLastHitPath = Collections.emptyList();
|
||||
private final float[] mLastEventCoordinates = new float[2];
|
||||
|
||||
public JSPointerDispatcher(ViewGroup viewGroup) {
|
||||
@@ -56,7 +57,7 @@ public class JSPointerDispatcher {
|
||||
return;
|
||||
}
|
||||
|
||||
List<Integer> hitPath =
|
||||
List<ViewTarget> hitPath =
|
||||
TouchTargetHelper.findTargetPathAndCoordinatesForTouch(
|
||||
motionEvent.getX(), motionEvent.getY(), mRootViewGroup, mTargetCoordinates);
|
||||
dispatchCancelEvent(hitPath, motionEvent, eventDispatcher);
|
||||
@@ -74,11 +75,14 @@ public class JSPointerDispatcher {
|
||||
|
||||
int surfaceId = UIManagerHelper.getSurfaceId(mRootViewGroup);
|
||||
int action = motionEvent.getActionMasked();
|
||||
List<Integer> hitPath =
|
||||
List<ViewTarget> hitPath =
|
||||
TouchTargetHelper.findTargetPathAndCoordinatesForTouch(
|
||||
motionEvent.getX(), motionEvent.getY(), mRootViewGroup, mTargetCoordinates);
|
||||
|
||||
int targetTag = hitPath.get(0);
|
||||
if (hitPath.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
int targetTag = hitPath.get(0).getViewId();
|
||||
|
||||
if (supportsHover) {
|
||||
if (action == MotionEvent.ACTION_HOVER_MOVE) {
|
||||
@@ -105,7 +109,7 @@ public class JSPointerDispatcher {
|
||||
if (!supportsHover) {
|
||||
// Enter root -> child
|
||||
for (int i = hitPath.size(); i-- > 0; ) {
|
||||
int tag = hitPath.get(i);
|
||||
int tag = hitPath.get(i).getViewId();
|
||||
eventDispatcher.dispatchEvent(
|
||||
PointerEvent.obtain(PointerEventHelper.POINTER_ENTER, surfaceId, tag, motionEvent));
|
||||
}
|
||||
@@ -161,7 +165,7 @@ public class JSPointerDispatcher {
|
||||
if (!supportsHover) {
|
||||
// Leave child -> root
|
||||
for (int i = 0; i < hitPath.size(); i++) {
|
||||
int tag = hitPath.get(i);
|
||||
int tag = hitPath.get(i).getViewId();
|
||||
eventDispatcher.dispatchEvent(
|
||||
PointerEvent.obtain(PointerEventHelper.POINTER_LEAVE, surfaceId, tag, motionEvent));
|
||||
}
|
||||
@@ -195,7 +199,7 @@ public class JSPointerDispatcher {
|
||||
MotionEvent motionEvent,
|
||||
EventDispatcher eventDispatcher,
|
||||
int surfaceId,
|
||||
List<Integer> hitPath) {
|
||||
List<ViewTarget> hitPath) {
|
||||
|
||||
int action = motionEvent.getActionMasked();
|
||||
if (action != MotionEvent.ACTION_HOVER_MOVE) {
|
||||
@@ -222,13 +226,17 @@ public class JSPointerDispatcher {
|
||||
|
||||
// If child is handling, eliminate target tags under handling child
|
||||
if (mChildHandlingNativeGesture > 0) {
|
||||
int index = hitPath.indexOf(mChildHandlingNativeGesture);
|
||||
if (index > 0) {
|
||||
hitPath.subList(0, index).clear();
|
||||
int index = 0;
|
||||
for (ViewTarget viewTarget : hitPath) {
|
||||
if (viewTarget.getViewId() == mChildHandlingNativeGesture) {
|
||||
hitPath.subList(0, index).clear();
|
||||
break;
|
||||
}
|
||||
index++;
|
||||
}
|
||||
}
|
||||
|
||||
int targetTag = hitPath.size() > 0 ? hitPath.get(0) : -1;
|
||||
int targetTag = hitPath.isEmpty() ? -1 : hitPath.get(0).getViewId();
|
||||
// If targetTag is empty, we should bail?
|
||||
if (targetTag == -1) {
|
||||
return;
|
||||
@@ -252,26 +260,31 @@ public class JSPointerDispatcher {
|
||||
// If something has changed in either enter/exit, let's start a new coalescing key
|
||||
mTouchEventCoalescingKeyHelper.incrementCoalescingKey(mHoverInteractionKey);
|
||||
|
||||
List<Integer> enterTargetTags = hitPath.subList(0, hitPath.size() - firstDivergentIndex);
|
||||
if (enterTargetTags.size() > 0) {
|
||||
List<ViewTarget> enterViewTargets = hitPath.subList(0, hitPath.size() - firstDivergentIndex);
|
||||
if (enterViewTargets.size() > 0) {
|
||||
// root -> child
|
||||
for (int i = enterTargetTags.size(); i-- > 0; ) {
|
||||
int enterTargetTag = enterTargetTags.get(i);
|
||||
for (int i = enterViewTargets.size(); i-- > 0; ) {
|
||||
eventDispatcher.dispatchEvent(
|
||||
PointerEvent.obtain(
|
||||
PointerEventHelper.POINTER_ENTER, surfaceId, enterTargetTag, motionEvent));
|
||||
PointerEventHelper.POINTER_ENTER,
|
||||
surfaceId,
|
||||
enterViewTargets.get(i).getViewId(),
|
||||
motionEvent));
|
||||
}
|
||||
}
|
||||
|
||||
// Fire all relevant exit events
|
||||
List<Integer> exitTargetTags =
|
||||
List<ViewTarget> exitViewTargets =
|
||||
mLastHitPath.subList(0, mLastHitPath.size() - firstDivergentIndex);
|
||||
if (exitTargetTags.size() > 0) {
|
||||
if (exitViewTargets.size() > 0) {
|
||||
// child -> root
|
||||
for (Integer exitTargetTag : exitTargetTags) {
|
||||
for (ViewTarget exitViewTarget : exitViewTargets) {
|
||||
eventDispatcher.dispatchEvent(
|
||||
PointerEvent.obtain(
|
||||
PointerEventHelper.POINTER_LEAVE, surfaceId, exitTargetTag, motionEvent));
|
||||
PointerEventHelper.POINTER_LEAVE,
|
||||
surfaceId,
|
||||
exitViewTarget.getViewId(),
|
||||
motionEvent));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -287,7 +300,7 @@ public class JSPointerDispatcher {
|
||||
}
|
||||
|
||||
private void dispatchCancelEvent(
|
||||
List<Integer> hitPath, MotionEvent motionEvent, EventDispatcher eventDispatcher) {
|
||||
List<ViewTarget> hitPath, MotionEvent motionEvent, EventDispatcher eventDispatcher) {
|
||||
// This means the gesture has already ended, via some other CANCEL or UP event. This is not
|
||||
// expected to happen very often as it would mean some child View has decided to intercept the
|
||||
// touch stream and start a native gesture only upon receiving the UP/CANCEL event.
|
||||
@@ -297,16 +310,19 @@ public class JSPointerDispatcher {
|
||||
"Expected to not have already sent a cancel for this gesture");
|
||||
int surfaceId = UIManagerHelper.getSurfaceId(mRootViewGroup);
|
||||
|
||||
int targetTag = hitPath.get(0);
|
||||
// Question: Does cancel fire on all in hit path?
|
||||
Assertions.assertNotNull(eventDispatcher)
|
||||
.dispatchEvent(
|
||||
PointerEvent.obtain(
|
||||
PointerEventHelper.POINTER_CANCEL, surfaceId, targetTag, motionEvent));
|
||||
if (!hitPath.isEmpty()) {
|
||||
int targetTag = hitPath.get(0).getViewId();
|
||||
// Question: Does cancel fire on all in hit path?
|
||||
Assertions.assertNotNull(eventDispatcher)
|
||||
.dispatchEvent(
|
||||
PointerEvent.obtain(
|
||||
PointerEventHelper.POINTER_CANCEL, surfaceId, targetTag, motionEvent));
|
||||
|
||||
for (int tag : hitPath) {
|
||||
eventDispatcher.dispatchEvent(
|
||||
PointerEvent.obtain(PointerEventHelper.POINTER_LEAVE, surfaceId, tag, motionEvent));
|
||||
for (ViewTarget viewTarget : hitPath) {
|
||||
eventDispatcher.dispatchEvent(
|
||||
PointerEvent.obtain(
|
||||
PointerEventHelper.POINTER_LEAVE, surfaceId, viewTarget.getViewId(), motionEvent));
|
||||
}
|
||||
}
|
||||
|
||||
mTouchEventCoalescingKeyHelper.removeCoalescingKey(mDownStartTime);
|
||||
|
||||
Reference in New Issue
Block a user