fix(Input): icon should be always after <input> (#2302)

Semantic-Org · Nov 16, 2017 · 21ebc89 · 21ebc89
1 parent bf27992
commit 21ebc89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/elements/Input/Input.js b/src/elements/Input/Input.js
@@ -222,7 +222,6 @@ class Input extends Component {
     // Render Shorthand
     // ----------------------------------------
     const actionElement = Button.create(action)
-    const iconElement = Icon.create(this.computeIcon())
     const labelElement = Label.create(label, {
       defaultProps: {
         className: cx(
@@ -236,11 +235,10 @@ class Input extends Component {
     return (
       <ElementType {...rest} className={classes}>
         {actionPosition === 'left' && actionElement}
-        {iconPosition === 'left' && iconElement}
         {labelPosition !== 'right' && labelElement}
         {createHTMLInput(input || type, { defaultProps: htmlInputProps })}
         {actionPosition !== 'left' && actionElement}
-        {iconPosition !== 'left' && iconElement}
+        {Icon.create(this.computeIcon())}
         {labelPosition === 'right' && labelElement}
       </ElementType>
     )

diff --git a/test/specs/elements/Input/Input-test.js b/test/specs/elements/Input/Input-test.js
@@ -59,6 +59,7 @@ describe('Input', () => {
     propKey: 'action',
   })
   common.implementsCreateMethod(Input)
+  common.implementsIconProp(Input)
   common.implementsLabelProp(Input, {
     shorthandDefaultProps: { className: 'label' },
   })
@@ -85,7 +86,6 @@ describe('Input', () => {
   common.propKeyOnlyToClassName(Input, 'loading', { className: 'icon' })
   common.propKeyOnlyToClassName(Input, 'transparent')
   common.propKeyOnlyToClassName(Input, 'icon')
-  common.propKeyOnlyToClassName(Input, 'icon')
 
   common.propValueOnlyToClassName(Input, 'size', SUI.SIZES)