Skip to content

Commit c91d947

Browse files
authored
Updated styles to reflect slds changes
1 parent e7bdcf2 commit c91d947

File tree

1 file changed

+26
-19
lines changed

1 file changed

+26
-19
lines changed

src/aura/OrderedList/OrderedList.cmp

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
<!--event handlers-->
44
<aura:handler name="init" value="{!this}" action="{!c.doInit}" />
5+
<aura:handler name="change" value="{!v.values}" action="{!c.doInit}" />
56
<aura:handler event="c:DataChange_AE" action="{!c.handleDataChangeAppEvent}"/>
67

78
<!--event registration-->
8-
<aura:registerEvent name="multiColumnSelectChange" type="c:DataChange_CE" />
9-
<aura:registerEvent name="generalCommunication" type="c:DataChange_AE"/>
9+
<aura:registerEvent name="multiColumnSelectChange" type="c:ComponentEvent" />
10+
<aura:registerEvent name="generalCommunication" type="c:ApplicationEvent"/>
1011

1112
<!--public methods-->
1213
<aura:method name="removeItem" action="{!c.deleteFromList}" description="Delete an item based on a unique key">
@@ -30,33 +31,42 @@
3031
<aura:attribute name="storedTimer" type="Object" description="storing a timer allows it to be cancelled" access="private" />
3132
<aura:attribute name="changeEventScheduled" type="Boolean" description="set when we are scheduled to send an event" access="private" />
3233

33-
<div class="slds">
34-
35-
<div class="slds-picklist--draggable slds-grid">
34+
35+
<!-- <div class="slds-picklist^^draggable slds-grid"> -->
36+
<div class="slds-dueling-list__column">
3637

37-
<div class="slds-form-element">
38+
<!-- <div class="slds-form-element"> -->
3839
<span class="slds-form-element__label" >{!v.fieldName}</span>
39-
<div class="slds-picklist" aura:id="items" role="application" ondrop="{!c.handleOnDropParent}"
40+
<div class="slds-dueling-list__options" aura:id="items" role="application" ondrop="{!c.handleOnDropParent}"
4041
ondragenter="{!c.handleOnDragEnterDummy}" ondragleave="{!c.handleOnDragLeaveDummy}" ondragover="{!c.handleOnDragOverDummy}">
41-
<ul aria-describedby="option-drag-label" aria-multiselectable="true" class="slds-picklist__options slds-picklist__options--multi"
42+
<ul aria-describedby="option-drag-label" aria-multiselectable="true" class="slds-listbox slds-listbox_vertical"
4243
role="listbox" tabindex="0">
4344

4445
<aura:iteration items="{!v.items}" var="item">
4546

46-
<li class="{! 'slds-picklist__item slds-is-draggable ' + item.style}"
47+
<li class="{! ' slds-listbox__item ' + item.style}"
4748
draggable="true" ondragstart="{!c.handleDragStart}"
48-
id="{!item.id}" aria-selected="false" role="option"
49+
id="{!item.id}" role="option"
4950
tabindex="{!item.sort}" onclick="{!c.handleListClick}">
50-
<span id="{!item.id}" class="slds-truncate">{!item.sort} : {!item.value}</span>
51+
52+
53+
<div class="slds-listbox__option slds-listbox__option_plain slds-media slds-media_small slds-media_inline"
54+
draggable="true" role="option" aria-selected="{!item.selected}">
55+
<span class="slds-media__body">
56+
<span id="{!item.id}" class="slds-truncate">{!item.sort} : {!item.value}</span>
57+
</span>
58+
</div>
5159
</li>
5260

5361
</aura:iteration>
5462
</ul>
55-
</div>
63+
<!-- </div> -->
5664
</div>
57-
58-
<aura:if isTrue="{!v.showUpDown}">
59-
<div class="slds-grid slds-grid--vertical">
65+
66+
</div>
67+
68+
<aura:if isTrue="{!v.showUpDown}">
69+
<div class="slds-dueling-list__column">
6070

6171
<button class="slds-button slds-button--icon-container slds-button--icon-small" title="Up" onclick="{!c.handleReorderItemUp}">
6272
<lightning:icon iconName="utility:up" size="small" class="slds-button__icon slds-button__icon--large" />
@@ -69,9 +79,6 @@
6979
</button>
7080

7181
</div>
72-
</aura:if>
73-
74-
</div>
75-
</div>
82+
</aura:if>
7683

7784
</aura:component>

0 commit comments

Comments
 (0)