Button: enhancements with ButtonLink and IconButton (#1659)

* Create icon only button

* Add ButtonLink and IconButton components

* Lint and test

* Remove react router for now. Maybe add an example later

* Fix the typescript error on as prop

* Fix lint issue

* Fix
1. Bug with disabled
2. Tests in testing lib

* lint issues

Author: pksjce

src/NewButton/button-base.tsx

@@ -0,0 +1,42 @@
+import React, {ComponentPropsWithRef, forwardRef} from 'react'
+import {ForwardRefComponent as PolymorphicForwardRefComponent} from '@radix-ui/react-polymorphic'
+import Box from '../Box'
+import {merge, SxProp} from '../sx'
+import {useTheme} from '../ThemeProvider'
+import {ButtonProps, StyledButton} from './types'
+import {getVariantStyles, getSizeStyles, getButtonStyles} from './styles'
+
+const ButtonBase = forwardRef<HTMLElement, ButtonProps>(
+  ({children, as: Component = 'button', sx: sxProp = {}, ...props}, forwardedRef): JSX.Element => {
+    const {leadingIcon: LeadingIcon, trailingIcon: TrailingIcon, variant = 'default', size = 'medium'} = props
+    const {theme} = useTheme()
+    const iconWrapStyles = {
+      display: 'inline-block'
+    }
+    const sxStyles = merge.all([
+      getButtonStyles(theme),
+      getSizeStyles(size, variant, false),
+      getVariantStyles(variant, theme),
+      sxProp as SxProp
+    ])
+    return (
+      <StyledButton as={Component} sx={sxStyles} {...props} ref={forwardedRef}>
+        {LeadingIcon && (
+          <Box as="span" data-component="leadingIcon" sx={iconWrapStyles}>
+            <LeadingIcon />
+          </Box>
+        )}
+        <span data-component="text">{children}</span>
+        {TrailingIcon && (
+          <Box as="span" data-component="trailingIcon" sx={{...iconWrapStyles, ml: 2}}>
+            <TrailingIcon />
+          </Box>
+        )}
+      </StyledButton>
+    )
+  }
+) as PolymorphicForwardRefComponent<'button' | 'a', ButtonProps>
+
+export type ButtonBaseProps = ComponentPropsWithRef<typeof ButtonBase>
+
+export default ButtonBase

src/NewButton/button-link.tsx

@@ -0,0 +1,18 @@
+import React, {forwardRef} from 'react'
+import {LinkButtonProps} from './types'
+import ButtonBase, {ButtonBaseProps} from './button-base'
+import {ForwardRefComponent as PolymorphicForwardRefComponent} from '@radix-ui/react-polymorphic'
+
+type MyProps = LinkButtonProps & ButtonBaseProps
+
+const LinkButton = forwardRef<HTMLElement, MyProps>(
+  ({children, as: Component = 'a', ...props}, forwardedRef): JSX.Element => {
+    return (
+      <ButtonBase as={Component} ref={forwardedRef} {...props}>
+        {children}
+      </ButtonBase>
+    )
+  }
+) as PolymorphicForwardRefComponent<'a', ButtonBaseProps>
+
+export default LinkButton

src/NewButton/button.tsx

@@ -1,283 +1,15 @@
 import React, {forwardRef} from 'react'
-import Box from '../Box'
-import styled from 'styled-components'
-import sx, {merge, SxProp} from '../sx'
-import {useTheme, Theme} from '../ThemeProvider'
-import {VariantType, ButtonProps} from './types'
+import {ButtonProps} from './types'
+import ButtonBase from './button-base'
 
-const TEXT_ROW_HEIGHT = '20px' // custom value off the scale
-
-const getVariantStyles = (variant: VariantType = 'default', theme?: Theme) => {
-  const style = {
-    default: {
-      color: 'btn.text',
-      backgroundColor: 'btn.bg',
-      boxShadow: `${theme?.shadows.btn.shadow}, ${theme?.shadows.btn.insetShadow}`,
-      '&:hover:not([disabled])': {
-        backgroundColor: 'btn.hoverBg'
-      },
-      // focus must come before :active so that the active box shadow overrides
-      '&:focus:not([disabled])': {
-        boxShadow: `${theme?.shadows.btn.focusShadow}`
-      },
-      '&:active:not([disabled])': {
-        backgroundColor: 'btn.selectedBg',
-        boxShadow: `${theme?.shadows.btn.shadowActive}`
-      },
-      '&:disabled': {
-        color: 'primer.fg.disabled',
-        backgroundColor: 'btn.disabledBg'
-      }
-    },
-    primary: {
-      color: 'btn.primary.text',
-      backgroundColor: 'btn.primary.bg',
-      borderColor: 'border.subtle',
-      boxShadow: `${theme?.shadows.btn.primary.shadow}`,
-      '&:hover:not([disabled])': {
-        color: 'btn.primary.hoverText',
-        backgroundColor: 'btn.primary.hoverBg'
-      },
-      // focus must come before :active so that the active box shadow overrides
-      '&:focus:not([disabled])': {
-        boxShadow: `${theme?.shadows.btn.primary.focusShadow}`
-      },
-      '&:active:not([disabled])': {
-        backgroundColor: 'btn.primary.selectedBg',
-        boxShadow: `${theme?.shadows.btn.primary.selectedShadow}`
-      },
-      '&:disabled': {
-        color: 'btn.primary.disabledText',
-        backgroundColor: 'btn.primary.disabledBg'
-      },
-      '[data-component="ButtonCounter"]': {
-        backgroundColor: 'btn.primary.counterBg',
-        color: 'btn.primary.text'
-      }
-    },
-    danger: {
-      color: 'btn.danger.text',
-      backgroundColor: 'btn.bg',
-      boxShadow: `${theme?.shadows.btn.shadow}`,
-      '&:hover:not([disabled])': {
-        color: 'btn.danger.hoverText',
-        backgroundColor: 'btn.danger.hoverBg',
-        borderColor: 'btn.danger.hoverBorder',
-        boxShadow: `${theme?.shadows.btn.danger.hoverShadow}`,
-        '[data-component="ButtonCounter"]': {
-          backgroundColor: 'btn.danger.hoverCounterBg',
-          color: 'btn.danger.hoverText'
-        }
-      },
-      // focus must come before :active so that the active box shadow overrides
-      '&:focus:not([disabled])': {
-        borderColor: 'btn.danger.focusBorder',
-        boxShadow: `${theme?.shadows.btn.danger.focusShadow}`
-      },
-      '&:active:not([disabled])': {
-        color: 'btn.danger.selectedText',
-        backgroundColor: 'btn.danger.selectedBg',
-        boxShadow: `${theme?.shadows.btn.danger.selectedShadow}`,
-        borderColor: 'btn.danger.selectedBorder'
-      },
-      '&:disabled': {
-        color: 'btn.danger.disabledText',
-        backgroundColor: 'btn.danger.disabledBg',
-        borderColor: 'btn.danger.disabledBorder',
-        '[data-component="ButtonCounter"]': {
-          backgroundColor: 'btn.danger.disabledCounterBg'
-        }
-      },
-      '[data-component="ButtonCounter"]': {
-        color: 'btn.danger.text',
-        backgroundColor: 'btn.danger.counterBg'
-      }
-    },
-    invisible: {
-      color: 'accent.fg',
-      backgroundColor: 'transparent',
-      border: '0',
-      boxShadow: 'none',
-      '&:hover:not([disabled])': {
-        backgroundColor: 'btn.hoverBg'
-      },
-      // focus must come before :active so that the active box shadow overrides
-      '&:focus:not([disabled])': {
-        boxShadow: `${theme?.shadows.btn.focusShadow}`
-      },
-      '&:active:not([disabled])': {
-        backgroundColor: 'btn.selectedBg'
-      },
-      '&:disabled': {
-        color: 'primer.fg.disabled'
-      }
-    },
-    outline: {
-      color: 'btn.outline.text',
-      boxShadow: `${theme?.shadows.btn.shadow}`,
-
-      '&:hover': {
-        color: 'btn.outline.hoverText',
-        backgroundColor: 'btn.outline.hoverBg',
-        borderColor: 'outline.hoverBorder',
-        boxShadow: `${theme?.shadows.btn.outline.hoverShadow}`,
-        '[data-component="ButtonCounter"]': {
-          backgroundColor: 'btn.outline.hoverCounterBg',
-          color: 'btn.outline.hoverText'
-        }
-      },
-      // focus must come before :active so that the active box shadow overrides
-      '&:focus': {
-        borderColor: 'btn.outline.focusBorder',
-        boxShadow: `${theme?.shadows.btn.outline.focusShadow}`
-      },
-
-      '&:active:not([disabled])': {
-        color: 'btn.outline.selectedText',
-        backgroundColor: 'btn.outline.selectedBg',
-        boxShadow: `${theme?.shadows.btn.outline.selectedShadow}`,
-        borderColor: 'btn.outline.selectedBorder'
-      },
-
-      '&:disabled': {
-        color: 'btn.outline.disabledText',
-        backgroundColor: 'btn.outline.disabledBg',
-        borderColor: 'btn.border',
-        '[data-component="ButtonCounter"]': {
-          backgroundColor: 'btn.outline.disabledCounterBg'
-        }
-      },
-      '[data-component="ButtonCounter"]': {
-        backgroundColor: 'btn.outline.counterBg',
-        color: 'btn.outline.text'
-      }
-    }
-  }
-  return style[variant]
-}
-
-const getSizeStyles = (size = 'medium', variant: VariantType = 'default', iconOnly: boolean) => {
-  let paddingY, paddingX, fontSize
-  switch (size) {
-    case 'small':
-      paddingY = 3
-      paddingX = 12
-      fontSize = 0
-      break
-    case 'large':
-      paddingY = 9
-      paddingX = 20
-      fontSize = 2
-      break
-    case 'medium':
-    default:
-      paddingY = 5
-      paddingX = 16
-      fontSize = 1
-  }
-  if (iconOnly) {
-    paddingX = paddingY + 2
-  }
-  if (variant === 'invisible') {
-    paddingY = paddingY + 1
-  }
-  return {
-    paddingY: `${paddingY}px`,
-    paddingX: `${paddingX}px`,
-    fontSize,
-    '[data-component="ButtonCounter"]': {
-      fontSize
-    }
-  }
-}
-
-const ButtonBase = styled.button<SxProp>(sx)
-
-const Button = forwardRef<HTMLButtonElement, ButtonProps>(
-  ({children, sx: sxProp = {}, ...props}, forwardedRef): JSX.Element => {
-    const {
-      icon: Icon,
-      leadingIcon: LeadingIcon,
-      trailingIcon: TrailingIcon,
-      variant = 'default',
-      size = 'medium'
-    } = props
-    const iconOnly = !!Icon
-    const {theme} = useTheme()
-
-    const styles = {
-      borderRadius: '2',
-      border: '1px solid',
-      borderColor: theme?.colors.btn.border,
-      display: 'grid',
-      gridTemplateAreas: '"leadingIcon text trailingIcon"',
-      fontWeight: 'bold',
-      lineHeight: TEXT_ROW_HEIGHT,
-      whiteSpace: 'nowrap',
-      verticalAlign: 'middle',
-      cursor: 'pointer',
-      appearance: 'none',
-      userSelect: 'none',
-      textDecoration: 'none',
-      textAlign: 'center',
-      '& > :not(:last-child)': {
-        mr: '2'
-      },
-      '&:focus': {
-        outline: 'none'
-      },
-      '&:disabled': {
-        cursor: 'default'
-      },
-      '&:disabled svg': {
-        opacity: '0.6'
-      },
-      '[data-component="leadingIcon"]': {
-        gridArea: 'leadingIcon'
-      },
-      '[data-component="text"]': {
-        gridArea: 'text'
-      },
-      '[data-component="trailingIcon"]': {
-        gridArea: 'trailingIcon'
-      }
-    }
-    const iconWrapStyles = {
-      display: 'inline-block'
-    }
-    const sxStyles = merge.all([
-      styles,
-      getSizeStyles(size, variant, iconOnly),
-      getVariantStyles(variant, theme),
-      sxProp as SxProp
-    ])
-    return (
-      <ButtonBase sx={sxStyles} ref={forwardedRef} {...props}>
-        {LeadingIcon && (
-          <Box as="span" data-component="leadingIcon" sx={iconWrapStyles} aria-hidden={!iconOnly}>
-            <LeadingIcon />
-          </Box>
-        )}
-        <span data-component="text" hidden={Icon ? true : false}>
-          {children}
-        </span>
-        {Icon && (
-          <Box data-component="icon-only" as="span" sx={{display: 'inline-block'}} aria-hidden={!iconOnly}>
-            <Icon />
-          </Box>
-        )}
-        {TrailingIcon && (
-          <Box as="span" data-component="trailingIcon" sx={{...iconWrapStyles, ml: 2}} aria-hidden={!iconOnly}>
-            <TrailingIcon />
-          </Box>
-        )}
-      </ButtonBase>
-    )
-  }
-)
+const Button = forwardRef<HTMLButtonElement, ButtonProps>(({children, ...props}, forwardedRef): JSX.Element => {
+  return (
+    <ButtonBase ref={forwardedRef} {...props} as="button">
+      {children}
+    </ButtonBase>
+  )
+})
 
 Button.displayName = 'Button'
 
-Object.assign(Button, {})
-
 export {Button}

src/NewButton/icon-button.tsx

@@ -0,0 +1,34 @@
+import React, {forwardRef} from 'react'
+import {merge, SxProp} from '../sx'
+import {useTheme} from '../ThemeProvider'
+import Box from '../Box'
+import {IconButtonProps, StyledButton} from './types'
+import {getBaseStyles, getSizeStyles, getVariantStyles} from './styles'
+import {useSSRSafeId} from '@react-aria/ssr'
+
+const IconButton = forwardRef<HTMLButtonElement, IconButtonProps>((props, forwardedRef): JSX.Element => {
+  const {variant = 'default', size = 'medium', sx: sxProp = {}, icon: Icon, iconLabel} = props
+  const iconLabelId = useSSRSafeId()
+  const {theme} = useTheme()
+  const styles = {
+    ...getBaseStyles(theme)
+  }
+  const sxStyles = merge.all([
+    styles,
+    getSizeStyles(size, variant, true),
+    getVariantStyles(variant, theme),
+    sxProp as SxProp
+  ])
+  return (
+    <StyledButton aria-labelledby={iconLabelId} sx={sxStyles} ref={forwardedRef} {...props}>
+      <span id={iconLabelId} hidden={true}>
+        {iconLabel}
+      </span>
+      <Box as="span" sx={{display: 'inline-block'}}>
+        <Icon />
+      </Box>
+    </StyledButton>
+  )
+})
+
+export default IconButton