Fix merge error

wpmudev · Apr 19, 2021 · db9351c · db9351c
1 parent e01c679
commit db9351c
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/packages/react-button-icon/lib/react-button-icon.js b/packages/react-button-icon/lib/react-button-icon.js
@@ -1,13 +1,6 @@
 import React from "react";
 
-const ButtonIcon = React.forwardRef( ({
-	label,
-	icon,
-	design = "solid",
-	color,
-	className,
-	...props
-}, ref) => {
+const ButtonIcon = ({ label, icon, iconSize, extraClasses, color, design = "solid", ...props }) => {
 	const loader = (
 		<span
 			className="sui-icon-loader sui-loading"
@@ -23,9 +16,7 @@ const ButtonIcon = React.forwardRef( ({
 		</React.Fragment>
 	);
 
-	className = '' !== className
-		? 'sui-button-icon ' + className
-		: 'sui-button-icon';
+	let className = `sui-button-icon ${extraClasses || ""}`;
 
 	// Set button color.
 	switch (color) {
@@ -77,13 +68,12 @@ const ButtonIcon = React.forwardRef( ({
 
 	return (
 		<button
-			ref={ref}
 			className={className}
 			disabled={props.disabled || props.loading}
 			{...props}>
 			{props.loading ? loader : content}
 		</button>
 	);
-});
+};
 
 export { ButtonIcon };