From 19526f9f91943e70a652047d3ffaeb7873a20bc0 Mon Sep 17 00:00:00 2001 From: Wojciech Lewicki Date: Wed, 23 Mar 2022 12:48:00 +0100 Subject: [PATCH] fix: remove processColor --- .../main/java/com/swmansion/rnscreens/ScreenViewManager.kt | 6 +----- src/index.native.tsx | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/android/src/main/java/com/swmansion/rnscreens/ScreenViewManager.kt b/android/src/main/java/com/swmansion/rnscreens/ScreenViewManager.kt index d89f963768..4d37502dd3 100644 --- a/android/src/main/java/com/swmansion/rnscreens/ScreenViewManager.kt +++ b/android/src/main/java/com/swmansion/rnscreens/ScreenViewManager.kt @@ -1,12 +1,8 @@ package com.swmansion.rnscreens -import androidx.annotation.NonNull -import androidx.annotation.Nullable import com.facebook.react.bridge.JSApplicationIllegalArgumentException import com.facebook.react.common.MapBuilder import com.facebook.react.module.annotations.ReactModule -import com.facebook.react.uimanager.ReactStylesDiffMap -import com.facebook.react.uimanager.StateWrapper import com.facebook.react.uimanager.ThemedReactContext import com.facebook.react.uimanager.ViewGroupManager import com.facebook.react.uimanager.ViewManagerDelegate @@ -105,7 +101,7 @@ class ScreenViewManager : ViewGroupManager(), RNSScreenManagerInterface< view.isStatusBarAnimated = animated } - @ReactProp(name = "statusBarColor") + @ReactProp(name = "statusBarColor", customType = "Color") override fun setStatusBarColor(view: Screen, statusBarColor: Int?) { view.statusBarColor = statusBarColor } diff --git a/src/index.native.tsx b/src/index.native.tsx index 35ce64cbd6..0d778d4af6 100644 --- a/src/index.native.tsx +++ b/src/index.native.tsx @@ -11,9 +11,6 @@ import { ViewProps, } from 'react-native'; import { Freeze } from 'react-freeze'; -// @ts-ignore Getting private component -// eslint-disable-next-line import/default -import processColor from 'react-native/Libraries/StyleSheet/processColor'; import { version } from 'react-native/package.json'; import TransitionProgressContext from './TransitionProgressContext'; @@ -251,7 +248,6 @@ class Screen extends React.Component { activityState, children, isNativeStack, - statusBarColor, ...props } = rest; @@ -262,8 +258,6 @@ class Screen extends React.Component { activityState = active !== 0 ? 2 : 0; // in the new version, we need one of the screens to have value of 2 after the transition } - const processedColor = processColor(statusBarColor); - const handleRef = (ref: ViewConfig) => { if (!ENABLE_FABRIC) { if (ref?.viewConfig?.validAttributes?.style) { @@ -280,7 +274,6 @@ class Screen extends React.Component {