🎨 MultiListCollection arrangement of methods

kuychaco · kuychaco · commit c3fd7da86b59 · 2016-08-21T12:42:09.000-07:00
diff --git a/lib/multi-list-collection.js b/lib/multi-list-collection.js
@@ -16,10 +16,57 @@ export default class MultiListCollection {
     this.updateSelections()
   }
 
+  clearSelectedItems () {
+    this.selectedItems = new Set()
+  }
+
+  clearSelectedKeys () {
+    this.selectedKeys = new Set()
+  }
+
+  getSelectedItems () {
+    return this.selectedItems
+  }
+
+  getSelectedKeys () {
+    return this.selectedKeys
+  }
+
+  getItemsForKey (key) {
+    return this.list.getItemsForKey(key)
+  }
+
   getLastSelectedListKey () {
     return this.list.getSelectedListKey()
   }
 
+  selectNextList ({wrap, addToExisting} = {}) {
+    this.list.selectNextList({wrap})
+    this.updateSelections({addToExisting})
+  }
+
+  selectPreviousList ({wrap, addToExisting} = {}) {
+    this.list.selectPreviousList({wrap})
+    this.updateSelections({addToExisting})
+  }
+
+  selectNextItem ({addToExisting, stopAtBounds} = {}) {
+    this.list.selectNextItem({stopAtBounds})
+    this.updateSelections({addToExisting})
+  }
+
+  selectPreviousItem ({addToExisting, stopAtBounds} = {}) {
+    this.list.selectPreviousItem({stopAtBounds})
+    this.updateSelections({addToExisting})
+  }
+
+  updateSelections ({addToExisting} = {}) {
+    const selectedKey = this.list.getSelectedListKey()
+    const selectedItem = this.list.getSelectedItem()
+    this.selectItems(selectedItem ? [selectedItem] : [], {addToExisting, suppressCallback: true})
+    this.selectKeys(selectedKey ? [selectedKey] : [], {addToExisting, suppressCallback: true})
+  }
+
   selectItems (items, {addToExisting, suppressCallback} = {}) {
     if (!addToExisting) this.clearSelectedItems()
     items.forEach(item => this.selectedItems.add(item))
@@ -42,22 +89,6 @@ export default class MultiListCollection {
     this.selectItems([this.list.getItemsForKey(key)[0]], {addToExisting})
   }
 
-  clearSelectedItems () {
-    this.selectedItems = new Set()
-  }
-
-  clearSelectedKeys () {
-    this.selectedKeys = new Set()
-  }
-
-  getSelectedItems () {
-    return this.selectedItems
-  }
-
-  getSelectedKeys () {
-    return this.selectedKeys
-  }
-
   selectItemsAndKeysInRange (endPoint1, endPoint2, addToExisting) {
     if (!addToExisting) {
       this.clearSelectedItems()
@@ -108,35 +139,4 @@ export default class MultiListCollection {
       }
     }
   }
-
-  selectNextList ({wrap, addToExisting} = {}) {
-    this.list.selectNextList({wrap})
-    this.updateSelections({addToExisting})
-  }
-
-  selectPreviousList ({wrap, addToExisting} = {}) {
-    this.list.selectPreviousList({wrap})
-    this.updateSelections({addToExisting})
-  }
-
-  updateSelections ({addToExisting} = {}) {
-    const selectedKey = this.list.getSelectedListKey()
-    const selectedItem = this.list.getSelectedItem()
-    this.selectItems(selectedItem ? [selectedItem] : [], {addToExisting, suppressCallback: true})
-    this.selectKeys(selectedKey ? [selectedKey] : [], {addToExisting, suppressCallback: true})
-  }
-
-  selectNextItem ({addToExisting, stopAtBounds} = {}) {
-    this.list.selectNextItem({stopAtBounds})
-    this.updateSelections({addToExisting})
-  }
-
-  selectPreviousItem ({addToExisting, stopAtBounds} = {}) {
-    this.list.selectPreviousItem({stopAtBounds})
-    this.updateSelections({addToExisting})
-  }
-
-  getItemsForKey (key) {
-    return this.list.getItemsForKey(key)
-  }
 }
