@sdcx/bottom-sheet 1.0.6 → 1.0.8

package/android/src/main/java/com/reactnative/bottomsheet/BottomSheetContentView.java

@@ -1,10 +1,15 @@
 package com.reactnative.bottomsheet;
 
 import android.content.Context;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.Drawable;
+
+import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.PointerEvents;
 import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.views.view.ReactViewGroup;
 
@@ -14,7 +19,6 @@ import com.facebook.react.views.view.ReactViewGroup;
  */
 public class BottomSheetContentView extends ReactViewGroup {
 
-    @SuppressWarnings("NullableProblems")
     private StateWrapper stateWrapper;
 
     public BottomSheetContentView(Context context) {
@@ -36,4 +40,14 @@ public class BottomSheetContentView extends ReactViewGroup {
             stateWrapper.updateState(map);
         }
     }
+
+	@NonNull
+	@Override
+	public PointerEvents getPointerEvents() {
+		Drawable bg = getBackground();
+		if (bg == null || bg.getOpacity() != PixelFormat.OPAQUE) {
+			return PointerEvents.BOX_NONE;
+		}
+		return PointerEvents.AUTO;
+	}
 }

package/common/cpp/react/renderer/components/bottomsheet/BottomSheetContentViewComponentDescriptor.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <react/renderer/components/bottomsheet/BottomSheetContentViewShadowNode.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Descriptor for <BottomSheetContentView> component.
+ */
+class BottomSheetContentViewComponentDescriptor final
+    : public ConcreteComponentDescriptor<BottomSheetContentViewShadowNode> {
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+};
+
+} // namespace react
+} // namespace facebook

package/common/cpp/react/renderer/components/bottomsheet/BottomSheetContentViewShadowNode.cpp

@@ -0,0 +1,19 @@
+#include "BottomSheetContentViewShadowNode.h"
+
+namespace facebook {
+namespace react {
+
+extern const char BottomSheetContentViewComponentName[] = "BottomSheetContentView";
+
+Point BottomSheetContentViewShadowNode::getContentOriginOffset(bool includeTransform) const {
+  auto stateData = getStateData();
+  auto contentOffset = stateData.contentOffset;
+
+  return {
+      .x = 0,
+      .y = static_cast<Float>(contentOffset),
+  };
+}
+
+} // namespace react
+} // namespace facebook

package/common/cpp/react/renderer/components/bottomsheet/BottomSheetContentViewShadowNode.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <jsi/jsi.h>
+#include <react/renderer/components/bottomsheet/BottomSheetContentViewState.h>
+#include <react/renderer/components/bottomsheet/EventEmitters.h>
+#include <react/renderer/components/bottomsheet/Props.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+
+namespace facebook {
+namespace react {
+
+JSI_EXPORT extern const char BottomSheetContentViewComponentName[];
+
+/*
+ * ShadowNode for <BottomSheetContentView>. getContentOriginOffset returns
+ * the view's top offset so that RN hit-testing uses the correct coordinates
+ * when the parent BottomSheet has moved this content view.
+ */
+class JSI_EXPORT BottomSheetContentViewShadowNode final
+    : public ConcreteViewShadowNode<
+          BottomSheetContentViewComponentName,
+          BottomSheetContentViewProps,
+          ViewEventEmitter,
+          BottomSheetContentViewState> {
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+ public:
+  Point getContentOriginOffset(bool includeTransform) const override;
+};
+
+} // namespace react
+} // namespace facebook

package/common/cpp/react/renderer/components/bottomsheet/BottomSheetContentViewState.cpp

@@ -0,0 +1,15 @@
+#include "BottomSheetContentViewState.h"
+
+namespace facebook {
+namespace react {
+
+#ifdef ANDROID
+folly::dynamic BottomSheetContentViewState::getDynamic() const {
+  folly::dynamic data = folly::dynamic::object();
+  data["contentOffset"] = contentOffset;
+  return data;
+}
+#endif
+
+} // namespace react
+} // namespace facebook

package/common/cpp/react/renderer/components/bottomsheet/BottomSheetContentViewState.h

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <react/renderer/components/bottomsheet/Props.h>
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+/*
+ * State for <BottomSheetContentView> component. contentOffset is the offset
+ * (actual top - layout top) of this view. Used by getContentOriginOffset
+ * so that hit-testing uses the correct content origin when the sheet moves the view.
+ */
+class JSI_EXPORT BottomSheetContentViewState final {
+ public:
+  using Shared = std::shared_ptr<const BottomSheetContentViewState>;
+
+  BottomSheetContentViewState() = default;
+
+#ifdef ANDROID
+  BottomSheetContentViewState(
+      BottomSheetContentViewState const &previousState,
+      folly::dynamic data) {
+    contentOffset = data.getDefault("contentOffset", previousState.contentOffset).asDouble();
+  }
+#endif
+
+  double contentOffset{};
+
+#ifdef ANDROID
+  folly::dynamic getDynamic() const;
+  MapBuffer getMapBuffer() const { return MapBufferBuilder::EMPTY(); }
+#endif
+};
+
+} // namespace react
+} // namespace facebook

package/ios/RNBottomSheetContentView.mm

@@ -1,5 +1,8 @@
 #import "RNBottomSheetContentView.h"
 
+#import <CoreGraphics/CoreGraphics.h>
+#import <UIKit/UIKit.h>
+
 #import <react/renderer/components/bottomsheet/BottomSheetContentViewComponentDescriptor.h>
 #import <react/renderer/components/bottomsheet/BottomSheetContentViewShadowNode.h>
 #import <react/renderer/components/bottomsheet/EventEmitters.h>
@@ -44,4 +47,20 @@ using namespace facebook::react;
 		});
 }
 
+- (BOOL)_isBackgroundTransparent {
+	if (self.backgroundColor == nil) {
+		return YES;
+	}
+	return CGColorGetAlpha(self.backgroundColor.CGColor) < 1.0;
+}
+
+- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
+	UIView *hit = [super hitTest:point withEvent:event];
+	// 背景透明时相当于 BOX_NONE：只有子视图接收触摸，自身不接收
+	if ([self _isBackgroundTransparent] && hit == self) {
+		return nil;
+	}
+	return hit;
+}
+
 @end

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@sdcx/bottom-sheet",
 	"description": "A react-native BottomSheet component.",
-	"version": "1.0.6",
+	"version": "1.0.8",
 	"main": "./dist/index",
 	"module": "./dist/index",
 	"types": "./dist/index.d.ts",
@@ -13,6 +13,7 @@
 		"dist",
 		"android",
 		"ios",
+		"common",
 		"react-native.config.js",
 		"RNBottomSheet.podspec",
 		"!android/build",