fix query filtering for Promise<Object> case

Author: aviatesk

lib/ui/selector.js

@@ -75,41 +75,37 @@ export function show (items, { active, emptyMessage, errorMessage, infoMessage,
         }
       }
     }
-    selector.props.filterKeyForItem = (items.length > 0 && items[0] instanceof Object) ?
-      item => item.primary : item => item
-    if (items.constructor == Promise) {
-      items.then(items => {
-        selector.update({
-          items,
-          emptyMessage,
-          errorMessage,
-          infoMessage,
-          loadingMessage: ''
-        })
-        if (active) {
-          const index = (active instanceof Number) ? active :
-            (active instanceof Function) ? items.findIndex(active) :
-            items.findIndex(item => item == active)
-          selector.selectIndex(index)
-        }
-      }).catch(err => {
-        reject(err)
-        selector.cancelSelection()
-      })
-    } else {
+    // for handling `Promise`
+    function updateSelector (items) {
+      selector.props.filterKeyForItem = (items.length > 0 && items[0] instanceof Object) ?
+        item => item.primary : item => item
       selector.update({
         items,
         emptyMessage,
         errorMessage,
         infoMessage,
         loadingMessage: ''
       })
-      if (active) {
-        const index = (active instanceof Number) ? active :
-          (active instanceof Function) ? items.findIndex(active) :
-          items.findIndex(item => item == active)
-        selector.selectIndex(index)
-      }
+      if (active) selectActiveItem(selector, items, active)
+    }
+    if (items.constructor == Promise) {
+      items.then(items => {
+        updateSelector(items)
+      }).catch(err => {
+        reject(err)
+        selector.cancelSelection()
+      })
+    } else {
+      updateSelector(items)
     }
   })
 }
+
+function selectActiveItem (selector, items, active) {
+  const index = (active instanceof Number) ? active :
+    (active instanceof Function) ? items.findIndex(active) :
+    (items.length > 0 && items[0].primary) ? items.findIndex(item => item.primary === active) :
+    items.indexOf(active)
+  if (index === -1) return // do nothing
+  selector.selectIndex(index)
+}