Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-10 09:08:31 -05:00
Code Issues Activity

🐛 Show correctly context menu when the shape was not selected

Browse source
This commit is contained in:
Andrés Moya 2020-12-11 10:09:39 +01:00 • committed by Andrey Antukh
parent baec7838b4
commit 4e48b78e03
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
frontend/src/app/main/data/workspace.cljs
View file

@ -1122,36 +1122,31 @@
(s/def ::point gpt/point?)
(defn show-context-menu
[{:keys [position] :as params}]
[{:keys [position shape] :as params}]
(us/verify ::point position)
(us/verify (s/nilable ::cp/minimal-shape) shape)
(ptk/reify ::show-context-menu
ptk/UpdateEvent
(update [_ state]
(assoc-in state [:workspace-local :context-menu] {:position position}))))
(let [mdata (cond-> params
(some? shape)
(assoc :selected
(get-in state [:workspace-local :selected])))]
(assoc-in state [:workspace-local :context-menu] mdata)))))
(defn show-shape-context-menu
[{:keys [position shape] :as params}]
(us/verify ::point position)
(us/verify ::cp/minimal-shape shape)
(ptk/reify ::show-context-menu
ptk/UpdateEvent
(update [_ state]
(let [page-id (:current-page-id state)
objects (dwc/lookup-page-objects state page-id)
mdata {:position position
:shape shape
:selected (get-in state [:workspace-local :selected])}]
(-> state
(assoc-in [:workspace-local :context-menu] mdata))))
(ptk/reify ::show-shape-context-menu
ptk/WatchEvent
(watch [_ state stream]
(let [selected (get-in state [:workspace-local :selected])]
(if (selected (:id shape))
(rx/empty)
(rx/of (dws/deselect-all)
(dws/select-shape (:id shape))))))))
(rx/concat
(when-not (selected (:id shape))
(rx/of (dws/deselect-all)
(dws/select-shape (:id shape))))
(rx/of (show-context-menu params)))))))
(def hide-context-menu
(ptk/reify ::hide-context-menu