diff --git a/README.md b/README.md index d6da439..e36cff3 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Previews http://repo.quamolit.org/phlox/ . [![Clojars Project](https://img.shields.io/clojars/v/quamolit/phlox.svg)](https://clojars.org/quamolit/phlox) ```edn -[quamolit/phlox "0.1.7-a3"] +[quamolit/phlox "0.1.7-a4"] ``` `render!` to add canvas to ``: diff --git a/calcit.cirru b/calcit.cirru index 2e826f5..f81a508 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -6013,15 +6013,16 @@ |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583038537146) (:text |vector+) (:id |VZgKdBSU) |j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583038538580) :data $ {} - |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583038539062) (:text |or) (:id |o9eIu0Ju) - |j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583038539302) + |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583049504000) (:text |any+) (:id |o9eIu0Ju) + |j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583049504366) :data $ {} - |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583038540314) (:text |number+) (:id |Dxx1H9Cck) - :id |70w4GnFZF - |b $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583038543345) - :data $ {} - |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583038547164) (:text |keyword+) (:id |TE9f6abq) - :id |Aofo_7vte + |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583049504663) (:text |{}) (:id |SI_cNhqY) + |j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583049504934) + :data $ {} + |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583049505896) (:text |:some?) (:id |X0Kk49U2l) + |j $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583049506446) (:text |true) (:id |PhOIn8EJO) + :id |jec8BB7sf + :id |b6MCw93vg :id |-weI7zhef :id |lkkSz_T0Q :id |7NOI_I3e @@ -8248,22 +8249,23 @@ :data $ {} |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583043081994) (:text |dev-check) (:id |REA6ZwiAR) |j $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583043081994) (:text |cursor) (:id |asTuPcxhl) - |r $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583043081994) + |r $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583049512191) :data $ {} - |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583043081994) (:text |vector+) (:id |LVbaXwpdD) - |j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583043081994) + |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583049512191) (:text |vector+) (:id |YOvbKpthf) + |j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583049512191) :data $ {} - |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583043081994) (:text |or) (:id |dttEvh0oa) - |j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583043081994) + |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583049512191) (:text |any+) (:id |7vilOuXBK) + |j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583049512191) :data $ {} - |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583043081994) (:text |keyword+) (:id |GLdVuZTPd) - :id |z46uy4IKP - |r $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583043081994) - :data $ {} - |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583043081994) (:text |number+) (:id |-oOn2EjlY) - :id |jxthMb0Zu - :id |-w1XmFwUc - :id |vRykbnZf8 + |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583049512191) (:text |{}) (:id |JE6TAOPEy) + |j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583049512191) + :data $ {} + |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583049512191) (:text |:some?) (:id |Fdd2lnXqx) + |j $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1583049512191) (:text |true) (:id |8zJUgdSU6) + :id |A1lOGClBg + :id |g_9isA5TX + :id |jNsW6_ml6 + :id |FlzvUVhQ6 :id |mEOhe_b9u |u $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1583043089620) :data $ {} diff --git a/pom.xml b/pom.xml index 0d5b927..6c0d1fd 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 quamolit phlox - 0.1.7-a3 + 0.1.7-a4 phlox https://github.com/Quamolit/phlox diff --git a/src/phlox/comp/drag_point.cljs b/src/phlox/comp/drag_point.cljs index 79cca50..27e75a0 100644 --- a/src/phlox/comp/drag_point.cljs +++ b/src/phlox/comp/drag_point.cljs @@ -33,7 +33,7 @@ {:check-keys? true})) (defn comp-drag-point [cursor states props] - (dev-check cursor (vector+ (or (keyword+) (number+)))) + (dev-check cursor (vector+ (any+ {:some? true}))) (dev-check props lilac-drag-point) (let [state (or (:data states) {:dragging false, :x0 [0 0]}) unit (or (:unit props) 1) diff --git a/src/phlox/comp/slider.cljs b/src/phlox/comp/slider.cljs index 2de4ee1..91c6969 100644 --- a/src/phlox/comp/slider.cljs +++ b/src/phlox/comp/slider.cljs @@ -35,7 +35,7 @@ (defcomp comp-slider (cursor states props) - (dev-check cursor (vector+ (or (keyword+) (number+)))) + (dev-check cursor (vector+ (any+ {:some? true}))) (dev-check props lilac-slider) (let [value (or (:value props) 1) state (or (:data states) {:v0 value, :x0 0, :dragging? false})