Merge pull request #11 from perimetre/1.1

1.1.11
perimetre · Feb 26, 2021 · 679d75b · 679d75b
2 parents 602a82b + ae79ad7
commit 679d75b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [1.1.11] - 2021-02-26
+
+### Fixed
+
+- Fixed an issue where the button classes weren't being applied if using icon variant
+
 ## [1.1.10] - 2021-02-26
 
 ### Changes

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@perimetre/ui",
   "description": "A component library made by @perimetre",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/perimetre/ui.git"

diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
@@ -35,16 +35,15 @@ export type ButtonProps = React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTM
 export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
   ({ size = 'medium', variant = 'default', isChip, className, children, ...props }, ref) => {
     const isIcon = variant === 'icon';
+
     return (
       <button
         type="button"
         {...props}
         ref={ref}
         className={classnames(
+          isIcon ? 'pui-btn-icon' : `pui-btn-${size} pui-btn-${variant}`,
           {
-            'pui-btn-icon': isIcon,
-            [`pui-btn-${size}`]: !isIcon,
-            [`pui-btn-${variant}`]: !isIcon,
             'pui-chip-btn': isChip
           },
           className