From b7ced96cf33c6aa43bfbbb413bb7702492d252fe Mon Sep 17 00:00:00 2001
From: Armagan Ersoz <broccolinisoup@github.com>
Date: Tue, 29 Aug 2023 14:46:26 +1000
Subject: [PATCH] Button: Make button visuals overridable by sx

---
 src/Button/Button.dev.stories.tsx |  6 +++++-
 src/Button/Button.tsx             | 18 ++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/Button/Button.dev.stories.tsx b/src/Button/Button.dev.stories.tsx
index 77d71808dcb..151bdb31c51 100644
--- a/src/Button/Button.dev.stories.tsx
+++ b/src/Button/Button.dev.stories.tsx
@@ -1,6 +1,7 @@
-import {SearchIcon, TriangleDownIcon, EyeIcon} from '@primer/octicons-react'
+import {SearchIcon, TriangleDownIcon, EyeIcon, IssueClosedIcon} from '@primer/octicons-react'
 import React from 'react'
 import {Button, IconButton} from '.'
+import {default as Text} from '../Text'
 
 export default {
   title: 'Components/Button/DevOnly',
@@ -70,6 +71,9 @@ export const TestSxProp = () => {
       <Button leadingIcon={SearchIcon} variant="invisible" sx={{color: 'firebrick'}}>
         Red
       </Button>
+      <Button leadingIcon={IssueClosedIcon} sx={{color: 'done.fg'}}>
+        <Text sx={{color: 'fg.default'}}>Close issue</Text>
+      </Button>
       <Button
         size="small"
         variant="invisible"
diff --git a/src/Button/Button.tsx b/src/Button/Button.tsx
index f4f02ce123b..136bb55ea6c 100644
--- a/src/Button/Button.tsx
+++ b/src/Button/Button.tsx
@@ -66,13 +66,21 @@ export function generateCustomSxProp(
   props: Partial<Pick<ButtonProps, 'size' | 'block' | 'leadingIcon' | 'trailingIcon' | 'trailingAction'>>,
   providedSx: BetterSystemStyleObject,
 ) {
-  // Possible data attributes: data-size, data-block, data-no-visuals
+  const cssSelectorList = []
+  // Possible data attributes for button component: data-size, data-block, data-no-visuals
   const size = props.size && props.size !== 'medium' ? `[data-size="${props.size}"]` : '' // medium is a default size therefore it doesn't have a data attribute that used for styling
   const block = props.block ? `[data-block="block"]` : ''
   const noVisuals = props.leadingIcon || props.trailingIcon || props.trailingAction ? '' : '[data-no-visuals="true"]'
-
-  // this is custom selector. We need to make sure we add the data attributes to the base css class (& -> &[data-attributename="value"]])
+  // We need to make sure we add the data attributes to the base css class (& -> &[data-attributename="value"]]) otherwise sx styles are applied due to data attribute has more specificity than class selector
   const cssSelector = `&${size}${block}${noVisuals}` // &[data-size="small"][data-block="block"][data-no-visuals="true"]
+  cssSelectorList.push(cssSelector)
+
+  // Possible data attributes for children of button component: data-component="leadingVisual", data-component="trailingVisual", data-component="trailingAction"
+  // When sx is used in the parent button component, these styles aren't applied to its children (leadingIcon, trailingIcon, trailingAction)
+  // Because sx only applies to the base selector which is  "&", but we want it to be applied to '& [data-component="leadingVisual"]'
+  if (props.leadingIcon) cssSelectorList.push(`& [data-component="leadingVisual"]`)
+  if (props.trailingIcon) cssSelectorList.push(`& [data-component="trailingVisual"]`)
+  if (props.trailingAction) cssSelectorList.push(`& [data-component="trailingAction"]`)
 
   const customSxProp: {
     [key: string]: BetterSystemStyleObject
@@ -80,7 +88,9 @@ export function generateCustomSxProp(
 
   if (!providedSx) return customSxProp
   else {
-    customSxProp[cssSelector] = providedSx
+    for (const selector of cssSelectorList) {
+      customSxProp[selector] = providedSx
+    }
     return customSxProp
   }
 }