🛠 Refactor: Update Usage for AdaptiveModal

dominicstop · Jan 25, 2024 · ebea86b · ebea86b
1 parent 041bf46
commit ebea86b
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 30 deletions.
diff --git a/...nitializableFromDictionary/AdaptiveModalSnapPointConfig+InitializableFromDictionary.swift b/...nitializableFromDictionary/AdaptiveModalSnapPointConfig+InitializableFromDictionary.swift
@@ -23,7 +23,12 @@ extension AdaptiveModalSnapPointConfig: InitializableFromDictionary {
       type: Mode.self
     );
 
-    let layoutConfig = try dict.getValueFromDictionary(
+    let key = try? dict.getValueFromDictionary(
+      forKey: "key",
+      type: String.self
+    );
+
+    let layoutConfig = try? dict.getValueFromDictionary(
       forKey: "layoutConfig",
       type: ComputableLayout.self
     );
@@ -35,14 +40,27 @@ extension AdaptiveModalSnapPointConfig: InitializableFromDictionary {
 
     switch mode {
       case .standard:
-        self = .snapPoint(
-          layoutConfig: layoutConfig,
+        guard let layoutConfig = layoutConfig else {
+          throw RNIAdaptiveModalError(
+            errorCode: .unexpectedNilValue,
+            description: "layoutConfig is nil"
+          );
+        };
+
+        self = .init(
+          key: key,
+          type: .standard(
+            layoutConfig: layoutConfig
+          ),
           keyframeConfig: keyframeConfig
         );
 
       case .inBetween:
-        self = .inBetweenSnapPoint(
-          layoutConfig: layoutConfig,
+        self = .init(
+          key: key,
+          type: .inBetween(
+            layoutConfig: layoutConfig
+          ),
           keyframeConfig: keyframeConfig
         );
     };

diff --git a/...ptiveModalView/RNIAdaptiveModalController+AdaptiveModalPresentationEventsNotifiable.swift b/...ptiveModalView/RNIAdaptiveModalController+AdaptiveModalPresentationEventsNotifiable.swift
@@ -18,10 +18,6 @@ extension RNIAdaptiveModalController: AdaptiveModalPresentationEventsNotifiable
 
   func notifyOnModalWillSnap(
     sender: AdaptiveModalManager,
-    prevSnapPointIndex: Int?,
-    nextSnapPointIndex: Int,
-    prevSnapPointConfig: AdaptiveModalSnapPointConfig?,
-    nextSnapPointConfig: AdaptiveModalSnapPointConfig,
     prevInterpolationPoint: AdaptiveModalInterpolationPoint?,
     nextInterpolationPoint: AdaptiveModalInterpolationPoint
   ) {
@@ -30,10 +26,6 @@ extension RNIAdaptiveModalController: AdaptiveModalPresentationEventsNotifiable
 
   func notifyOnModalDidSnap(
     sender: AdaptiveModalManager,
-    prevSnapPointIndex: Int?,
-    currentSnapPointIndex: Int,
-    prevSnapPointConfig: AdaptiveModalSnapPointConfig?,
-    currentSnapPointConfig: AdaptiveModalSnapPointConfig,
     prevInterpolationPoint: AdaptiveModalInterpolationPoint?,
     currentInterpolationPoint: AdaptiveModalInterpolationPoint
   ) {

diff --git a/...RNIAdaptiveModalView/RNIAdaptiveModalView+AdaptiveModalPresentationEventsNotifiable.swift b/...RNIAdaptiveModalView/RNIAdaptiveModalView+AdaptiveModalPresentationEventsNotifiable.swift
@@ -16,10 +16,7 @@ import ComputableLayout
 extension RNIAdaptiveModalView: AdaptiveModalPresentationEventsNotifiable {
 
   public func notifyOnModalWillSnap(
-    sender: AdaptiveModalManager, prevSnapPointIndex: Int?,
-    nextSnapPointIndex: Int,
-    prevSnapPointConfig: AdaptiveModalSnapPointConfig?,
-    nextSnapPointConfig: AdaptiveModalSnapPointConfig,
+    sender: AdaptiveModalManager,
     prevInterpolationPoint: AdaptiveModalInterpolationPoint?,
     nextInterpolationPoint: AdaptiveModalInterpolationPoint
   ) {
@@ -28,10 +25,6 @@ extension RNIAdaptiveModalView: AdaptiveModalPresentationEventsNotifiable {
 
   public func notifyOnModalDidSnap(
     sender: AdaptiveModal.AdaptiveModalManager,
-    prevSnapPointIndex: Int?,
-    currentSnapPointIndex: Int,
-    prevSnapPointConfig: AdaptiveModalSnapPointConfig?,
-    currentSnapPointConfig: AdaptiveModalSnapPointConfig,
     prevInterpolationPoint: AdaptiveModalInterpolationPoint?,
     currentInterpolationPoint: AdaptiveModalInterpolationPoint
   ) {

diff --git a/src/types/AdaptiveModalConfig/AdaptiveModalSnapPointConfig.ts b/src/types/AdaptiveModalConfig/AdaptiveModalSnapPointConfig.ts
@@ -1,15 +1,17 @@
 import { ComputableLayout } from "react-native-ios-utilities";
 import { AdaptiveModalKeyframeConfig } from "./AdaptiveModalKeyframeConfig";
 
-export type AdaptiveModalSnapPointConfigMode = 
- | 'standard'
- | 'inBetween';
-
-export type AdaptiveModalSnapPointConfig = {
-  mode: AdaptiveModalSnapPointConfigMode;
-  // TODO: WIP
-  // key: SnapPointKey;
 
+export type AdaptiveModalSnapPointConfig = ({
+  mode: 'standard';
   layoutConfig: ComputableLayout;
+} | {
+  mode: 'inBetween';
+  layoutConfig?: ComputableLayout;
+}) & {
+  key?: string;
   keyframeConfig?: AdaptiveModalKeyframeConfig; 
-};
+};
+
+export type AdaptiveModalSnapPointConfigMode =
+  AdaptiveModalSnapPointConfig['mode'];