react-native-smooth-clip-view 0.3.0 → 0.4.0

package/ios/SmoothClipTurboModule.h

@@ -9,14 +9,16 @@ namespace facebook::react {
 struct SmoothClipAnimationCompletion {
   double driverId;
   int32_t animationId;
+  int32_t completionTag;
   bool finished;
 };
 
 struct SmoothClipGroupAnimationCompletion {
   double controllerId;
   int32_t groupId;
+  int32_t completionTag;
   bool finished;
-  std::vector<double> driverIds;
+  std::vector<double> snapshots;
 };
 
 template <>
@@ -28,6 +30,8 @@ struct Bridging<SmoothClipAnimationCompletion> {
         value.getProperty(runtime, "driverId").asNumber(),
         static_cast<int32_t>(
             value.getProperty(runtime, "animationId").asNumber()),
+        static_cast<int32_t>(
+            value.getProperty(runtime, "completionTag").asNumber()),
         value.getProperty(runtime, "finished").getBool()};
   }
 
@@ -37,6 +41,7 @@ struct Bridging<SmoothClipAnimationCompletion> {
     jsi::Object result(runtime);
     result.setProperty(runtime, "driverId", value.driverId);
     result.setProperty(runtime, "animationId", value.animationId);
+    result.setProperty(runtime, "completionTag", value.completionTag);
     result.setProperty(runtime, "finished", value.finished);
     return result;
   }
@@ -48,18 +53,20 @@ struct Bridging<SmoothClipGroupAnimationCompletion> {
       jsi::Runtime &runtime,
       const jsi::Object &value) {
     const jsi::Array ids =
-        value.getProperty(runtime, "driverIds").asObject(runtime).asArray(runtime);
-    std::vector<double> driverIds;
-    driverIds.reserve(ids.size(runtime));
+        value.getProperty(runtime, "snapshots").asObject(runtime).asArray(runtime);
+    std::vector<double> snapshots;
+    snapshots.reserve(ids.size(runtime));
     for (size_t index = 0; index < ids.size(runtime); index += 1) {
-      driverIds.push_back(ids.getValueAtIndex(runtime, index).asNumber());
+      snapshots.push_back(ids.getValueAtIndex(runtime, index).asNumber());
     }
     return {
         value.getProperty(runtime, "controllerId").asNumber(),
         static_cast<int32_t>(
             value.getProperty(runtime, "groupId").asNumber()),
+        static_cast<int32_t>(
+            value.getProperty(runtime, "completionTag").asNumber()),
         value.getProperty(runtime, "finished").getBool(),
-        std::move(driverIds),
+        std::move(snapshots),
     };
   }
 
@@ -69,12 +76,13 @@ struct Bridging<SmoothClipGroupAnimationCompletion> {
     jsi::Object result(runtime);
     result.setProperty(runtime, "controllerId", value.controllerId);
     result.setProperty(runtime, "groupId", value.groupId);
+    result.setProperty(runtime, "completionTag", value.completionTag);
     result.setProperty(runtime, "finished", value.finished);
-    jsi::Array driverIds(runtime, value.driverIds.size());
-    for (size_t index = 0; index < value.driverIds.size(); index += 1) {
-      driverIds.setValueAtIndex(runtime, index, value.driverIds[index]);
+    jsi::Array snapshots(runtime, value.snapshots.size());
+    for (size_t index = 0; index < value.snapshots.size(); index += 1) {
+      snapshots.setValueAtIndex(runtime, index, value.snapshots[index]);
     }
-    result.setProperty(runtime, "driverIds", std::move(driverIds));
+    result.setProperty(runtime, "snapshots", std::move(snapshots));
     return result;
   }
 };
@@ -85,18 +93,17 @@ class SmoothClipTurboModule final
   explicit SmoothClipTurboModule(std::shared_ptr<CallInvoker> jsInvoker);
   ~SmoothClipTurboModule() override;
 
-  int32_t getPresentationProtocolVersion(jsi::Runtime &runtime);
   bool supportsAutonomousComplexPathAnimation(jsi::Runtime &runtime);
-  jsi::Array beginGroupInteractionV2(
+  jsi::Array beginGroupInteraction(
       jsi::Runtime &runtime,
       jsi::Array driverIds);
-  jsi::Array snapshotGroupV2(
+  jsi::Array snapshotGroup(
       jsi::Runtime &runtime,
       jsi::Array driverIds);
-  bool setClipPresentationBatchV2(
+  bool setClipPresentationBatch(
       jsi::Runtime &runtime,
       jsi::Array entries);
-  int32_t animateTimingGroupV2(
+  int32_t animateTimingGroup(
       jsi::Runtime &runtime,
       double controllerId,
       jsi::Array entries,
@@ -106,160 +113,33 @@ class SmoothClipTurboModule final
       double controlPoint2X,
       double controlPoint2Y,
       int32_t reduceMotion,
-      int32_t suspensionPolicy);
-  int32_t animateSpringGroupV2(
+      int32_t completionTag,
+      double startTimestamp);
+  int32_t animateSpringGroup(
       jsi::Runtime &runtime,
       double controllerId,
       jsi::Array entries,
       double mass,
       double stiffness,
       double damping,
-      double initialVelocity,
-      bool inheritVelocity,
-      int32_t reduceMotion,
-      int32_t suspensionPolicy);
-  int32_t animateKeyframesGroupV2(
-      jsi::Runtime &runtime,
-      double controllerId,
-      jsi::Array entries,
-      double durationMs,
+      double velocity,
+      double energyThreshold,
       int32_t reduceMotion,
-      int32_t suspensionPolicy);
-  jsi::Array cancelAnimationGroupV2(
+      int32_t completionTag,
+      double startTimestamp);
+  jsi::Array cancelAnimationGroup(
       jsi::Runtime &runtime,
       int32_t groupId,
       int32_t behavior);
-  void setClipPresentationV2(
-      jsi::Runtime &runtime,
-      double driverId,
-      double x,
-      double y,
-      double width,
-      double height,
-      double topLeftRadius,
-      double topRightRadius,
-      double bottomRightRadius,
-      double bottomLeftRadius,
-      int32_t curveCode,
-      double contentTranslateX,
-      double contentTranslateY,
-      double contentScale,
-      bool takeOwnership,
-      bool overridePendingAnimation);
-  jsi::Array beginInteractionV2(jsi::Runtime &runtime, double driverId);
-  jsi::Array snapshotCurrentV2(jsi::Runtime &runtime, double driverId);
-
   void setClipPresentation(
       jsi::Runtime &runtime,
       double driverId,
-      double x,
-      double y,
-      double width,
-      double height,
-      double radius,
-      double contentTranslateX,
-      double contentTranslateY,
+      jsi::Array presentation,
       bool takeOwnership,
       bool overridePendingAnimation);
-  jsi::Array beginInteraction(jsi::Runtime &runtime, double driverId);
-  int32_t animateTiming(
-      jsi::Runtime &runtime,
-      double driverId,
-      bool hasInteractiveStart,
-      double startX,
-      double startY,
-      double startWidth,
-      double startHeight,
-      double startRadius,
-      double startContentTranslateX,
-      double startContentTranslateY,
-      double x,
-      double y,
-      double width,
-      double height,
-      double radius,
-      double contentTranslateX,
-      double contentTranslateY,
-      double durationMs,
-      double controlPoint1X,
-      double controlPoint1Y,
-      double controlPoint2X,
-      double controlPoint2Y,
-      int32_t reduceMotion);
-  int32_t animateTimingV2(
-      jsi::Runtime &runtime,
-      double driverId,
-      bool hasInteractiveStart,
-      double startX,
-      double startY,
-      double startWidth,
-      double startHeight,
-      double startTopLeftRadius,
-      double startTopRightRadius,
-      double startBottomRightRadius,
-      double startBottomLeftRadius,
-      int32_t startCurveCode,
-      double startContentTranslateX,
-      double startContentTranslateY,
-      double startContentScale,
-      double x,
-      double y,
-      double width,
-      double height,
-      double topLeftRadius,
-      double topRightRadius,
-      double bottomRightRadius,
-      double bottomLeftRadius,
-      int32_t curveCode,
-      double contentTranslateX,
-      double contentTranslateY,
-      double contentScale,
-      double durationMs,
-      double controlPoint1X,
-      double controlPoint1Y,
-      double controlPoint2X,
-      double controlPoint2Y,
-      int32_t reduceMotion);
-  int32_t animateSpring(
-      jsi::Runtime &runtime,
-      double driverId,
-      bool hasInteractiveStart,
-      double startX,
-      double startY,
-      double startWidth,
-      double startHeight,
-      double startRadius,
-      double startContentTranslateX,
-      double startContentTranslateY,
-      double x,
-      double y,
-      double width,
-      double height,
-      double radius,
-      double contentTranslateX,
-      double contentTranslateY,
-      double mass,
-      double stiffness,
-      double damping,
-      double initialVelocity,
-      bool inheritVelocity,
-      int32_t reduceMotion);
-  int32_t animateSpringV2(
+  void setClipFrameScalars(
       jsi::Runtime &runtime,
       double driverId,
-      bool hasInteractiveStart,
-      double startX,
-      double startY,
-      double startWidth,
-      double startHeight,
-      double startTopLeftRadius,
-      double startTopRightRadius,
-      double startBottomRightRadius,
-      double startBottomLeftRadius,
-      int32_t startCurveCode,
-      double startContentTranslateX,
-      double startContentTranslateY,
-      double startContentScale,
       double x,
       double y,
       double width,
@@ -272,171 +152,48 @@ class SmoothClipTurboModule final
       double contentTranslateX,
       double contentTranslateY,
       double contentScale,
-      double mass,
-      double stiffness,
-      double damping,
-      double initialVelocity,
-      bool inheritVelocity,
-      int32_t reduceMotion);
-  int32_t animateKeyframes(
-      jsi::Runtime &runtime,
-      double driverId,
-      bool hasInteractiveStart,
-      double startX,
-      double startY,
-      double startWidth,
-      double startHeight,
-      double startRadius,
-      double startContentTranslateX,
-      double startContentTranslateY,
-      double x,
-      double y,
-      double width,
-      double height,
-      double radius,
-      double contentTranslateX,
-      double contentTranslateY,
-      double durationMs,
-      jsi::Array frames,
-      int32_t reduceMotion);
-  int32_t animateKeyframesV2(
+      bool shadowEnabled,
+      double shadowRed,
+      double shadowGreen,
+      double shadowBlue,
+      double shadowAlpha,
+      double shadowOffsetX,
+      double shadowOffsetY,
+      double shadowBlurRadius,
+      double shadowSpreadDistance);
+  jsi::Array beginInteraction(jsi::Runtime &runtime, double driverId);
+  jsi::Array snapshotCurrent(jsi::Runtime &runtime, double driverId);
+
+  int32_t animateTiming(
       jsi::Runtime &runtime,
       double driverId,
-      bool hasInteractiveStart,
-      double startX,
-      double startY,
-      double startWidth,
-      double startHeight,
-      double startTopLeftRadius,
-      double startTopRightRadius,
-      double startBottomRightRadius,
-      double startBottomLeftRadius,
-      int32_t startCurveCode,
-      double startContentTranslateX,
-      double startContentTranslateY,
-      double startContentScale,
-      double x,
-      double y,
-      double width,
-      double height,
-      double topLeftRadius,
-      double topRightRadius,
-      double bottomRightRadius,
-      double bottomLeftRadius,
-      int32_t curveCode,
-      double contentTranslateX,
-      double contentTranslateY,
-      double contentScale,
-      double durationMs,
-      jsi::Array frames,
-      int32_t reduceMotion);
-  int32_t animateTimingFromV2(
-      jsi::Runtime &runtime,
-      double driverId,
-      double startX,
-      double startY,
-      double startWidth,
-      double startHeight,
-      double startTopLeftRadius,
-      double startTopRightRadius,
-      double startBottomRightRadius,
-      double startBottomLeftRadius,
-      int32_t startCurveCode,
-      double startContentTranslateX,
-      double startContentTranslateY,
-      double startContentScale,
-      double x,
-      double y,
-      double width,
-      double height,
-      double topLeftRadius,
-      double topRightRadius,
-      double bottomRightRadius,
-      double bottomLeftRadius,
-      int32_t curveCode,
-      double contentTranslateX,
-      double contentTranslateY,
-      double contentScale,
+      jsi::Array start,
+      jsi::Array target,
       double durationMs,
       double controlPoint1X,
       double controlPoint1Y,
       double controlPoint2X,
       double controlPoint2Y,
-      int32_t reduceMotion);
-  int32_t animateSpringFromV2(
+      int32_t reduceMotion,
+      int32_t completionTag);
+  int32_t animateSpring(
       jsi::Runtime &runtime,
       double driverId,
-      double startX,
-      double startY,
-      double startWidth,
-      double startHeight,
-      double startTopLeftRadius,
-      double startTopRightRadius,
-      double startBottomRightRadius,
-      double startBottomLeftRadius,
-      int32_t startCurveCode,
-      double startContentTranslateX,
-      double startContentTranslateY,
-      double startContentScale,
-      double x,
-      double y,
-      double width,
-      double height,
-      double topLeftRadius,
-      double topRightRadius,
-      double bottomRightRadius,
-      double bottomLeftRadius,
-      int32_t curveCode,
-      double contentTranslateX,
-      double contentTranslateY,
-      double contentScale,
+      jsi::Array start,
+      jsi::Array target,
       double mass,
       double stiffness,
       double damping,
       double initialVelocity,
       bool inheritVelocity,
-      int32_t reduceMotion);
-  int32_t animateKeyframesFromV2(
-      jsi::Runtime &runtime,
-      double driverId,
-      double startX,
-      double startY,
-      double startWidth,
-      double startHeight,
-      double startTopLeftRadius,
-      double startTopRightRadius,
-      double startBottomRightRadius,
-      double startBottomLeftRadius,
-      int32_t startCurveCode,
-      double startContentTranslateX,
-      double startContentTranslateY,
-      double startContentScale,
-      double x,
-      double y,
-      double width,
-      double height,
-      double topLeftRadius,
-      double topRightRadius,
-      double bottomRightRadius,
-      double bottomLeftRadius,
-      int32_t curveCode,
-      double contentTranslateX,
-      double contentTranslateY,
-      double contentScale,
-      double durationMs,
-      jsi::Array frames,
-      int32_t reduceMotion);
+      int32_t reduceMotion,
+      int32_t completionTag);
   int32_t rejectAnimation(jsi::Runtime &runtime, double driverId);
   jsi::Array cancelAnimation(
       jsi::Runtime &runtime,
       double driverId,
       int32_t animationId,
       int32_t behavior);
-  jsi::Array cancelAnimationV2(
-      jsi::Runtime &runtime,
-      double driverId,
-      int32_t animationId,
-      int32_t behavior);
   void destroyDriver(jsi::Runtime &runtime, double driverId);
 };