chore: merge branch 'main' into sgunter/button-component

for clsx, and other features
This commit is contained in:
Samuel Gunter
2024-02-07 00:27:55 -06:00
18 changed files with 282 additions and 89 deletions

View File

@@ -1,4 +1,4 @@
import classNames from 'classnames';
import clsx from 'clsx';
import React from 'react';
import styles from './Button.module.scss';
@@ -43,7 +43,7 @@ export function Button({
} as React.CSSProperties
}
data-testid={testId}
className={classNames(useScss ? styles.button : BUTTON_BASE_CLASS, className, {
className={clsx(useScss ? styles.button : BUTTON_BASE_CLASS, className, {
[styles[variant]]: useScss,
[styles.disabled]: disabled && useScss,
'disabled:(cursor-not-allowed opacity-50)': disabled && !useScss,