diff --git a/src/components/base/InputCurrency/index.js b/src/components/base/InputCurrency/index.js index 5fa7c9d8..9349bfe4 100644 --- a/src/components/base/InputCurrency/index.js +++ b/src/components/base/InputCurrency/index.js @@ -187,6 +187,7 @@ class InputCurrency extends PureComponent { renderOption={this.renderOption} renderValue={this.renderValue} fakeFocusRight={isFocused} + isRight /> ) diff --git a/src/components/base/Select/createStyles.js b/src/components/base/Select/createStyles.js index a09f1639..cc0eb04a 100644 --- a/src/components/base/Select/createStyles.js +++ b/src/components/base/Select/createStyles.js @@ -7,10 +7,14 @@ export default ({ width, minWidth, small, + isRight, + isLeft, }: { width: number, minWidth: number, small: boolean, + isRight: boolean, + isLeft: boolean, }) => ({ control: (styles: Object, { isFocused }: Object) => ({ ...styles, @@ -19,6 +23,8 @@ export default ({ ...ff('Open Sans|SemiBold'), height: small ? 34 : 40, minHeight: 'unset', + borderRadius: isRight ? '0 4px 4px 0' : isLeft ? '4px 0 0 4px' : 4, + borderColor: colors.fog, backgroundColor: 'white', ...(isFocused diff --git a/src/components/base/Select/index.js b/src/components/base/Select/index.js index 9d55dee2..3551b4dc 100644 --- a/src/components/base/Select/index.js +++ b/src/components/base/Select/index.js @@ -21,6 +21,8 @@ type Props = { placeholder: string, isClearable: boolean, isDisabled: boolean, + isRight: boolean, + isLeft: boolean, isLoading: boolean, isSearchable: boolean, small: boolean, @@ -52,6 +54,8 @@ class Select extends PureComponent { isSearchable, isDisabled, isLoading, + isRight, + isLeft, placeholder, options, renderOption, @@ -69,7 +73,7 @@ class Select extends PureComponent { classNamePrefix="select" options={options} components={createRenderers({ renderOption, renderValue })} - styles={createStyles({ width, minWidth, small })} + styles={createStyles({ width, minWidth, small, isRight, isLeft })} placeholder={placeholder} isDisabled={isDisabled} isLoading={isLoading}