From e6a9ddea8a6534c2243fe74fcfdb6d1f91219531 Mon Sep 17 00:00:00 2001
From: Carlos Lancha <carlos.lancha@liferay.com>
Date: Wed, 27 Dec 2017 15:41:13 +0100
Subject: [PATCH] SF

---
 packages/clay-button/src/ClayButton.soy | 59 ++++++++++++++-----------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/packages/clay-button/src/ClayButton.soy b/packages/clay-button/src/ClayButton.soy
index 18e200813..9c4669610 100644
--- a/packages/clay-button/src/ClayButton.soy
+++ b/packages/clay-button/src/ClayButton.soy
@@ -57,42 +57,25 @@
 	{@param? label: html|string}
 	{@param? spritemap: string}
 
-	{let $classes kind="text"}
-		inline-item
-		{if $iconAlignment == 'left'}
-			{sp}inline-item-before
-		{elseif $iconAlignment == 'right'}
-			{sp}inline-item-after
-		{/if}
-	{/let}
-
 	{let $iconContent kind="html"}
 		{if $icon and $spritemap}
 			{call .icon}
 				{param icon: $icon /}
+				{param iconAlignment: $iconAlignment /}
+				{param label: $label /}
 				{param spritemap: $spritemap /}
 			{/call}
 		{/if}
 	{/let}
 
-	{let $iconWrapper kind="html"}
-		{if $label}
-			<span class="{$classes}">
-				{$iconContent}
-			</span>
-		{else}
-			{$iconContent}
-		{/if}
-	{/let}
-
-	{if $icon and $iconAlignment == 'left' and $spritemap}
-		{$iconWrapper}
+	{if $iconContent != '' and $iconAlignment == 'left'}
+		{$iconContent}
 	{/if}
 
 	{$label ?: ''}
 
-	{if $icon and $iconAlignment == 'right' and $spritemap}
-		{$iconWrapper}
+	{if $iconContent != '' and $iconAlignment == 'right'}
+		{$iconContent}
 	{/if}
 {/template}
 
@@ -102,11 +85,33 @@
 {template .icon}
 	{@param icon: string}
 	{@param spritemap: string}
+	{@param? iconAlignment: string}
+	{@param? label: html|string}
+
+	{let $iconContent kind="html"}
+		{call ClayIcon.render}
+			{param spritemap: $spritemap /}
+			{param symbol: $icon /}
+		{/call}
+	{/let}
+
+	{if $label}
+		{let $iconWrapperClasses kind="text"}
+			inline-item
+			{if $iconAlignment == 'left'}
+				{sp}inline-item-before
+			{elseif $iconAlignment == 'right'}
+				{sp}inline-item-after
+			{/if}
+		{/let}
+
+		<span class="{$iconWrapperClasses}">
+			{$iconContent}
+		</span>
+	{else}
+		{$iconContent}
+	{/if}
 
-	{call ClayIcon.render}
-		{param spritemap: $spritemap /}
-		{param symbol: $icon /}
-	{/call}
 {/template}
 
 /**