Merge 4f3f724 into 21687d5

helpscout · Mar 15, 2019 · 747fc82 · 747fc82
2 parents 21687d5 + 4f3f724
commit 747fc82
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/components/Input/Input.js b/src/components/Input/Input.js
@@ -752,8 +752,8 @@ export class Input extends Component<Props, State> {
               {this.getInputMarkup(props)}
               {this.getInlineSuffixMarkup()}
               {this.getSuffixMarkup()}
-              {this.getActionMarkup()}
               {this.getErrorMarkup()}
+              {this.getActionMarkup()}
               <Backdrop
                 className="c-Input__backdrop"
                 disabled={disabled}

diff --git a/stories/Input.stories.js b/stories/Input.stories.js
@@ -1,6 +1,7 @@
 import React from 'react'
 import { storiesOf } from '@storybook/react'
 import { action } from '@storybook/addon-actions'
+import { boolean } from '@storybook/addon-knobs'
 import { Button, Flexy, Icon, Input, styled } from '../src/index.js'
 
 const stories = storiesOf('Input', module)
@@ -246,6 +247,9 @@ const PaddedTextArea = styled('div')`
 `
 
 stories.add('Action', () => {
+  const error = boolean('error', false)
+  const state = error ? 'error' : null
+
   class Example extends React.Component {
     state = {
       isDisabled: true,
@@ -270,6 +274,7 @@ stories.add('Action', () => {
             type="text"
             onChange={this.onChange}
             value={this.state.value}
+            state={state}
             action={
               <Button
                 version={2}
@@ -291,6 +296,7 @@ stories.add('Action', () => {
             onChange={this.onChange}
             value={this.state.value}
             size="sm"
+            state={state}
             action={
               <Button
                 version={2}