@lodev09/react-native-true-sheet 3.0.0-beta.0 → 3.0.0-beta.10

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

@@ -1,10 +1,11 @@
 package com.lodev09.truesheet
 
-import android.graphics.Color
 import android.view.WindowManager
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.PixelUtil.dpToPx
+import com.facebook.react.uimanager.ReactStylesDiffMap
+import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.ViewGroupManager
@@ -36,7 +37,7 @@ class TrueSheetViewManager :
 
   override fun onAfterUpdateTransaction(view: TrueSheetView) {
     super.onAfterUpdateTransaction(view)
-    view.showOrUpdate()
+    view.finalizeUpdates()
   }
 
   override fun addEventEmitters(reactContext: ThemedReactContext, view: TrueSheetView) {
@@ -44,6 +45,11 @@ class TrueSheetViewManager :
     view.eventDispatcher = dispatcher
   }
 
+  override fun updateState(view: TrueSheetView, props: ReactStylesDiffMap?, stateWrapper: StateWrapper?): Any? {
+    view.stateWrapper = stateWrapper
+    return null
+  }
+
   override fun getDelegate(): ViewManagerDelegate<TrueSheetView> = delegate
 
   /**
@@ -61,8 +67,7 @@ class TrueSheetViewManager :
       DragBeginEvent.EVENT_NAME to hashMapOf("registrationName" to DragBeginEvent.REGISTRATION_NAME),
       DragChangeEvent.EVENT_NAME to hashMapOf("registrationName" to DragChangeEvent.REGISTRATION_NAME),
       DragEndEvent.EVENT_NAME to hashMapOf("registrationName" to DragEndEvent.REGISTRATION_NAME),
-      PositionChangeEvent.EVENT_NAME to hashMapOf("registrationName" to PositionChangeEvent.REGISTRATION_NAME),
-      SizeChangeEvent.EVENT_NAME to hashMapOf("registrationName" to SizeChangeEvent.REGISTRATION_NAME)
+      PositionChangeEvent.EVENT_NAME to hashMapOf("registrationName" to PositionChangeEvent.REGISTRATION_NAME)
     )
 
   // ==================== Props ====================
@@ -85,16 +90,14 @@ class TrueSheetViewManager :
     view.setDetents(detents)
   }
 
-  @ReactProp(name = "background", defaultInt = Color.WHITE)
+  @ReactProp(name = "background", defaultInt = 0)
   override fun setBackground(view: TrueSheetView, color: Int) {
     view.setSheetBackgroundColor(color)
   }
 
   @ReactProp(name = "cornerRadius", defaultDouble = -1.0)
   override fun setCornerRadius(view: TrueSheetView, radius: Double) {
-    if (radius >= 0) {
-      view.setCornerRadius(radius.dpToPx())
-    }
+    view.setCornerRadius(radius.dpToPx())
   }
 
   @ReactProp(name = "grabber", defaultBoolean = true)
@@ -112,9 +115,9 @@ class TrueSheetViewManager :
     view.setDimmed(dimmed)
   }
 
-  @ReactProp(name = "dimmedIndex", defaultInt = 0)
-  override fun setDimmedIndex(view: TrueSheetView, index: Int) {
-    view.setDimmedIndex(index)
+  @ReactProp(name = "dimmedDetentIndex", defaultInt = 0)
+  override fun setDimmedDetentIndex(view: TrueSheetView, index: Int) {
+    view.setDimmedDetentIndex(index)
   }
 
   @ReactProp(name = "initialDetentIndex", defaultInt = -1)
@@ -154,6 +157,16 @@ class TrueSheetViewManager :
     view.setEdgeToEdgeFullScreen(edgeToEdgeFullScreen)
   }
 
+  @ReactProp(name = "scrollable", defaultBoolean = false)
+  override fun setScrollable(view: TrueSheetView, value: Boolean) {
+    // iOS-specific prop - no-op on Android
+  }
+
+  @ReactProp(name = "pageSizing", defaultBoolean = true)
+  override fun setPageSizing(view: TrueSheetView, value: Boolean) {
+    // iOS-specific prop - no-op on Android
+  }
+
   companion object {
     const val REACT_CLASS = "TrueSheetView"
     const val TAG_NAME = "TrueSheet"

package/android/src/main/java/com/lodev09/truesheet/core/RNScreensFragmentObserver.kt

@@ -0,0 +1,116 @@
+package com.lodev09.truesheet.core
+
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import com.facebook.react.bridge.ReactContext
+
+private const val RN_SCREENS_PACKAGE = "com.swmansion.rnscreens"
+
+/**
+ * Observes fragment lifecycle to detect react-native-screens modal presentation.
+ * Automatically notifies when modals are presented/dismissed.
+ */
+class RNScreensFragmentObserver(
+  private val reactContext: ReactContext,
+  private val onModalPresented: () -> Unit,
+  private val onModalDismissed: () -> Unit
+) {
+  private var fragmentLifecycleCallback: FragmentManager.FragmentLifecycleCallbacks? = null
+  private val activeModalFragments: MutableSet<Fragment> = mutableSetOf()
+
+  /**
+   * Check if there are active modal fragments being tracked.
+   */
+  fun hasActiveModals(): Boolean = activeModalFragments.isNotEmpty()
+
+  /**
+   * Start observing fragment lifecycle events.
+   */
+  fun start() {
+    val activity = reactContext.currentActivity as? AppCompatActivity ?: return
+    val fragmentManager = activity.supportFragmentManager
+
+    fragmentLifecycleCallback = object : FragmentManager.FragmentLifecycleCallbacks() {
+      override fun onFragmentAttached(fm: FragmentManager, fragment: Fragment, context: android.content.Context) {
+        super.onFragmentAttached(fm, fragment, context)
+
+        if (isModalFragment(fragment)) {
+          activeModalFragments.add(fragment)
+
+          // Notify when the first modal is attached
+          if (activeModalFragments.size == 1) {
+            onModalPresented()
+          }
+        }
+      }
+
+      override fun onFragmentStopped(fm: FragmentManager, fragment: Fragment) {
+        super.onFragmentStopped(fm, fragment)
+
+        if (activeModalFragments.contains(fragment)) {
+          activeModalFragments.remove(fragment)
+
+          // Notify when all modals are dismissed
+          if (activeModalFragments.isEmpty()) {
+            onModalDismissed()
+          }
+        }
+      }
+    }
+
+    fragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallback!!, true)
+  }
+
+  /**
+   * Stop observing and cleanup.
+   */
+  fun stop() {
+    fragmentLifecycleCallback?.let { callback ->
+      val activity = reactContext.currentActivity as? AppCompatActivity
+      activity?.supportFragmentManager?.unregisterFragmentLifecycleCallbacks(callback)
+    }
+    fragmentLifecycleCallback = null
+    activeModalFragments.clear()
+  }
+
+  companion object {
+    /**
+     * Check if fragment is from react-native-screens.
+     */
+    private fun isScreensFragment(fragment: Fragment): Boolean = fragment.javaClass.name.startsWith(RN_SCREENS_PACKAGE)
+
+    /**
+     * Check if fragment is a react-native-screens modal (fullScreenModal, transparentModal, or formSheet).
+     * Uses reflection to check the fragment's screen.stackPresentation property.
+     */
+    private fun isModalFragment(fragment: Fragment): Boolean {
+      val className = fragment.javaClass.name
+
+      if (!isScreensFragment(fragment)) {
+        return false
+      }
+
+      // ScreenModalFragment is always a modal (used for formSheet with BottomSheetDialog)
+      if (className.contains("ScreenModalFragment")) {
+        return true
+      }
+
+      // For ScreenStackFragment, check the screen's stackPresentation via reflection
+      try {
+        val getScreenMethod = fragment.javaClass.getMethod("getScreen")
+        val screen = getScreenMethod.invoke(fragment) ?: return false
+
+        val getStackPresentationMethod = screen.javaClass.getMethod("getStackPresentation")
+        val stackPresentation = getStackPresentationMethod.invoke(screen) ?: return false
+
+        val presentationName = stackPresentation.toString()
+        return presentationName == "MODAL" ||
+          presentationName == "TRANSPARENT_MODAL" ||
+          presentationName == "FORM_SHEET"
+      } catch (e: Exception) {
+        return false
+      }
+    }
+  }
+}

package/android/src/main/java/com/lodev09/truesheet/utils/ScreenUtils.kt

@@ -89,14 +89,42 @@ object ScreenUtils {
   }
 
   /**
-   * Get the Y coordinate of a view in screen coordinates
+   * Get the screen width
    *
-   * @param view The view to get screen Y coordinate for
-   * @return Y coordinate in screen space
+   * @param context React context
+   * @return Screen width in pixels
    */
-  fun getScreenY(view: View): Int {
+  fun getScreenWidth(context: ReactContext): Int {
+    val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      val windowMetrics = windowManager.currentWindowMetrics
+      windowMetrics.bounds.width()
+    } else {
+      val displayMetrics = DisplayMetrics()
+      @Suppress("DEPRECATION")
+      windowManager.defaultDisplay.getMetrics(displayMetrics)
+      displayMetrics.widthPixels
+    }
+  }
+
+  /**
+   * Get the location of a view in screen coordinates
+   *
+   * @param view The view to get screen location for
+   * @return IntArray with [x, y] coordinates in screen space
+   */
+  fun getScreenLocation(view: View): IntArray {
     val location = IntArray(2)
     view.getLocationOnScreen(location)
-    return location[1]
+    return location
   }
+
+  /**
+   * Get the Y coordinate of a view in screen coordinates
+   *
+   * @param view The view to get screen Y coordinate for
+   * @return Y coordinate in screen space
+   */
+  fun getScreenY(view: View): Int = getScreenLocation(view)[1]
 }

package/android/src/main/jni/CMakeLists.txt

@@ -0,0 +1,87 @@
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
+set(LIB_LITERAL TrueSheetSpec)
+set(LIB_TARGET_NAME react_codegen_${LIB_LITERAL})
+
+set(LIB_ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+set(LIB_COMMON_DIR ${LIB_ANDROID_DIR}/../common/cpp)
+set(LIB_ANDROID_GENERATED_JNI_DIR ${LIB_ANDROID_DIR}/build/generated/source/codegen/jni)
+set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/renderer/components/${LIB_LITERAL})
+
+file(GLOB LIB_CUSTOM_SRCS CONFIGURE_DEPENDS *.cpp ${LIB_COMMON_DIR}/react/renderer/components/${LIB_LITERAL}/*.cpp)
+file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS ${LIB_ANDROID_GENERATED_JNI_DIR}/*.cpp ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}/*.cpp)
+
+add_library(
+  ${LIB_TARGET_NAME}
+  SHARED
+  ${LIB_CUSTOM_SRCS}
+  ${LIB_CODEGEN_SRCS}
+)
+
+target_include_directories(
+  ${LIB_TARGET_NAME}
+  PUBLIC
+  .
+  ${LIB_COMMON_DIR}
+  ${LIB_ANDROID_GENERATED_JNI_DIR}
+  ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}
+)
+
+if (REACTNATIVE_MERGED_SO)
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    fbjni
+    jsi
+    reactnative
+    log
+  )
+else()
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    fbjni
+    folly_runtime
+    glog
+    jsi
+    react_codegen_rncore
+    react_debug
+    react_nativemodule_core
+    react_render_core
+    react_render_debug
+    react_render_graphics
+    react_render_mapbuffer
+    react_render_componentregistry
+    react_utils
+    rrc_view
+    turbomodulejsijni
+    yoga
+    log
+  )
+endif()
+
+target_include_directories(
+  ${CMAKE_PROJECT_NAME}
+  PUBLIC
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
+  target_compile_reactnative_options(${LIB_TARGET_NAME} PUBLIC)
+else()
+  target_compile_options(
+    ${LIB_TARGET_NAME}
+    PRIVATE
+    -fexceptions
+    -frtti
+    -std=c++20
+    -Wall
+  )
+endif()
+
+target_compile_options(
+  ${LIB_TARGET_NAME}
+  PRIVATE
+  -Wpedantic
+  -Wno-gnu-zero-variadic-macro-arguments
+  -Wno-dollar-in-identifier-extension
+)

package/android/src/main/jni/TrueSheetSpec.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
+#include <react/renderer/components/TrueSheetSpec/TrueSheetViewComponentDescriptor.h>
+
+namespace facebook {
+namespace react {
+
+JSI_EXPORT
+std::shared_ptr<TurboModule> TrueSheetSpec_ModuleProvider(
+    const std::string &moduleName,
+    const JavaTurboModule::InitParams &params);
+
+} // namespace react
+} // namespace facebook

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewComponentDescriptor.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include <react/renderer/components/TrueSheetSpec/TrueSheetViewShadowNode.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+
+/*
+ * Descriptor for <TrueSheetView> component.
+ */
+class TrueSheetViewComponentDescriptor final
+    : public ConcreteComponentDescriptor<TrueSheetViewShadowNode> {
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+
+  void adopt(ShadowNode &shadowNode) const override {
+    auto &concreteShadowNode =
+        static_cast<TrueSheetViewShadowNode &>(shadowNode);
+    concreteShadowNode.adjustLayoutWithState();
+
+    ConcreteComponentDescriptor::adopt(shadowNode);
+  }
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewShadowNode.cpp

@@ -0,0 +1,46 @@
+#include "TrueSheetViewShadowNode.h"
+
+#include <yoga/style/StyleSizeLength.h>
+
+namespace facebook::react {
+
+extern const char TrueSheetViewComponentName[] = "TrueSheetView";
+
+void TrueSheetViewShadowNode::adjustLayoutWithState() {
+  ensureUnsealed();
+
+  auto state = std::static_pointer_cast<
+      const TrueSheetViewShadowNode::ConcreteState>(getState());
+  auto stateData = state->getData();
+
+  // If container dimensions are set from native, override Yoga's dimensions
+  if (stateData.containerWidth > 0 || stateData.containerHeight > 0) {
+    auto &props = getConcreteProps();
+    yoga::Style adjustedStyle = props.yogaStyle;
+    auto currentStyle = yogaNode_.style();
+    bool needsUpdate = false;
+
+    // Set width if provided
+    if (stateData.containerWidth > 0) {
+      adjustedStyle.setDimension(yoga::Dimension::Width, yoga::StyleSizeLength::points(stateData.containerWidth));
+      if (adjustedStyle.dimension(yoga::Dimension::Width) != currentStyle.dimension(yoga::Dimension::Width)) {
+        needsUpdate = true;
+      }
+    }
+
+    // Set height if provided
+    if (stateData.containerHeight > 0) {
+      adjustedStyle.setDimension(yoga::Dimension::Height, yoga::StyleSizeLength::points(stateData.containerHeight));
+      if (adjustedStyle.dimension(yoga::Dimension::Height) != currentStyle.dimension(yoga::Dimension::Height)) {
+        needsUpdate = true;
+      }
+    }
+
+    if (needsUpdate) {
+      yogaNode_.setStyle(adjustedStyle);
+      yogaNode_.setDirty(true);
+    }
+  }
+}
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewShadowNode.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <jsi/jsi.h>
+#include <react/renderer/components/TrueSheetSpec/EventEmitters.h>
+#include <react/renderer/components/TrueSheetSpec/Props.h>
+#include <react/renderer/components/TrueSheetSpec/TrueSheetViewState.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+
+namespace facebook::react {
+
+JSI_EXPORT extern const char TrueSheetViewComponentName[];
+
+/*
+ * `ShadowNode` for <TrueSheetView> component.
+ */
+class JSI_EXPORT TrueSheetViewShadowNode final
+    : public ConcreteViewShadowNode<
+          TrueSheetViewComponentName,
+          TrueSheetViewProps,
+          TrueSheetViewEventEmitter,
+          TrueSheetViewState> {
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+ public:
+  void adjustLayoutWithState();
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewState.cpp

@@ -0,0 +1,11 @@
+#include "TrueSheetViewState.h"
+
+namespace facebook::react {
+
+#ifdef ANDROID
+folly::dynamic TrueSheetViewState::getDynamic() const {
+  return folly::dynamic::object("containerWidth", containerWidth)("containerHeight", containerHeight);
+}
+#endif
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewState.h

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <memory>
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook::react {
+
+/*
+ * State for <TrueSheetView> component.
+ * Contains the container dimensions from native.
+ */
+class TrueSheetViewState final {
+ public:
+  using Shared = std::shared_ptr<const TrueSheetViewState>;
+
+  TrueSheetViewState() = default;
+
+#ifdef ANDROID
+  TrueSheetViewState(
+      TrueSheetViewState const &previousState,
+      folly::dynamic data)
+      : containerWidth(static_cast<float>(data["containerWidth"].getDouble())),
+        containerHeight(static_cast<float>(data["containerHeight"].getDouble())) {}
+#endif
+
+  float containerWidth{0};
+  float containerHeight{0};
+
+#ifdef ANDROID
+  folly::dynamic getDynamic() const;
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  }
+#endif
+};
+
+} // namespace facebook::react

package/ios/TrueSheetContainerView.h

@@ -21,6 +21,14 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)containerViewContentDidChangeSize:(CGSize)newSize;
 
+@optional
+
+/**
+ * Called when the header size changes
+ * @param newSize The new size of the header
+ */
+- (void)containerViewHeaderDidChangeSize:(CGSize)newSize;
+
 @end
 
 @interface TrueSheetContainerView : RCTViewComponentView
@@ -30,16 +38,31 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, weak, nullable) id<TrueSheetContainerViewDelegate> delegate;
 
+/**
+ * Enable ScrollView pinning
+ */
+@property (nonatomic, assign) BOOL scrollViewPinningEnabled;
+
 /**
  * Returns the current content height
  */
 - (CGFloat)contentHeight;
 
+/**
+ * Returns the current header height
+ */
+- (CGFloat)headerHeight;
+
 /**
  * Updates footer layout constraints if needed
  */
 - (void)layoutFooter;
 
+/**
+ * Setup ScrollView pinning
+ */
+- (void)setupContentScrollViewPinning;
+
 @end
 
 NS_ASSUME_NONNULL_END