@swmansion/react-native-bottom-sheet 0.8.0-next.2 → 0.8.0-next.4

package/android/src/main/java/com/swmansion/reactnativebottomsheet/BottomSheetView.kt

@@ -140,11 +140,10 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
         val closedTy = detentSpecs.lastOrNull()?.height ?: h.toFloat()
         sheetContainer.translationY = closedTy
         emitPosition()
-        snapToIndex(targetIndex, 0f)
+        snapToIndex(targetIndex, 0f, emitIndexChange = false)
       } else {
         sheetContainer.translationY = translationY(targetIndex)
         emitPosition()
-        listener?.onIndexChange(targetIndex)
       }
       return
     }
@@ -288,7 +287,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
 
   // MARK: - Spring animation
 
-  private fun snapToIndex(index: Int, velocity: Float) {
+  private fun snapToIndex(index: Int, velocity: Float, emitIndexChange: Boolean = true) {
     if (index < 0 || index >= detentSpecs.size) return
     targetIndex = index
 
@@ -310,7 +309,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
         emitPosition()
         activeAnimation = null
         updateInteractionState()
-        listener?.onIndexChange(index)
+        if (emitIndexChange) listener?.onIndexChange(index)
       }
     }
 

package/common/cpp/react/renderer/components/ReactNativeBottomSheetSpec/ComponentDescriptors.h

@@ -1,13 +1,22 @@
 #pragma once
 
-#include <react/renderer/components/ReactNativeBottomSheetSpec/ShadowNodes.h>
+#include "ShadowNodes.h"
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {
 
 class BottomSheetViewComponentDescriptor final
     : public ConcreteComponentDescriptor<BottomSheetViewShadowNode> {
+ public:
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+
+  State::Shared createInitialState(
+      const Props::Shared& /*props*/,
+      const ShadowNodeFamily::Shared& family) const override {
+    return std::make_shared<BottomSheetViewShadowNode::ConcreteState>(
+        std::make_shared<const BottomSheetViewState>(),
+        family);
+  }
 };
 
 } // namespace facebook::react

package/ios/BottomSheetComponentView.mm

@@ -1,10 +1,10 @@
 #import "BottomSheetComponentView.h"
 #import "BottomSheetContentView.h"
+#import "../common/cpp/react/renderer/components/ReactNativeBottomSheetSpec/BottomSheetStateHelper.h"
+#import "../common/cpp/react/renderer/components/ReactNativeBottomSheetSpec/ComponentDescriptors.h"
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/ReactNativeBottomSheetSpec/BottomSheetStateHelper.h>
-#import <react/renderer/components/ReactNativeBottomSheetSpec/ComponentDescriptors.h>
 #import <react/renderer/components/ReactNativeBottomSheetSpec/EventEmitters.h>
 #import <react/renderer/components/ReactNativeBottomSheetSpec/Props.h>
 #import <react/renderer/components/ReactNativeBottomSheetSpec/RCTComponentViewHelpers.h>
@@ -107,7 +107,7 @@ using namespace facebook::react;
     emitter->onPositionChange({.position = static_cast<double>(position)});
   }
 
-  float contentOffsetY = static_cast<float>(self.bounds.size.height - position);
+  float contentOffsetY = static_cast<float>(view.currentContentOffsetY);
   if (contentOffsetY == _lastContentOffsetY) {
     return;
   }

package/ios/BottomSheetContentView.h

@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setDetents:(NSArray<NSDictionary *> *)raw;
 - (void)setDetentIndex:(NSInteger)newIndex;
 - (void)setScrimColor:(UIColor *_Nullable)color;
+- (CGFloat)currentContentOffsetY;
 - (void)mountChildComponentView:(UIView *)childView atIndex:(NSInteger)index;
 - (void)unmountChildComponentView:(UIView *)childView;
 - (void)resetSheetState;

package/ios/BottomSheetContentView.mm

@@ -65,6 +65,11 @@
   _impl.scrimColor = color;
 }
 
+- (CGFloat)currentContentOffsetY
+{
+  return _impl.currentContentOffsetY;
+}
+
 - (void)mountChildComponentView:(UIView *)childView atIndex:(NSInteger)index
 {
   [_impl mountChildComponentView:childView atIndex:index];

package/ios/RNSBottomSheetHostingView.swift

@@ -112,11 +112,10 @@ public final class RNSBottomSheetHostingView: UIView {
         let closedTy = detentSpecs.last?.height ?? bounds.height
         sheetContainer.transform = CGAffineTransform(translationX: 0, y: closedTy)
         emitPosition()
-        snapToIndex(targetIndex, velocity: 0)
+        snapToIndex(targetIndex, velocity: 0, emitIndexChange: false)
       } else {
         sheetContainer.transform = CGAffineTransform(translationX: 0, y: translationY(for: targetIndex))
         emitPosition()
-        eventDelegate?.bottomSheetHostingView(self, didChangeIndex: targetIndex)
       }
       return
     }
@@ -237,6 +236,13 @@ public final class RNSBottomSheetHostingView: UIView {
     return maxHeight - ty
   }
 
+  public var currentContentOffsetY: CGFloat {
+    let maxHeight = detentSpecs.last?.height ?? bounds.height
+    let containerTop = bounds.height - maxHeight
+    let ty = sheetContainer.layer.presentation()?.affineTransform().ty ?? sheetContainer.transform.ty
+    return containerTop + ty
+  }
+
   private var isScrimVisible: Bool {
     modal && currentSheetHeight > 0.5
   }
@@ -290,7 +296,7 @@ public final class RNSBottomSheetHostingView: UIView {
     snapToIndex(closedIndex, velocity: 0)
   }
 
-  private func snapToIndex(_ index: Int, velocity: CGFloat) {
+  private func snapToIndex(_ index: Int, velocity: CGFloat, emitIndexChange: Bool = true) {
     guard index >= 0, index < detentSpecs.count else { return }
     targetIndex = index
 
@@ -316,7 +322,9 @@ public final class RNSBottomSheetHostingView: UIView {
       self.activeAnimator = nil
       self.setContentInteractionEnabled(true)
       self.updateInteractionState()
-      self.eventDelegate?.bottomSheetHostingView(self, didChangeIndex: index)
+      if emitIndexChange {
+        self.eventDelegate?.bottomSheetHostingView(self, didChangeIndex: index)
+      }
     }
     animator.startAnimation()
     activeAnimator = animator

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/react-native-bottom-sheet",
-  "version": "0.8.0-next.2",
+  "version": "0.8.0-next.4",
   "description": "Provides bottom-sheet components for React Native.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",