From a9008fb975f1025627cda9d3a94afcc50c6b458b Mon Sep 17 00:00:00 2001 From: Nicolay Arefyeu Date: Wed, 27 Mar 2024 15:09:15 +0200 Subject: [PATCH 1/2] Fix hover issue with ButtonWithDropdownMenu --- src/components/ButtonWithDropdownMenu/index.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/ButtonWithDropdownMenu/index.tsx b/src/components/ButtonWithDropdownMenu/index.tsx index 896330f5e77e..15420bdaf1d2 100644 --- a/src/components/ButtonWithDropdownMenu/index.tsx +++ b/src/components/ButtonWithDropdownMenu/index.tsx @@ -93,8 +93,7 @@ function ButtonWithDropdownMenu({ style={[styles.pl0]} onPress={() => setIsMenuVisible(!isMenuVisible)} shouldRemoveLeftBorderRadius - large={isButtonSizeLarge} - medium={!isButtonSizeLarge} + medium innerStyles={[styles.dropDownButtonCartIconContainerPadding, innerStyleDropButton]} enterKeyEventListenerPriority={enterKeyEventListenerPriority} > From b2ff7b03134d1548b473267896631be328eb956e Mon Sep 17 00:00:00 2001 From: Nicolay Arefyeu Date: Thu, 28 Mar 2024 15:21:48 +0200 Subject: [PATCH 2/2] Add correct sizing based on figma spec --- src/components/ButtonWithDropdownMenu/index.tsx | 10 +++++----- src/styles/index.ts | 9 +++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/components/ButtonWithDropdownMenu/index.tsx b/src/components/ButtonWithDropdownMenu/index.tsx index 15420bdaf1d2..a4e6e2c87fec 100644 --- a/src/components/ButtonWithDropdownMenu/index.tsx +++ b/src/components/ButtonWithDropdownMenu/index.tsx @@ -8,7 +8,6 @@ import useStyleUtils from '@hooks/useStyleUtils'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import useWindowDimensions from '@hooks/useWindowDimensions'; -import variables from '@styles/variables'; import CONST from '@src/CONST'; import type {AnchorPosition} from '@src/styles'; import type {ButtonWithDropdownMenuProps} from './types'; @@ -93,18 +92,19 @@ function ButtonWithDropdownMenu({ style={[styles.pl0]} onPress={() => setIsMenuVisible(!isMenuVisible)} shouldRemoveLeftBorderRadius - medium + large={isButtonSizeLarge} + medium={!isButtonSizeLarge} innerStyles={[styles.dropDownButtonCartIconContainerPadding, innerStyleDropButton]} enterKeyEventListenerPriority={enterKeyEventListenerPriority} > - + diff --git a/src/styles/index.ts b/src/styles/index.ts index bb772fff7534..389370a108af 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -4023,9 +4023,14 @@ const styles = (theme: ThemeColors) => paddingLeft: 0, }, - dropDownButtonArrowContain: { + dropDownMediumButtonArrowContain: { marginLeft: 12, - marginRight: 14, + marginRight: 16, + }, + + dropDownLargeButtonArrowContain: { + marginLeft: 16, + marginRight: 20, }, dropDownButtonCartIconView: {