From f404ef798dc3e8683650ba3c795c81155153b620 Mon Sep 17 00:00:00 2001
From: ankit-tailor <tailorankit3345@gmail.com>
Date: Mon, 31 Oct 2022 16:29:27 +0530
Subject: [PATCH 01/14] fix: color mode button

---
 example/storybook/stories/components/Wrapper.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/storybook/stories/components/Wrapper.tsx b/example/storybook/stories/components/Wrapper.tsx
index 6d89912da..3e0536367 100644
--- a/example/storybook/stories/components/Wrapper.tsx
+++ b/example/storybook/stories/components/Wrapper.tsx
@@ -123,7 +123,7 @@ function MyWrapper({ children }: any) {
       bg={bgColor}
       safeAreaY
     >
-      {/* <Tooltip
+      <Tooltip
         label={colorMode === 'dark' ? 'Enable light mode' : 'Enable dark mode'}
         placement="bottom right"
         openDelay={300}
@@ -138,7 +138,7 @@ function MyWrapper({ children }: any) {
           icon={colorMode === 'dark' ? <SunIcon /> : <MoonIcon />}
           size="lg"
         />
-      </Tooltip> */}
+      </Tooltip>
       {children}
     </Box>
   );

From 694061e098a04b14d48c0251734feaab43cc5586 Mon Sep 17 00:00:00 2001
From: Viraj-10 <virajjoshi132@gmail.com>
Date: Thu, 3 Nov 2022 13:02:28 +0530
Subject: [PATCH 02/14] fix: avatar group reverse

---
 src/components/composites/Avatar/Group.tsx | 36 ++++++++--------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/components/composites/Avatar/Group.tsx b/src/components/composites/Avatar/Group.tsx
index dd9acc091..89fc891a8 100644
--- a/src/components/composites/Avatar/Group.tsx
+++ b/src/components/composites/Avatar/Group.tsx
@@ -22,7 +22,6 @@ const getAvatarGroupChildren = (
     plusAvatars = childrenArray.length - max;
     childrenArray = childrenArray.slice(0, max);
   }
-  const trailingChildren = childrenArray.slice(1);
   const spacingProps = {
     ml: isVertical ? 0 : space,
     mt: isVertical ? space : 0,
@@ -38,29 +37,18 @@ const getAvatarGroupChildren = (
         {'+ ' + plusAvatars}
       </Avatar>
     ) : null,
-    React.Children.map(
-      trailingChildren.reverse(),
-      (child: any, index: number) => {
-        return React.cloneElement(
-          child,
-          {
-            key: `avatar-group-child-${index}`,
-            ..._avatar,
-            ...spacingProps,
-            ...child.props,
-          },
-          child.props.children
-        );
-      }
-    ),
-    React.cloneElement(
-      childrenArray[0],
-      {
-        ..._avatar,
-        ...childrenArray[0].props,
-      },
-      childrenArray[0].props.children
-    ),
+    React.Children.map(childrenArray.reverse(), (child: any, index: number) => {
+      return React.cloneElement(
+        child,
+        {
+          key: `avatar-group-child-${index}`,
+          ..._avatar,
+          ...spacingProps,
+          ...child.props,
+        },
+        child.props.children
+      );
+    }),
   ];
 };
 

From 64f0b88528a06eadd99e123323485461826ef358 Mon Sep 17 00:00:00 2001
From: ruchik02 <ruchikasharma.cse19@chitkarauniversity.edu.in>
Date: Thu, 3 Nov 2022 13:26:37 +0530
Subject: [PATCH 03/14] fix: alignment issue in select component

---
 .../stories/components/primitives/Select/FormControlled.tsx     | 2 +-
 .../stories/components/primitives/Select/SelectLongList.tsx     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/storybook/stories/components/primitives/Select/FormControlled.tsx b/example/storybook/stories/components/primitives/Select/FormControlled.tsx
index 74b74a4aa..240d6f2da 100644
--- a/example/storybook/stories/components/primitives/Select/FormControlled.tsx
+++ b/example/storybook/stories/components/primitives/Select/FormControlled.tsx
@@ -10,7 +10,7 @@ import {
 export const Example = () => {
   return (
     <Center>
-      <FormControl w="3/4" maxW="300" isRequired isInvalid>
+      <FormControl maxW="300" isRequired isInvalid>
         <FormControl.Label>Choose service</FormControl.Label>
         <Select
           minWidth="200"
diff --git a/example/storybook/stories/components/primitives/Select/SelectLongList.tsx b/example/storybook/stories/components/primitives/Select/SelectLongList.tsx
index d9e3772de..a75a47724 100644
--- a/example/storybook/stories/components/primitives/Select/SelectLongList.tsx
+++ b/example/storybook/stories/components/primitives/Select/SelectLongList.tsx
@@ -54,7 +54,7 @@ export const Example = () => {
   ];
   return (
     <Container>
-      <FormControl>
+      <FormControl maxW="300" alignItems="center" justifyContent="center">
         <FormControl.Label>Select Color</FormControl.Label>
         <Select
           selectedValue={value}

From e99dea624c3a2b3a702021d5d9b7d8721a2377a8 Mon Sep 17 00:00:00 2001
From: ruchik02 <ruchikasharma.cse19@chitkarauniversity.edu.in>
Date: Thu, 3 Nov 2022 13:31:49 +0530
Subject: [PATCH 04/14] fix: addons example in  input component

---
 .../storybook/stories/components/primitives/Input/Addons.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/storybook/stories/components/primitives/Input/Addons.tsx b/example/storybook/stories/components/primitives/Input/Addons.tsx
index 617783165..006e6a1fe 100644
--- a/example/storybook/stories/components/primitives/Input/Addons.tsx
+++ b/example/storybook/stories/components/primitives/Input/Addons.tsx
@@ -10,8 +10,8 @@ import {
 
 export const Example = () => {
   return (
-    <Stack alignItems="center">
-      <InputGroup w={{ base: '70%', md: '285' }}>
+    <Stack>
+      <InputGroup w={{ base: '70%', md: '285' }} justifyContent="center">
         <InputLeftAddon children={'https://'} />
         <Input w={{ base: '70%', md: '100%' }} placeholder="nativebase" />
         <InputRightAddon children={'.io'} />

From 8d01b596ce076a6f924c3b276d0736f70db26ac8 Mon Sep 17 00:00:00 2001
From: ruchik02 <ruchikasharma.cse19@chitkarauniversity.edu.in>
Date: Thu, 3 Nov 2022 16:17:35 +0530
Subject: [PATCH 05/14] fix: changes in SelectLongList in select Component

---
 .../stories/components/primitives/Select/SelectLongList.tsx   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/storybook/stories/components/primitives/Select/SelectLongList.tsx b/example/storybook/stories/components/primitives/Select/SelectLongList.tsx
index a75a47724..e9af5248a 100644
--- a/example/storybook/stories/components/primitives/Select/SelectLongList.tsx
+++ b/example/storybook/stories/components/primitives/Select/SelectLongList.tsx
@@ -54,11 +54,11 @@ export const Example = () => {
   ];
   return (
     <Container>
-      <FormControl maxW="300" alignItems="center" justifyContent="center">
+      <FormControl maxW="300">
         <FormControl.Label>Select Color</FormControl.Label>
         <Select
           selectedValue={value}
-          minWidth="100"
+          minWidth="200"
           accessibilityLabel="Select a Color"
           placeholder="Select a Color"
           onValueChange={(itemValue) => {

From 706ef1b102b2c22d7968e579d197d5159329ddcc Mon Sep 17 00:00:00 2001
From: ankit-tailor <tailorankit3345@gmail.com>
Date: Thu, 3 Nov 2022 16:28:37 +0530
Subject: [PATCH 06/14] feat: add backdrop pseudo prop

---
 src/components/composites/Popover/Popover.tsx | 3 ++-
 src/components/composites/Popover/types.ts    | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/composites/Popover/Popover.tsx b/src/components/composites/Popover/Popover.tsx
index 7f6e05858..32b5120c3 100644
--- a/src/components/composites/Popover/Popover.tsx
+++ b/src/components/composites/Popover/Popover.tsx
@@ -27,6 +27,7 @@ const Popover = (
     finalFocusRef,
     useRNModal,
     trapFocus = true,
+    _backdrop,
     ...props
   }: IPopoverProps,
   ref: any
@@ -101,7 +102,7 @@ const Popover = (
           style={StyleSheet.absoluteFill}
         >
           <Popper onClose={handleClose} triggerRef={triggerRef} {...props}>
-            <Backdrop onPress={handleClose} bg="transparent" />
+            <Backdrop onPress={handleClose} bg="transparent" {..._backdrop} />
             <PopoverContext.Provider
               value={{
                 onClose: handleClose,
diff --git a/src/components/composites/Popover/types.ts b/src/components/composites/Popover/types.ts
index 36c3cb9fa..5ebd1c780 100644
--- a/src/components/composites/Popover/types.ts
+++ b/src/components/composites/Popover/types.ts
@@ -103,6 +103,10 @@ export interface InterfacePopoverProps {
    * @default false
    */
   useRNModal?: boolean;
+  /**
+   * Props applied on Overlay.
+   */
+  _backdrop?: any;
 }
 
 export type IPopoverContentImpl = {

From 69d38e51267a8d316be64d299900b6d73ba150e5 Mon Sep 17 00:00:00 2001
From: ankit-tailor <tailorankit3345@gmail.com>
Date: Thu, 3 Nov 2022 16:40:09 +0530
Subject: [PATCH 07/14] fix: _backdrop description

---
 src/components/composites/Popover/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/composites/Popover/types.ts b/src/components/composites/Popover/types.ts
index 5ebd1c780..47652ba89 100644
--- a/src/components/composites/Popover/types.ts
+++ b/src/components/composites/Popover/types.ts
@@ -104,7 +104,7 @@ export interface InterfacePopoverProps {
    */
   useRNModal?: boolean;
   /**
-   * Props applied on Overlay.
+   * Props applied on backdrop.
    */
   _backdrop?: any;
 }

From b9a8161d81fcb7519fc431b7aea7832009e356ab Mon Sep 17 00:00:00 2001
From: ankit-tailor <tailorankit3345@gmail.com>
Date: Thu, 3 Nov 2022 16:59:16 +0530
Subject: [PATCH 08/14] fix: add scale flex direction

---
 src/theme/styled-system.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/theme/styled-system.ts b/src/theme/styled-system.ts
index 8aabb52a7..200db4c2b 100644
--- a/src/theme/styled-system.ts
+++ b/src/theme/styled-system.ts
@@ -114,6 +114,7 @@ export const flexbox = {
   flexDirection: true,
   flexDir: {
     property: 'flexDirection',
+    scale: 'flexDirection',
   },
   // item
   flex: true,

From 85883238aa7a63246ce5192ca6679f75859d8a1b Mon Sep 17 00:00:00 2001
From: Viraj-10 <virajjoshi132@gmail.com>
Date: Thu, 3 Nov 2022 18:23:27 +0530
Subject: [PATCH 09/14] feat: factory with state props

---
 src/factory/component.tsx                             | 5 +++--
 src/factory/types.ts                                  | 2 ++
 src/hooks/useThemeProps/usePropsWithComponentTheme.ts | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/factory/component.tsx b/src/factory/component.tsx
index 70a56a2ea..ba9f89790 100644
--- a/src/factory/component.tsx
+++ b/src/factory/component.tsx
@@ -9,11 +9,12 @@ export default function Factory<P>(
   componentTheme?: ComponentTheme
 ) {
   return React.forwardRef(
-    ({ children, ...props }: P & FactoryComponentProps, ref: any) => {
+    ({ children, state, ...props }: P & FactoryComponentProps, ref: any) => {
       const StyledComponent = useMemo(() => makeStyledComponent(Component), []);
       const calculatedProps = usePropsWithComponentTheme(
         componentTheme ?? {},
-        props
+        props,
+        state
       );
       return (
         <StyledComponent {...(calculatedProps as P)} ref={ref}>
diff --git a/src/factory/types.ts b/src/factory/types.ts
index 3d24405f6..1b93780ef 100644
--- a/src/factory/types.ts
+++ b/src/factory/types.ts
@@ -1,7 +1,9 @@
 import type { PlatformProps } from '../components/types';
 import type { StyledProps } from '../theme/types';
+import type { IStateProps } from '../hooks/useThemeProps/propsFlattener';
 
 export type FactoryComponentProps = StyledProps &
   PlatformProps<StyledProps> & {
     children?: string | JSX.Element | JSX.Element[];
+    state: IStateProps;
   };
diff --git a/src/hooks/useThemeProps/usePropsWithComponentTheme.ts b/src/hooks/useThemeProps/usePropsWithComponentTheme.ts
index a029a7432..5e56afcae 100644
--- a/src/hooks/useThemeProps/usePropsWithComponentTheme.ts
+++ b/src/hooks/useThemeProps/usePropsWithComponentTheme.ts
@@ -1,9 +1,11 @@
 import { usePropsResolutionWithComponentTheme } from './usePropsResolution';
 import type { ComponentTheme } from '../../theme';
+import type { IStateProps } from './propsFlattener';
 
 export function usePropsWithComponentTheme(
   localTheme: ComponentTheme,
-  propsReceived: any
+  propsReceived: any,
+  state: IStateProps
 ) {
-  return usePropsResolutionWithComponentTheme(localTheme, propsReceived);
+  return usePropsResolutionWithComponentTheme(localTheme, propsReceived, state);
 }

From 8a848291765410fb8b2d6b7e4ae92f629c789b47 Mon Sep 17 00:00:00 2001
From: Viraj-10 <virajjoshi132@gmail.com>
Date: Thu, 3 Nov 2022 18:26:17 +0530
Subject: [PATCH 10/14] fix: typing making state optinal

---
 src/factory/types.ts                                  | 2 +-
 src/hooks/useThemeProps/usePropsWithComponentTheme.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/factory/types.ts b/src/factory/types.ts
index 1b93780ef..d73595708 100644
--- a/src/factory/types.ts
+++ b/src/factory/types.ts
@@ -5,5 +5,5 @@ import type { IStateProps } from '../hooks/useThemeProps/propsFlattener';
 export type FactoryComponentProps = StyledProps &
   PlatformProps<StyledProps> & {
     children?: string | JSX.Element | JSX.Element[];
-    state: IStateProps;
+    state?: IStateProps;
   };
diff --git a/src/hooks/useThemeProps/usePropsWithComponentTheme.ts b/src/hooks/useThemeProps/usePropsWithComponentTheme.ts
index 5e56afcae..da868b1bf 100644
--- a/src/hooks/useThemeProps/usePropsWithComponentTheme.ts
+++ b/src/hooks/useThemeProps/usePropsWithComponentTheme.ts
@@ -5,7 +5,7 @@ import type { IStateProps } from './propsFlattener';
 export function usePropsWithComponentTheme(
   localTheme: ComponentTheme,
   propsReceived: any,
-  state: IStateProps
+  state?: IStateProps
 ) {
   return usePropsResolutionWithComponentTheme(localTheme, propsReceived, state);
 }

From 9147bcf347352bbf77aac2a0e3c58f42b5ac6ab1 Mon Sep 17 00:00:00 2001
From: Viraj-10 <virajjoshi132@gmail.com>
Date: Thu, 3 Nov 2022 18:59:30 +0530
Subject: [PATCH 11/14] fix: state propname

---
 src/factory/component.tsx                             | 4 ++--
 src/factory/types.ts                                  | 2 +-
 src/hooks/useThemeProps/usePropsWithComponentTheme.ts | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/factory/component.tsx b/src/factory/component.tsx
index ba9f89790..8eb91a64d 100644
--- a/src/factory/component.tsx
+++ b/src/factory/component.tsx
@@ -9,12 +9,12 @@ export default function Factory<P>(
   componentTheme?: ComponentTheme
 ) {
   return React.forwardRef(
-    ({ children, state, ...props }: P & FactoryComponentProps, ref: any) => {
+    ({ children, _state, ...props }: P & FactoryComponentProps, ref: any) => {
       const StyledComponent = useMemo(() => makeStyledComponent(Component), []);
       const calculatedProps = usePropsWithComponentTheme(
         componentTheme ?? {},
         props,
-        state
+        _state
       );
       return (
         <StyledComponent {...(calculatedProps as P)} ref={ref}>
diff --git a/src/factory/types.ts b/src/factory/types.ts
index d73595708..723ae9d63 100644
--- a/src/factory/types.ts
+++ b/src/factory/types.ts
@@ -5,5 +5,5 @@ import type { IStateProps } from '../hooks/useThemeProps/propsFlattener';
 export type FactoryComponentProps = StyledProps &
   PlatformProps<StyledProps> & {
     children?: string | JSX.Element | JSX.Element[];
-    state?: IStateProps;
+    _state?: IStateProps;
   };
diff --git a/src/hooks/useThemeProps/usePropsWithComponentTheme.ts b/src/hooks/useThemeProps/usePropsWithComponentTheme.ts
index da868b1bf..0f4f48d49 100644
--- a/src/hooks/useThemeProps/usePropsWithComponentTheme.ts
+++ b/src/hooks/useThemeProps/usePropsWithComponentTheme.ts
@@ -5,7 +5,11 @@ import type { IStateProps } from './propsFlattener';
 export function usePropsWithComponentTheme(
   localTheme: ComponentTheme,
   propsReceived: any,
-  state?: IStateProps
+  _state?: IStateProps
 ) {
-  return usePropsResolutionWithComponentTheme(localTheme, propsReceived, state);
+  return usePropsResolutionWithComponentTheme(
+    localTheme,
+    propsReceived,
+    _state
+  );
 }

From fe4ad90fa6224992b9c88d798c786376abd753c2 Mon Sep 17 00:00:00 2001
From: ankit-tailor <tailorankit3345@gmail.com>
Date: Thu, 3 Nov 2022 19:37:47 +0530
Subject: [PATCH 12/14] fix: user select none

---
 src/theme/components/actionsheet.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/theme/components/actionsheet.ts b/src/theme/components/actionsheet.ts
index e6761336a..90f9686e6 100644
--- a/src/theme/components/actionsheet.ts
+++ b/src/theme/components/actionsheet.ts
@@ -15,6 +15,9 @@ export const ActionsheetContent = {
     py: 2,
     borderRadius: 'none',
     roundedTop: 20,
+    _web: {
+      userSelect: 'none',
+    },
     _dragIndicator: {
       height: 1,
       width: 10,

From af4935dc841682f424ef8d75e900b8f1d885e1a5 Mon Sep 17 00:00:00 2001
From: ankit-tailor <tailorankit3345@gmail.com>
Date: Thu, 3 Nov 2022 19:48:02 +0530
Subject: [PATCH 13/14] v3.4.20-rc.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d3d212e0a..43941e3a7 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
       "prettier --write"
     ]
   },
-  "version": "3.4.19",
+  "version": "3.4.20-rc.0",
   "license": "MIT",
   "private": false,
   "main": "lib/commonjs/index",

From 13778e2db802b332d7644177041f9c95405abe0e Mon Sep 17 00:00:00 2001
From: ankit-tailor <tailorankit3345@gmail.com>
Date: Thu, 3 Nov 2022 19:58:08 +0530
Subject: [PATCH 14/14] v3.4.21

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 201a5d9ad..51f73cff4 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
       "prettier --write"
     ]
   },
-  "version": "3.4.20",
+  "version": "3.4.21",
   "license": "MIT",
   "private": false,
   "main": "lib/commonjs/index",