Merge pull request #597 from toeverything/feature/fix-button-loading

feat: fix show content when loading
2026-07-16 09:36:17 +08:00 · 2022-12-28 16:10:08 +08:00
parent c4ff077c11 235fe92771
commit 32fce00627
1 changed files with 9 additions and 7 deletions
@@ -43,14 +43,16 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
        {loading ? (
          <Loading type={type}></Loading>
        ) : (
-          icon &&
-          cloneElement(Children.only(icon), {
-            width: iconSize,
-            height: iconSize,
-            className: `affine-button-icon ${icon.props.className ?? ''}`,
-          })
+          <>
+            {icon &&
+              cloneElement(Children.only(icon), {
+                width: iconSize,
+                height: iconSize,
+                className: `affine-button-icon ${icon.props.className ?? ''}`,
+              })}
+            {children && <span>{children}</span>}
+          </>
        )}
-        {children && <span>{children}</span>}
      </StyledButton>
    );
  }