Merge pull request #16434 from tienifr/fix/15916-suggested-emoji-dupl…

…icate-background-hover-and-focus Fix/15916: Duplicate hovered and focused background in suggested emoji list
Expensify · Mar 23, 2023 · ab3af32 · ab3af32
2 parents 8661157 + 4ea0c71
commit ab3af32
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js
@@ -826,16 +826,22 @@ function getEmojiSuggestionItemStyle(
     hovered,
     currentEmojiIndex,
 ) {
+    let backgroundColor;
+
+    if (currentEmojiIndex === highlightedEmojiIndex) {
+        backgroundColor = themeColors.activeComponentBG;
+    } else if (hovered) {
+        backgroundColor = themeColors.hoverComponentBG;
+    }
+
     return [
         {
             height: rowHeight,
             justifyContent: 'center',
         },
-        (currentEmojiIndex === highlightedEmojiIndex && !hovered) || hovered
-            ? {
-                backgroundColor: themeColors.highlightBG,
-            }
-            : {},
+        backgroundColor ? {
+            backgroundColor,
+        } : {},
     ];
 }