Merge branch 'main' into feat/drag-events

Author: lodev09

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

@@ -3,6 +3,7 @@ package com.lodev09.truesheet
 import android.graphics.Color
 import android.util.Log
 import android.view.WindowManager
+import com.facebook.react.bridge.ColorPropConverter
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.common.MapBuilder
@@ -96,8 +97,8 @@ class TrueSheetViewManager : ViewGroupManager<TrueSheetView>() {
   }
 
   @ReactProp(name = "background")
-  fun setBackground(view: TrueSheetView, colorName: String) {
-    val color = runCatching { Color.parseColor(colorName) }.getOrDefault(Color.WHITE)
+  fun setBackground(view: TrueSheetView, colorName: Double) {
+    val color = runCatching { ColorPropConverter.getColor(colorName, view.context) }.getOrDefault(Color.WHITE)
     view.setBackground(color)
   }
 
@@ -107,10 +108,13 @@ class TrueSheetViewManager : ViewGroupManager<TrueSheetView>() {
     for (i in 0 until minOf(sizes.size(), 3)) {
       when (sizes.getType(i)) {
         ReadableType.Number -> result.add(sizes.getDouble(i))
+
         // React Native < 0.77 used String for getString, but 0.77
         // changed it to String?. Suppress the error for older APIs.
         @Suppress("UNNECESSARY_SAFE_CALL")
-        ReadableType.String -> sizes.getString(i)?.let { result.add(it) }
+        ReadableType.String
+        -> sizes.getString(i)?.let { result.add(it) }
+
         else -> Log.d(TAG, "Invalid type")
       }
     }

ios/Extensions/UIColor+withName.swift

@@ -266,13 +266,8 @@ class TrueSheetView: UIView, RCTInvalidating, TrueSheetViewControllerDelegate {
   }
 
   @objc
-  func setBackground(_ color: NSString?) {
-    if let color {
-      viewController.backgroundColor = UIColor(name: color as String)
-    } else {
-      viewController.backgroundColor = nil
-    }
-
+  func setBackground(_ color: NSNumber?) {
+    viewController.backgroundColor = RCTConvert.uiColor(color)
     viewController.setupBackground()
   }
 

ios/TrueSheetView.swift

@@ -35,7 +35,7 @@ @interface RCT_EXTERN_REMAP_MODULE (TrueSheetView, TrueSheetViewManager, RCTView
 RCT_EXPORT_VIEW_PROPERTY(maxHeight, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(sizes, NSArray)
 RCT_EXPORT_VIEW_PROPERTY(blurTint, NSString)
-RCT_EXPORT_VIEW_PROPERTY(background, NSString)
+RCT_EXPORT_VIEW_PROPERTY(background, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(cornerRadius, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(grabber, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(dismissible, BOOL)

ios/TrueSheetViewManager.m

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/commonjs/index.js",

package.json

@@ -8,7 +8,8 @@ import {
   type ViewStyle,
   type NativeSyntheticEvent,
   type LayoutChangeEvent,
-  type ColorValue,
+  type ProcessedColorValue,
+  processColor,
 } from 'react-native'
 
 import type { TrueSheetProps, SizeInfo } from './TrueSheet.types'
@@ -33,7 +34,7 @@ interface TrueSheetNativeViewProps
   extends Omit<TrueSheetProps, 'onPresent' | 'onSizeChange' | 'backgroundColor'> {
   contentHeight?: number
   footerHeight?: number
-  background?: ColorValue
+  background?: ProcessedColorValue | null
   scrollableHandle: number | null
   onPresent: (event: SizeChangeEvent) => void
   onSizeChange: (event: SizeChangeEvent) => void
@@ -272,7 +273,7 @@ export class TrueSheet extends PureComponent<TrueSheetProps, TrueSheetState> {
         scrollableHandle={this.state.scrollableHandle}
         sizes={sizes}
         blurTint={blurTint}
-        background={backgroundColor}
+        background={processColor(backgroundColor)}
         cornerRadius={cornerRadius}
         contentHeight={this.state.contentHeight}
         footerHeight={this.state.footerHeight}