@@ -120,11 +120,24 @@

    (let [direction (case (.-key event)

                      "ArrowUp"   :backward

                      "ArrowDown" :forward

-                     nil)]

-     (if direction

-       (do (.preventDefault event)

-           (merge cmd (cycle-history cmd direction)))

-       cmd))))

+                     "ArrowRight" :right

+                     nil)

+         tab (= (.-key event) "Tab")

+         escape (= (.-key event) "Escape")]

+     (println (.-key event) direction (contains? #{:backward :forward} direction))

+     (cond

+      (contains? #{:backward :forward} direction) (do (.preventDefault event)

+                                                      (if (some-> cmd :suggestions :options)

+                                                          (merge cmd (cycle-suggestions cmd direction))

+                                                          (merge cmd (cycle-history cmd direction))))

+      (and (= :right direction)

+           (some-> cmd :suggestions :selected)) (do (.preventDefault event)

+                                                    (merge cmd (complete-suggestion cmd)))

+      tab (do (.preventDefault event)

+              (merge cmd (cycle-suggestions cmd :forward)))

+      (and escape (some-> cmd :suggestions :options)) (do (.preventDefault event)

+                                                          (merge cmd {:suggestions null-suggestions}))

+      :else     cmd))))

 (re-frame/reg-event-fx

  ::submit-cmd