Merge pull request #4873 from GeekyAnts/release/3.4.0-rc.3

Release/3.4.0 rc.3

Author: surajahmed

example/storybook/stories/components/Wrapper.tsx

@@ -11,6 +11,7 @@ import {
   SunIcon,
   extendTheme,
   Button,
+  Input,
 } from 'native-base';
 import type { StorageManager } from 'native-base';
 import AsyncStorage from '@react-native-async-storage/async-storage';
@@ -38,6 +39,12 @@ const myTheme = extendTheme({
             padding: myPaddingX,
           };
         },
+
+        myNewButton1: (props: any) => {
+          return {
+            padding: props.padding,
+          };
+        },
       },
       sizes: {
         newsize: ({ mySize }: { mySize: number }) => {
@@ -48,6 +55,27 @@ const myTheme = extendTheme({
       },
     },
 
+    Input: {
+      variants: {
+        newsize: ({ mySize }: { mySize: number }) => {
+          return {
+            padding: mySize,
+          };
+        },
+
+        newsize1: (props: any) => {
+          return {
+            padding: props.padding,
+          };
+        },
+      },
+      sizes: {
+        'my-size': {
+          padding: 2,
+        },
+      },
+    },
+
     Checkbox: {
       sizes: {
         myBtn: {
@@ -115,7 +143,9 @@ export function RenderTestButton() {
   const [state, setState] = React.useState(1);
   return (
     <Box style={{ position: 'absolute', top: 10, left: 20 }} m={2} bg="red.100">
+      <Input m={2} size="my-size" />
       <Button
+        size=""
         variant={'myNewButton'}
         // title={state.toString()}
         onPress={() => setState(state + 1)}

example/yarn.lock

@@ -36,7 +36,7 @@
       "prettier --write"
     ]
   },
-  "version": "3.4.0-rc.1",
+  "version": "3.4.0-rc.3",
   "license": "MIT",
   "private": false,
   "main": "lib/commonjs/index",
@@ -89,7 +89,7 @@
     "release-it": "^13.5.8",
     "rollup": "^2.34.1",
     "rollup-plugin-flow": "^1.1.1",
-    "typescript": "4.2",
+    "typescript": "4.6",
     "visualize-bundle": "^1.4.0"
   },
   "peerDependencies": {
@@ -182,7 +182,7 @@
     "@react-native-aria/combobox": "^0.2.4-alpha.0",
     "@react-native-aria/focus": "^0.2.4",
     "@react-native-aria/interactions": "^0.2.2",
-    "@react-native-aria/listbox": "0.2.4-alpha.3",
+    "@react-native-aria/listbox": "^0.2.4-alpha.3",
     "@react-native-aria/overlays": "0.3.3-rc.0",
     "@react-native-aria/radio": "^0.2.4",
     "@react-native-aria/slider": "^0.2.5-alpha.1",

package.json

@@ -12,6 +12,5 @@ export interface InterfaceFlatListProps<ItemT>
   _contentContainerStyle?: Partial<IFlatListProps<ItemT>>;
 }
 
-export type IFlatListProps<ItemT> =
-  | InterfaceFlatListProps<ItemT>
-  | CustomProps<'FlatList'>;
+export type IFlatListProps<ItemT> = InterfaceFlatListProps<ItemT> &
+  CustomProps<'FlatList'>;

src/components/basic/FlatList/types.ts

@@ -11,6 +11,5 @@ export interface InterfaceKeyboardAvoidingViewProps
   children?: JSX.Element | JSX.Element[] | string | any;
 }
 
-export type IKeyboardAvoidingViewProps =
-  | InterfaceKeyboardAvoidingViewProps
-  | CustomProps<'KeyboardAvoidingView'>;
+export type IKeyboardAvoidingViewProps = InterfaceKeyboardAvoidingViewProps &
+  CustomProps<'KeyboardAvoidingView'>;

src/components/basic/KeyboardAvoidingView/types.ts

@@ -15,6 +15,5 @@ export interface InterfaceScrollViewProps
   _contentContainerStyle?: Partial<IScrollViewProps>;
 }
 
-export type IScrollViewProps =
-  | InterfaceScrollViewProps
-  | CustomProps<'ScrollView'>;
+export type IScrollViewProps = InterfaceScrollViewProps &
+  CustomProps<'ScrollView'>;

src/components/basic/ScrollView/types.ts

@@ -10,6 +10,7 @@ export interface InterfaceSectionListProps<ItemT, sectionT = DefaultSectionT>
     StyledProps,
     PlatformProps<ISectionListProps<ItemT, sectionT>> {}
 
-export type ISectionListProps<ItemT, sectionT = DefaultSectionT> =
-  | InterfaceSectionListProps<ItemT, sectionT>
-  | CustomProps<'SectionList'>;
+export type ISectionListProps<
+  ItemT,
+  sectionT = DefaultSectionT
+> = InterfaceSectionListProps<ItemT, sectionT> & CustomProps<'SectionList'>;

src/components/basic/SectionList/types.ts

@@ -2,6 +2,7 @@ import type { StatusBarProps } from 'react-native';
 import type { CustomProps } from '../../../components/types';
 
 export interface InterfaceStatusBarProps extends StatusBarProps {}
-export type IStatusBarProps =
-  | InterfaceStatusBarProps
-  | CustomProps<'StatusBar'>;
+export type IStatusBarProps = InterfaceStatusBarProps &
+  CustomProps<'StatusBar'>;
+
+export type IStatusBarComponentType = (props: IStatusBarProps) => JSX.Element;

src/components/basic/StatusBar/types.ts

@@ -11,4 +11,4 @@ export interface InterfaceViewProps
   children?: JSX.Element | JSX.Element[] | string | any;
 }
 
-export type IViewProps = InterfaceViewProps | CustomProps<'View'>;
+export type IViewProps = InterfaceViewProps & CustomProps<'View'>;

src/components/basic/View/types.ts

@@ -1,10 +1,10 @@
 import type { InterfaceButtonProps } from '../../primitives/Button/types';
-import type { IBoxProps } from '../../primitives/Box';
+import type { InterfaceBoxProps } from '../../primitives/Box';
 import type { MutableRefObject } from 'react';
 import type { CustomProps } from '../../../components/types';
 
 export interface InterfaceActionsheetProps
-  extends IBoxProps<IActionsheetProps> {
+  extends InterfaceBoxProps<IActionsheetProps> {
   /**
    * If true, the ActionSheet will open. Useful for controllable state behaviour
    */
@@ -30,24 +30,24 @@ export interface InterfaceActionsheetProps
 }
 
 export interface IActionsheetContentProps
-  extends IBoxProps<IActionsheetContentProps> {
+  extends InterfaceBoxProps<IActionsheetContentProps> {
   /**
    * Props applied on area above actionsheet content
    */
-  _dragIndicatorWrapperOffSet?: IBoxProps<IActionsheetContentProps>;
+  _dragIndicatorWrapperOffSet?: InterfaceBoxProps<IActionsheetContentProps>;
   /**
    * Props applied on area around drag indicator
    */
-  _dragIndicatorWrapper?: IBoxProps<IActionsheetContentProps>;
+  _dragIndicatorWrapper?: InterfaceBoxProps<IActionsheetContentProps>;
   /**
    * Props applied on drag indicator
    */
-  _dragIndicator?: IBoxProps<IActionsheetContentProps>;
+  _dragIndicator?: InterfaceBoxProps<IActionsheetContentProps>;
 }
 export interface IActionsheetFooterProps
-  extends IBoxProps<IActionsheetFooterProps> {}
+  extends InterfaceBoxProps<IActionsheetFooterProps> {}
 export interface IActionsheetHeaderProps
-  extends IBoxProps<IActionsheetHeaderProps> {}
+  extends InterfaceBoxProps<IActionsheetHeaderProps> {}
 export interface IActionsheetItemProps extends InterfaceButtonProps {}
 
 export type IActionsheetComponentType = ((
@@ -75,6 +75,5 @@ export type IActionsheetComponentType = ((
   // >;
 };
 
-export type IActionsheetProps =
-  | InterfaceActionsheetProps
-  | CustomProps<'Actionsheet'>;
+export type IActionsheetProps = InterfaceActionsheetProps &
+  CustomProps<'Actionsheet'>;