@sdcx/bottom-sheet 1.0.3 → 1.0.5

package/RNBottomSheet.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/github-account/bottom-sheet.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/BottomSheet/**/*.{h,m,mm}"
+  s.source_files = "ios/**/*.{h,m,mm}"
 
   install_modules_dependencies(s)
 end

package/android/build.gradle

@@ -1,58 +1,46 @@
-
-buildscript {
-  repositories {
-    mavenCentral()
-    google()
-  }
-
-  dependencies {
-    classpath "com.android.tools.build:gradle:8.7.2"
-  }
-}
-
 apply plugin: 'com.android.library'
 apply plugin: 'com.facebook.react'
 
 def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+	rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 android {
 
-  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
-  // Check AGP version for backward compatibility w/react-native versions still on gradle plugin 6
-  def major = agpVersion[0].toInteger()
-  def minor = agpVersion[1].toInteger()
-  if ((major == 7 && minor >= 3) || major >= 8) {
-    namespace "com.reactnative.bottomsheet"
-    buildFeatures {
-      buildConfig true
-    }
-  }
-
-  compileSdkVersion safeExtGet('compileSdkVersion', 35)
-  buildToolsVersion safeExtGet('buildToolsVersion', '35.0.0')
-
-  defaultConfig {
-    minSdkVersion safeExtGet('minSdkVersion', 24)
-    targetSdkVersion safeExtGet('targetSdkVersion', 35)
-  }
-
-  sourceSets {
-        main {
-            java.srcDirs += [
-                    "generated/java",
-                    "generated/jni"
-            ]
-        }
-    }
+	def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+	// Check AGP version for backward compatibility w/react-native versions still on gradle plugin 6
+	def major = agpVersion[0].toInteger()
+	def minor = agpVersion[1].toInteger()
+	if ((major == 7 && minor >= 3) || major >= 8) {
+		namespace "com.reactnative.bottomsheet"
+		buildFeatures {
+			buildConfig true
+		}
+	}
+
+	compileSdkVersion safeExtGet('compileSdkVersion', 35)
+	buildToolsVersion safeExtGet('buildToolsVersion', '35.0.0')
+
+	defaultConfig {
+		minSdkVersion safeExtGet('minSdkVersion', 24)
+		targetSdkVersion safeExtGet('targetSdkVersion', 35)
+	}
+
+	sourceSets {
+		main {
+			java.srcDirs += [
+				"generated/java",
+				"generated/jni"
+			]
+		}
+	}
 }
 
 repositories {
-  google()
-  mavenCentral()
+	google()
+	mavenCentral()
 }
 
 dependencies {
-  api 'com.facebook.react:react-native:+'
+	implementation 'com.facebook.react:react-native:+'
 }

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

@@ -6,51 +6,59 @@ import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.viewmanagers.BottomSheetManagerDelegate;
 import com.facebook.react.viewmanagers.BottomSheetManagerInterface;
 
 import java.util.Map;
 
-public class BottomSheetManager extends ViewGroupManager<BottomSheet>
-	implements BottomSheetManagerInterface<BottomSheet> {
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "BottomSheet";
-    }
-
-    @NonNull
-    @Override
-    protected BottomSheet createViewInstance(@NonNull ThemedReactContext reactContext) {
-        return new BottomSheet(reactContext);
-    }
-
-    @Override
-    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-        return MapBuilder.<String, Object>builder()
-                .put(OnStateChangedEvent.Name, MapBuilder.of("registrationName", OnStateChangedEvent.JSEventName))
-                .put(OnSlideEvent.Name, MapBuilder.of("registrationName", OnSlideEvent.JSEventName))
-                .build();
-    }
+public class BottomSheetManager extends ViewGroupManager<BottomSheet> implements BottomSheetManagerInterface<BottomSheet> {
+
+	private final BottomSheetManagerDelegate<BottomSheet, BottomSheetManager> mDelegate = new BottomSheetManagerDelegate<>(this);
+
+	@Override
+	protected ViewManagerDelegate<BottomSheet> getDelegate() {
+		return mDelegate;
+	}
+
+	@NonNull
+	@Override
+	public String getName() {
+		return "BottomSheet";
+	}
+
+	@NonNull
+	@Override
+	protected BottomSheet createViewInstance(@NonNull ThemedReactContext reactContext) {
+		return new BottomSheet(reactContext);
+	}
+
+	@Override
+	public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+		return MapBuilder.<String, Object>builder()
+			.put(OnStateChangedEvent.Name, MapBuilder.of("registrationName", OnStateChangedEvent.JSEventName))
+			.put(OnSlideEvent.Name, MapBuilder.of("registrationName", OnSlideEvent.JSEventName))
+			.build();
+	}
 
 	@Override
-    @ReactProp(name = "peekHeight", defaultInt = 200)
-    public void setPeekHeight(BottomSheet view, int dp) {
-        view.setPeekHeight((int) (PixelUtil.toPixelFromDIP(dp) + 0.5));
-    }
+	@ReactProp(name = "peekHeight", defaultInt = 200)
+	public void setPeekHeight(BottomSheet view, int dp) {
+		view.setPeekHeight((int) (PixelUtil.toPixelFromDIP(dp) + 0.5));
+	}
 
 	@Override
-    @ReactProp(name = "status")
-    public void setStatus(BottomSheet view, String status) {
+	@ReactProp(name = "status")
+	public void setStatus(BottomSheet view, String status) {
 		assert status != null;
-        view.setStatus(BottomSheetStatus.valueOf(status.toUpperCase()));
-    }
+		view.setStatus(BottomSheetStatus.valueOf(status.toUpperCase()));
+	}
 
 	@Override
-    @ReactProp(name = "draggable")
-    public void setDraggable(BottomSheet view, boolean draggable) {
-        view.setDraggable(draggable);
-    }
+	@ReactProp(name = "draggable")
+	public void setDraggable(BottomSheet view, boolean draggable) {
+		view.setDraggable(draggable);
+	}
 
 }

package/package.json

@@ -1,10 +1,12 @@
 {
 	"name": "@sdcx/bottom-sheet",
 	"description": "A react-native BottomSheet component.",
-	"version": "1.0.3",
-	"main": "./dist/index.js",
-	"typings": "./dist/index.d.ts",
+	"version": "1.0.5",
+	"main": "./dist/index",
+	"module": "./dist/index",
+	"types": "./dist/index.d.ts",
 	"react-native": "src/index",
+	"source": "src/index",
 	"nativePackage": true,
 	"files": [
 		"src",
@@ -17,8 +19,8 @@
 		"!ios/build",
 		"!**/__tests__"
 	],
-	"repository": "https://github.com/sdcxtech/react-native-troika",
-	"homepage": "https://github.com/sdcxtech/react-native-troika/tree/master/packages/bottom-sheet/README.md",
+	"repository": "https://github.com/listenzz/react-native-troika",
+	"homepage": "https://github.com/listenzz/react-native-troika/tree/master/packages/bottom-sheet/README.md",
 	"author": "sdcx",
 	"license": "MIT",
 	"keywords": [

package/ios/BottomSheet.xcodeproj/project.pbxproj

@@ -1,283 +0,0 @@
-// !$*UTF8*$!
-{
-  archiveVersion = 1;
-  classes = {
-  };
-  objectVersion = 48;
-  objects = {
-
-/* Begin PBXBuildFile section */
-    91C884A6202C3E8600EC0A20 /* undefined.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C884A1202C3E8600EC0A20 /* undefined.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-    910362D01FE9318600F4DA8E /* CopyFiles */ = {
-      isa = PBXCopyFilesBuildPhase;
-      buildActionMask = 2147483647;
-      dstPath = "include/$(PRODUCT_NAME)";
-      dstSubfolderSpec = 16;
-      files = (
-      );
-      runOnlyForDeploymentPostprocessing = 0;
-    };
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-    910362D21FE9318600F4DA8E /* libBottomSheet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libBottomSheet.a; sourceTree = BUILT_PRODUCTS_DIR; };
-    91C884A1202C3E8600EC0A20 /* undefined.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = undefined.m; sourceTree = "<group>"; };
-    91C884A2202C3E8600EC0A20 /* undefined.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = undefined.h; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-    910362CF1FE9318600F4DA8E /* Frameworks */ = {
-      isa = PBXFrameworksBuildPhase;
-      buildActionMask = 2147483647;
-      files = (
-      );
-      runOnlyForDeploymentPostprocessing = 0;
-    };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-    910362C91FE9318600F4DA8E = {
-      isa = PBXGroup;
-      children = (
-        910362D41FE9318600F4DA8E /* BottomSheet */,
-        910362D31FE9318600F4DA8E /* Products */,
-      );
-      sourceTree = "<group>";
-    };
-    910362D31FE9318600F4DA8E /* Products */ = {
-      isa = PBXGroup;
-      children = (
-        910362D21FE9318600F4DA8E /* libBottomSheet.a */,
-      );
-      name = Products;
-      sourceTree = "<group>";
-    };
-    910362D41FE9318600F4DA8E /* BottomSheet */ = {
-      isa = PBXGroup;
-      children = (
-        91C884A2202C3E8600EC0A20 /* undefined.h */,
-        91C884A1202C3E8600EC0A20 /* undefined.m */,
-      );
-      path = BottomSheet;
-      sourceTree = "<group>";
-    };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-    910362D11FE9318600F4DA8E /* BottomSheet */ = {
-      isa = PBXNativeTarget;
-      buildConfigurationList = 910362DB1FE9318600F4DA8E /* Build configuration list for PBXNativeTarget "BottomSheet" */;
-      buildPhases = (
-        910362CE1FE9318600F4DA8E /* Sources */,
-        910362CF1FE9318600F4DA8E /* Frameworks */,
-        910362D01FE9318600F4DA8E /* CopyFiles */,
-      );
-      buildRules = (
-      );
-      dependencies = (
-      );
-      name = BottomSheet;
-      productName = BottomSheet;
-      productReference = 910362D21FE9318600F4DA8E /* libBottomSheet.a */;
-      productType = "com.apple.product-type.library.static";
-    };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-    910362CA1FE9318600F4DA8E /* Project object */ = {
-      isa = PBXProject;
-      attributes = {
-        LastUpgradeCheck = 0920;
-        ORGANIZATIONNAME = Listen;
-        TargetAttributes = {
-          910362D11FE9318600F4DA8E = {
-            CreatedOnToolsVersion = 9.2;
-            ProvisioningStyle = Automatic;
-          };
-        };
-      };
-      buildConfigurationList = 910362CD1FE9318600F4DA8E /* Build configuration list for PBXProject "BottomSheet" */;
-      compatibilityVersion = "Xcode 8.0";
-      developmentRegion = en;
-      hasScannedForEncodings = 0;
-      knownRegions = (
-        en,
-      );
-      mainGroup = 910362C91FE9318600F4DA8E;
-      productRefGroup = 910362D31FE9318600F4DA8E /* Products */;
-      projectDirPath = "";
-      projectRoot = "";
-      targets = (
-        910362D11FE9318600F4DA8E /* BottomSheet */,
-      );
-    };
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-    910362CE1FE9318600F4DA8E /* Sources */ = {
-      isa = PBXSourcesBuildPhase;
-      buildActionMask = 2147483647;
-      files = (
-        91C884A6202C3E8600EC0A20 /* undefined.m in Sources */,
-      );
-      runOnlyForDeploymentPostprocessing = 0;
-    };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-    910362D91FE9318600F4DA8E /* Debug */ = {
-      isa = XCBuildConfiguration;
-      buildSettings = {
-        ALWAYS_SEARCH_USER_PATHS = NO;
-        CLANG_ANALYZER_NONNULL = YES;
-        CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-        CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-        CLANG_CXX_LIBRARY = "libc++";
-        CLANG_ENABLE_MODULES = YES;
-        CLANG_ENABLE_OBJC_ARC = YES;
-        CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-        CLANG_WARN_BOOL_CONVERSION = YES;
-        CLANG_WARN_COMMA = YES;
-        CLANG_WARN_CONSTANT_CONVERSION = YES;
-        CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-        CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-        CLANG_WARN_EMPTY_BODY = YES;
-        CLANG_WARN_ENUM_CONVERSION = YES;
-        CLANG_WARN_INFINITE_RECURSION = YES;
-        CLANG_WARN_INT_CONVERSION = YES;
-        CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-        CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-        CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-        CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-        CLANG_WARN_STRICT_PROTOTYPES = YES;
-        CLANG_WARN_SUSPICIOUS_MOVE = YES;
-        CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-        CLANG_WARN_UNREACHABLE_CODE = YES;
-        CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-        CODE_SIGN_IDENTITY = "iPhone Developer";
-        COPY_PHASE_STRIP = NO;
-        DEBUG_INFORMATION_FORMAT = dwarf;
-        ENABLE_STRICT_OBJC_MSGSEND = YES;
-        ENABLE_TESTABILITY = YES;
-        GCC_C_LANGUAGE_STANDARD = gnu11;
-        GCC_DYNAMIC_NO_PIC = NO;
-        GCC_NO_COMMON_BLOCKS = YES;
-        GCC_OPTIMIZATION_LEVEL = 0;
-        GCC_PREPROCESSOR_DEFINITIONS = (
-          "DEBUG=1",
-          "$(inherited)",
-        );
-        GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-        GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-        GCC_WARN_UNDECLARED_SELECTOR = YES;
-        GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-        GCC_WARN_UNUSED_FUNCTION = YES;
-        GCC_WARN_UNUSED_VARIABLE = YES;
-        IPHONEOS_DEPLOYMENT_TARGET = 7.0;
-        MTL_ENABLE_DEBUG_INFO = YES;
-        ONLY_ACTIVE_ARCH = YES;
-        SDKROOT = iphoneos;
-      };
-      name = Debug;
-    };
-    910362DA1FE9318600F4DA8E /* Release */ = {
-      isa = XCBuildConfiguration;
-      buildSettings = {
-        ALWAYS_SEARCH_USER_PATHS = NO;
-        CLANG_ANALYZER_NONNULL = YES;
-        CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-        CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-        CLANG_CXX_LIBRARY = "libc++";
-        CLANG_ENABLE_MODULES = YES;
-        CLANG_ENABLE_OBJC_ARC = YES;
-        CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-        CLANG_WARN_BOOL_CONVERSION = YES;
-        CLANG_WARN_COMMA = YES;
-        CLANG_WARN_CONSTANT_CONVERSION = YES;
-        CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-        CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-        CLANG_WARN_EMPTY_BODY = YES;
-        CLANG_WARN_ENUM_CONVERSION = YES;
-        CLANG_WARN_INFINITE_RECURSION = YES;
-        CLANG_WARN_INT_CONVERSION = YES;
-        CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-        CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-        CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-        CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-        CLANG_WARN_STRICT_PROTOTYPES = YES;
-        CLANG_WARN_SUSPICIOUS_MOVE = YES;
-        CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-        CLANG_WARN_UNREACHABLE_CODE = YES;
-        CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-        CODE_SIGN_IDENTITY = "iPhone Developer";
-        COPY_PHASE_STRIP = NO;
-        DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-        ENABLE_NS_ASSERTIONS = NO;
-        ENABLE_STRICT_OBJC_MSGSEND = YES;
-        GCC_C_LANGUAGE_STANDARD = gnu11;
-        GCC_NO_COMMON_BLOCKS = YES;
-        GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-        GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-        GCC_WARN_UNDECLARED_SELECTOR = YES;
-        GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-        GCC_WARN_UNUSED_FUNCTION = YES;
-        GCC_WARN_UNUSED_VARIABLE = YES;
-        IPHONEOS_DEPLOYMENT_TARGET = 7.0;
-        MTL_ENABLE_DEBUG_INFO = NO;
-        SDKROOT = iphoneos;
-        VALIDATE_PRODUCT = YES;
-      };
-      name = Release;
-    };
-    910362DC1FE9318600F4DA8E /* Debug */ = {
-      isa = XCBuildConfiguration;
-      buildSettings = {
-        CODE_SIGN_STYLE = Automatic;
-        DEVELOPMENT_TEAM = 9H9696K6NL;
-        OTHER_LDFLAGS = "-ObjC";
-        PRODUCT_NAME = "$(TARGET_NAME)";
-        SKIP_INSTALL = YES;
-        TARGETED_DEVICE_FAMILY = "1,2";
-      };
-      name = Debug;
-    };
-    910362DD1FE9318600F4DA8E /* Release */ = {
-      isa = XCBuildConfiguration;
-      buildSettings = {
-        CODE_SIGN_STYLE = Automatic;
-        DEVELOPMENT_TEAM = 9H9696K6NL;
-        OTHER_LDFLAGS = "-ObjC";
-        PRODUCT_NAME = "$(TARGET_NAME)";
-        SKIP_INSTALL = YES;
-        TARGETED_DEVICE_FAMILY = "1,2";
-      };
-      name = Release;
-    };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-    910362CD1FE9318600F4DA8E /* Build configuration list for PBXProject "BottomSheet" */ = {
-      isa = XCConfigurationList;
-      buildConfigurations = (
-        910362D91FE9318600F4DA8E /* Debug */,
-        910362DA1FE9318600F4DA8E /* Release */,
-      );
-      defaultConfigurationIsVisible = 0;
-      defaultConfigurationName = Release;
-    };
-    910362DB1FE9318600F4DA8E /* Build configuration list for PBXNativeTarget "BottomSheet" */ = {
-      isa = XCConfigurationList;
-      buildConfigurations = (
-        910362DC1FE9318600F4DA8E /* Debug */,
-        910362DD1FE9318600F4DA8E /* Release */,
-      );
-      defaultConfigurationIsVisible = 0;
-      defaultConfigurationName = Release;
-    };
-/* End XCConfigurationList section */
-  };
-  rootObject = 910362CA1FE9318600F4DA8E /* Project object */;
-}