kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-06 22:38:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Inline extractSingleTouch from fbjs

Browse Source 
Summary: There is only a single use of this function across RN, and one more use in a test file. I inlined this function in both places to reduce the dependency on fbjs.

Reviewed By: yungsters

Differential Revision: D13138137

fbshipit-source-id: 32660c965a975d17e236bdd13ff0b2a8d64751ee
This commit is contained in:
Christoph Nakazawa
2018-11-26 06:24:05 -08:00
committed by Facebook Github Bot
parent f377926677
commit 2de01cb54d
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Libraries/Components/Touchable/Touchable.js
View File

@@ -17,7 +17,6 @@ const React = require('React');
const ReactNative = require('ReactNative');
const StyleSheet = require('StyleSheet');
const TVEventHandler = require('TVEventHandler');
const TouchEventUtils = require('fbjs/lib/TouchEventUtils');
const UIManager = require('UIManager');
const View = require('View');
@@ -27,6 +26,19 @@ const normalizeColor = require('normalizeColor');
import type {PressEvent} from 'CoreEventTypes';
import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
const extractSingleTouch = nativeEvent => {
const touches = nativeEvent.touches;
const changedTouches = nativeEvent.changedTouches;
const hasTouches = touches && touches.length > 0;
const hasChangedTouches = changedTouches && changedTouches.length > 0;
return !hasTouches && hasChangedTouches
? changedTouches[0]
: hasTouches
? touches[0]
: nativeEvent;
};
/**
* `Touchable`: Taps done right.
*
@@ -526,7 +538,7 @@ const TouchableMixin = {
pressExpandBottom += hitSlop.bottom;
}
const touch = TouchEventUtils.extractSingleTouch(e.nativeEvent);
const touch = extractSingleTouch(e.nativeEvent);
const pageX = touch && touch.pageX;
const pageY = touch && touch.pageY;
@@ -779,7 +791,7 @@ const TouchableMixin = {
},
_savePressInLocation: function(e: PressEvent) {
const touch = TouchEventUtils.extractSingleTouch(e.nativeEvent);
const touch = extractSingleTouch(e.nativeEvent);
const pageX = touch && touch.pageX;
const pageY = touch && touch.pageY;
const locationX = touch && touch.locationX;

20
ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js
View File

@@ -12,21 +12,33 @@
const React = require('React');
const Recording = require('NativeModules').Recording;
const StyleSheet = require('StyleSheet');
const TouchEventUtils = require('fbjs/lib/TouchEventUtils');
const View = require('View');
const extractSingleTouch = nativeEvent => {
const touches = nativeEvent.touches;
const changedTouches = nativeEvent.changedTouches;
const hasTouches = touches && touches.length > 0;
const hasChangedTouches = changedTouches && changedTouches.length > 0;
return !hasTouches && hasChangedTouches
? changedTouches[0]
: hasTouches
? touches[0]
: nativeEvent;
};
class TouchTestApp extends React.Component {
handleStartShouldSetResponder = e => {
return true;
};
handleOnResponderMove = e => {
e = TouchEventUtils.extractSingleTouch(e.nativeEvent);
e = extractSingleTouch(e.nativeEvent);
Recording.record('move;' + e.touches.length);
};
handleResponderStart = e => {
e = TouchEventUtils.extractSingleTouch(e.nativeEvent);
e = extractSingleTouch(e.nativeEvent);
if (e.touches) {
Recording.record('start;' + e.touches.length);
} else {
@@ -35,7 +47,7 @@ class TouchTestApp extends React.Component {
};
handleResponderEnd = e => {
e = TouchEventUtils.extractSingleTouch(e.nativeEvent);
e = extractSingleTouch(e.nativeEvent);
if (e.touches) {
Recording.record('end;' + e.touches.length);
} else {