Merge f9ec190 into b9af827

AlgusDark · Nov 3, 2018 · f78e397 · f78e397
2 parents b9af827 + f9ec190
commit f78e397
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/elements/Icon.tsx b/src/elements/Icon.tsx
@@ -17,7 +17,7 @@ export interface Icon<T> extends Bulma.Size, Bulma.Alignment,
 
 const isAlignOption = isOption(isLeft, isRight);
 
-export function Icon({children, ...props }: Icon<HTMLElement>) {
+export function Icon({ children, ...props }: Icon<HTMLElement>) {
     const className = classNames(
         'icon',
         {
@@ -30,7 +30,7 @@ export function Icon({children, ...props }: Icon<HTMLElement>) {
 
     const icon = (
         <span {...HTMLProps} className={className}>
-            <i className={`${props.className}`} aria-hidden="true"></i>
+            {children ? children : (<i className={`${props.className}`} aria-hidden="true"></i>)}
         </span>
     );
 

diff --git a/test/elements/Icon.test.tsx b/test/elements/Icon.test.tsx
@@ -44,4 +44,13 @@ describe('Icon', () => {
             </span>
         )).toBe(true);
     });
+
+    it('should render children instead of icon', () => {
+        const component = shallow(<Icon><span>child</span></Icon>)
+        expect(component.contains(
+            <span className='icon'>
+               <span>child</span>
+            </span>
+        )).toBe(true);
+    })
 });