react-native-reanimated 4.3.3 → 4.3.4

package/Common/cpp/reanimated/Fabric/ShadowTreeCloner.cpp

@@ -24,7 +24,7 @@ Props::Shared mergeProps(const ShadowNode &shadowNode, const PropsMap &propsMap,
   if (propsVector.size() > 1) {
     folly::dynamic newPropsDynamic = folly::dynamic::object;
     for (const auto &props : propsVector) {
-      newPropsDynamic = folly::dynamic::merge(props.operator folly::dynamic(), newPropsDynamic);
+      newPropsDynamic = folly::dynamic::merge(newPropsDynamic, props.operator folly::dynamic());
     }
     return shadowNode.getComponentDescriptor().cloneProps(propsParserContext, newProps, RawProps(newPropsDynamic));
   }

package/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy_Experimental.cpp

@@ -34,6 +34,8 @@ std::optional<MountingTransaction> LayoutAnimationsProxy_Experimental::pullTrans
   const std::vector<std::shared_ptr<MutationNode>> roots;
   const bool isInTransition = static_cast<bool>(transitionState_);
 
+  reconcileContradictedRemovals(mutations, filteredMutations);
+
   if (isInTransition) {
     updateLightTree(propsParserContext, mutations, filteredMutations);
     handleProgressTransition(filteredMutations, mutations, propsParserContext, surfaceId);
@@ -105,6 +107,67 @@ std::optional<MountingTransaction> LayoutAnimationsProxy_Experimental::pullTrans
   return MountingTransaction{surfaceId, transactionNumber, std::move(filteredMutations), telemetry};
 }
 
+// If React re-creates or re-inserts a tag whose exiting removal we are still
+// withholding, it has contradicted that withheld removal. Flush it now instead
+// of letting the stale node linger: updateLightTree would overwrite its
+// lightNodes_ entry (the "LightNode already exists" assert is compiled out in
+// release), orphaning the still-mounted exiting view, and the eventual
+// endLayoutAnimation would then remove the wrong, live view and crash the
+// mounting layer.
+//
+// This must run before updateLightTree (so the tag is re-registered cleanly)
+// and before addOngoingAnimations (which would otherwise emit an Update for a
+// tag we are about to Delete this frame).
+void LayoutAnimationsProxy_Experimental::reconcileContradictedRemovals(
+    const ShadowViewMutationList &mutations,
+    ShadowViewMutationList &filteredMutations) const {
+  for (const auto &mutation : mutations) {
+    if (mutation.type != ShadowViewMutation::Type::Create && mutation.type != ShadowViewMutation::Type::Insert) {
+      continue;
+    }
+    const auto tag = mutation.newChildShadowView.tag;
+    std::shared_ptr<LightNode> node;
+    if (const auto it = lightNodes_.find(tag); it != lightNodes_.end() && it->second->state != UNDEFINED) {
+      node = it->second;
+      lightNodes_.erase(it);
+      if (node->state == DELETED) {
+        // already unmounted — only the stale map entry had to go
+        continue;
+      }
+    } else {
+      // A settled exiting view (state DEAD) has already left lightNodes_ but is
+      // still mounted, awaiting the deadNodes cleanup in handleRemovals. That
+      // cleanup runs at the end of the transaction — after this Create would
+      // have re-registered the tag in the mounting layer's view registry — so
+      // it must be flushed now instead.
+      const auto deadIt = std::find_if(
+          deadNodes.begin(), deadNodes.end(), [tag](const auto &deadNode) { return deadNode->current.tag == tag; });
+      if (deadIt == deadNodes.end()) {
+        continue;
+      }
+      node = *deadIt;
+      deadNodes.erase(deadIt);
+      if (node->state == DELETED) {
+        continue;
+      }
+    }
+    // Flush the withheld removal for this tag (and its withheld subtree) right
+    // now, mirroring the deadNodes cleanup in handleRemovals.
+    const auto parent = node->parent.lock();
+    react_native_assert(parent && "Parent node is nullptr");
+    if (!parent) {
+      continue;
+    }
+    const auto index = parent->removeChild(node);
+    react_native_assert(index != -1 && "Exiting node not found");
+    if (index == -1) {
+      continue;
+    }
+    endAnimationsRecursively(node, index, filteredMutations);
+    maybeDropAncestors(parent, filteredMutations);
+  }
+}
+
 bool LayoutAnimationsProxy_Experimental::shouldOverridePullTransaction() const {
   // we need to listen to every possible mutation to keep the light tree updated
   return true;
@@ -298,11 +361,18 @@ std::optional<SurfaceId> LayoutAnimationsProxy_Experimental::endLayoutAnimation(
     return surfaceId;
   }
 
-  auto node = lightNodes_[tag];
-  react_native_assert(node && "LightNode not found");
+  const auto nodeIt = lightNodes_.find(tag);
+  // the withheld removal may have already been flushed (e.g. reconciled after
+  // React re-created the tag) — the assert alone is compiled out in release
+  // and operator[] would insert a null node here
+  if (nodeIt == lightNodes_.end() || !nodeIt->second) {
+    react_native_assert(false && "LightNode not found");
+    return surfaceId;
+  }
+  auto node = nodeIt->second;
 
   node->state = DEAD;
-  lightNodes_.erase(tag);
+  lightNodes_.erase(nodeIt);
   deadNodes.insert(node);
 
   return surfaceId;
@@ -341,6 +411,7 @@ void LayoutAnimationsProxy_Experimental::handleRemovals(
       parent->children.push_back(node);
       if (node->state == UNDEFINED) {
         node->state = WAITING;
+        lightNodes_[node->current.tag] = node;
       }
     } else {
       maybeCancelAnimation(node->current.tag);
@@ -424,6 +495,10 @@ void LayoutAnimationsProxy_Experimental::endAnimationsRecursively(
     ShadowViewMutationList &mutations) const {
   maybeCancelAnimation(node->current.tag);
   node->state = DELETED;
+  // drop the tag mapping unless it was already re-registered for a new node
+  if (const auto it = lightNodes_.find(node->current.tag); it != lightNodes_.end() && it->second == node) {
+    lightNodes_.erase(it);
+  }
   // iterate from the end, so that children
   // with higher indices appear first in the mutations list
 
@@ -455,6 +530,9 @@ void LayoutAnimationsProxy_Experimental::maybeDropAncestors(
   react_native_assert(index != -1 && "Child node not found");
 
   node->state = DELETED;
+  if (const auto it = lightNodes_.find(node->current.tag); it != lightNodes_.end() && it->second == node) {
+    lightNodes_.erase(it);
+  }
   maybeCancelAnimation(node->current.tag);
   cleanupMutations.push_back(ShadowViewMutation::RemoveMutation(parent->current.tag, node->current, index));
   cleanupMutations.push_back(ShadowViewMutation::DeleteMutation(node->current));
@@ -507,6 +585,9 @@ bool LayoutAnimationsProxy_Experimental::startAnimationsRecursively(
       mutations.push_back(ShadowViewMutation::DeleteMutation(subNode->current));
     } else {
       subNode->state = WAITING;
+      // register withheld subtree members, so that reconcileContradictedRemovals
+      // can find them when React re-creates their tags
+      lightNodes_[subNode->current.tag] = subNode;
     }
   }
 

package/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy_Experimental.h

@@ -108,6 +108,9 @@ struct LayoutAnimationsProxy_Experimental : public LayoutAnimationsProxyCommon,
       const ShadowViewMutationList &mutations,
       ShadowViewMutationList &filteredMutations) const;
 
+  void reconcileContradictedRemovals(const ShadowViewMutationList &mutations, ShadowViewMutationList &filteredMutations)
+      const;
+
   void handleSharedTransitionsStart(
       const std::shared_ptr<LightNode> &afterTopScreen,
       const std::shared_ptr<LightNode> &beforeTopScreen,

package/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.cpp

@@ -560,7 +560,19 @@ bool ReanimatedModuleProxy::handleRawEvent(const RawEvent &rawEvent, double curr
     return false;
   }
 
-  int tag = eventTarget->getTag();
+#if REACT_NATIVE_VERSION_MINOR >= 87
+  const auto tag = eventTarget->getTag();
+#else
+  // A stale event dispatched during unmount may carry an EventTarget with a null
+  // InstanceHandle which getTag() would dereference (see #9925).
+  // Fixed in React Native 0.87 by https://github.com/facebook/react-native/pull/56763.
+  const auto shadowNodeFamily = rawEvent.shadowNodeFamily.lock();
+  if (shadowNodeFamily == nullptr) {
+    return false;
+  }
+  const auto tag = shadowNodeFamily->getTag();
+#endif
+
   auto eventType = rawEvent.type;
   if (eventType.rfind("top", 0) == 0) {
     eventType = "on" + eventType.substr(3);

package/lib/module/animation/decay/rigidDecay.js

@@ -11,7 +11,7 @@ export function rigidDecay(animation, now, config) {
     current,
     velocity
   } = animation;
-  const deltaTime = Math.min(now - lastTimestamp, 64);
+  const deltaTime = Math.min(Math.max(now - lastTimestamp, 0), 64);
   const v = velocity * Math.exp(-(1 - config.deceleration) * (now - startTimestamp) * SLOPE_FACTOR);
   animation.current = current + v * config.velocityFactor * deltaTime / 1000;
   animation.velocity = v;

package/lib/module/animation/decay/rigidDecay.js.map

@@ -1 +1 @@
-{"version":3,"names":["SLOPE_FACTOR","VELOCITY_EPS","rigidDecay","animation","now","config","lastTimestamp","startTimestamp","initialVelocity","current","velocity","deltaTime","Math","min","v","exp","deceleration","velocityFactor","clamp","abs"],"sourceRoot":"../../../../src","sources":["animation/decay/rigidDecay.ts"],"mappings":"AAAA,YAAY;;AAEZ,SAASA,YAAY,EAAEC,YAAY,QAAQ,SAAS;AAEpD,OAAO,SAASC,UAAUA,CACxBC,SAA8B,EAC9BC,GAAW,EACXC,MAA0B,EACjB;EACT,SAAS;;EACT,MAAM;IAAEC,aAAa;IAAEC,cAAc;IAAEC,eAAe;IAAEC,OAAO;IAAEC;EAAS,CAAC,GACzEP,SAAS;EAEX,MAAMQ,SAAS,GAAGC,IAAI,CAACC,GAAG,CAACT,GAAG,GAAGE,aAAa,EAAE,EAAE,CAAC;EACnD,MAAMQ,CAAC,GACLJ,QAAQ,GACRE,IAAI,CAACG,GAAG,CACN,EAAE,CAAC,GAAGV,MAAM,CAACW,YAAY,CAAC,IAAIZ,GAAG,GAAGG,cAAc,CAAC,GAAGP,YACxD,CAAC;EACHG,SAAS,CAACM,OAAO,GAAGA,OAAO,GAAIK,CAAC,GAAGT,MAAM,CAACY,cAAc,GAAGN,SAAS,GAAI,IAAI;EAC5ER,SAAS,CAACO,QAAQ,GAAGI,CAAC;EACtBX,SAAS,CAACG,aAAa,GAAGF,GAAG;EAE7B,IAAIC,MAAM,CAACa,KAAK,EAAE;IAChB,IAAIV,eAAe,GAAG,CAAC,IAAIL,SAAS,CAACM,OAAO,IAAIJ,MAAM,CAACa,KAAK,CAAC,CAAC,CAAC,EAAE;MAC/Df,SAAS,CAACM,OAAO,GAAGJ,MAAM,CAACa,KAAK,CAAC,CAAC,CAAC;MACnC,OAAO,IAAI;IACb,CAAC,MAAM,IAAIV,eAAe,GAAG,CAAC,IAAIL,SAAS,CAACM,OAAO,IAAIJ,MAAM,CAACa,KAAK,CAAC,CAAC,CAAC,EAAE;MACtEf,SAAS,CAACM,OAAO,GAAGJ,MAAM,CAACa,KAAK,CAAC,CAAC,CAAC;MACnC,OAAO,IAAI;IACb;EACF;EACA,OAAON,IAAI,CAACO,GAAG,CAACL,CAAC,CAAC,GAAGb,YAAY;AACnC","ignoreList":[]}
+{"version":3,"names":["SLOPE_FACTOR","VELOCITY_EPS","rigidDecay","animation","now","config","lastTimestamp","startTimestamp","initialVelocity","current","velocity","deltaTime","Math","min","max","v","exp","deceleration","velocityFactor","clamp","abs"],"sourceRoot":"../../../../src","sources":["animation/decay/rigidDecay.ts"],"mappings":"AAAA,YAAY;;AAEZ,SAASA,YAAY,EAAEC,YAAY,QAAQ,SAAS;AAEpD,OAAO,SAASC,UAAUA,CACxBC,SAA8B,EAC9BC,GAAW,EACXC,MAA0B,EACjB;EACT,SAAS;;EACT,MAAM;IAAEC,aAAa;IAAEC,cAAc;IAAEC,eAAe;IAAEC,OAAO;IAAEC;EAAS,CAAC,GACzEP,SAAS;EAEX,MAAMQ,SAAS,GAAGC,IAAI,CAACC,GAAG,CAACD,IAAI,CAACE,GAAG,CAACV,GAAG,GAAGE,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;EAChE,MAAMS,CAAC,GACLL,QAAQ,GACRE,IAAI,CAACI,GAAG,CACN,EAAE,CAAC,GAAGX,MAAM,CAACY,YAAY,CAAC,IAAIb,GAAG,GAAGG,cAAc,CAAC,GAAGP,YACxD,CAAC;EACHG,SAAS,CAACM,OAAO,GAAGA,OAAO,GAAIM,CAAC,GAAGV,MAAM,CAACa,cAAc,GAAGP,SAAS,GAAI,IAAI;EAC5ER,SAAS,CAACO,QAAQ,GAAGK,CAAC;EACtBZ,SAAS,CAACG,aAAa,GAAGF,GAAG;EAE7B,IAAIC,MAAM,CAACc,KAAK,EAAE;IAChB,IAAIX,eAAe,GAAG,CAAC,IAAIL,SAAS,CAACM,OAAO,IAAIJ,MAAM,CAACc,KAAK,CAAC,CAAC,CAAC,EAAE;MAC/DhB,SAAS,CAACM,OAAO,GAAGJ,MAAM,CAACc,KAAK,CAAC,CAAC,CAAC;MACnC,OAAO,IAAI;IACb,CAAC,MAAM,IAAIX,eAAe,GAAG,CAAC,IAAIL,SAAS,CAACM,OAAO,IAAIJ,MAAM,CAACc,KAAK,CAAC,CAAC,CAAC,EAAE;MACtEhB,SAAS,CAACM,OAAO,GAAGJ,MAAM,CAACc,KAAK,CAAC,CAAC,CAAC;MACnC,OAAO,IAAI;IACb;EACF;EACA,OAAOP,IAAI,CAACQ,GAAG,CAACL,CAAC,CAAC,GAAGd,YAAY;AACnC","ignoreList":[]}

package/lib/module/animation/decay/rubberBandDecay.js

@@ -11,7 +11,7 @@ export function rubberBandDecay(animation, now, config) {
     current,
     velocity
   } = animation;
-  const deltaTime = Math.min(now - lastTimestamp, 64);
+  const deltaTime = Math.min(Math.max(now - lastTimestamp, 0), 64);
   const clampIndex = Math.abs(current - config.clamp[0]) < Math.abs(current - config.clamp[1]) ? 0 : 1;
   let derivative = 0;
   if (current < config.clamp[0] || current > config.clamp[1]) {

package/lib/module/animation/decay/rubberBandDecay.js.map

@@ -1 +1 @@
-{"version":3,"names":["SLOPE_FACTOR","VELOCITY_EPS","DERIVATIVE_EPS","rubberBandDecay","animation","now","config","lastTimestamp","startTimestamp","current","velocity","deltaTime","Math","min","clampIndex","abs","clamp","derivative","v","exp","deceleration","rubberBandFactor","springActive","velocityFactor"],"sourceRoot":"../../../../src","sources":["animation/decay/rubberBandDecay.ts"],"mappings":"AAAA,YAAY;;AAEZ,SAASA,YAAY,EAAEC,YAAY,QAAQ,SAAS;AAEpD,MAAMC,cAAc,GAAG,GAAG;AAE1B,OAAO,SAASC,eAAeA,CAC7BC,SAA8B,EAC9BC,GAAW,EACXC,MAA6B,EACpB;EACT,SAAS;;EACT,MAAM;IAAEC,aAAa;IAAEC,cAAc;IAAEC,OAAO;IAAEC;EAAS,CAAC,GAAGN,SAAS;EAEtE,MAAMO,SAAS,GAAGC,IAAI,CAACC,GAAG,CAACR,GAAG,GAAGE,aAAa,EAAE,EAAE,CAAC;EACnD,MAAMO,UAAU,GACdF,IAAI,CAACG,GAAG,CAACN,OAAO,GAAGH,MAAM,CAACU,KAAK,CAAC,CAAC,CAAC,CAAC,GAAGJ,IAAI,CAACG,GAAG,CAACN,OAAO,GAAGH,MAAM,CAACU,KAAK,CAAC,CAAC,CAAC,CAAC,GACrE,CAAC,GACD,CAAC;EAEP,IAAIC,UAAU,GAAG,CAAC;EAClB,IAAIR,OAAO,GAAGH,MAAM,CAACU,KAAK,CAAC,CAAC,CAAC,IAAIP,OAAO,GAAGH,MAAM,CAACU,KAAK,CAAC,CAAC,CAAC,EAAE;IAC1DC,UAAU,GAAGR,OAAO,GAAGH,MAAM,CAACU,KAAK,CAACF,UAAU,CAAC;EACjD;EAEA,MAAMI,CAAC,GACLR,QAAQ,GACNE,IAAI,CAACO,GAAG,CACN,EAAE,CAAC,GAAGb,MAAM,CAACc,YAAY,CAAC,IAAIf,GAAG,GAAGG,cAAc,CAAC,GAAGR,YACxD,CAAC,GACHiB,UAAU,GAAGX,MAAM,CAACe,gBAAgB;EAEtC,IAAIT,IAAI,CAACG,GAAG,CAACE,UAAU,CAAC,GAAGf,cAAc,EAAE;IACzCE,SAAS,CAACkB,YAAY,GAAG,IAAI;EAC/B,CAAC,MAAM,IAAIlB,SAAS,CAACkB,YAAY,EAAE;IACjClB,SAAS,CAACK,OAAO,GAAGH,MAAM,CAACU,KAAK,CAACF,UAAU,CAAC;IAC5C,OAAO,IAAI;EACb,CAAC,MAAM,IAAIF,IAAI,CAACG,GAAG,CAACG,CAAC,CAAC,GAAGjB,YAAY,EAAE;IACrC,OAAO,IAAI;EACb;EAEAG,SAAS,CAACK,OAAO,GAAGA,OAAO,GAAIS,CAAC,GAAGZ,MAAM,CAACiB,cAAc,GAAGZ,SAAS,GAAI,IAAI;EAC5EP,SAAS,CAACM,QAAQ,GAAGQ,CAAC;EACtBd,SAAS,CAACG,aAAa,GAAGF,GAAG;EAC7B,OAAO,KAAK;AACd","ignoreList":[]}
+{"version":3,"names":["SLOPE_FACTOR","VELOCITY_EPS","DERIVATIVE_EPS","rubberBandDecay","animation","now","config","lastTimestamp","startTimestamp","current","velocity","deltaTime","Math","min","max","clampIndex","abs","clamp","derivative","v","exp","deceleration","rubberBandFactor","springActive","velocityFactor"],"sourceRoot":"../../../../src","sources":["animation/decay/rubberBandDecay.ts"],"mappings":"AAAA,YAAY;;AAEZ,SAASA,YAAY,EAAEC,YAAY,QAAQ,SAAS;AAEpD,MAAMC,cAAc,GAAG,GAAG;AAE1B,OAAO,SAASC,eAAeA,CAC7BC,SAA8B,EAC9BC,GAAW,EACXC,MAA6B,EACpB;EACT,SAAS;;EACT,MAAM;IAAEC,aAAa;IAAEC,cAAc;IAAEC,OAAO;IAAEC;EAAS,CAAC,GAAGN,SAAS;EAEtE,MAAMO,SAAS,GAAGC,IAAI,CAACC,GAAG,CAACD,IAAI,CAACE,GAAG,CAACT,GAAG,GAAGE,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;EAChE,MAAMQ,UAAU,GACdH,IAAI,CAACI,GAAG,CAACP,OAAO,GAAGH,MAAM,CAACW,KAAK,CAAC,CAAC,CAAC,CAAC,GAAGL,IAAI,CAACI,GAAG,CAACP,OAAO,GAAGH,MAAM,CAACW,KAAK,CAAC,CAAC,CAAC,CAAC,GACrE,CAAC,GACD,CAAC;EAEP,IAAIC,UAAU,GAAG,CAAC;EAClB,IAAIT,OAAO,GAAGH,MAAM,CAACW,KAAK,CAAC,CAAC,CAAC,IAAIR,OAAO,GAAGH,MAAM,CAACW,KAAK,CAAC,CAAC,CAAC,EAAE;IAC1DC,UAAU,GAAGT,OAAO,GAAGH,MAAM,CAACW,KAAK,CAACF,UAAU,CAAC;EACjD;EAEA,MAAMI,CAAC,GACLT,QAAQ,GACNE,IAAI,CAACQ,GAAG,CACN,EAAE,CAAC,GAAGd,MAAM,CAACe,YAAY,CAAC,IAAIhB,GAAG,GAAGG,cAAc,CAAC,GAAGR,YACxD,CAAC,GACHkB,UAAU,GAAGZ,MAAM,CAACgB,gBAAgB;EAEtC,IAAIV,IAAI,CAACI,GAAG,CAACE,UAAU,CAAC,GAAGhB,cAAc,EAAE;IACzCE,SAAS,CAACmB,YAAY,GAAG,IAAI;EAC/B,CAAC,MAAM,IAAInB,SAAS,CAACmB,YAAY,EAAE;IACjCnB,SAAS,CAACK,OAAO,GAAGH,MAAM,CAACW,KAAK,CAACF,UAAU,CAAC;IAC5C,OAAO,IAAI;EACb,CAAC,MAAM,IAAIH,IAAI,CAACI,GAAG,CAACG,CAAC,CAAC,GAAGlB,YAAY,EAAE;IACrC,OAAO,IAAI;EACb;EAEAG,SAAS,CAACK,OAAO,GAAGA,OAAO,GAAIU,CAAC,GAAGb,MAAM,CAACkB,cAAc,GAAGb,SAAS,GAAI,IAAI;EAC5EP,SAAS,CAACM,QAAQ,GAAGS,CAAC;EACtBf,SAAS,CAACG,aAAa,GAAGF,GAAG;EAC7B,OAAO,KAAK;AACd","ignoreList":[]}

package/lib/module/animation/spring/spring.js

@@ -62,7 +62,7 @@ export const withSpring = (toValue, userConfig, callback) => {
         lastTimestamp,
         velocity
       } = animation;
-      const deltaTime = Math.min(now - lastTimestamp, 64);
+      const deltaTime = Math.min(Math.max(now - lastTimestamp, 0), 64);
       animation.lastTimestamp = now;
       const t = deltaTime / 1000;
       const v0 = velocity;
@@ -117,6 +117,13 @@ export const withSpring = (toValue, userConfig, callback) => {
       } else {
         animation.velocity = config.velocity || 0;
       }
+
+      // Clip velocity that would drive the first frame away from the new target.
+      // Inertia is only preserved when it already points toward toValue.
+      const toValueNum = Number(animation.toValue);
+      if (toValueNum > value && animation.velocity < 0 || toValueNum < value && animation.velocity > 0) {
+        animation.velocity = 0;
+      }
       if (triggeredTwice) {
         animation.zeta = previousAnimation?.zeta || 0;
         animation.omega0 = previousAnimation?.omega0 || 0;

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

@@ -1 +1 @@
-{"version":3,"names":["defineAnimation","getReduceMotionForAnimation","GentleSpringConfig","GentleSpringConfigWithDuration","calculateNewStiffnessToMatchDuration","checkIfConfigIsValid","criticallyDampedSpringCalculations","getEnergy","initialCalculations","isAnimationTerminatingCalculation","safeMergeConfigs","scaleZetaToMatchClamps","underDampedSpringCalculations","withSpring","toValue","userConfig","callback","defaultConfig","overshootClamping","energyThreshold","velocity","reduceMotion","undefined","clamp","config","useDuration","duration","dampingRatio","skipAnimation","springOnFrame","animation","now","current","lastTimestamp","deltaTime","Math","min","t","v0","x0","zeta","omega0","omega1","position","newPosition","newVelocity","isTriggeredTwice","previousAnimation","startTimestamp","onStart","value","stiffness","triggeredTwice","startValue","actualDuration","initialEnergy","mass","onFrame"],"sourceRoot":"../../../../src","sources":["animation/spring/spring.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["defineAnimation","getReduceMotionForAnimation","GentleSpringConfig","GentleSpringConfigWithDuration","calculateNewStiffnessToMatchDuration","checkIfConfigIsValid","criticallyDampedSpringCalculations","getEnergy","initialCalculations","isAnimationTerminatingCalculation","safeMergeConfigs","scaleZetaToMatchClamps","underDampedSpringCalculations","withSpring","toValue","userConfig","callback","defaultConfig","overshootClamping","energyThreshold","velocity","reduceMotion","undefined","clamp","config","useDuration","duration","dampingRatio","skipAnimation","springOnFrame","animation","now","current","lastTimestamp","deltaTime","Math","min","max","t","v0","x0","zeta","omega0","omega1","position","newPosition","newVelocity","isTriggeredTwice","previousAnimation","startTimestamp","onStart","value","stiffness","triggeredTwice","startValue","toValueNum","Number","actualDuration","initialEnergy","mass","onFrame"],"sourceRoot":"../../../../src","sources":["animation/spring/spring.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/animation/spring/springUtils.js

@@ -83,7 +83,7 @@ export function initialCalculations(stiffness = 0, config) {
      * https://courses.lumenlearning.com/suny-osuniversityphysics/chapter/15-5-damped-oscillations/
      */
     const omega0 = Math.sqrt(stiffness / m);
-    const omega1 = omega0 * Math.sqrt(1 - zeta ** 2);
+    const omega1 = zeta < 1 ? omega0 * Math.sqrt(1 - zeta ** 2) : 0;
     return {
       zeta,
       omega0,
@@ -97,7 +97,7 @@ export function initialCalculations(stiffness = 0, config) {
     } = config;
     const zeta = c / (2 * Math.sqrt(k * m)); // damping ratio
     const omega0 = Math.sqrt(k / m); // undamped angular frequency of the oscillator (rad/ms)
-    const omega1 = omega0 * Math.sqrt(1 - zeta ** 2); // exponential decay
+    const omega1 = zeta < 1 ? omega0 * Math.sqrt(1 - zeta ** 2) : 0; // exponential decay
 
     return {
       zeta,

package/lib/module/animation/spring/springUtils.js.map

@@ -1 +1 @@
-{"version":3,"names":["logger","checkIfConfigIsValid","config","errorMessage","forEach","prop","value","duration","clamp","min","max","warn","safeMergeConfigs","defaults","userConfig","filtered","Object","fromEntries","entries","filter","v","undefined","bisectRoot","func","precision","maxIterations","direction","idx","current","Math","abs","initialCalculations","stiffness","skipAnimation","zeta","omega0","omega1","useDuration","mass","m","dampingRatio","sqrt","damping","c","k","scaleZetaToMatchClamps","animation","toValue","startValue","toValueNum","Number","firstBound","secondBound","relativeExtremum1","relativeExtremum2","newZeta1","log","PI","newZeta2","zetaSatisfyingClamp","x","getEnergy","displacement","velocity","potentialEnergy","kineticEnergy","calculateNewStiffnessToMatchDuration","x0","v0","energyThreshold","threshold","targetDuration","energyDiffForStiffness","perceptualCoefficient","MILLISECONDS_IN_SECOND","settlingDuration","xtk","exp","vtk","e0","etk","energyFraction","EPSILON","criticallyDampedSpringCalculations","precalculatedValues","t","criticallyDampedEnvelope","criticallyDampedPosition","criticallyDampedVelocity","position","underDampedSpringCalculations","sin1","sin","cos1","cos","underDampedEnvelope","underDampedFrag1","underDampedPosition","underDampedVelocity","isAnimationTerminatingCalculation","initialEnergy","overshootClamping","leftBound","rightBound","currentEnergy"],"sourceRoot":"../../../../src","sources":["animation/spring/springUtils.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["logger","checkIfConfigIsValid","config","errorMessage","forEach","prop","value","duration","clamp","min","max","warn","safeMergeConfigs","defaults","userConfig","filtered","Object","fromEntries","entries","filter","v","undefined","bisectRoot","func","precision","maxIterations","direction","idx","current","Math","abs","initialCalculations","stiffness","skipAnimation","zeta","omega0","omega1","useDuration","mass","m","dampingRatio","sqrt","damping","c","k","scaleZetaToMatchClamps","animation","toValue","startValue","toValueNum","Number","firstBound","secondBound","relativeExtremum1","relativeExtremum2","newZeta1","log","PI","newZeta2","zetaSatisfyingClamp","x","getEnergy","displacement","velocity","potentialEnergy","kineticEnergy","calculateNewStiffnessToMatchDuration","x0","v0","energyThreshold","threshold","targetDuration","energyDiffForStiffness","perceptualCoefficient","MILLISECONDS_IN_SECOND","settlingDuration","xtk","exp","vtk","e0","etk","energyFraction","EPSILON","criticallyDampedSpringCalculations","precalculatedValues","t","criticallyDampedEnvelope","criticallyDampedPosition","criticallyDampedVelocity","position","underDampedSpringCalculations","sin1","sin","cos1","cos","underDampedEnvelope","underDampedFrag1","underDampedPosition","underDampedVelocity","isAnimationTerminatingCalculation","initialEnergy","overshootClamping","leftBound","rightBound","currentEnergy"],"sourceRoot":"../../../../src","sources":["animation/spring/springUtils.ts"],"mappings":"AAAA,YAAY;;AACZ,SAASA,MAAM,QAAQ,cAAc;;AAIrC;AACA;;AA+BA,OAAO,SAASC,oBAAoBA,CAACC,MAA2B,EAAW;EACzE,SAAS;;EACT,IAAIC,YAAY,GAAG,EAAE;EAEnB,CAAC,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,CAAC,CACnEC,OAAO,CAAEC,IAAI,IAAK;IAClB,MAAMC,KAAK,GAAGJ,MAAM,CAACG,IAAI,CAAC;IAC1B,IAAIC,KAAK,IAAI,CAAC,EAAE;MACdH,YAAY,IAAI,KAAKE,IAAI,qCAAqCC,KAAK,EAAE;IACvE;EACF,CAAC,CAAC;EAEF,IAAIJ,MAAM,CAACK,QAAQ,GAAG,CAAC,EAAE;IACvBJ,YAAY,IAAI,qCAAqCD,MAAM,CAACK,QAAQ,EAAE;EACxE;EAEA,IACEL,MAAM,CAACM,KAAK,EAAEC,GAAG,IACjBP,MAAM,CAACM,KAAK,EAAEE,GAAG,IACjBR,MAAM,CAACM,KAAK,CAACC,GAAG,GAAGP,MAAM,CAACM,KAAK,CAACE,GAAG,EACnC;IACAP,YAAY,IAAI,gEAAgED,MAAM,CAACM,KAAK,CAACC,GAAG,UAAUP,MAAM,CAACM,KAAK,CAACE,GAAG,IAAI;EAChI;EAEA,IAAIP,YAAY,KAAK,EAAE,EAAE;IACvBH,MAAM,CAACW,IAAI,CAAC,uBAAuB,GAAGR,YAAY,CAAC;EACrD;EAEA,OAAOA,YAAY,KAAK,EAAE;AAC5B;AAEA,OAAO,SAASS,gBAAgBA,CAC9BC,QAAiB,EACjBC,UAA6B,EACpB;EACT,SAAS;;EACT,IAAI,CAACA,UAAU,EAAE;IACf,OAAOD,QAAQ;EACjB;EAEA,MAAME,QAAQ,GAAGC,MAAM,CAACC,WAAW,CACjCD,MAAM,CAACE,OAAO,CAACJ,UAAU,CAAC,CAACK,MAAM,CAAC,CAAC,GAAGC,CAAC,CAAC,KAAKA,CAAC,KAAKC,SAAS,CAC9D,CAAqB;EAErB,OAAO;IACL,GAAGR,QAAQ;IACX,GAAGE;EACL,CAAC;AACH;AAEA,SAASO,UAAUA,CAAC;EAClBb,GAAG;EACHC,GAAG;EACHa,IAAI;EACJC,SAAS;EACTC,aAAa,GAAG;AAOlB,CAAC,EAAE;EACD,SAAS;;EACT,MAAMC,SAAS,GAAGH,IAAI,CAACb,GAAG,CAAC,IAAIa,IAAI,CAACd,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;EACjD,IAAIkB,GAAG,GAAGF,aAAa;EACvB,IAAIG,OAAO,GAAG,CAAClB,GAAG,GAAGD,GAAG,IAAI,CAAC;EAC7B,OAAOoB,IAAI,CAACC,GAAG,CAACP,IAAI,CAACK,OAAO,CAAC,CAAC,GAAGJ,SAAS,IAAIG,GAAG,GAAG,CAAC,EAAE;IACrDA,GAAG,IAAI,CAAC;IAER,IAAIJ,IAAI,CAACK,OAAO,CAAC,GAAGF,SAAS,GAAG,CAAC,EAAE;MACjCjB,GAAG,GAAGmB,OAAO;IACf,CAAC,MAAM;MACLlB,GAAG,GAAGkB,OAAO;IACf;IACAA,OAAO,GAAG,CAACnB,GAAG,GAAGC,GAAG,IAAI,CAAC;EAC3B;EACA,OAAOkB,OAAO;AAChB;AAEA,OAAO,SAASG,mBAAmBA,CACjCC,SAAS,GAAG,CAAC,EACb9B,MAA+C,EAK/C;EACA,SAAS;;EAET,IAAIA,MAAM,CAAC+B,aAAa,EAAE;IACxB,OAAO;MAAEC,IAAI,EAAE,CAAC;MAAEC,MAAM,EAAE,CAAC;MAAEC,MAAM,EAAE;IAAE,CAAC;EAC1C;EAEA,IAAIlC,MAAM,CAACmC,WAAW,EAAE;IACtB,MAAM;MAAEC,IAAI,EAAEC,CAAC;MAAEC,YAAY,EAAEN;IAAK,CAAC,GAAGhC,MAAM;;IAE9C;AACJ;AACA;AACA;AACA;IACI,MAAMiC,MAAM,GAAGN,IAAI,CAACY,IAAI,CAACT,SAAS,GAAGO,CAAC,CAAC;IACvC,MAAMH,MAAM,GAAGF,IAAI,GAAG,CAAC,GAAGC,MAAM,GAAGN,IAAI,CAACY,IAAI,CAAC,CAAC,GAAGP,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC;IAE/D,OAAO;MAAEA,IAAI;MAAEC,MAAM;MAAEC;IAAO,CAAC;EACjC,CAAC,MAAM;IACL,MAAM;MAAEM,OAAO,EAAEC,CAAC;MAAEL,IAAI,EAAEC,CAAC;MAAEP,SAAS,EAAEY;IAAE,CAAC,GAAG1C,MAAM;IAEpD,MAAMgC,IAAI,GAAGS,CAAC,IAAI,CAAC,GAAGd,IAAI,CAACY,IAAI,CAACG,CAAC,GAAGL,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,MAAMJ,MAAM,GAAGN,IAAI,CAACY,IAAI,CAACG,CAAC,GAAGL,CAAC,CAAC,CAAC,CAAC;IACjC,MAAMH,MAAM,GAAGF,IAAI,GAAG,CAAC,GAAGC,MAAM,GAAGN,IAAI,CAACY,IAAI,CAAC,CAAC,GAAGP,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;;IAEjE,OAAO;MAAEA,IAAI;MAAEC,MAAM;MAAEC;IAAO,CAAC;EACjC;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASS,sBAAsBA,CACpCC,SAA0B,EAC1BtC,KAAqC,EAC7B;EACR,SAAS;;EACT,MAAM;IAAE0B,IAAI;IAAEa,OAAO;IAAEC;EAAW,CAAC,GAAGF,SAAS;EAC/C,MAAMG,UAAU,GAAGC,MAAM,CAACH,OAAO,CAAC;EAElC,IAAIC,UAAU,KAAK,CAAC,EAAE;IACpB,OAAOd,IAAI;EACb;EAEA,MAAM,CAACiB,UAAU,EAAEC,WAAW,CAAC,GAC7BJ,UAAU,IAAI,CAAC,GAAG,CAACxC,KAAK,CAACC,GAAG,EAAED,KAAK,CAACE,GAAG,CAAC,GAAG,CAACF,KAAK,CAACE,GAAG,EAAEF,KAAK,CAACC,GAAG,CAAC;;EAEnE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;EAEE,MAAM4C,iBAAiB,GACrBD,WAAW,KAAK/B,SAAS,GACrBQ,IAAI,CAACC,GAAG,CAAC,CAACsB,WAAW,GAAGH,UAAU,IAAID,UAAU,CAAC,GACjD3B,SAAS;EAEf,MAAMiC,iBAAiB,GACrBH,UAAU,KAAK9B,SAAS,GACpBQ,IAAI,CAACC,GAAG,CAAC,CAACqB,UAAU,GAAGF,UAAU,IAAID,UAAU,CAAC,GAChD3B,SAAS;;EAEf;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;EAEE,MAAMkC,QAAQ,GACZF,iBAAiB,KAAKhC,SAAS,GAC3BQ,IAAI,CAACC,GAAG,CAACD,IAAI,CAAC2B,GAAG,CAACH,iBAAiB,CAAC,GAAGxB,IAAI,CAAC4B,EAAE,CAAC,GAC/CpC,SAAS;EAEf,MAAMqC,QAAQ,GACZJ,iBAAiB,KAAKjC,SAAS,GAC3BQ,IAAI,CAACC,GAAG,CAACD,IAAI,CAAC2B,GAAG,CAACF,iBAAiB,CAAC,IAAI,CAAC,GAAGzB,IAAI,CAAC4B,EAAE,CAAC,CAAC,GACrDpC,SAAS;EAEf,MAAMsC,mBAAmB,GAAG,CAACJ,QAAQ,EAAEG,QAAQ,CAAC,CAACvC,MAAM,CACpDyC,CAAqB,IAAkBA,CAAC,KAAKvC,SAChD,CAAC;EACD;EACA;EACA,OAAOQ,IAAI,CAACnB,GAAG,CAAC,GAAGiD,mBAAmB,EAAEzB,IAAI,CAAC;AAC/C;AAEA,OAAO,SAAS2B,SAASA,CACvBC,YAAoB,EACpBC,QAAgB,EAChB/B,SAAiB,EACjBM,IAAY,EACZ;EACA,SAAS;;EACT,MAAM0B,eAAe,GAAG,GAAG,GAAGhC,SAAS,GAAG8B,YAAY,IAAI,CAAC;EAC3D,MAAMG,aAAa,GAAG,GAAG,GAAG3B,IAAI,GAAGyB,QAAQ,IAAI,CAAC;EAChD,OAAOC,eAAe,GAAGC,aAAa;AACxC;;AAEA;AACA,OAAO,SAASC,oCAAoCA,CAClDC,EAAU,EACVjE,MAA+C,EAC/CkE,EAAU,EACV;EACA,SAAS;;EACT,IAAIlE,MAAM,CAAC+B,aAAa,EAAE;IACxB,OAAO,CAAC;EACV;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAM;IACJO,YAAY,EAAEN,IAAI;IAClBmC,eAAe,EAAEC,SAAS;IAC1BhC,IAAI,EAAEC,CAAC;IACPhC,QAAQ,EAAEgE;EACZ,CAAC,GAAGrE,MAAM;EAEV,MAAMsE,sBAAsB,GAAIxC,SAAiB,IAAK;IACpD,SAAS;;IACT,MAAMyC,qBAAqB,GAAG,GAAG;IACjC,MAAMC,sBAAsB,GAAG,IAAI;IAEnC,MAAMC,gBAAgB,GACnBJ,cAAc,GAAGE,qBAAqB,GAAIC,sBAAsB;IACnE,MAAMvC,MAAM,GAAGN,IAAI,CAACY,IAAI,CAACT,SAAS,GAAGO,CAAC,CAAC,GAAGL,IAAI;IAE9C,MAAM0C,GAAG,GACP,CAACT,EAAE,GAAG,CAACC,EAAE,GAAGD,EAAE,GAAGhC,MAAM,IAAIwC,gBAAgB,IAC3C9C,IAAI,CAACgD,GAAG,CAAC,CAAC1C,MAAM,GAAGwC,gBAAgB,CAAC;IAEtC,MAAMG,GAAG,GACP,CAACX,EAAE,GAAG,CAACC,EAAE,GAAGD,EAAE,GAAGhC,MAAM,IAAIwC,gBAAgB,IACzC9C,IAAI,CAACgD,GAAG,CAAC,CAAC1C,MAAM,GAAGwC,gBAAgB,CAAC,GACpC,CAACxC,MAAM,GACT,CAACiC,EAAE,GAAGD,EAAE,GAAGhC,MAAM,IAAIN,IAAI,CAACgD,GAAG,CAAC,CAAC1C,MAAM,GAAGwC,gBAAgB,CAAC;IAE3D,MAAMI,EAAE,GAAGlB,SAAS,CAACM,EAAE,EAAEC,EAAE,EAAEpC,SAAS,EAAEO,CAAC,CAAC;IAE1C,MAAMyC,GAAG,GAAGnB,SAAS,CAACe,GAAG,EAAEE,GAAG,EAAE9C,SAAS,EAAEO,CAAC,CAAC;IAE7C,MAAM0C,cAAc,GAAGD,GAAG,GAAGD,EAAE;IAE/B,OAAOE,cAAc,GAAGX,SAAS;EACnC,CAAC;EAED,MAAM9C,SAAS,GAAGtB,MAAM,CAACmE,eAAe,GAAG,IAAI,CAAC,CAAC;;EAEjD;EACA,OAAO/C,UAAU,CAAC;IAChBb,GAAG,EAAEyC,MAAM,CAACgC,OAAO;IACnBxE,GAAG,EAAE,GAAG,CAAC;IACTa,IAAI,EAAEiD,sBAAsB;IAC5BhD,SAAS;IACTC,aAAa,EAAE;EACjB,CAAC,CAAC;AACJ;AAEA,OAAO,SAAS0D,kCAAkCA,CAChDrC,SAA+B,EAC/BsC,mBAKC,EACuC;EACxC,SAAS;;EACT,MAAM;IAAErC;EAAQ,CAAC,GAAGD,SAAS;EAE7B,MAAM;IAAEsB,EAAE;IAAED,EAAE;IAAEhC,MAAM;IAAEkD;EAAE,CAAC,GAAGD,mBAAmB;EAEjD,MAAME,wBAAwB,GAAGzD,IAAI,CAACgD,GAAG,CAAC,CAAC1C,MAAM,GAAGkD,CAAC,CAAC;EACtD,MAAME,wBAAwB,GAC5BxC,OAAO,GAAGuC,wBAAwB,IAAInB,EAAE,GAAG,CAACC,EAAE,GAAGjC,MAAM,GAAGgC,EAAE,IAAIkB,CAAC,CAAC;EAEpE,MAAMG,wBAAwB,GAC5BF,wBAAwB,GAAG,CAACnD,MAAM,IAAIgC,EAAE,GAAG,CAACC,EAAE,GAAGjC,MAAM,GAAGgC,EAAE,IAAIkB,CAAC,CAAC,GAClEC,wBAAwB,IAAIlB,EAAE,GAAGjC,MAAM,GAAGgC,EAAE,CAAC;EAE/C,OAAO;IACLsB,QAAQ,EAAEF,wBAAwB;IAClCxB,QAAQ,EAAEyB;EACZ,CAAC;AACH;AAEA,OAAO,SAASE,6BAA6BA,CAC3C5C,SAA+B,EAC/BsC,mBAOC,EACuC;EACxC,SAAS;;EACT,MAAM;IAAErC;EAAQ,CAAC,GAAGD,SAAS;EAE7B,MAAM;IAAEZ,IAAI;IAAEmD,CAAC;IAAElD,MAAM;IAAEC,MAAM;IAAE+B,EAAE;IAAEC;EAAG,CAAC,GAAGgB,mBAAmB;EAE/D,MAAMO,IAAI,GAAG9D,IAAI,CAAC+D,GAAG,CAACxD,MAAM,GAAGiD,CAAC,CAAC;EACjC,MAAMQ,IAAI,GAAGhE,IAAI,CAACiE,GAAG,CAAC1D,MAAM,GAAGiD,CAAC,CAAC;;EAEjC;EACA,MAAMU,mBAAmB,GAAGlE,IAAI,CAACgD,GAAG,CAAC,CAAC3C,IAAI,GAAGC,MAAM,GAAGkD,CAAC,CAAC;EACxD,MAAMW,gBAAgB,GACpBD,mBAAmB,IAClBJ,IAAI,IAAI,CAACvB,EAAE,GAAGlC,IAAI,GAAGC,MAAM,GAAGgC,EAAE,IAAI/B,MAAM,CAAC,GAAG+B,EAAE,GAAG0B,IAAI,CAAC;EAE3D,MAAMI,mBAAmB,GAAGlD,OAAO,GAAGiD,gBAAgB;EACtD;EACA,MAAME,mBAAmB,GACvB,CAAChE,IAAI,GAAGC,MAAM,GAAG6D,gBAAgB,GACjCD,mBAAmB,IAChBF,IAAI,IAAIzB,EAAE,GAAGlC,IAAI,GAAGC,MAAM,GAAGgC,EAAE,CAAC,GAAG/B,MAAM,GAAG+B,EAAE,GAAGwB,IAAI,CAAC;EAE3D,OAAO;IAAEF,QAAQ,EAAEQ,mBAAmB;IAAElC,QAAQ,EAAEmC;EAAoB,CAAC;AACzE;AAEA,OAAO,SAASC,iCAAiCA,CAC/CrD,SAA+B,EAC/B5C,MAA+C,EACtC;EACT,SAAS;;EACT,MAAM;IAAE6C,OAAO;IAAEgB,QAAQ;IAAEf,UAAU;IAAEpB,OAAO;IAAEwE;EAAc,CAAC,GAAGtD,SAAS;EAE3E,IAAI5C,MAAM,CAACmG,iBAAiB,EAAE;IAC5B,MAAMC,SAAS,GAAGtD,UAAU,IAAI,CAAC,GAAGD,OAAO,GAAGA,OAAO,GAAGC,UAAU;IAClE,MAAMuD,UAAU,GAAGD,SAAS,GAAGzE,IAAI,CAACC,GAAG,CAACkB,UAAU,CAAC;IACnD,IAAIpB,OAAO,GAAG0E,SAAS,IAAI1E,OAAO,GAAG2E,UAAU,EAAE;MAC/C,OAAO,IAAI;IACb;EACF;EACA,MAAMC,aAAa,GAAG3C,SAAS,CAC7Bd,OAAO,GAAGnB,OAAO,EACjBmC,QAAQ,EACR7D,MAAM,CAAC8B,SAAS,EAChB9B,MAAM,CAACoC,IACT,CAAC;EAED,OACE8D,aAAa,KAAK,CAAC,IACnBI,aAAa,GAAGJ,aAAa,IAAIlG,MAAM,CAACmE,eAAe;AAE3D","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.3.3';
+export const jsVersion = '4.3.4';
 //# sourceMappingURL=jsVersion.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"spring.d.ts","sourceRoot":"","sources":["../../../../src/animation/spring/spring.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EAEf,iBAAiB,EAElB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAwBpD,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;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,UAAU,EAsMjB,cAAc,CAAC"}
+{"version":3,"file":"spring.d.ts","sourceRoot":"","sources":["../../../../src/animation/spring/spring.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EAEf,iBAAiB,EAElB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAwBpD,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;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,UAAU,EAgNjB,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.3.3";
+export declare const jsVersion = "4.3.4";
 //# sourceMappingURL=jsVersion.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "4.3.3",
+  "version": "4.3.4",
   "description": "More powerful alternative to Animated library for React Native.",
   "keywords": [
     "react-native",

package/src/animation/decay/rigidDecay.ts

@@ -11,7 +11,7 @@ export function rigidDecay(
   const { lastTimestamp, startTimestamp, initialVelocity, current, velocity } =
     animation;
 
-  const deltaTime = Math.min(now - lastTimestamp, 64);
+  const deltaTime = Math.min(Math.max(now - lastTimestamp, 0), 64);
   const v =
     velocity *
     Math.exp(

package/src/animation/decay/rubberBandDecay.ts

@@ -12,7 +12,7 @@ export function rubberBandDecay(
   'worklet';
   const { lastTimestamp, startTimestamp, current, velocity } = animation;
 
-  const deltaTime = Math.min(now - lastTimestamp, 64);
+  const deltaTime = Math.min(Math.max(now - lastTimestamp, 0), 64);
   const clampIndex =
     Math.abs(current - config.clamp[0]) < Math.abs(current - config.clamp[1])
       ? 0

package/src/animation/spring/spring.ts

@@ -103,7 +103,7 @@ export const withSpring = ((
       }
       const { lastTimestamp, velocity } = animation;
 
-      const deltaTime = Math.min(now - lastTimestamp, 64);
+      const deltaTime = Math.min(Math.max(now - lastTimestamp, 0), 64);
       animation.lastTimestamp = now;
 
       const t = deltaTime / 1000;
@@ -186,6 +186,16 @@ export const withSpring = ((
         animation.velocity = config.velocity || 0;
       }
 
+      // Clip velocity that would drive the first frame away from the new target.
+      // Inertia is only preserved when it already points toward toValue.
+      const toValueNum = Number(animation.toValue);
+      if (
+        (toValueNum > value && animation.velocity < 0) ||
+        (toValueNum < value && animation.velocity > 0)
+      ) {
+        animation.velocity = 0;
+      }
+
       if (triggeredTwice) {
         animation.zeta = previousAnimation?.zeta || 0;
         animation.omega0 = previousAnimation?.omega0 || 0;

package/src/animation/spring/springUtils.ts

@@ -138,7 +138,7 @@ export function initialCalculations(
      * https://courses.lumenlearning.com/suny-osuniversityphysics/chapter/15-5-damped-oscillations/
      */
     const omega0 = Math.sqrt(stiffness / m);
-    const omega1 = omega0 * Math.sqrt(1 - zeta ** 2);
+    const omega1 = zeta < 1 ? omega0 * Math.sqrt(1 - zeta ** 2) : 0;
 
     return { zeta, omega0, omega1 };
   } else {
@@ -146,7 +146,7 @@ export function initialCalculations(
 
     const zeta = c / (2 * Math.sqrt(k * m)); // damping ratio
     const omega0 = Math.sqrt(k / m); // undamped angular frequency of the oscillator (rad/ms)
-    const omega1 = omega0 * Math.sqrt(1 - zeta ** 2); // exponential decay
+    const omega1 = zeta < 1 ? omega0 * Math.sqrt(1 - zeta ** 2) : 0; // exponential decay
 
     return { zeta, omega0, omega1 };
   }

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.3.3';
+export const jsVersion = '4.3.4';