Make Vibration.vibrate compatible with TurboModules (#27951)

Summary: This PR fixes a compatibility issue with the Vibration module and TurboModules. The TurboModules spec doesn't allow nullable arguments of type Number, causing the following problem: ![IMG_3758](https://user-images.githubusercontent.com/1247834/73803879-10be6f80-4790-11ea-92d4-a008f0007681.PNG) ## Changelog [iOS] [Fixed] - Make Vibration library compatible with TurboModules. Pull Request resolved: #27951 Test Plan: Just submitted a PR to my own app to fix the issue [here](rainbow-me/rainbow#340) The problem should be reproducible on RNTester due to this line: https://github.com/facebook/react-native/blob/91f139b94118fe8db29728ea8ad855fc4a13f743/RNTester/js/examples/Vibration/VibrationExample.js#L66 and should be working on this branch. Reviewed By: TheSavior Differential Revision: D19761064 Pulled By: hramos fbshipit-source-id: 84f6b62a2734cc09d450e906b5866d4e9ce61124
facebook · Apr 8, 2020 · 3904228 · 3904228
1 parent 8e48dc0
commit 3904228
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h
@@ -2772,7 +2772,7 @@ namespace facebook {
 } // namespace facebook
 @protocol NativeVibrationSpec <RCTBridgeModule, RCTTurboModule>
 
-- (void)vibrate:(NSNumber *)pattern;
+- (void)vibrate:(double)pattern;
 - (void)vibrateByPattern:(NSArray *)pattern
                   repeat:(double)repeat;
 - (void)cancel;

diff --git a/Libraries/Vibration/NativeVibration.js b/Libraries/Vibration/NativeVibration.js
@@ -15,7 +15,7 @@ import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
   +getConstants: () => {||};
-  +vibrate: (pattern?: ?number) => void;
+  +vibrate: (pattern: number) => void;
 
   // Android only
   +vibrateByPattern: (pattern: Array<number>, repeat: number) => void;

diff --git a/Libraries/Vibration/RCTVibration.mm b/Libraries/Vibration/RCTVibration.mm
@@ -25,7 +25,7 @@ - (void)vibrate
   AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
 }
 
-RCT_EXPORT_METHOD(vibrate:(NSNumber *)pattern)
+RCT_EXPORT_METHOD(vibrate:(double)pattern)
 {
   [self vibrate];
 }

diff --git a/Libraries/Vibration/Vibration.js b/Libraries/Vibration/Vibration.js
@@ -22,14 +22,15 @@ const Platform = require('../Utilities/Platform');
 
 let _vibrating: boolean = false;
 let _id: number = 0; // _id is necessary to prevent race condition.
+const _default_vibration_length = 400;
 
 function vibrateByPattern(pattern: Array<number>, repeat: boolean = false) {
   if (_vibrating) {
     return;
   }
   _vibrating = true;
   if (pattern[0] === 0) {
-    NativeVibration.vibrate();
+    NativeVibration.vibrate(_default_vibration_length);
     pattern = pattern.slice(1);
   }
   if (pattern.length === 0) {
@@ -48,7 +49,7 @@ function vibrateScheduler(
   if (!_vibrating || id !== _id) {
     return;
   }
-  NativeVibration.vibrate();
+  NativeVibration.vibrate(_default_vibration_length);
   if (nextIndex >= pattern.length) {
     if (repeat) {
       nextIndex = 0;
@@ -70,7 +71,7 @@ const Vibration = {
    * See https://reactnative.dev/docs/vibration.html#vibrate
    */
   vibrate: function(
-    pattern: number | Array<number> = 400,
+    pattern: number | Array<number> = _default_vibration_length,
     repeat: boolean = false,
   ) {
     if (Platform.OS === 'android') {
@@ -86,7 +87,7 @@ const Vibration = {
         return;
       }
       if (typeof pattern === 'number') {
-        NativeVibration.vibrate();
+        NativeVibration.vibrate(pattern);
       } else if (Array.isArray(pattern)) {
         vibrateByPattern(pattern, repeat);
       } else {

diff --git a/ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeVibrationSpec.java b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeVibrationSpec.java
@@ -31,5 +31,5 @@ public NativeVibrationSpec(ReactApplicationContext reactContext) {
   public abstract void vibrateByPattern(ReadableArray pattern, double repeat);
 
   @ReactMethod
-  public abstract void vibrate(Double pattern);
+  public abstract void vibrate(double pattern);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/fbreact/specs/jni/FBReactNativeSpec-generated.cpp b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/jni/FBReactNativeSpec-generated.cpp
@@ -2399,7 +2399,7 @@ namespace facebook {
 
 
     static facebook::jsi::Value __hostFunction_NativeVibrationSpecJSI_vibrate(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<JavaTurboModule&>(turboModule).invokeJavaMethod(rt, VoidKind, "vibrate", "(Ljava/lang/Double;)V", args, count);
+      return static_cast<JavaTurboModule&>(turboModule).invokeJavaMethod(rt, VoidKind, "vibrate", "(D)V", args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeVibrationSpecJSI_vibrateByPattern(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java
@@ -31,8 +31,8 @@ public String getName() {
   }
 
   @Override
-  public void vibrate(Double durationDouble) {
-    int duration = (int) durationDouble.doubleValue();
+  public void vibrate(double durationDouble) {
+    int duration = (int) durationDouble;
 
     Vibrator v = (Vibrator) getReactApplicationContext().getSystemService(Context.VIBRATOR_SERVICE);
     if (v != null) {