zoriya/react-native-web
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-web.git synced 2026-05-31 01:36:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up View's event normalization code

Browse Source
This commit is contained in:
Nicolas Gallagher
2016-03-15 13:43:11 -07:00
parent 949cb75894
commit 5f795dfc6c
1 changed files with 17 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/View/index.js
+17 -86
View File
@@ -45,16 +45,7 @@ class View extends Component {
constructor(props, context) { constructor(props, context) {
super(props, context) super(props, context)
this._handleClick = this._handleClick.bind(this) this._normalizeEventForHandler = this._normalizeEventForHandler.bind(this)
this._handleClickCapture = this._handleClickCapture.bind(this)
this._handleTouchCancel = this._handleTouchCancel.bind(this)
this._handleTouchCancelCapture = this._handleTouchCancelCapture.bind(this)
this._handleTouchEnd = this._handleTouchEnd.bind(this)
this._handleTouchEndCapture = this._handleTouchEndCapture.bind(this)
this._handleTouchMove = this._handleTouchMove.bind(this)
this._handleTouchMoveCapture = this._handleTouchMoveCapture.bind(this)
this._handleTouchStart = this._handleTouchStart.bind(this)
this._handleTouchStartCapture = this._handleTouchStartCapture.bind(this)
} }
render() { render() {
@@ -70,15 +61,15 @@ class View extends Component {
<CoreComponent <CoreComponent
{...other} {...other}
onClick={this._handleClick} onClick={this._handleClick}
onClickCapture={this._handleClickCapture} onClickCapture={this._normalizeEventForHandler('onClickCapture')}
onTouchCancel={this._handleTouchCancel} onTouchCancel={this._normalizeEventForHandler('onTouchCancel')}
onTouchCancelCapture={this._handleTouchCancelCapture} onTouchCancelCapture={this._normalizeEventForHandler('onTouchCancelCapture')}
onTouchEnd={this._handleTouchEnd} onTouchEnd={this._normalizeEventForHandler('onTouchEnd')}
onTouchEndCapture={this._handleTouchEndCapture} onTouchEndCapture={this._normalizeEventForHandler('onTouchEndCapture')}
onTouchMove={this._handleTouchMove} onTouchMove={this._normalizeEventForHandler('onTouchMove')}
onTouchMoveCapture={this._handleTouchMoveCapture} onTouchMoveCapture={this._normalizeEventForHandler('onTouchMoveCapture')}
onTouchStart={this._handleTouchStart} onTouchStart={this._normalizeEventForHandler('onTouchStart')}
onTouchStartCapture={this._handleTouchStartCapture} onTouchStartCapture={this._normalizeEventForHandler('onTouchStartCapture')}
style={[ style={[
styles.initial, styles.initial,
style, style,
@@ -92,73 +83,13 @@ class View extends Component {
* React Native expects `pageX` and `pageY` to be on the `nativeEvent`, but * React Native expects `pageX` and `pageY` to be on the `nativeEvent`, but
* React doesn't include them for touch events. * React doesn't include them for touch events.
*/ */
_normalizeTouchEvent(event) { _normalizeEventForHandler(handler) {
const { pageX, changedTouches } = event.nativeEvent return (e) => {
if (pageX === undefined) { const { pageX } = e.nativeEvent
const { pageX, pageY } = changedTouches[0] if (pageX === undefined) {
event.nativeEvent.pageX = pageX e.nativeEvent = normalizeNativeEvent(e.nativeEvent)
event.nativeEvent.pageY = pageY }
} this.props[handler] && this.props[handler](e)
return event
}
_handleClick(e) {
if (this.props.onClick) {
this.props.onClick(this._normalizeTouchEvent(e))
}
}
_handleClickCapture(e) {
if (this.props.onClickCapture) {
this.props.onClickCapture(this._normalizeTouchEvent(e))
}
}
_handleTouchCancel(e) {
if (this.props.onTouchCancel) {
this.props.onTouchCancel(this._normalizeTouchEvent(e))
}
}
_handleTouchCancelCapture(e) {
if (this.props.onTouchCancelCapture) {
this.props.onTouchCancelCapture(this._normalizeTouchEvent(e))
}
}
_handleTouchEnd(e) {
if (this.props.onTouchEnd) {
this.props.onTouchEnd(this._normalizeTouchEvent(e))
}
}
_handleTouchEndCapture(e) {
if (this.props.onTouchEndCapture) {
this.props.onTouchEndCapture(this._normalizeTouchEvent(e))
}
}
_handleTouchMove(e) {
if (this.props.onTouchMove) {
this.props.onTouchMove(this._normalizeTouchEvent(e))
}
}
_handleTouchMoveCapture(e) {
if (this.props.onTouchMoveCapture) {
this.props.onTouchMoveCapture(this._normalizeTouchEvent(e))
}
}
_handleTouchStart(e) {
if (this.props.onTouchStart) {
this.props.onTouchStart(this._normalizeTouchEvent(e))
}
}
_handleTouchStartCapture(e) {
if (this.props.onTouchStartCapture) {
this.props.onTouchStartCapture(this._normalizeTouchEvent(e))
} }
} }
} }