Skip to content

Commit

Permalink
fix(combobox): Added spacing utility next to dropdown button icon
Browse files Browse the repository at this point in the history
  • Loading branch information
ishakasliwal committed Oct 23, 2017
1 parent 2907029 commit fbf6edc
Showing 1 changed file with 21 additions and 33 deletions.
54 changes: 21 additions & 33 deletions ui/components/combobox/base/example.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -214,21 +214,17 @@ export let ComboboxContainer = props => {
) : props.inputIcon === 'left' || props.inputIcon === 'both' ? (
<UtilityIcon
assistiveText={
props.inputIconLeftSymbol === 'search' ? (
false
) : (
props.inputIconLeftAssistiveText
)
props.inputIconLeftSymbol === 'search'
? false
: props.inputIconLeftAssistiveText
}
containerClassName="slds-input__icon slds-input__icon_left"
className="slds-icon slds-icon_x-small slds-icon-text-default"
symbol={props.inputIconLeftSymbol || 'search'}
title={
props.inputIconLeftSymbol === 'search' ? (
false
) : (
props.inputIconLeftAssistiveText
)
props.inputIconLeftSymbol === 'search'
? false
: props.inputIconLeftAssistiveText
}
/>
) : null}
Expand All @@ -245,13 +241,11 @@ export let ComboboxContainer = props => {
role="textbox"
type="text"
placeholder={
!props.placeholder ? props.autocomplete ? (
'Search Salesforce'
) : (
'Select an Option'
) : (
props.placeholder
)
!props.placeholder
? props.autocomplete
? 'Search Salesforce'
: 'Select an Option'
: props.placeholder
}
readOnly={props['readonly']}
defaultValue={props.value}
Expand All @@ -261,21 +255,17 @@ export let ComboboxContainer = props => {
{props.inputIcon === 'right' && props.inputButtonIcon != true ? (
<UtilityIcon
title={
props.inputIconRightSymbol === 'search' ? (
false
) : (
props.inputIconRightAssistiveText
)
props.inputIconRightSymbol === 'search'
? false
: props.inputIconRightAssistiveText
}
containerClassName="slds-input__icon slds-input__icon_right"
className="slds-icon slds-icon_x-small slds-icon-text-default"
symbol={props.inputIconRightSymbol || 'search'}
assistiveText={
props.inputIconRightSymbol === 'search' ? (
false
) : (
props.inputIconRightAssistiveText
)
props.inputIconRightSymbol === 'search'
? false
: props.inputIconRightAssistiveText
}
/>
) : null}
Expand Down Expand Up @@ -349,11 +339,9 @@ export let EntityOption = props => (
</span>
<span className="slds-media__body">
<span className="slds-listbox__option-text slds-listbox__option-text_entity">
{props.typeahead ? (
props.children
) : (
props.entityTitle || 'Salesforce.com, Inc.'
)}
{props.typeahead
? props.children
: props.entityTitle || 'Salesforce.com, Inc.'}
</span>
{props.entityMeta ? (
<span className="slds-listbox__option-meta slds-listbox__option-meta_entity">
Expand Down Expand Up @@ -438,7 +426,7 @@ let ObjectSwitcher = props => (
<span className="slds-assistive-text">Searching in: Accounts</span>
</span>
<SvgIcon
className="slds-button__icon slds-button__icon_x-small"
className="slds-button__icon slds-button__icon_x-small slds-m-left_xxx-small"
sprite="utility"
symbol="down"
/>
Expand Down

0 comments on commit fbf6edc

Please sign in to comment.