From b28581f44eed4e3c2471a0ad966136fc3482dbd6 Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Mon, 19 Feb 2018 18:27:49 -0800 Subject: [PATCH] [fix] Touchable 'touchAction' value --- .../src/exports/TouchableHighlight/index.js | 2 +- .../src/exports/TouchableOpacity/index.js | 2 +- .../src/exports/TouchableWithoutFeedback/index.js | 2 +- .../src/exports/View/ViewStylePropTypes.js | 14 +++++++++++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/react-native-web/src/exports/TouchableHighlight/index.js b/packages/react-native-web/src/exports/TouchableHighlight/index.js index 67accb9b..b8f60936 100644 --- a/packages/react-native-web/src/exports/TouchableHighlight/index.js +++ b/packages/react-native-web/src/exports/TouchableHighlight/index.js @@ -286,7 +286,7 @@ const styles = StyleSheet.create({ }, actionable: { cursor: 'pointer', - touchAction: 'manipulate' + touchAction: 'manipulation' } }); diff --git a/packages/react-native-web/src/exports/TouchableOpacity/index.js b/packages/react-native-web/src/exports/TouchableOpacity/index.js index 39ee304e..9d9daa04 100644 --- a/packages/react-native-web/src/exports/TouchableOpacity/index.js +++ b/packages/react-native-web/src/exports/TouchableOpacity/index.js @@ -203,7 +203,7 @@ const styles = StyleSheet.create({ }, actionable: { cursor: 'pointer', - touchAction: 'manipulate' + touchAction: 'manipulation' } }); diff --git a/packages/react-native-web/src/exports/TouchableWithoutFeedback/index.js b/packages/react-native-web/src/exports/TouchableWithoutFeedback/index.js index e98dd0cb..4309dc40 100644 --- a/packages/react-native-web/src/exports/TouchableWithoutFeedback/index.js +++ b/packages/react-native-web/src/exports/TouchableWithoutFeedback/index.js @@ -201,7 +201,7 @@ const TouchableWithoutFeedback = createReactClass({ const styles = StyleSheet.create({ actionable: { cursor: 'pointer', - touchAction: 'manipulate' + touchAction: 'manipulation' } }); diff --git a/packages/react-native-web/src/exports/View/ViewStylePropTypes.js b/packages/react-native-web/src/exports/View/ViewStylePropTypes.js index d48ef3f2..88e453aa 100644 --- a/packages/react-native-web/src/exports/View/ViewStylePropTypes.js +++ b/packages/react-native-web/src/exports/View/ViewStylePropTypes.js @@ -52,7 +52,19 @@ const ViewStylePropTypes = { overscrollBehaviorY: overscrollBehaviorType, perspective: oneOfType([number, string]), perspectiveOrigin: string, - touchAction: string, + touchAction: oneOf([ + 'auto', + 'inherit', + 'manipulation', + 'none', + 'pan-down', + 'pan-left', + 'pan-right', + 'pan-up', + 'pan-x', + 'pan-y', + 'pinch-zoom' + ]), transitionDelay: string, transitionDuration: string, transitionProperty: string,