@@ -31,7 +31,8 @@

 (def default-db

   {:name "DMR"

-   :cmdline {:current ""

+   :cmdline {:prompt-id nil

+             :current ""

              :suggestions {:options nil :selected nil}

              :selected-history nil

              :history []}

@@ -11,6 +11,9 @@

  (fn-traced [_ _]

    db/default-db))

+(defn prompt [db]

+  (->> db :cmdline :prompt-id (.getElementById js/document)))

+

 (defn single-space [s]

   (as-> s x

         (split x " ")

@@ -60,6 +63,11 @@

    (-> entities concatv (get-using-name)) (-> entities concatv get-using-name append-history)

    :else (append-history {:err (str "Unknown command '" cmdline "'")}))))

+(re-frame/reg-event-db

+ ::set-prompt-id

+ (fn [db [_ prompt-id]]

+     (assoc-in db [:cmdline :prompt-id] prompt-id)))

+

 (re-frame/reg-fx

  :window/scroll-to

  (fn [element]

@@ -158,17 +166,22 @@

       :else     cmd))))

 (re-frame/reg-event-fx

- ::submit-cmd

- (fn [cofx [_ prompt]]

+ ::execute-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-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]]]})))

@@ -100,6 +100,11 @@

         ; letters that hang down touch the lower edge of the box without this

         :padding-bottom :0.4rem}])

+(defclass code []

+    {:font-size :1rem

+     :text-decoration :underline

+     :cursor :pointer})

+

 (def kind-style [:span.kind {:font-style :italic}])

 (def description-style [:section.description {:font-style :italic}])

 (def license-notice-style

@@ -40,17 +40,23 @@

 (defn- enumerated [& colls] (apply zip (range) colls))

+(defn code [text]

+    [:code {:class (styles/code)

+            :on-click #(re-frame/dispatch [::events/execute-cmd text])}

+     text])

-(defn prompt []

+(defn prompt [prompt-id]

   (let [cmdline (re-frame/subscribe [::subs/cmdline])

         suggestions (re-frame/subscribe [::subs/cmdline-suggestions])

         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

               :on-keyDown key-pressed

@@ -249,7 +255,7 @@

      (for [[index spell] (enumerated (sort-by :name spells))]

         ^{:key index}

          [:li

-           [:span (spell :name)]

+           [:span [code (spell :name)]]

            [:span (-> spell short-spell-description parenthesize)]])]

     [listing-license-notice spells]])

@@ -259,7 +265,7 @@

    [property-table items

      :Name

        {}

-       :name

+       #(-> % :name code)

      :Cost

        {:align :right}

        cost

@@ -324,4 +330,4 @@

 (defn main-panel []

   [:div {:class (styles/screen)}

    [:div {:class (styles/main-panel)}

-    [title] [history] [prompt] [footer]]])

+    [title] [history] [prompt "prompt"] [footer]]])