diff --git a/ui/components/dueling-picklist/base/_index.scss b/ui/components/dueling-picklist/base/_index.scss index 1cc0c0ef8b..0a7d004b5b 100644 --- a/ui/components/dueling-picklist/base/_index.scss +++ b/ui/components/dueling-picklist/base/_index.scss @@ -33,28 +33,6 @@ margin-top: $spacing-large; } } - - [aria-disabled="true"] { - background-color: $color-background-input-disabled; - border: 1px solid $color-border-input-disabled; - color: $color-text-input-disabled; - - &:hover { - cursor: not-allowed; - } - - .slds-listbox__option { - - &:hover { - cursor: not-allowed; - background-color: transparent; - } - - &:focus { - background-color: transparent; - } - } - } } /** @@ -83,6 +61,28 @@ color: $color-text-button-brand-hover; } } + + &.slds-is-disabled { + background-color: $color-background-input-disabled; + border-color: $color-border-input-disabled; + color: $color-text-input-disabled; + + &:hover { + cursor: not-allowed; + } + + .slds-listbox__option { + + &:hover { + cursor: not-allowed; + background-color: transparent; + } + + &:focus { + background-color: transparent; + } + } + } } @include deprecate('4.0.0', 'Use slds-listbox__item instead of slds-picklist__item') { diff --git a/ui/components/dueling-picklist/base/example.jsx b/ui/components/dueling-picklist/base/example.jsx index 72ae2342b8..ed1abc6b26 100644 --- a/ui/components/dueling-picklist/base/example.jsx +++ b/ui/components/dueling-picklist/base/example.jsx @@ -42,52 +42,42 @@ const MultiSelect = props => { ); }; -const MoveButtons = props => ( -
- - -
-); +const MoveButtons = props => { + const firstButtonText = + 'Move Selection ' + + (props.direction === 'vertical' ? 'Up' : 'to ' + props.targetB); + const secondButtonText = + 'Move Selection ' + + (props.direction === 'vertical' ? 'Down' : 'to ' + props.targetA); + return ( +
+ + +
+ ); +}; const SelectionGroup = props => { const groupLabelID = _.uniqueId('label-'); @@ -107,12 +97,15 @@ const SelectionGroup = props => { const ListBox = props => (