diff --git a/Libraries/Vibration/NativeVibration.js b/Libraries/Vibration/NativeVibration.js index abdfa680c114cc..6de5352ec82f8e 100644 --- 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, repeat: number) => void; diff --git a/Libraries/Vibration/RCTVibration.mm b/Libraries/Vibration/RCTVibration.mm index a26424693d71a0..80925bf14ede63 100644 --- 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:(nonnull NSNumber *)pattern) { [self vibrate]; } diff --git a/Libraries/Vibration/Vibration.js b/Libraries/Vibration/Vibration.js index 2f20cd7ae6061e..6165258ddfffa6 100644 --- a/Libraries/Vibration/Vibration.js +++ b/Libraries/Vibration/Vibration.js @@ -22,6 +22,7 @@ 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, repeat: boolean = false) { if (_vibrating) { @@ -29,7 +30,7 @@ function vibrateByPattern(pattern: Array, repeat: boolean = false) { } _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://facebook.github.io/react-native/docs/vibration.html#vibrate */ vibrate: function( - pattern: number | Array = 400, + pattern: number | Array = _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 index 4214a3c30fed47..f3f622dff63b4e 100644 --- a/ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeVibrationSpec.java +++ b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeVibrationSpec.java @@ -18,6 +18,7 @@ import com.facebook.react.bridge.ReactModuleWithSpec; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.turbomodule.core.interfaces.TurboModule; +import javax.annotation.Nonnull; public abstract class NativeVibrationSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule { public NativeVibrationSpec(ReactApplicationContext reactContext) { @@ -31,5 +32,5 @@ public NativeVibrationSpec(ReactApplicationContext reactContext) { public abstract void vibrateByPattern(ReadableArray pattern, double repeat); @ReactMethod - public abstract void vibrate(Double pattern); + public abstract void vibrate(@Nonnull Double pattern); } 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 index 5e594ba9bd4619..e8601d694590c9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java @@ -8,6 +8,7 @@ package com.facebook.react.modules.vibration; import android.annotation.SuppressLint; +import androidx.annotation.NonNull; import android.content.Context; import android.os.Vibrator; import com.facebook.fbreact.specs.NativeVibrationSpec; @@ -31,7 +32,7 @@ public String getName() { } @Override - public void vibrate(Double durationDouble) { + public void vibrate(@NonNull Double durationDouble) { int duration = (int) durationDouble.doubleValue(); Vibrator v = (Vibrator) getReactApplicationContext().getSystemService(Context.VIBRATOR_SERVICE);