From a02dd3b7b4305d281487965ea415dcc93723de1b Mon Sep 17 00:00:00 2001
From: Thibaut Courouble <thibaut@me.com>
Date: Sun, 7 Aug 2016 10:39:39 -0400
Subject: [PATCH] Improve tab/focus navigation of doc picker

---
 assets/javascripts/views/sidebar/doc_picker.coffee | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/assets/javascripts/views/sidebar/doc_picker.coffee b/assets/javascripts/views/sidebar/doc_picker.coffee
index 8181be9e..d0890351 100644
--- a/assets/javascripts/views/sidebar/doc_picker.coffee
+++ b/assets/javascripts/views/sidebar/doc_picker.coffee
@@ -30,6 +30,7 @@ class app.views.DocPicker extends app.View
       @empty()
       app.appCache?.off 'progress', @onAppCacheProgress
       $.off @el, 'focus', @onDOMFocus, true
+      @focusEl = null
     return
 
   render: ->
@@ -101,8 +102,16 @@ class app.views.DocPicker extends app.View
     else if target.classList.contains(app.views.ListFold.targetClass)
       target.blur()
       unless @mouseDown and @mouseDown > Date.now() - 100
-        @listFold.open(target) unless target.classList.contains(app.views.ListFold.activeClass)
-        $('input', target.nextElementSibling).focus()
+        if @focusEl is $('input', target.nextElementSibling)
+          @listFold.close(target) if target.classList.contains(app.views.ListFold.activeClass)
+          prev = target.previousElementSibling
+          prev = prev.previousElementSibling until prev.tagName is 'LABEL' or prev.classList.contains(app.views.ListFold.targetClass)
+          prev = $.makeArray($$('input', prev.nextElementSibling)).pop() if prev.classList.contains(app.views.ListFold.activeClass)
+          @delay -> prev.focus()
+        else
+          @listFold.open(target) unless target.classList.contains(app.views.ListFold.activeClass)
+          @delay -> $('input', target.nextElementSibling).focus()
+    @focusEl = target
     return
 
   onEnter: =>