@@ -30,17 +30,34 @@

    (contains? equipment cmd) (equipment cmd)

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

-(re-frame/reg-event-db

+(re-frame/reg-fx

+ :window/scroll-smoothly-to-bottom

+ (fn []

+   (let [x (.-scrollX js/window)

+         y (.-scrollMaxY js/window)]

+     (.scrollTo js/window (clj->js {:left x :top y :behavior :smooth})))))

+

+(re-frame/reg-event-fx

+ ::scroll-to-bottom

+ (fn []

+   {:window/scroll-smoothly-to-bottom []}))

+

+(re-frame/reg-event-fx

  ::submit-cmd

- (fn-traced [db _]

-  (let [cmdline (-> db (get-in [:cmdline :current]) trim)

+ (fn [cofx _]

+  (let [db (cofx :db)

+        cmdline (-> db (get-in [:cmdline :current]) trim)

         not-empty? seq]

-    ; TODO replace this with a "->when" macro so that we

-    ; don't always have to prefix with a conditional

-    (cond-> db

-     true (update-in [:cmdline :current] (constantly nil))

-     (not-empty? cmdline)

-     (as-> db

-       (let [output (execute db cmdline)]

-           (update-in db [:cmdline :history] conj

-               {:input cmdline :output output})))))))

+    {:db

+     ; TODO replace this with a "->when" macro so that we

+     ; don't always have to prefix with a conditional

+     (cond-> db

+      true (update-in [:cmdline :current] (constantly nil))

+      (not-empty? cmdline)

+      (as-> db

+        (let [output (execute db cmdline)]

+            (update-in db [:cmdline :history] conj

+                {:input cmdline :output output}))))

+     ; 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-bottom]}]]})))

@@ -137,6 +137,7 @@

 (defclass spell-list-panel []

     {}

     title-style

+    license-notice-style

     [:ul {:padding-left 0}]

     [:li {:list-style :inside

           :list-style-type "'* '"}

@@ -145,7 +146,8 @@

 (defclass item-list-panel []

     {}

-    title-style)

+    title-style

+    license-notice-style)

 (defclass error-message []

@@ -165,7 +167,8 @@

      (content-after ":")])

 (defclass property-table []

-    {:border-spacing 0}

+    {:border-spacing 0

+     :margin-bottom :1rem}

     [:td :th {:padding 0

               :padding-left :2ch}

      (s/& s/first-child) {:padding-left 0}]

@@ -9,7 +9,7 @@

 (defn prompt []

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

-        update-cmdline #(re-frame/dispatch

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

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

         submit-cmd #(do (.preventDefault %)

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

@@ -87,6 +87,11 @@

         [:section.license-notice

          (spaced (x :name) "is" (l :content-kind) "subject to the" (l :license-name))])))

+(defn- listing-license-notice [listing]

+  [license-notice

+   {:name "This listing"

+    :license-notice (-> listing first :license-notice)}])

+

 (defn- description [x]

     (some->> x :desc (map #(vector :p %)) (into [:section.description])))

@@ -227,7 +232,8 @@

         ^{:key index}

          [:li

            [:span (spell :name)]

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

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

+    [listing-license-notice spells]])

 (defn equipment-list-panel [items]

   [:article {:class (styles/item-list-panel)}

@@ -241,7 +247,8 @@

        cost

      :Weight

        {:align :right}

-       #(weight % :unit "lb" :no-quantity true)]])

+       #(weight % :unit "lb" :no-quantity true)]

+   [listing-license-notice items]])

 (defn error-message

     [{e :err}]