fix: restore PR #73, accidentally reverted by 9f0c810

quid · Apr 18, 2019 · 6846cb0 · 6846cb0
1 parent ddda090
commit 6846cb0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/packages/react-core/src/Button/__snapshots__/index.test.js.snap b/packages/react-core/src/Button/__snapshots__/index.test.js.snap
@@ -82,7 +82,11 @@ exports[`renders a Button with small size 1`] = `
       className="emotion-0 emotion-1"
       type="button"
     >
-      Hello, World!
+      <span
+        key=".0"
+      >
+        Hello, World!
+      </span>
     </button>
   </ForwardRef>
 </Button>
@@ -184,7 +188,11 @@ exports[`renders a disabled and transparent Button 1`] = `
       disabled={true}
       type="button"
     >
-      Hello, World!
+      <span
+        key=".0"
+      >
+        Hello, World!
+      </span>
     </button>
   </ForwardRef>
 </Button>
@@ -275,7 +283,11 @@ exports[`renders the expected markup 1`] = `
       data-action="foo"
       type="button"
     >
-      Hello, World!
+      <span
+        key=".0"
+      >
+        Hello, World!
+      </span>
     </button>
   </ForwardRef>
 </Button>

diff --git a/packages/react-core/src/Button/index.js b/packages/react-core/src/Button/index.js
@@ -82,6 +82,7 @@ const Button = styled(
         importance,
         disabled,
         type,
+        children,
         ...props
       }: Props,
       ref: React.ElementRef<any>
@@ -98,7 +99,17 @@ const Button = styled(
         specificProps = { disabled, type };
       }
 
-      return <Tag {...specificProps} {...props} ref={ref} />;
+      return (
+        <Tag {...specificProps} {...props}>
+          {React.Children.map(children, node =>
+            ['string', 'number'].includes(typeof node) ? (
+              <span>{node}</span>
+            ) : (
+              node
+            )
+          )}
+        </Tag>
+      );
     }
   )
 )`