add macros: action-> mutation-> ; bumo 0.8.6

Respo · Jan 10, 2018 · c1ec2d5 · c1ec2d5
1 parent 3eaf951
commit c1ec2d5
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 290 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Respo: A virtual DOM library in ClojureScript
 [![Respo](https://img.shields.io/clojars/v/respo/respo.svg)](https://clojars.org/respo/respo)
 
 ```clojure
-[respo "0.8.5"]
+[respo "0.8.6"]
 ```
 
 * Home http://respo.site

diff --git a/build.boot b/build.boot
@@ -10,7 +10,7 @@
                                      :username "jiyinyiyong"
                                      :password (read-password "Clojars password: ")}]))
 
-(def +version+ "0.8.5")
+(def +version+ "0.8.6")
 
 (deftask deploy []
   (comp

diff --git a/coir.edn b/coir.edn
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "respo",
   "version": "0.1.0",
-  "description": "FIXME: description",
+  "description": "Virtual DOM library",
   "main": "index.js",
   "scripts": {
     "tiye": "rsync -r dist/ repo.respo.site:repo/Respo/respo",
@@ -30,7 +30,7 @@
   "dependencies": {},
   "devDependencies": {
     "http-server": "^0.10.0",
-    "shadow-cljs": "^2.0.125",
+    "shadow-cljs": "^2.0.129",
     "source-map-support": "^0.5.0",
     "ws": "^3.3.3"
   }

diff --git a/polyfill/respo/macros.clj b/polyfill/respo/macros.clj
@@ -41,3 +41,11 @@
   ([tag props children]
     (assert (keyword? tag) "tag in list-> should be keyword")
     `(respo.core/create-list-element ~tag ~props ~children)))
+
+(defmacro action-> [op op-data]
+  `(fn [~'%e d!# m!#]
+    (d!# ~op ~op-data)))
+
+(defmacro mutation-> [state]
+  `(fn [~'%e d!# m!#]
+    (m!# ~state)))
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -10,7 +10,7 @@
                 :devtools {:after-load respo.main/reload!
                            :preloads [shadow.cljs.devtools.client.hud]
                            :http-root "target"
-                           :http-port 8080}
+                           :http-port 7000}
                 :release {:output-dir "dist/"}}
           :test {:target :node-script
                  :output-to "target/test.js"

diff --git a/src/respo/app/comp/task.cljs b/src/respo/app/comp/task.cljs
@@ -1,22 +1,16 @@
 
 (ns respo.app.comp.task
-  (:require [respo.macros :refer [defcomp div input span button <>]]
+  (:require [respo.macros :refer [defcomp div input span button <> action-> mutation->]]
             [hsl.core :refer [hsl]]
             [respo.comp.space :refer [=<]]
             [respo.comp.inspect :refer [comp-inspect]]
             [respo.app.style.widget :as widget]))
 
-(defn handle-done [task-id] (fn [e dispatch!] (dispatch! :toggle task-id)))
-
-(defn handle-remove [task] (fn [e dispatch!] (dispatch! :remove (:id task))))
-
 (defn on-text-change [task]
   (fn [event dispatch!]
     (let [task-id (:id task), text (:value event)]
       (dispatch! :update {:id task-id, :text text}))))
 
-(defn on-text-state [e dispatch! mutate!] (mutate! (:value e)))
-
 (def style-done
   {:width 32, :height 32, :outline :none, :border :none, :vertical-align :middle})
 
@@ -33,13 +27,13 @@
      {:style (merge
               style-done
               {:background-color (if (:done? task) (hsl 200 20 80) (hsl 200 80 70))}),
-      :on-click (handle-done (:id task))})
+      :on-click (action-> :toggle (:id task))})
     (=< 8 nil)
     (input {:value (:text task), :style widget/input, :on-input (on-text-change task)})
     (=< 8 nil)
-    (input {:value state, :style widget/input, :on-input on-text-state})
+    (input {:value state, :style widget/input, :on-input (mutation-> (:value %e))})
     (=< 8 nil)
-    (div {:style widget/button, :on-click (handle-remove task)} (<> "Remove"))
+    (div {:style widget/button, :on-click (action-> :remove (:id task))} (<> "Remove"))
     (=< 8 nil)
     (div {} (<> state)))))
 

diff --git a/src/respo/app/comp/todolist.cljs b/src/respo/app/comp/todolist.cljs
@@ -1,7 +1,9 @@
 
 (ns respo.app.comp.todolist
   (:require [clojure.string :as string]
-            [respo.macros :refer [defcomp div span input <> cursor-> list->]]
+            [respo.macros
+             :refer
+             [defcomp div span input <> cursor-> list-> action-> mutation->]]
             [hsl.core :refer [hsl]]
             [respo.app.comp.task :refer [comp-task]]
             [respo.comp.space :refer [=<]]
@@ -11,29 +13,12 @@
             [respo.util.dom :refer [text-width]]
             [respo.app.style.widget :as widget]))
 
-(defn clear-done [e dispatch!] (println "dispatch clear-done") (dispatch! :clear nil))
-
 (defn handle-add [state]
   (fn [e dispatch! mutate!] (dispatch! :add (:draft state)) (mutate! (assoc state :draft ""))))
 
-(def style-root
-  {:color :black,
-   :background-color (hsl 120 20 98),
-   :line-height "24px",
-   :font-size 16,
-   :padding 10,
-   :font-family "\"微软雅黑\", Verdana"})
-
-(def style-list {:color :black, :background-color (hsl 120 20 98)})
-
-(def style-toolbar
-  {:display :flex,
-   :flex-direction :row,
-   :justify-content :start,
-   :padding "4px 0",
-   :white-space :nowrap})
+(def initial-state {:draft "", :locked? false})
 
-(def style-panel {:display :flex, :margin-bottom 4})
+(defn on-focus [e dispatch!] (println "Just focused~"))
 
 (defn run-test! [dispatch! acc]
   (let [started (.valueOf (js/Date.))]
@@ -49,14 +34,24 @@
 
 (defn on-test [e dispatch!] (println "trigger test!") (run-test! dispatch! []))
 
-(defn on-focus [e dispatch!] (println "Just focused~"))
+(def style-list {:color :black, :background-color (hsl 120 20 98)})
 
-(def initial-state {:draft "", :locked? false})
+(def style-panel {:display :flex, :margin-bottom 4})
 
-(defn on-text-change [state]
-  (fn [e dispatch! mutate!] (mutate! (assoc state :draft (:value e)))))
+(def style-root
+  {:color :black,
+   :background-color (hsl 120 20 98),
+   :line-height "24px",
+   :font-size 16,
+   :padding 10,
+   :font-family "\"微软雅黑\", Verdana"})
 
-(defn on-lock [state] (fn [e dispatch! mutate!] (mutate! (update state :locked? not))))
+(def style-toolbar
+  {:display :flex,
+   :flex-direction :row,
+   :justify-content :start,
+   :padding "4px 0",
+   :white-space :nowrap})
 
 (defcomp
  comp-todolist
@@ -73,12 +68,12 @@
        :style (merge
                widget/input
                {:width (max 200 (+ 24 (text-width (:draft state) 16 "BlinkMacSystemFont")))}),
-       :on-input (on-text-change state),
+       :on-input (mutation-> (assoc state :draft (:value %e))),
        :on-focus on-focus})
      (=< 8 nil)
      (span {:style widget/button, :on-click (handle-add state)} (<> "Add"))
      (=< 8 nil)
-     (span {:inner-text "Clear", :style widget/button, :on-click clear-done})
+     (span {:inner-text "Clear", :style widget/button, :on-click (action-> :clear nil)})
      (=< 8 nil)
      (div {} (div {:style widget/button, :on-click on-test} (<> "heavy tasks"))))
     (list->
@@ -92,11 +87,11 @@
       (div
        {:spell-check true, :style style-toolbar}
        (div
-        {:style widget/button, :on (if (:locked? state) {} {:click clear-done})}
+        {:style widget/button, :on (if (:locked? state) {} {:click (action-> :clear nil)})}
         (<> "Clear2"))
        (=< 8 nil)
        (div
-        {:style widget/button, :on-click (on-lock state)}
+        {:style widget/button, :on-click (mutation-> (update state :locked? not))}
         (<> (str "Lock?" (:locked? state))))
        (=< 8 nil)
        (comp-wrap (comp-zero))))

diff --git a/yarn.lock b/yarn.lock
@@ -1194,9 +1194,9 @@ [email protected]:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/shadow-cljs-jar/-/shadow-cljs-jar-1.1.1.tgz#5d74383f5aff8fba25a5d00ee3c3ad035a1bd7a3"
 
-shadow-cljs@^2.0.125:
-  version "2.0.125"
-  resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.0.125.tgz#99bf6cc783fb06035fd9a67748351f6b34d88db3"
+shadow-cljs@^2.0.129:
+  version "2.0.129"
+  resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.0.129.tgz#aa3781f955be4a29fc08d8d2a53d87a71246afc6"
   dependencies:
     babel-core "^6.26.0"
     babel-preset-env "^1.6.0"