diff --git a/src/modules/injectResponderEventPlugin.js b/src/modules/injectResponderEventPlugin/index.js similarity index 97% rename from src/modules/injectResponderEventPlugin.js rename to src/modules/injectResponderEventPlugin/index.js index 4c2cd2c8..df51b226 100644 --- a/src/modules/injectResponderEventPlugin.js +++ b/src/modules/injectResponderEventPlugin/index.js @@ -1,7 +1,7 @@ // based on https://github.com/facebook/react/pull/4303/files import EventPluginHub from 'react-dom/lib/EventPluginHub'; -import normalizeNativeEvent from './normalizeNativeEvent'; +import normalizeNativeEvent from '../normalizeNativeEvent'; import ResponderEventPlugin from 'react-dom/lib/ResponderEventPlugin'; import ResponderTouchHistoryStore from 'react-dom/lib/ResponderTouchHistoryStore'; diff --git a/src/modules/normalizeNativeEvent.js b/src/modules/normalizeNativeEvent/index.js similarity index 90% rename from src/modules/normalizeNativeEvent.js rename to src/modules/normalizeNativeEvent/index.js index 4ffda873..f9b624b9 100644 --- a/src/modules/normalizeNativeEvent.js +++ b/src/modules/normalizeNativeEvent/index.js @@ -27,6 +27,8 @@ const normalizeTouches = (touches = emptyArray) => locationX: locationX, locationY: locationY, identifier: identifier, + offsetX: touch.offsetX, + offsetY: touch.offsetY, pageX: touch.pageX, pageY: touch.pageY, radiusX: touch.radiusX, @@ -61,7 +63,11 @@ function normalizeTouchEvent(nativeEvent) { }; if (changedTouches[0]) { + event.clientX = changedTouches[0].clientX; + event.clientY = changedTouches[0].clientY; event.identifier = changedTouches[0].identifier; + event.offsetX = changedTouches[0].offsetX; + event.offsetY = changedTouches[0].offsetY; event.pageX = changedTouches[0].pageX; event.pageY = changedTouches[0].pageY; event.locationX = changedTouches[0].locationX; @@ -81,6 +87,8 @@ function normalizeMouseEvent(nativeEvent) { locationX: nativeEvent.clientX, locationY: nativeEvent.clientY, identifier: 0, + offsetX: nativeEvent.offsetX, + offsetY: nativeEvent.offsetY, pageX: nativeEvent.pageX, pageY: nativeEvent.pageY, screenX: nativeEvent.screenX, @@ -95,6 +103,8 @@ function normalizeMouseEvent(nativeEvent) { identifier: touches[0].identifier, locationX: nativeEvent.offsetX, locationY: nativeEvent.offsetY, + offsetX: nativeEvent.offsetX, + offsetY: nativeEvent.offsetY, pageX: nativeEvent.pageX, pageY: nativeEvent.pageY, preventDefault: nativeEvent.preventDefault.bind(nativeEvent),