@@ -165,22 +165,23 @@

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

       :else     cmd))))

-(re-frame/reg-event-db

+(re-frame/reg-event-fx

  ::execute-cmd

- (fn [db [_ cmd]] (execute db cmd)))

+ (fn [cofx [_ cmd]]

+    (let [db (cofx :db)]

+      {:db (execute db cmd)

+       ; dispatch-later to ensure that the DOM has already been updated,

+       ; so that scrollMaxY has been changed appropriately.

+       :fx [[:dispatch-later {:ms 10 :dispatch [::scroll-to (prompt db)]}]]})))

 (re-frame/reg-event-fx

- ::submit-cmd

- (fn [cofx [_ prompt]]

+ ::submit-cmdline

+ (fn [cofx [_]]

   (let [db (cofx :db)

         cmdline (some-> db :cmdline :current)]

     {:db

      (-> db

       (assoc-in [:cmdline :current] nil)

       (assoc-in [:cmdline :selected-history] nil)

-      (assoc-in [:cmdline :suggestions] {:options nil :selected nil})

-      (execute cmdline))

-

-     ; dispatch-later to ensure that the DOM has already been updated,

-     ; so that scrollMaxY has been changed appropriately.

-     :fx [[:dispatch-later {:ms 10 :dispatch [::scroll-to prompt]}]]})))

+      (assoc-in [:cmdline :suggestions] {:options nil :selected nil}))

+     :fx [[:dispatch [::execute-cmd cmdline]]]})))

@@ -51,11 +51,11 @@

         update-cmdline #(re-frame/dispatch-sync

                          [::events/update-cmdline (-> % .-target .-value)])

         key-pressed #(re-frame/dispatch-sync [::events/prompt-keypress %])

-        submit-cmd #(do (.preventDefault %)

-                        (re-frame/dispatch [::events/submit-cmd (-> % .-target)]))]

+        submit #(do (.preventDefault %)

+                    (re-frame/dispatch [::events/submit-cmdline]))]

     (re-frame/dispatch [::events/set-prompt-id prompt-id])

     [:form {:class (styles/prompt-style)

-            :on-submit submit-cmd}

+            :on-submit submit

             :id prompt-id}

      [:input {:value @cmdline

               :on-change update-cmdline