Merge pull request #4806 from GeekyAnts/fix/type-basic-components

Fix/type basic components

Author: surajahmed

example/storybook/stories/components/Wrapper.tsx

@@ -33,9 +33,9 @@ const myTheme = extendTheme({
         myBtn: {
           padding: 10,
         },
-        myNewButton: ({ myPadding }: { myPadding: number }) => {
+        myNewButton: ({ myPaddingX }: { myPaddingX: number }) => {
           return {
-            padding: myPadding,
+            padding: myPaddingX,
           };
         },
       },
@@ -115,6 +115,7 @@ export function RenderTestButton() {
   return (
     <Box style={{ position: 'absolute', top: 10, left: 20 }} m={2} bg="red.100">
       <Button
+        variant={'myNewButton'}
         // title={state.toString()}
         onPress={() => setState(state + 1)}
       />

package.json

@@ -36,7 +36,7 @@
       "prettier --write"
     ]
   },
-  "version": "3.3.8-alpha.6",
+  "version": "3.3.8-alpha.7",
   "license": "MIT",
   "private": false,
   "main": "lib/commonjs/index",

src/components/basic/FlatList/types.ts

@@ -1,8 +1,8 @@
 import type { StyledProps } from '../../../theme/types';
 import type { FlatListProps } from 'react-native';
-import type { PlatformProps } from '../../types';
+import type { CustomProps, PlatformProps } from '../../types';
 
-export interface IFlatListProps<ItemT>
+export interface InterfaceFlatListProps<ItemT>
   extends FlatListProps<ItemT>,
     StyledProps,
     PlatformProps<IFlatListProps<ItemT>> {
@@ -11,3 +11,7 @@ export interface IFlatListProps<ItemT>
    */
   _contentContainerStyle?: IFlatListProps<ItemT>;
 }
+
+export type IFlatListProps<ItemT> =
+  | InterfaceFlatListProps<ItemT>
+  | CustomProps<'FlatList'>;

src/components/basic/KeyboardAvoidingView/types.ts

@@ -1,12 +1,16 @@
 import type { KeyboardAvoidingViewProps } from 'react-native';
 import type { StyledProps } from '../../../theme/types';
-import type { PlatformProps } from '../../types';
+import type { CustomProps, PlatformProps } from '../../types';
 
-export interface IKeyboardAvoidingViewProps
+export interface InterfaceKeyboardAvoidingViewProps
   extends KeyboardAvoidingViewProps,
     StyledProps,
     PlatformProps<IKeyboardAvoidingViewProps> {
   /**
    * Renders components as Box children. Accepts a JSX.Element or an array of JSX.Element. */
   children?: JSX.Element | JSX.Element[] | string | any;
 }
+
+export type IKeyboardAvoidingViewProps =
+  | InterfaceKeyboardAvoidingViewProps
+  | CustomProps<'KeyboardAvoidingView'>;

src/components/basic/ScrollView/types.ts

@@ -1,8 +1,8 @@
 import type { ScrollViewProps } from 'react-native';
 import type { StyledProps } from '../../../theme/types';
-import type { PlatformProps } from '../../types';
+import type { CustomProps, PlatformProps } from '../../types';
 
-export interface IScrollViewProps
+export interface InterfaceScrollViewProps
   extends ScrollViewProps,
     StyledProps,
     PlatformProps<IScrollViewProps> {
@@ -14,3 +14,7 @@ export interface IScrollViewProps
    */
   _contentContainerStyle?: IScrollViewProps;
 }
+
+export type IScrollViewProps =
+  | InterfaceScrollViewProps
+  | CustomProps<'ScrollView'>;

src/components/basic/SectionList/types.ts

@@ -1,11 +1,15 @@
 import type { StyledProps } from '../../../theme/types';
 import type { SectionListProps } from 'react-native';
-import type { PlatformProps } from '../../types';
+import type { CustomProps, PlatformProps } from '../../types';
 type DefaultSectionT = {
   [key: string]: any;
 };
 // TODO: any need to fixed
-export interface ISectionListProps<ItemT, sectionT = DefaultSectionT>
+export interface InterfaceSectionListProps<ItemT, sectionT = DefaultSectionT>
   extends SectionListProps<ItemT, sectionT>,
     StyledProps,
     PlatformProps<ISectionListProps<ItemT, sectionT>> {}
+
+export type ISectionListProps<ItemT, sectionT = DefaultSectionT> =
+  | InterfaceSectionListProps<ItemT, sectionT>
+  | CustomProps<'SectionList'>;

src/components/basic/StatusBar/types.ts

@@ -1,3 +1,7 @@
 import type { StatusBarProps } from 'react-native';
+import type { CustomProps } from '../../../components/types';
 
-export interface IStatusBarProps extends StatusBarProps {}
+export interface InterfaceStatusBarProps extends StatusBarProps {}
+export type IStatusBarProps =
+  | InterfaceStatusBarProps
+  | CustomProps<'StatusBar'>;

src/components/basic/View/types.ts

@@ -1,12 +1,14 @@
 import type { StyledProps } from '../../../theme/types';
 import type { ViewProps } from 'react-native';
-import type { PlatformProps } from '../../types';
+import type { CustomProps, PlatformProps } from '../../types';
 
-export interface IViewProps
+export interface InterfaceViewProps
   extends ViewProps,
     StyledProps,
     PlatformProps<IViewProps> {
   /**
    * Renders components as Box children. Accepts a JSX.Element or an array of JSX.Element. */
   children?: JSX.Element | JSX.Element[] | string | any;
 }
+
+export type IViewProps = InterfaceViewProps | CustomProps<'View'>;