fix: fix duplicate loader for iconright, #noissue (#201)

5app · May 5, 2022 · 9f68035 · 9f68035
1 parent 3eb0048
commit 9f68035
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Button/README.stories.mdx b/src/Button/README.stories.mdx
@@ -73,6 +73,9 @@ Basic button types and sizes:
 		<Button  iconRight icon="arrow-right" isActive size="medium">
 			Let's go
 		</Button>
+		<Button iconRight="arrow-right" isActive size="medium">
+			Let's go again
+		</Button>
 	</InlineList>
 </Canvas>
 
@@ -101,6 +104,9 @@ Disabled:
 		<Button isDisabled iconRight icon="arrow-right" isActive size="medium">
 			Let's go
 		</Button>
+		<Button isDisabled iconRight="arrow-right" isActive size="medium">
+			Let's go again
+		</Button>
 	</InlineList>
 </Canvas>
 
@@ -129,6 +135,9 @@ Loading:
 		<Button isLoading iconRight icon="arrow-right" isActive size="medium">
 			Let's go
 		</Button>
+		<Button isLoading iconRight="arrow-right" isActive size="medium">
+			Let's go again
+		</Button>
 	</InlineList>
 </Canvas>
 

diff --git a/src/Button/index.js b/src/Button/index.js
@@ -347,7 +347,9 @@ const Button = forwardRef((props, ref) => {
 							{isLoading && (
 								<VisuallyHidden>{loadingLabel}</VisuallyHidden>
 							)}
-							{!icon && isLoading && <SpinnerDot />}
+							{!icon && !hasSeparateRightIcon && isLoading && (
+								<SpinnerDot />
+							)}
 						</>
 					))}