3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-30 21:06:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

🎉 Add 'toggle overlay' action (and some fixes)

Browse source
This commit is contained in:
Andrés Moya 2021-09-22 14:18:41 +02:00
parent c241100886
commit bc1372c2f9
7 changed files with 107 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
common/src/app/common/types/interactions.cljc
View file

@ -40,6 +40,7 @@
(s/def ::action-type #{:navigate
:open-overlay
:toggle-overlay
:close-overlay
:prev-screen
:open-url})
@ -70,6 +71,13 @@
:opt-un [::close-click-outside
::background-overlay]))
(defmethod action-opts-spec :toggle-overlay [_]
(s/keys :req-un [::destination
::overlay-position
::overlay-pos-type]
:opt-un [::close-click-outside
::background-overlay]))
(defmethod action-opts-spec :close-overlay [_]
(s/keys :req-un [::destination]))
@ -137,7 +145,7 @@
:action-type action-type
:destination (get interaction :destination))
:open-overlay
(:open-overlay :toggle-overlay)
(let [destination (get interaction :destination)
overlay-pos-type (get interaction :overlay-pos-type :center)
overlay-position (get interaction
@ -174,12 +182,13 @@
(us/verify ::destination destination)
(assert (or (nil? destination)
(some? (get objects destination))))
(assert #(:navigate :open-overlay :close-overlay) (:action-type interaction))
(assert (#{:navigate :open-overlay :toggle-overlay :close-overlay} (:action-type interaction)))
(cond-> interaction
:always
(assoc :destination destination)
(= (:action-type interaction) :open-overlay)
(or (= (:action-type interaction) :open-overlay)
(= (:action-type interaction) :toggle-overlay))
(assoc :overlay-pos-type :center
:overlay-position (calc-overlay-position destination
interaction
@ -191,7 +200,7 @@
[interaction overlay-pos-type shape objects]
(us/verify ::interaction interaction)
(us/verify ::overlay-pos-type overlay-pos-type)
(assert #(= :open-overlay (:action-type interaction)))
(assert (#{:open-overlay :toggle-overlay} (:action-type interaction)))
(assoc interaction
:overlay-pos-type overlay-pos-type
:overlay-position (calc-overlay-position (:destination interaction)
@ -204,7 +213,7 @@
[interaction overlay-pos-type shape objects]
(us/verify ::interaction interaction)
(us/verify ::overlay-pos-type overlay-pos-type)
(assert #(= :open-overlay (:action-type interaction)))
(assert (#{:open-overlay :toggle-overlay} (:action-type interaction)))
(let [new-pos-type (if (= (:overlay-pos-type interaction) overlay-pos-type)
:manual
overlay-pos-type)]
@ -220,7 +229,7 @@
[interaction overlay-position]
(us/verify ::interaction interaction)
(us/verify ::overlay-position overlay-position)
(assert #(= :open-overlay (:action-type interaction)))
(assert (#{:open-overlay :toggle-overlay} (:action-type interaction)))
(assoc interaction
:overlay-pos-type :manual
:overlay-position overlay-position))
@ -229,14 +238,14 @@
[interaction close-click-outside]
(us/verify ::interaction interaction)
(us/verify ::us/boolean close-click-outside)
(assert #(= :open-overlay (:action-type interaction)))
(assert (#{:open-overlay :toggle-overlay} (:action-type interaction)))
(assoc interaction :close-click-outside close-click-outside))
(defn set-background-overlay
[interaction background-overlay]
(us/verify ::interaction interaction)
(us/verify ::us/boolean background-overlay)
(assert #(= :open-overlay (:action-type interaction)))
(assert (#{:open-overlay :toggle-overlay} (:action-type interaction)))
(assoc interaction :background-overlay background-overlay))
(defn- calc-overlay-position