@lodev09/react-native-true-sheet 3.1.0-beta.1 → 3.1.0-beta.10

package/android/src/main/java/com/lodev09/truesheet/TrueSheetModule.kt

@@ -22,10 +22,6 @@ class TrueSheetModule(reactContext: ReactApplicationContext) :
 
   override fun getName(): String = NAME
 
-  override fun initialize() {
-    super.initialize()
-  }
-
   override fun invalidate() {
     super.invalidate()
     // Clear all registered views and observer on module invalidation
@@ -46,12 +42,12 @@ class TrueSheetModule(reactContext: ReactApplicationContext) :
    * @throws OPERATION_FAILED if the operation fails for any other reason
    */
   @ReactMethod
-  fun presentByRef(viewTag: Double, index: Double, promise: Promise) {
+  fun presentByRef(viewTag: Double, index: Double, animated: Boolean, promise: Promise) {
     val tag = viewTag.toInt()
     val detentIndex = index.toInt()
 
     withTrueSheetView(tag, promise) { view ->
-      view.present(detentIndex) {
+      view.present(detentIndex, animated) {
         promise.resolve(null)
       }
     }
@@ -67,11 +63,11 @@ class TrueSheetModule(reactContext: ReactApplicationContext) :
    * @throws OPERATION_FAILED if the operation fails for any other reason
    */
   @ReactMethod
-  fun dismissByRef(viewTag: Double, promise: Promise) {
+  fun dismissByRef(viewTag: Double, animated: Boolean, promise: Promise) {
     val tag = viewTag.toInt()
 
     withTrueSheetView(tag, promise) { view ->
-      view.dismiss {
+      view.dismiss(animated) {
         promise.resolve(null)
       }
     }
@@ -89,8 +85,14 @@ class TrueSheetModule(reactContext: ReactApplicationContext) :
    */
   @ReactMethod
   fun resizeByRef(viewTag: Double, index: Double, promise: Promise) {
-    // Resize is just an alias for present
-    presentByRef(viewTag, index, promise)
+    val tag = viewTag.toInt()
+    val detentIndex = index.toInt()
+
+    withTrueSheetView(tag, promise) { view ->
+      view.resize(detentIndex) {
+        promise.resolve(null)
+      }
+    }
   }
 
   /**

package/android/src/main/java/com/lodev09/truesheet/TrueSheetView.kt

@@ -1,6 +1,7 @@
 package com.lodev09.truesheet
 
 import android.annotation.SuppressLint
+import android.util.Log
 import android.view.View
 import android.view.ViewStructure
 import android.view.accessibility.AccessibilityEvent
@@ -12,6 +13,7 @@ import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.util.RNLog
 import com.facebook.react.views.view.ReactViewGroup
 import com.lodev09.truesheet.core.GrabberOptions
 import com.lodev09.truesheet.core.TrueSheetDialogObserver
@@ -92,7 +94,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
       viewController.setupBackground()
       viewController.setupGrabber()
       updateSheetIfNeeded()
-      viewController.setStateForDetentIndex(viewController.currentDetentIndex)
     }
   }
 
@@ -157,15 +158,15 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   override fun viewControllerWillPresent(index: Int, position: Float, detent: Float) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(WillPresentEvent(surfaceId, id, index, position, detent))
+
+    // Enable touch event dispatching to React Native
+    viewController.eventDispatcher = eventDispatcher
+    containerView?.footerView?.eventDispatcher = eventDispatcher
   }
 
   override fun viewControllerDidPresent(index: Int, position: Float, detent: Float) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(DidPresentEvent(surfaceId, id, index, position, detent))
-
-    // Enable touch event dispatching to React Native
-    viewController.eventDispatcher = eventDispatcher
-    containerView?.footerView?.eventDispatcher = eventDispatcher
   }
 
   override fun viewControllerWillDismiss() {
@@ -326,9 +327,20 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   }
 
   @UiThread
-  fun dismiss(promiseCallback: () -> Unit) {
+  fun dismiss(animated: Boolean = true, promiseCallback: () -> Unit) {
     viewController.dismissPromise = promiseCallback
-    viewController.dismiss()
+    viewController.dismiss(animated)
+  }
+
+  @UiThread
+  fun resize(detentIndex: Int, promiseCallback: () -> Unit) {
+    if (!viewController.isPresented) {
+      RNLog.w(reactContext, "TrueSheet: Cannot resize. Sheet is not presented.")
+      promiseCallback()
+      return
+    }
+
+    present(detentIndex, true, promiseCallback)
   }
 
   /**