From bb648499b49fb566b953411a2fc8832d5ed3da91 Mon Sep 17 00:00:00 2001 From: David Goldfarb Date: Sun, 15 Oct 2017 15:26:40 +0300 Subject: [PATCH] v0.6.0 - Update deps, :on-click everywhere, fix handling true --- CHANGELOG.md | 11 ++++++++++- project.clj | 6 +++--- src/sodium/core.cljs | 7 ++++++- src/sodium/keys.clj | 7 +------ 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0478ff5..e6e1df3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,14 @@ _(nothing)_ ### Fixed _(nothing)_ +## [0.6.0] +### Changed +- Updated dependencies: re-frame, lein-doo +### Added +- Support :on-click in all components +### Fixed +- Correctly handle true value from dom + ## [0.5.0]- 2017-10-02 ### Added - Added components advertisement, divider, icon, icon-group, menu-header, menu-menu, segment, segment-group @@ -54,7 +62,8 @@ _(nothing)_ - Minor helper functions: `evt`, etc. -[Unreleased]: https://github.com/deg/sodium/compare/a1dd09e...HEAD +[Unreleased]: https://github.com/deg/sodium/compare/HEAD...HEAD +[0.6.0]: https://github.com/deg/sodium/compare/a1dd09e...HEAD [0.5.0]: https://github.com/deg/sodium/compare/0dd1e35...a1dd09e [0.4.0]: https://github.com/deg/sodium/compare/17de322...0dd1e35 [0.3.0]: https://github.com/deg/sodium/compare/043f00a...17de322 diff --git a/project.clj b/project.clj index a3314be..0617b73 100644 --- a/project.clj +++ b/project.clj @@ -1,16 +1,16 @@ (defproject - com.degel/sodium "0.6.0-SNAPSHOT" + com.degel/sodium "0.6.0" :description "A wrapper around soda-ash and semantic-ui-react" :url "https://github.com/deg/sodium" :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} :dependencies [[org.clojure/clojure "1.9.0-alpha17"] [org.clojure/clojurescript "1.9.908"] - [re-frame "0.10.1"] + [re-frame "0.10.2"] [reagent "0.7.0"] [soda-ash "0.4.0"]] :plugins [[lein-cljsbuild "1.1.7"] - [lein-doo "0.1.7"]] + [lein-doo "0.1.8"]] :cljsbuild {:builds [{:id "dev" diff --git a/src/sodium/core.cljs b/src/sodium/core.cljs index 31c8dce..a7156ec 100644 --- a/src/sodium/core.cljs +++ b/src/sodium/core.cljs @@ -6,12 +6,17 @@ [sodium.macros :refer [defcomponent def-simple-component]]) (:require [clojure.spec.alpha :as s] + [re-frame.loggers :refer [console]] [soda-ash.core :as sa] [sodium.re-utils :refer [evt]] [sodium.utils :as utils])) (s/def :sodium/size #{:tiny :small :medium :large :huge}) +(defn- negligible? + [x] + (if (seqable? x) (empty? x) (not x))) + (defn >event "Return a function suitable for an on-* handler, to deliver the value into into a re-frame event. See also >atom. @@ -29,7 +34,7 @@ ([event default coercer] #(>evt (let [value (or (.-value %2) (.-checked %2))] (conj event - (coercer (if (empty? value) + (coercer (if (negligible? value) default value))))))) diff --git a/src/sodium/keys.clj b/src/sodium/keys.clj index 06d4d28..87230aa 100644 --- a/src/sodium/keys.clj +++ b/src/sodium/keys.clj @@ -31,6 +31,7 @@ ;; *** NOT LISTED IN DOC! :key :style + :on-click ]) ;;; From https://react.semantic-ui.com/views/advertisement @@ -57,7 +58,6 @@ :label-position ;; enum [right left] :loading? ;; bool :negative? ;; bool - :on-click ;; func :positive? ;; bool :primary? ;; bool :secondary? ;; bool @@ -78,7 +78,6 @@ :label :name :on-change - :on-click :on-mouse-down :radio :read-only? @@ -134,7 +133,6 @@ :on-add-item :on-blur :on-change - :on-click :on-close :on-focus :on-label-click @@ -354,7 +352,6 @@ :horizontal? :icon :image - :on-click :on-remove :pointing :remove-icon @@ -389,7 +386,6 @@ :header :icon :image - :on-click :value]) ;;; From https://react.semantic-ui.com/collections/menu @@ -436,7 +432,6 @@ :index :link? :name - :on-click :position ])