Merge pull request #4547 from GeekyAnts/release/3.3.3-alpha.2

release 3.3.3-alpha.2

package.json

@@ -37,7 +37,7 @@
       "prettier --write"
     ]
   },
-  "version": "3.3.2",
+  "version": "3.3.3-alpha.2",
   "license": "MIT",
   "private": false,
   "main": "lib/commonjs/index",

src/components/composites/SimpleGrid/types.ts

@@ -1,4 +1,4 @@
-import type { IBoxProps } from 'native-base';
+import type { IBoxProps } from '../../primitives/Box/types';
 
 export type ISimpleGridProps = IBoxProps<ISimpleGridProps> & {
   space?: number;

src/components/composites/Typeahead/types.ts

@@ -1,4 +1,4 @@
-import type { IBoxProps } from 'native-base';
+import type { IBoxProps } from '../../primitives/Box/types';
 
 export type ITypeaheadProps = IBoxProps<ITypeaheadProps> & {
   options: any[];

src/components/primitives/Box/types.ts

@@ -1,10 +1,10 @@
 import type { ViewProps } from 'react-native';
 import type { StyledProps } from '../../../theme/types';
-import type { IColors } from '../../../theme/base/colors';
 import type {
   SafeAreaProps,
   PlatformProps,
   ResponsiveValue,
+  ColorType,
 } from '../../types';
 import type { ITextProps } from './../Text/types';
 
@@ -34,10 +34,12 @@ export interface IBoxProps<T = null>
    * For providing props to Text inside Box
    */
   _text?: ITextProps;
-  bg?: ResponsiveValue<IColors | (string & {}) | ILinearGradientProps>;
-  background?: ResponsiveValue<IColors | (string & {}) | ILinearGradientProps>;
-  bgColor?: ResponsiveValue<IColors | (string & {}) | ILinearGradientProps>;
+  bg?: ResponsiveValue<ColorType | (string & {}) | ILinearGradientProps>;
+  background?: ResponsiveValue<
+    ColorType | (string & {}) | ILinearGradientProps
+  >;
+  bgColor?: ResponsiveValue<ColorType | (string & {}) | ILinearGradientProps>;
   backgroundColor?: ResponsiveValue<
-    IColors | (string & {}) | ILinearGradientProps
+    ColorType | (string & {}) | ILinearGradientProps
   >;
 }

src/core/NativeBaseProvider.tsx

@@ -87,23 +87,17 @@ const NativeBaseProvider = (props: NativeBaseProviderProps) => {
         }
       >
         <ResponsiveQueryProvider disableCSSMediaQueries={!isSSR}>
-          <SafeAreaProvider
-            initialMetrics={
-              initialWindowMetrics ?? defaultInitialWindowMetricsBasedOnPlatform
-            }
+          <HybridProvider
+            colorModeManager={colorModeManager}
+            options={theme.config}
           >
-            <HybridProvider
-              colorModeManager={colorModeManager}
-              options={theme.config}
-            >
-              <OverlayProvider>
-                <ToastProvider>
-                  <InitializeToastRef />
-                  <SSRProvider>{children}</SSRProvider>
-                </ToastProvider>
-              </OverlayProvider>
-            </HybridProvider>
-          </SafeAreaProvider>
+            <OverlayProvider>
+              <ToastProvider>
+                <InitializeToastRef />
+                <SSRProvider>{children}</SSRProvider>
+              </ToastProvider>
+            </OverlayProvider>
+          </HybridProvider>
         </ResponsiveQueryProvider>
       </SafeAreaProvider>
     </NativeBaseConfigProvider>

src/utils/getSpacedChildren.tsx

@@ -1,6 +1,5 @@
-import { Box } from 'native-base';
 import React from 'react';
-// import { default as Box } from '../components/primitives/Box';
+import { default as Box } from '../components/primitives/Box';
 import type { SpaceType as ThemeSpaceType } from '../components/types';
 import { ResponsiveQueryContext } from './useResponsiveQuery/ResponsiveQueryProvider';