💫 Update: Exp - AdaptiveModal

Summary: Update experiment/test - `swift-programmatic-modal/AdaptiveModal`.
dominicstop · Jun 10, 2023 · 5a29f46 · 5a29f46
1 parent c72a65d
commit 5a29f46
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift
@@ -1239,18 +1239,26 @@ class AdaptiveModalManager: NSObject {
 
   func onModalWillSnap(){
     let interpolationSteps = self.interpolationSteps!;
-    let closestSnapPoint = self.getClosestSnapPoint();
-
     let prevIndex = self.currentInterpolationIndex;
-    let nextIndex = closestSnapPoint.interpolationPoint.snapPointIndex;
+
+    let nextIndex: Int = {
+      guard let nextIndex = self.nextInterpolationIndex else {
+        let closestSnapPoint = self.getClosestSnapPoint();
+        return closestSnapPoint.interpolationPoint.snapPointIndex;
+      };
+
+      return nextIndex;
+    }();
+
+    let nextPoint = self.interpolationSteps[nextIndex];
 
     guard prevIndex != nextIndex else { return };
 
     self.eventDelegate?.notifyOnModalWillSnap(
       prevSnapPointIndex: interpolationSteps[prevIndex].snapPointIndex,
       nextSnapPointIndex: interpolationSteps[nextIndex].snapPointIndex,
-      snapPointConfig: closestSnapPoint.snapPointConfig,
-      interpolationPoint: closestSnapPoint.interpolationPoint
+      snapPointConfig: self.modalConfig.snapPoints[nextPoint.snapPointIndex],
+      interpolationPoint: nextPoint
     );
   };