react-native-reanimated 4.7.0 → 4.7.1

package/android/src/main/java/com/swmansion/reanimated/sensor/ReanimatedSensorListener.kt

@@ -4,6 +4,7 @@ import android.hardware.Sensor
 import android.hardware.SensorEvent
 import android.hardware.SensorEventListener
 import android.hardware.SensorManager
+import android.util.Log
 import android.view.Display
 import android.view.Surface
 import com.swmansion.reanimated.nativeProxy.SensorSetter
@@ -12,8 +13,10 @@ class ReanimatedSensorListener(
     private val setter: SensorSetter,
     private val interval: Double,
     private val display: Display,
+    private val sensorType: ReanimatedSensorType,
 ) : SensorEventListener {
     private var lastRead = System.currentTimeMillis().toDouble()
+    private var didWarnAboutMislabeledEvent = false
 
     private val rotation = FloatArray(9)
     private val orientation = FloatArray(3)
@@ -24,8 +27,8 @@ class ReanimatedSensorListener(
         if (current - lastRead < interval) {
             return
         }
-        val sensorType = event.sensor.type
         lastRead = current
+        warnOnceAboutMislabeledEvent(event.sensor)
 
         val orientationDegrees =
             when (display.rotation) {
@@ -35,43 +38,51 @@ class ReanimatedSensorListener(
                 else -> 0
             }
 
-        when (sensorType) {
-            Sensor.TYPE_ROTATION_VECTOR -> {
-                SensorManager.getQuaternionFromVector(quaternion, event.values)
-                SensorManager.getRotationMatrixFromVector(rotation, event.values)
-                SensorManager.getOrientation(rotation, orientation)
-                val data =
-                    floatArrayOf(
-                        quaternion[1], // qx
-                        quaternion[3], // qy -> we set qz to match iOS
-                        -quaternion[2], // qz -> we set -qy to match iOS
-                        quaternion[0], // qw
-                        // make Android consistent with iOS, which is better documented here:
-                        // https://developer.apple.com/documentation/coremotion/getting_processed_device-motion_data/
-                        -orientation[0], // yaw
-                        -orientation[1], // pitch
-                        orientation[2], // roll
-                    )
-                setter.sensorSetter(data, orientationDegrees)
+        val values = event.values
+        val data =
+            when (sensorType) {
+                ReanimatedSensorType.ROTATION_VECTOR -> rotationData(values)
+                ReanimatedSensorType.GYROSCOPE,
+                ReanimatedSensorType.MAGNETIC_FIELD,
+                -> floatArrayOf(values[0], values[1], values[2])
+                ReanimatedSensorType.GRAVITY,
+                ReanimatedSensorType.ACCELEROMETER,
+                -> floatArrayOf(-values[0], -values[1], -values[2])
             }
-            Sensor.TYPE_GYROSCOPE,
-            Sensor.TYPE_MAGNETIC_FIELD,
-            -> {
-                val data = floatArrayOf(event.values[0], event.values[1], event.values[2])
-                setter.sensorSetter(data, orientationDegrees)
-            }
-            Sensor.TYPE_GRAVITY,
-            Sensor.TYPE_LINEAR_ACCELERATION,
-            -> {
-                val data = floatArrayOf(-event.values[0], -event.values[1], -event.values[2])
-                setter.sensorSetter(data, orientationDegrees)
-            }
-            else -> throw IllegalArgumentException("[Reanimated] Unknown sensor type.")
-        }
+        setter.sensorSetter(data, orientationDegrees)
     }
 
     override fun onAccuracyChanged(
         sensor: Sensor,
         accuracy: Int,
     ) {}
+
+    private fun warnOnceAboutMislabeledEvent(eventSensor: Sensor) {
+        if (didWarnAboutMislabeledEvent || eventSensor.type == sensorType.getType()) {
+            return
+        }
+        didWarnAboutMislabeledEvent = true
+        Log.w(
+            "Reanimated",
+            "Sensor $sensorType (type ${sensorType.getType()}) receives events from " +
+                "\"${eventSensor.name}\" (type ${eventSensor.type}).",
+        )
+    }
+
+    private fun rotationData(values: FloatArray): FloatArray {
+        SensorManager.getQuaternionFromVector(quaternion, values)
+        SensorManager.getRotationMatrixFromVector(rotation, values)
+        SensorManager.getOrientation(rotation, orientation)
+        return floatArrayOf(
+            quaternion[1], // qx
+            quaternion[3], // qy -> we set qz to match iOS
+            -quaternion[2], // qz -> we set -qy to match iOS
+            quaternion[0], // qw
+            // make Android consistent with iOS, which is better documented here:
+            // https://developer.apple.com/documentation/coremotion/getting_processed_device-motion_data/
+            -orientation[0], // yaw
+            -orientation[1], // pitch
+            orientation[2], // roll
+        )
+    }
 }

package/apple/reanimated/apple/REASynchronousPropsRewriter.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#import <React/RCTSurfacePresenter.h>
+#import <reanimated/NativeModules/ReanimatedModuleProxy.h>
+
+#import <memory>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface REASynchronousPropsRewriter : NSObject <RCTSurfacePresenterObserver>
+
+- (instancetype)initWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter
+                   reanimatedModuleProxy:
+                       (const std::shared_ptr<reanimated::ReanimatedModuleProxy> &)reanimatedModuleProxy;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/apple/reanimated/apple/REASynchronousPropsRewriter.mm

@@ -0,0 +1,37 @@
+#import <reanimated/apple/REASynchronousPropsRewriter.h>
+
+#import <React/RCTAssert.h>
+
+@implementation REASynchronousPropsRewriter {
+  __weak RCTSurfacePresenter *_surfacePresenter;
+  std::weak_ptr<reanimated::ReanimatedModuleProxy> _reanimatedModuleProxy;
+}
+
+- (instancetype)initWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter
+                   reanimatedModuleProxy:
+                       (const std::shared_ptr<reanimated::ReanimatedModuleProxy> &)reanimatedModuleProxy
+{
+  if (self = [super init]) {
+    _surfacePresenter = surfacePresenter;
+    _reanimatedModuleProxy = reanimatedModuleProxy;
+    // `addObserver:` is deprecated, but its replacement has no hook for an external observer.
+    // See `REAPseudoSelectorAttachQueue`.
+    [surfacePresenter addObserver:self];
+  }
+  return self;
+}
+
+- (void)dealloc
+{
+  [_surfacePresenter removeObserver:self];
+}
+
+- (void)didMountComponentsWithRootTag:(NSInteger)rootTag
+{
+  RCTAssertMainQueue();
+  if (const auto reanimatedModuleProxy = _reanimatedModuleProxy.lock()) {
+    reanimatedModuleProxy->rewriteSynchronousProps();
+  }
+}
+
+@end

package/apple/reanimated/apple/ReanimatedModule.mm

@@ -10,6 +10,7 @@
 #import <reanimated/apple/REAAssertJavaScriptQueue.h>
 #import <reanimated/apple/REAAssertTurboModuleManagerQueue.h>
 #import <reanimated/apple/REANodesManager.h>
+#import <reanimated/apple/REASynchronousPropsRewriter.h>
 #import <reanimated/apple/ReanimatedModule.h>
 #import <reanimated/apple/native/NativeProxy.h>
 #import <reanimated/apple/native/REAJSIUtils.h>
@@ -25,6 +26,7 @@ using namespace worklets;
 @implementation ReanimatedModule {
   __weak RCTSurfacePresenter *_surfacePresenter;
   std::shared_ptr<ReanimatedModuleProxy> _reanimatedModuleProxy;
+  REASynchronousPropsRewriter *_synchronousPropsRewriter;
 #ifndef NDEBUG
   reanimated::SingleInstanceChecker<ReanimatedModule> singleInstanceChecker_;
 #endif // NDEBUG
@@ -41,6 +43,7 @@ RCT_EXPORT_MODULE(ReanimatedModule);
   REAAssertTurboModuleManagerQueue();
 
   [_nodesManager invalidate];
+  _synchronousPropsRewriter = nil;
   _reanimatedModuleProxy.reset();
   [super invalidate];
 }
@@ -184,6 +187,10 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(installTurboModule)
   const auto &uiManager = scheduler.uiManager;
   react_native_assert(uiManager.get() != nil);
   _reanimatedModuleProxy->initializeFabric(uiManager);
+  if (_reanimatedModuleProxy->hasSynchronousWritesTracker()) {
+    _synchronousPropsRewriter = [[REASynchronousPropsRewriter alloc] initWithSurfacePresenter:_surfacePresenter
+                                                                        reanimatedModuleProxy:_reanimatedModuleProxy];
+  }
   [self attachReactEventListener:_reanimatedModuleProxy];
   [self registerRCTEventHandler:_reanimatedModuleProxy uiWorkletRuntime:uiWorkletRuntime];
 

package/apple/reanimated/apple/keyboardObserver/REAKeyboardEventObserver.mm

@@ -86,6 +86,23 @@ typedef NS_ENUM(NSUInteger, KeyboardState) { // NOLINT(performance-enum-size,cpp
 
 #else
 
+static UIWindow *_Nullable REAFindKeyWindow(void)
+{
+  // The window used to be read straight off the app delegate. Apps that adopt the UIScene
+  // life cycle own their window in a UISceneDelegate, so their app delegate may not declare
+  // `window` at all and messaging it raises NSInvalidArgumentException. Prefer the delegate
+  // when it is available so existing apps keep the exact same window, and otherwise fall back
+  // to the scene-aware lookup (cf. -[REATouchHoverCoordinator activeKeyWindow]).
+  id<UIApplicationDelegate> delegate = RCTSharedApplication().delegate;
+  if ([delegate respondsToSelector:@selector(window)]) {
+    UIWindow *window = delegate.window;
+    if (window != nil) {
+      return window;
+    }
+  }
+  return RCTKeyWindow();
+}
+
 - (void)runListeners:(float)keyboardHeight
 {
   for (NSString *key in _listeners.allKeys) {
@@ -185,7 +202,7 @@ typedef NS_ENUM(NSUInteger, KeyboardState) { // NOLINT(performance-enum-size,cpp
   CGRect beginFrame = [[userInfo objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue];
   CGRect endFrame = [[userInfo objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
   NSTimeInterval animationDuration = [[userInfo objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue];
-  auto window = [[[UIApplication sharedApplication] delegate] window];
+  auto window = REAFindKeyWindow();
 
   /*
    The keyboard frame is in the screen's coordinate space and must first be converted
@@ -238,7 +255,7 @@ typedef NS_ENUM(NSUInteger, KeyboardState) { // NOLINT(performance-enum-size,cpp
   RCTExecuteOnMainQueue(^() {
     if (!self->_measuringView) {
       self->_measuringView = [[UIView alloc] initWithFrame:CGRectMake(0, -1, 0, 0)];
-      UIWindow *keyWindow = [[[UIApplication sharedApplication] delegate] window];
+      UIWindow *keyWindow = REAFindKeyWindow();
       [keyWindow addSubview:self->_measuringView];
     }
     if ([self->_listeners count] == 0) {
@@ -301,7 +318,7 @@ typedef NS_ENUM(NSUInteger, KeyboardState) { // NOLINT(performance-enum-size,cpp
 {
   [[self getDisplayLink] setPaused:YES];
 
-  auto window = [[[UIApplication sharedApplication] delegate] window];
+  auto window = REAFindKeyWindow();
   auto keyboardView = [self getKeyboardView];
   if (keyboardView) {
     CGRect frameIntersection = CGRectIntersection(window.bounds, keyboardView.frame);

package/apple/reanimated/apple/native/PlatformDepMethodsHolderImpl.mm

@@ -12,9 +12,11 @@
 #import <reanimated/apple/pseudoSelectors/REAPseudoSelectorAttachQueue.h>
 #import <reanimated/apple/sensor/ReanimatedSensorContainer.h>
 
+#import <React/RCTAssert.h>
 #import <React/RCTComponentViewProtocol.h>
 #import <React/RCTComponentViewRegistry.h>
 #import <React/RCTMountingManager.h>
+#import <React/RCTViewComponentView.h>
 
 #import <memory>
 #import <variant>
@@ -194,18 +196,36 @@ std::shared_ptr<css::CSSPlatformTransitionBackend> makePlatformTransitionBackend
 
 ForceScreenSnapshotFunction makeForceScreenSnapshotFunction(REANodesManager *nodesManager)
 {
-  auto forceScreenSnapshot = [=](Tag tag) {
+  auto forceScreenSnapshot = [=](Tag tag) -> bool {
     RCTSurfacePresenter *surfacePresenter = nodesManager.surfacePresenter;
     RCTComponentViewRegistry *componentViewRegistry = surfacePresenter.mountingManager.componentViewRegistry;
     REAUIView<RCTComponentViewProtocol> *maybeRNSScreenView = [componentViewRegistry findComponentViewWithTag:tag];
     SEL setSnapshotAfterUpdatesSelector = @selector(setSnapshotAfterUpdates:);
     if ([maybeRNSScreenView respondsToSelector:setSnapshotAfterUpdatesSelector]) {
       [static_cast<id<RNScreenViewOptionalProtocol>>(maybeRNSScreenView) setSnapshotAfterUpdates:YES];
+      return true;
     }
+    return false;
   };
   return forceScreenSnapshot;
 }
 
+ReadMountedViewPropsFunction makeReadMountedViewPropsFunction(REANodesManager *nodesManager)
+{
+  auto readMountedViewProps = [=](Tag tag) -> Props::Shared {
+    RCTAssertMainQueue();
+    RCTSurfacePresenter *surfacePresenter = nodesManager.surfacePresenter;
+    RCTComponentViewRegistry *componentViewRegistry = surfacePresenter.mountingManager.componentViewRegistry;
+    REAUIView<RCTComponentViewProtocol> *componentView = [componentViewRegistry findComponentViewWithTag:tag];
+    // The default `props` getter of `UIView` asserts.
+    if (![componentView isKindOfClass:[RCTViewComponentView class]]) {
+      return nullptr;
+    }
+    return [componentView props];
+  };
+  return readMountedViewProps;
+}
+
 PlatformAttachPseudoSelectorFunction makeAttachPseudoSelectorFunction(REAPseudoSelectorAttachQueue *attachQueue)
 {
   return [attachQueue](Tag tag, PseudoSelector selector, std::function<void(bool)> callback) {
@@ -228,6 +248,8 @@ PlatformDepMethodsHolder makePlatformDepMethodsHolder(RCTModuleRegistry *moduleR
 
   auto forceScreenSnapshotFunction = makeForceScreenSnapshotFunction(nodesManager);
 
+  auto readMountedViewPropsFunction = makeReadMountedViewPropsFunction(nodesManager);
+
   auto synchronouslyUpdateUIPropsFunction = makeSynchronouslyUpdateUIPropsFunction(nodesManager);
 
   auto getAnimationTimestamp = makeGetAnimationTimestamp();
@@ -258,6 +280,7 @@ PlatformDepMethodsHolder makePlatformDepMethodsHolder(RCTModuleRegistry *moduleR
   PlatformDepMethodsHolder platformDepMethodsHolder = {
       requestRender,
       forceScreenSnapshotFunction,
+      readMountedViewPropsFunction,
       synchronouslyUpdateUIPropsFunction,
       getAnimationTimestamp,
       registerSensorFunction,

package/lib/module/animation/timing.js

@@ -56,14 +56,27 @@ export const withTiming = function (toValue, userConfig, callback) {
         startTime,
         startValue
       } = animation;
-      const runtime = now - startTime;
+      let runtime = now - startTime;
+      if (runtime < 0) {
+        // `startTime` comes from `global.__frameTimestamp ||
+        // global._getAnimationTimestamp()` (see `valueSetter`). An animation
+        // started outside a frame flush - from a gesture callback, for
+        // instance - takes the second branch and reads the clock at that
+        // instant, while the frame that first progresses it passes its vsync
+        // timestamp, which is earlier. The first tick then sees a small
+        // negative runtime. This can potentially cause glitches during
+        // animations.
+        animation.startTime = now;
+        runtime = 0;
+      }
       if (runtime >= config.duration) {
         // reset startTime to avoid reusing finished animation config in `start` method
         animation.startTime = 0;
         animation.current = toValue;
         return true;
       }
-      const progress = animation.easing(runtime / config.duration);
+      const normalizedTime = Math.min(Math.max(runtime / config.duration, 0), 1);
+      const progress = animation.easing(normalizedTime);
       animation.current = startValue + (toValue - startValue) * progress;
       return false;
     }

package/lib/module/animation/timing.js.map

@@ -1 +1 @@
-{"version":3,"names":["Easing","assertEasingIsWorklet","defineAnimation","getReduceMotionForAnimation","withTiming","toValue","userConfig","callback","__DEV__","easing","config","duration","inOut","quad","Object","keys","forEach","key","timing","animation","now","startTime","startValue","runtime","current","progress","onStart","value","previousAnimation","type","factory","onFrame","reduceMotion"],"sourceRoot":"../../../src","sources":["animation/timing.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Easing","assertEasingIsWorklet","defineAnimation","getReduceMotionForAnimation","withTiming","toValue","userConfig","callback","__DEV__","easing","config","duration","inOut","quad","Object","keys","forEach","key","timing","animation","now","startTime","startValue","runtime","current","normalizedTime","Math","min","max","progress","onStart","value","previousAnimation","type","factory","onFrame","reduceMotion"],"sourceRoot":"../../../src","sources":["animation/timing.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/platform-specific/jsVersion.js

@@ -5,5 +5,5 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export const jsVersion = '4.7.0';
+export const jsVersion = '4.7.1';
 //# sourceMappingURL=jsVersion.js.map

package/lib/typescript/animation/timing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timing.d.ts","sourceRoot":"","sources":["../../../src/animation/timing.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EACf,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,YAAY,EACZ,SAAS,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAQvD;;;;;;;;;;GAUG;AACH,UAAU,YAAY;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,MAAM,CAAC,EAAE,cAAc,GAAG,qBAAqB,CAAC;CACjD;AAED,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC;AAE5C,MAAM,WAAW,eAAgB,SAAQ,SAAS,CAAC,eAAe,CAAC;IACjE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,eAAe,CAAC;IAC5B,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,OAAO,EAAE,eAAe,CAAC;CAC1B;AAWD,KAAK,cAAc,GAAG,CAAC,CAAC,SAAS,eAAe,EAC9C,OAAO,EAAE,CAAC,EACV,UAAU,CAAC,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,iBAAiB,KACzB,CAAC,CAAC;AAEP;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,UAAU,EAuFlB,cAAc,CAAC"}
+{"version":3,"file":"timing.d.ts","sourceRoot":"","sources":["../../../src/animation/timing.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EACf,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,YAAY,EACZ,SAAS,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAQvD;;;;;;;;;;GAUG;AACH,UAAU,YAAY;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,MAAM,CAAC,EAAE,cAAc,GAAG,qBAAqB,CAAC;CACjD;AAED,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC;AAE5C,MAAM,WAAW,eAAgB,SAAQ,SAAS,CAAC,eAAe,CAAC;IACjE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,eAAe,CAAC;IAC5B,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,OAAO,EAAE,eAAe,CAAC;CAC1B;AAWD,KAAK,cAAc,GAAG,CAAC,CAAC,SAAS,eAAe,EAC9C,OAAO,EAAE,CAAC,EACV,UAAU,CAAC,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,iBAAiB,KACzB,CAAC,CAAC;AAEP;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,UAAU,EAyGlB,cAAc,CAAC"}

package/lib/typescript/platform-specific/jsVersion.d.ts

@@ -3,5 +3,5 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export declare const jsVersion = "4.7.0";
+export declare const jsVersion = "4.7.1";
 //# sourceMappingURL=jsVersion.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "More powerful alternative to Animated library for React Native.",
   "keywords": [
     "react-native",
@@ -9,6 +9,8 @@
     "reanimated"
   ],
   "scripts": {
+    "changelog:add": "node --experimental-strip-types ../../scripts/changelog/add.mts",
+    "changelog:squash": "node --experimental-strip-types ../../scripts/changelog/squash.mts",
     "test": "yarn run --top-level jest",
     "lint": "yarn lint:js && yarn lint:android && yarn lint:apple && yarn lint:clang-tidy",
     "lint:js": "eslint src __tests__ __typetests__ && yarn run --top-level oxfmt --check src __tests__ __typetests__ && yarn validate-mock",

package/src/animation/timing.ts

@@ -101,7 +101,20 @@ export const withTiming = function (
     function timing(animation: InnerTimingAnimation, now: Timestamp): boolean {
       // eslint-disable-next-line @typescript-eslint/no-shadow
       const { toValue, startTime, startValue } = animation;
-      const runtime = now - startTime;
+      let runtime = now - startTime;
+
+      if (runtime < 0) {
+        // `startTime` comes from `global.__frameTimestamp ||
+        // global._getAnimationTimestamp()` (see `valueSetter`). An animation
+        // started outside a frame flush - from a gesture callback, for
+        // instance - takes the second branch and reads the clock at that
+        // instant, while the frame that first progresses it passes its vsync
+        // timestamp, which is earlier. The first tick then sees a small
+        // negative runtime. This can potentially cause glitches during
+        // animations.
+        animation.startTime = now;
+        runtime = 0;
+      }
 
       if (runtime >= config.duration) {
         // reset startTime to avoid reusing finished animation config in `start` method
@@ -109,7 +122,12 @@ export const withTiming = function (
         animation.current = toValue;
         return true;
       }
-      const progress = animation.easing(runtime / config.duration);
+
+      const normalizedTime = Math.min(
+        Math.max(runtime / config.duration, 0),
+        1
+      );
+      const progress = animation.easing(normalizedTime);
       animation.current =
         (startValue as number) + (toValue - (startValue as number)) * progress;
       return false;

package/src/platform-specific/jsVersion.ts

@@ -4,4 +4,4 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export const jsVersion = '4.7.0';
+export const jsVersion = '4.7.1';