diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h index 9f538506463f93..2da6323051c629 100644 --- a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h +++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h @@ -2772,7 +2772,7 @@ namespace facebook { } // namespace facebook @protocol NativeVibrationSpec -- (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 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 cd04c8a2d92fac..2bbf168acd0d9e 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:(double)pattern) { [self vibrate]; } diff --git a/Libraries/Vibration/Vibration.js b/Libraries/Vibration/Vibration.js index ff3a755a05e706..4a2d8444ea702b 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://reactnative.dev/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..abd9fbbb5022dd 100644 --- 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 index d3e521352b9322..b90658b8dfa3c0 100644 --- 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(turboModule).invokeJavaMethod(rt, VoidKind, "vibrate", "(Ljava/lang/Double;)V", args, count); + return static_cast(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 index 5e594ba9bd4619..909ced4fc61547 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 @@ -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) {