💫 Update: ModalView.onModalDetentDidCompute

Summary: Update `ModalView.onModalDetentDidCompute` event - add event argument `computedDetentValue`, and `key`.
dominicstop · Apr 28, 2023 · 82f5abc · 82f5abc
1 parent df4d829
commit 82f5abc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/ios/src_library/React Native/RNIModal/RNIModalCustomSheetDetent.swift b/ios/src_library/React Native/RNIModal/RNIModalCustomSheetDetent.swift
@@ -24,7 +24,9 @@ struct RNIModalCustomSheetDetent {
 
   typealias OnDetentDidCreate = (
     _ containerTraitCollection: UITraitCollection,
-    _ maximumDetentValue: CGFloat
+    _ maximumDetentValue: CGFloat,
+    _ computedDetentValue: CGFloat,
+    _ sender: RNIModalCustomSheetDetent
   ) -> Void;
 
   let mode: RNIModalCustomSheetDetentMode;
@@ -81,7 +83,6 @@ struct RNIModalCustomSheetDetent {
   var synthesizedDetent: UISheetPresentationController.Detent {
     return .custom(identifier: self.synthesizedDetentIdentifier) { context in
 
-
       let computedValueBase: Double = {
         switch self.mode {
           case let .relative(value):
@@ -98,8 +99,10 @@ struct RNIModalCustomSheetDetent {
       let computedValue = computedValueWithOffset ?? computedValueBase;
 
       self.onDetentDidCreate?(
-        $0.containerTraitCollection,
-        $0.maximumDetentValue
+        context.containerTraitCollection,
+        context.maximumDetentValue,
+        computedValue,
+        self
       );
 
       return computedValue;

diff --git a/ios/src_library/React Native/RNIModal/RNIModalEventData.swift b/ios/src_library/React Native/RNIModal/RNIModalEventData.swift
@@ -50,4 +50,6 @@ public struct RNIModalDidChangeSelectedDetentIdentifierEventData: RNIDictionaryS
 
 public struct RNIModalDetentDidComputeEventData: RNIDictionarySynthesizable {
   public let maximumDetentValue: CGFloat;
+  public let computedDetentValue: CGFloat;
+  public let key: String;
 };
diff --git a/ios/src_library/React Native/RNIModalView/RNIModalView.swift b/ios/src_library/React Native/RNIModalView/RNIModalView.swift
@@ -385,10 +385,12 @@ public class RNIModalView:
                 let dict = $0 as? Dictionary<String, Any> {
 
         let customDetent = RNIModalCustomSheetDetent(forDict: dict) {
-          _, maximumDetentValue in
+          _, maximumDetentValue, computedDetentValue, sender in
 
           let eventData = RNIModalDetentDidComputeEventData(
-            maximumDetentValue: maximumDetentValue
+            maximumDetentValue: maximumDetentValue,
+            computedDetentValue: computedDetentValue,
+            key: sender.key
           );
 
           self.onModalDetentDidCompute?(

diff --git a/src/native_components/RNIModalView/RNIModalViewEvents.ts b/src/native_components/RNIModalView/RNIModalViewEvents.ts
@@ -101,6 +101,8 @@ export type OnModalDidFocusEventObject = NativeSyntheticEvent<
 
 export type OnModalDetentDidComputeEventObject = NativeSyntheticEvent<{
   maximumDetentValue: number;
+  computedDetentValue: number;
+  key: string;
 }>;
 
 export type OnModalDidChangeSelectedDetentIdentifierEventObject =