⭐️ Impl: RNIModalSheetStateMetrics.isIdle

dominicstop · Sep 29, 2024 · cc4ca4b · cc4ca4b
1 parent 8636385
commit cc4ca4b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/ios/RNIModalSheetView/RNIModalSheetStateMetrics.swift b/ios/RNIModalSheetView/RNIModalSheetStateMetrics.swift
@@ -17,21 +17,24 @@ public struct RNIModalSheetStateMetrics: DictionaryRepresentationSynthesizing {
   public var isPresented: Bool;
   public var isDismissing: Bool;
   public var isDismissed: Bool;
+  public var isIdle: Bool;
 
   public init(
     state: ModalSheetState,
     simplified: ModalSheetState,
     isPresenting: Bool,
     isPresented: Bool,
     isDismissing: Bool,
-    isDismissed: Bool
+    isDismissed: Bool,
+    isIdle: Bool
   ) {
     self.state = state;
     self.simplified = simplified;
     self.isPresenting = isPresenting;
     self.isPresented = isPresented;
     self.isDismissing = isDismissing;
     self.isDismissed = isDismissed;
+    self.isIdle = isIdle;
   };
 
   public init(fromModalSheetState state: ModalSheetState){
@@ -41,5 +44,6 @@ public struct RNIModalSheetStateMetrics: DictionaryRepresentationSynthesizing {
     self.isPresented = state.isPresented;
     self.isDismissing = state.isDismissing;
     self.isDismissed = state.isDismissed;
+    self.isIdle = state.isIdle;
   };
 };
diff --git a/ios/Temp/ModalSheetState.swift b/ios/Temp/ModalSheetState.swift
@@ -16,6 +16,8 @@ public enum ModalSheetState: String {
   case presented;
   case dismissViaGestureCancelled;
 
+  case draggingViaGesture;
+
   case dismissing;
   case dismissingViaGesture;
   case presentingViaGestureCanceling;
@@ -35,7 +37,7 @@ public enum ModalSheetState: String {
       case .presented, .dismissViaGestureCancelled:
         return .presented;
 
-      case .dismissing, .dismissingViaGesture, .presentingViaGestureCanceling:
+      case .dismissing, .dismissingViaGesture, .presentingViaGestureCanceling, .draggingViaGesture:
         return .dismissing;
 
       case .dismissed, .dismissedViaGesture, .presentingViaGestureCancelled:
@@ -59,6 +61,16 @@ public enum ModalSheetState: String {
     self.modalState.isDismissed;
   };
 
+  public var isIdle: Bool {
+    switch self {
+      case .draggingViaGesture:
+        return false;
+
+      default:
+        return self.modalState.isIdle;
+    };
+  };
+
   public var simplified: Self {
     self.modalState.modalSheetState;
   };

diff --git a/ios/Temp/ModalState.swift b/ios/Temp/ModalState.swift
@@ -34,6 +34,16 @@ public enum ModalState: String {
     self == .dismissed;
   };
 
+  public var isIdle: Bool {
+    switch self {
+      case .presenting, .dismissing:
+        return false;
+
+      default:
+        return true;
+    };
+  };
+
   public var modalSheetState: ModalSheetState {
     switch self {
       case .presenting:

diff --git a/src/types/RNIModalSheetStateMetrics.ts b/src/types/RNIModalSheetStateMetrics.ts
@@ -9,4 +9,5 @@ export type RNIModalSheetStateMetrics = {
   isPresented: boolean;
   isDismissing: boolean;
   isDismissed: boolean;
+  isIdle: boolean;
 };