Skip to content

Commit

Permalink
Merge branch 'main' of github.com:nextjournal/clerk-demo
Browse files Browse the repository at this point in the history
  • Loading branch information
jackrusher committed Feb 15, 2023
2 parents a3ecdfd + ddb5cd3 commit 8d73a19
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion deps.edn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{:paths ["dev" "notebooks" "resources"]
:deps {io.github.nextjournal/clerk {:git/sha "fad499407d979916d21b33cc7e46e73f7a485e37"}
io.github.nextjournal/clerk-slideshow {:git/sha "562f634494a1e1a9149ed78d5d39fd9486cc00ba"}
io.github.nextjournal/clerk-slideshow {:git/sha "5fe197ca0c8f28128379849dc677cd718be71524"}

;; keep 1.10 until `kixi/stats` and `sicmutils` fix warnings
org.clojure/clojure {:mvn/version "1.10.3"}
Expand Down
4 changes: 2 additions & 2 deletions notebooks/controls.clj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
:render-fn '(fn [{:keys [var-name value]}]
[:input {:type :range
:initial-value value
:on-change #(v/clerk-eval `(reset! ~var-name (Integer/parseInt ~(.. % -target -value))))}])})
:on-change #(nextjournal.clerk.render/clerk-eval `(reset! ~var-name (Integer/parseInt ~(.. % -target -value))))}])})

;; And then assign is to a particular atom like this:
^{::clerk/viewer slider}
Expand Down Expand Up @@ -72,7 +72,7 @@
:placeholder "⌨️"
:initial-value value
:class "px-3 py-3 placeholder-blueGray-300 text-blueGray-600 relative bg-white bg-white rounded text-sm border border-blueGray-300 outline-none focus:outline-none focus:ring w-full"
:on-input #(v/clerk-eval `(reset! ~var-name ~(.. % -target -value)))}])})
:on-input #(nextjournal.clerk.render/clerk-eval `(reset! ~var-name ~(.. % -target -value)))}])})

^{::clerk/viewer text-input}
(defonce text-state (atom ""))
Expand Down
4 changes: 2 additions & 2 deletions notebooks/rule_30.clj
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
:render-fn '(fn [n] [:div.inline-block {:style {:width 16 :height 16}
:class (if (pos? n) "bg-black" "bg-white border-solid border-2 border-black")}])}
{:pred (every-pred list? (partial every? (some-fn number? vector?)))
:render-fn '(fn [rows opts] (into [:div.flex.flex-col] (v/inspect-children opts) rows))}
:render-fn '(fn [rows opts] (into [:div.flex.flex-col] (nextjournal.clerk.render/inspect-children opts) rows))}
{:pred (every-pred vector? (complement map-entry?) (partial every? number?))
:render-fn '(fn [row opts] (into [:div.flex.inline-flex] (v/inspect-children opts) row))}])
:render-fn '(fn [row opts] (into [:div.flex.inline-flex] (nextjournal.clerk.render/inspect-children opts) row))}])

;; Now let's test each one to make sure they look the way we want:

Expand Down

0 comments on commit 8d73a19

Please sign in to comment.