Merge pull request #17095 from RobertKozik/haptics-extend-implementation

Extend implementation of Haptic Feedback
Expensify · Apr 10, 2023 · c31a259 · c31a259
2 parents f6d8c43 + ff0b335
commit c31a259
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 34 deletions.
diff --git a/src/components/Button.js b/src/components/Button.js
@@ -241,13 +241,13 @@ class Button extends Component {
                     }
 
                     if (this.props.shouldEnableHapticFeedback) {
-                        HapticFeedback.trigger();
+                        HapticFeedback.press();
                     }
                     this.props.onPress(e);
                 }}
                 onLongPress={(e) => {
                     if (this.props.shouldEnableHapticFeedback) {
-                        HapticFeedback.trigger();
+                        HapticFeedback.longPress();
                     }
                     this.props.onLongPress(e);
                 }}

diff --git a/src/components/PressableWithSecondaryInteraction/index.native.js b/src/components/PressableWithSecondaryInteraction/index.native.js
@@ -20,7 +20,7 @@ const PressableWithSecondaryInteraction = (props) => {
             onPress={props.onPress}
             onLongPress={(e) => {
                 e.preventDefault();
-                HapticFeedback.trigger();
+                HapticFeedback.longPress();
                 props.onSecondaryInteraction(e);
             }}
             onPressIn={props.onPressIn}

diff --git a/src/libs/HapticFeedback/index.android.js b/src/libs/HapticFeedback/index.android.js
diff --git a/src/libs/HapticFeedback/index.ios.js b/src/libs/HapticFeedback/index.ios.js
diff --git a/src/libs/HapticFeedback/index.js b/src/libs/HapticFeedback/index.js
@@ -2,5 +2,8 @@
  * Web does not support Haptic feedback
  */
 export default {
-    trigger: () => {},
+    press: () => {},
+    longPress: () => {},
+    success: () => {},
+    error: () => {},
 };
diff --git a/src/libs/HapticFeedback/index.native.js b/src/libs/HapticFeedback/index.native.js
@@ -0,0 +1,33 @@
+
+import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
+
+function press() {
+    ReactNativeHapticFeedback.trigger('impactLight', {
+        enableVibrateFallback: true,
+    });
+}
+
+function longPress() {
+    ReactNativeHapticFeedback.trigger('impactHeavy', {
+        enableVibrateFallback: true,
+    });
+}
+
+function success() {
+    ReactNativeHapticFeedback.trigger('notificationSuccess', {
+        enableVibrateFallback: true,
+    });
+}
+
+function error() {
+    ReactNativeHapticFeedback.trigger('notificationError', {
+        enableVibrateFallback: true,
+    });
+}
+
+export default {
+    press,
+    longPress,
+    success,
+    error,
+};