From b9954b764dc524d2638f95048a52bd13ca78c07c Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Wed, 18 Nov 2015 12:28:54 -0800 Subject: [PATCH] fix(search): Execute search for subject, autoselect first item Fixes T5899, but we may want to iterate on it more later. --- internal_packages/search-bar/lib/search-bar.cjsx | 3 +-- .../thread-list/lib/thread-list-store.coffee | 15 +++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/internal_packages/search-bar/lib/search-bar.cjsx b/internal_packages/search-bar/lib/search-bar.cjsx index 5892bb0f5..8ffd24b39 100644 --- a/internal_packages/search-bar/lib/search-bar.cjsx +++ b/internal_packages/search-bar/lib/search-bar.cjsx @@ -116,8 +116,7 @@ class SearchBar extends React.Component _onSelectSuggestion: (item) => if item.thread? - Actions.searchQueryCommitted(null) - Actions.setFocus({collection: 'thread', item: item.thread}) + Actions.searchQueryCommitted([{all: "\"#{item.thread.subject}\""}]) else Actions.searchQueryCommitted(item.value) diff --git a/internal_packages/thread-list/lib/thread-list-store.coffee b/internal_packages/thread-list/lib/thread-list-store.coffee index 1ff825daa..4d2d0a49f 100644 --- a/internal_packages/thread-list/lib/thread-list-store.coffee +++ b/internal_packages/thread-list/lib/thread-list-store.coffee @@ -50,6 +50,13 @@ class ThreadListStore extends NylasStore @trigger(@) ,@ + # Set up a one-time listener to focus an item in the new view + if WorkspaceStore.layoutMode() is 'split' + unlisten = view.listen -> + if view.loaded() + Actions.setFocus(collection: 'thread', item: view.get(0)) + unlisten() + @trigger(@) createView: -> @@ -75,14 +82,6 @@ class ThreadListStore extends NylasStore for message in messages messagesByThread[message.threadId].push message messagesByThread - - if WorkspaceStore.layoutMode() is 'split' - # Set up a one-time listener to focus an item in the new view - unlisten = view.listen -> - if view.loaded() - Actions.setFocus(collection: 'thread', item: view.get(0)) - unlisten() - @setView(view) Actions.setFocus(collection: 'thread', item: null)