@sdcx/bottom-sheet 0.16.0 → 1.0.0

package/android/src/main/java/com/reactnative/bottomsheet/{OffsetChangedEvent.java → OnSlideEvent.java}

@@ -1,5 +1,6 @@
 package com.reactnative.bottomsheet;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.Arguments;
@@ -7,21 +8,22 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.events.Event;
 
-public class OffsetChangedEvent extends Event<OffsetChangedEvent> {
-    public static final String Name = "offsetEvent";
+public class OnSlideEvent extends Event<OnSlideEvent> {
+    public static final String Name = "topSlide";
     public static final String JSEventName = "onSlide";
 
     private final int offset;
     private final int minOffset;
     private final int maxOffset;
 
-    public OffsetChangedEvent(int surfaceId, int viewTag, int offset, int minOffset, int maxOffset) {
+    public OnSlideEvent(int surfaceId, int viewTag, int offset, int minOffset, int maxOffset) {
         super(surfaceId, viewTag);
         this.offset = offset;
         this.maxOffset = maxOffset;
         this.minOffset = minOffset;
     }
 
+	@NonNull
     @Override
     public String getEventName() {
         return Name;

package/android/src/main/java/com/reactnative/bottomsheet/{StateChangedEvent.java → OnStateChangedEvent.java}

@@ -1,22 +1,24 @@
 package com.reactnative.bottomsheet;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
-public class StateChangedEvent extends Event<StateChangedEvent> {
-    public static final String Name = "stateEvent";
+public class OnStateChangedEvent extends Event<OnStateChangedEvent> {
+    public static final String Name = "topStateChanged";
     public static final String JSEventName = "onStateChanged";
 
     private final String state;
 
-    public StateChangedEvent(int surfaceId, int viewTag, String state) {
+    public OnStateChangedEvent(int surfaceId, int viewTag, String state) {
         super(surfaceId, viewTag);
         this.state = state;
     }
 
+	@NonNull
     @Override
     public String getEventName() {
         return Name;

package/dist/BottomSheetNativeComponent.d.ts

@@ -0,0 +1,20 @@
+import type { CodegenTypes, HostComponent, ViewProps } from 'react-native';
+export type BottomSheetStatus = 'collapsed' | 'expanded' | 'hidden' | 'dragging' | 'settling';
+export type OnStateChangedEventPayload = {
+    state: 'collapsed' | 'expanded' | 'hidden';
+};
+export type OnSlideEventPayload = {
+    progress: CodegenTypes.Float;
+    offset: CodegenTypes.Float;
+    expandedOffset: CodegenTypes.Float;
+    collapsedOffset: CodegenTypes.Float;
+};
+export interface NativeProps extends ViewProps {
+    peekHeight?: CodegenTypes.WithDefault<CodegenTypes.Int32, 200>;
+    draggable?: CodegenTypes.WithDefault<boolean, true>;
+    status?: CodegenTypes.WithDefault<BottomSheetStatus, 'collapsed'>;
+    onSlide?: CodegenTypes.DirectEventHandler<OnSlideEventPayload>;
+    onStateChanged?: CodegenTypes.DirectEventHandler<OnStateChangedEventPayload>;
+}
+declare const _default: HostComponent<NativeProps>;
+export default _default;

package/dist/BottomSheetNativeComponent.js

@@ -0,0 +1,2 @@
+import { codegenNativeComponent } from 'react-native';
+export default codegenNativeComponent('BottomSheet');

package/dist/index.d.ts

@@ -1,24 +1,17 @@
 import React from 'react';
 import { NativeSyntheticEvent, ViewProps } from 'react-native';
-export interface OffsetChangedEventData {
-    progress: number;
-    offset: number;
-    expandedOffset: number;
-    collapsedOffset: number;
-}
+import type { OnStateChangedEventPayload, OnSlideEventPayload } from './BottomSheetNativeComponent';
 export type BottomSheetState = 'collapsed' | 'expanded' | 'hidden';
-export interface StateChangedEventData {
-    state: BottomSheetState;
-}
-interface NativeBottomSheetProps extends ViewProps {
-    onSlide?: (event: NativeSyntheticEvent<OffsetChangedEventData>) => void;
-    onStateChanged?: (event: NativeSyntheticEvent<StateChangedEventData>) => void;
+export type BottomSheetOnSlideEvent = NativeSyntheticEvent<OnSlideEventPayload>;
+export type BottomSheetOnStateChangedEvent = NativeSyntheticEvent<OnStateChangedEventPayload>;
+interface BottomSheetProps extends ViewProps {
+    onSlide?: (event: BottomSheetOnSlideEvent) => void;
+    onStateChanged?: (event: BottomSheetOnStateChangedEvent) => void;
     peekHeight?: number;
     draggable?: boolean;
     state?: BottomSheetState;
+    fitToContents?: boolean;
     contentContainerStyle?: ViewProps['style'];
 }
-declare const BottomSheet: React.ForwardRefExoticComponent<NativeBottomSheetProps & {
-    fitToContents?: boolean | undefined;
-} & React.RefAttributes<React.Component<NativeBottomSheetProps, {}, any> & import("react-native").NativeMethods>>;
+declare function BottomSheet(props: BottomSheetProps): React.JSX.Element;
 export default BottomSheet;

package/dist/index.js

@@ -1,20 +1,20 @@
 import React from 'react';
-import { requireNativeComponent, StyleSheet, View, } from 'react-native';
+import { StyleSheet, View } from 'react-native';
 import splitLayoutProps from './splitLayoutProps';
-const NativeBottomSheet = requireNativeComponent('BottomSheet');
-const BottomSheet = React.forwardRef((props, ref) => {
+import BottomSheetNativeComponent from './BottomSheetNativeComponent';
+function BottomSheet(props) {
     const { style, contentContainerStyle, children, peekHeight = 200, draggable = true, state = 'collapsed', fitToContents, ...rest } = props;
     const { outer, inner } = splitLayoutProps(StyleSheet.flatten(style));
-    return (<NativeBottomSheet style={[StyleSheet.absoluteFill, outer]} peekHeight={peekHeight} draggable={draggable} state={state} {...rest} ref={ref}>
-      <View style={[
+    return (<BottomSheetNativeComponent style={[StyleSheet.absoluteFill, outer]} peekHeight={peekHeight} draggable={draggable} status={state} {...rest}>
+			<View style={[
             fitToContents ? styles.fitToContents : StyleSheet.absoluteFill,
             inner,
             contentContainerStyle,
         ]} collapsable={false}>
-        {children}
-      </View>
-    </NativeBottomSheet>);
-});
+				{children}
+			</View>
+		</BottomSheetNativeComponent>);
+}
 const styles = StyleSheet.create({
     fitToContents: {
         position: 'absolute',

package/ios/BottomSheet/{RNBottomSheetOffsetChangedEvent.m → Event/RNBottomSheetOffsetChangedEvent.mm}

@@ -1,5 +1,7 @@
 #import "RNBottomSheetOffsetChangedEvent.h"
 
+#import <React/UIView+React.h>
+
 @interface RNBottomSheetOffsetChangedEvent ()
 
 @property (nonatomic, assign) CGFloat progress;
@@ -34,7 +36,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
 }
 
 - (BOOL)canCoalesce {
-    return YES;
+	return YES;
 }
 
 - (uint16_t)coalescingKey {

package/ios/BottomSheet/{RNBottomSheetStateChangedEvent.h → Event/RNBottomSheetStateChangedEvent.h}

@@ -1,12 +1,10 @@
 #import <React/RCTEventDispatcherProtocol.h>
 
-#import "RNBottomSheetState.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RNBottomSheetStateChangedEvent : NSObject <RCTEvent>
 
-- (instancetype)initWithViewTag:(NSNumber *)viewTag state:(RNBottomSheetState)state;
+- (instancetype)initWithViewTag:(NSNumber *)viewTag state:(NSString *)state;
 
 @end
 

package/ios/BottomSheet/{RNBottomSheetStateChangedEvent.m → Event/RNBottomSheetStateChangedEvent.mm}

@@ -4,7 +4,7 @@ static uint16_t _coalescingKey = 0;
 
 @interface RNBottomSheetStateChangedEvent ()
 
-@property (nonatomic, assign) RNBottomSheetState state;
+@property (nonatomic, copy) NSString *state;
 
 @end
 
@@ -17,7 +17,7 @@ static uint16_t _coalescingKey = 0;
 }
 
 RCT_NOT_IMPLEMENTED(- (instancetype)init)
-- (instancetype)initWithViewTag:(NSNumber *)viewTag state:(RNBottomSheetState)state {
+- (instancetype)initWithViewTag:(NSNumber *)viewTag state:(NSString *)state {
     if (self = [super init]) {
         _viewTag = viewTag;
         _state = state;
@@ -39,8 +39,8 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
 
 - (NSArray *)arguments {
     return @[self.viewTag, RCTNormalizeInputEventName(self.eventName), @{
-                @"state": RNBottomSheetStateToString(self.state)
-            }];
+		@"state": self.state
+	}];
 }
 
 - (id<RCTEvent>)coalesceWithEvent:(id<RCTEvent>)newEvent {

package/ios/BottomSheet/RNBottomSheetComponentView.h

@@ -0,0 +1,10 @@
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNBottomSheetComponentView : RCTViewComponentView
+
+@end
+
+NS_ASSUME_NONNULL_END