From dbe5e9f7e07458c08694fcbc3c36457f08c366d2 Mon Sep 17 00:00:00 2001 From: truph01 Date: Wed, 17 Jul 2024 00:01:24 +0700 Subject: [PATCH] Feat: Selected row in onboarding modal should not get :hover style --- src/components/MenuItem.tsx | 2 +- src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx index 473806aac3af..f033556376fc 100644 --- a/src/components/MenuItem.tsx +++ b/src/components/MenuItem.tsx @@ -538,7 +538,7 @@ function MenuItem( ...(Array.isArray(wrapperStyle) ? wrapperStyle : [wrapperStyle]), !focused && (isHovered || pressed) && hoverAndPressStyle, shouldGreyOutWhenDisabled && disabled && styles.buttonOpacityDisabled, - isHovered && interactive && !pressed && styles.hoveredComponentBG, + isHovered && interactive && !focused && !pressed && styles.hoveredComponentBG, ] as StyleProp } disabledStyle={shouldUseDefaultCursorWhenDisabled && [styles.cursorDefault]} diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx index 03a4b790bc5f..e631d4ce6016 100644 --- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx +++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx @@ -105,6 +105,7 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, on Welcome.setOnboardingPurposeSelected(choice); setErrorMessage(''); }, + focused: isSelected, }; }); const isFocused = useIsFocused();