Skip to content

Commit

Permalink
Merge pull request #52 from Quamolit/message-optional
Browse files Browse the repository at this point in the history 
fix optional mark for message props
  • Loading branch information
@soyaine
soyaine authored May 20, 2020
2 parents b7a4dbc + 76177df commit 6ec76dd
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 47 deletions.
45 changes: 17 additions & 28 deletions calcit.cirru
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2665,6 +2665,11 @@
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586602264156) (:text |:check-keys?) (:id |J-XAcQrdbN)
|j $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586602264156) (:text |true) (:id |tXhIgVTImJ)
:id |Z5bQx77UMr
|r $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1589905651738)
:data $ {}
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1589905655160) (:text |:all-optional?) (:id |vqHoifZSLxleaf)
|j $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1589905655836) (:text |true) (:id |XMGAh66EEh)
:id |vqHoifZSLx
:id |FRpt-Kwkar
|b $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586602265062)
:data $ {}
Expand All @@ -2685,47 +2690,31 @@
|n $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586602343089)
:data $ {}
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586602345146) (:text |:position) (:id |I4lnKZAAoleaf)
|j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586602626127)
:data $ {}
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586602369802) (:text |lilac-point) (:id |pPFphoiSY2)
|D $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586602629806) (:text |optional+) (:id |zLP0a8_pWU)
:id |-r6Anbame
|j $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586602369802) (:text |lilac-point) (:id |pPFphoiSY2)
:id |I4lnKZAAo
|l $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586603055582)
:data $ {}
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586603056812) (:text |:color) (:id |CtBi4FDonD)
|j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586603059423)
|j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586603056812)
:data $ {}
|T $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586603056812)
:data $ {}
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586603056812) (:text |number+) (:id |FMrpuQxeCq)
:id |H--IgUx86o
|D $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586603061609) (:text |optional+) (:id |QvdhflatnI)
:id |b01Rkw5t71
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586603056812) (:text |number+) (:id |FMrpuQxeCq)
:id |H--IgUx86o
:id |w30B4Mfol
|m $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586603055582)
:data $ {}
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586603064643) (:text |:fill) (:id |CtBi4FDonD)
|j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586603059423)
|j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586603056812)
:data $ {}
|T $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586603056812)
:data $ {}
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586603056812) (:text |number+) (:id |FMrpuQxeCq)
:id |H--IgUx86o
|D $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586603061609) (:text |optional+) (:id |QvdhflatnI)
:id |b01Rkw5t71
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586603056812) (:text |number+) (:id |FMrpuQxeCq)
:id |H--IgUx86o
:id |TGU32fPNsi
|p $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586602343089)
:data $ {}
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586603626901) (:text |:bottom?) (:id |I4lnKZAAoleaf)
|j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586602626127)
|j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586603629637)
:data $ {}
|T $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586603629637)
:data $ {}
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586603636657) (:text |boolean+) (:id |pPFphoiSY2)
:id |a4lSc2Dac_
|D $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586602629806) (:text |optional+) (:id |zLP0a8_pWU)
:id |-r6Anbame
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586603636657) (:text |boolean+) (:id |pPFphoiSY2)
:id |a4lSc2Dac_
:id |LXWkjlZ9Ky
:id |OQG0Os9Is
:id |wTR26RBHvQ
Expand Down Expand Up @@ -4702,10 +4691,10 @@
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586601675513) (:text |{}) (:id |Ub9OTJWO_tleaf)
|b $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586602227667)
:data $ {}
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586602229603) (:text |:messages) (:id |ieRkPtN1PCleaf)
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1589905737150) (:text |:messages) (:id |ieRkPtN1PCleaf)
|j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1586602230185)
:data $ {}
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586602230185) (:text |:messages) (:id |v-0PCa7SvC)
|T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1589905728367) (:text |:messages) (:id |v-0PCa7SvC)
|j $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1586602230185) (:text |state) (:id |S6r7FPm2kQ)
:id |msiHrGomD7
:id |ieRkPtN1PC
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"author": "jiyinyiyong",
"license": "MIT",
"devDependencies": {
"shadow-cljs": "^2.9.0"
"shadow-cljs": "^2.9.8"
},
"dependencies": {
"fontfaceobserver": "^2.1.0",
Expand Down
10 changes: 5 additions & 5 deletions src/phlox/comp/messages.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
(def lilac-messages
(record+
{:messages lilac-message-list,
:color (optional+ (number+)),
:fill (optional+ (number+)),
:position (optional+ lilac-point),
:bottom? (optional+ (boolean+)),
:color (number+),
:fill (number+),
:position lilac-point,
:bottom? (boolean+),
:on-pointertap (fn+)}
{:check-keys? true}))
{:check-keys? true, :all-optional? true}))

(defcomp
comp-messages
Expand Down
27 changes: 14 additions & 13 deletions yarn.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6ec76dd

Please sign in to comment.