Skip to content

A local-first personal finance app

Use cx in Button className merging (#4956)

Joel Jeremy Marquez0a8f82065289
diff --git a/packages/component-library/src/Button.tsx b/packages/component-library/src/Button.tsx
index a62469d5c7..a87e1a245e 100644
--- a/packages/component-library/src/Button.tsx
+++ b/packages/component-library/src/Button.tsx
@@ -7,7 +7,7 @@ import React, {
} from 'react';
import { Button as ReactAriaButton } from 'react-aria-components';
-import { css } from '@emotion/css';
+import { css, cx } from '@emotion/css';
import { AnimatedLoading } from './icons/AnimatedLoading';
import { styles } from './styles';
@@ -145,26 +145,24 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
const defaultButtonClassName: string = useMemo(
() =>
- String(
- css({
- alignItems: 'center',
- justifyContent: 'center',
- flexShrink: 0,
- padding: _getPadding(variant),
- margin: 0,
- overflow: 'hidden',
- display: 'flex',
- borderRadius: 4,
- backgroundColor: backgroundColor[variantWithDisabled],
- border: _getBorder(variant, variantWithDisabled),
- color: textColor[variantWithDisabled],
- transition: 'box-shadow .25s',
- WebkitAppRegion: 'no-drag',
- ...styles.smallText,
- '&[data-hovered]': _getHoveredStyles(variant),
- '&[data-pressed]': _getActiveStyles(variant, bounce),
- }),
- ),
+ css({
+ alignItems: 'center',
+ justifyContent: 'center',
+ flexShrink: 0,
+ padding: _getPadding(variant),
+ margin: 0,
+ overflow: 'hidden',
+ display: 'flex',
+ borderRadius: 4,
+ backgroundColor: backgroundColor[variantWithDisabled],
+ border: _getBorder(variant, variantWithDisabled),
+ color: textColor[variantWithDisabled],
+ transition: 'box-shadow .25s',
+ WebkitAppRegion: 'no-drag',
+ ...styles.smallText,
+ '&[data-hovered]': _getHoveredStyles(variant),
+ '&[data-pressed]': _getActiveStyles(variant, bounce),
+ }),
[bounce, variant, variantWithDisabled],
);
@@ -176,9 +174,8 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
{...restProps}
className={
typeof className === 'function'
- ? renderProps =>
- `${defaultButtonClassName} ${className(renderProps)}`
- : `${defaultButtonClassName} ${className || ''}`
+ ? renderProps => cx(defaultButtonClassName, className(renderProps))
+ : cx(defaultButtonClassName, className)
}
>
{children}
diff --git a/upcoming-release-notes/4956.md b/upcoming-release-notes/4956.md
new file mode 100644
index 0000000000..da7a4cfb45
--- /dev/null
+++ b/upcoming-release-notes/4956.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [joel-jeremy]
+---
+
+Use cx in Button className merging