mirror of
https://github.com/penpot/penpot.git
synced 2025-07-24 08:17:19 +02:00
✨ Add minor code consistency fixes
This commit is contained in:
Andrey Antukh
parent
cb46d643ac
commit
892c9ab12c
6 changed files with 97 additions and 96 deletions
|
|
@ -8,7 +8,6 @@
|
|||
(:require
|
||||
["ua-parser-js" :as ua]
|
||||
[app.common.data :as d]
|
||||
[app.common.files.helpers :as cfh]
|
||||
[app.common.json :as json]
|
||||
[app.common.logging :as l]
|
||||
[app.config :as cf]
|
||||
|
|
@ -243,39 +242,3 @@
|
|||
(l/error :hint "error on event batching stream" :cause cause))
|
||||
(fn []
|
||||
(l/debug :hitn "events batching stream terminated")))))))))
|
||||
|
||||
;; ---- HELPERS
|
||||
|
||||
(defn get-shape-type
|
||||
"Returns the type of the shape, or Empty if it's Root Frame"
|
||||
[objects id]
|
||||
(let [shape (get objects id)]
|
||||
(if (cfh/root? shape)
|
||||
"Empty"
|
||||
(:type shape))))
|
||||
|
||||
(defn frame-has-layout
|
||||
"Returns true if the provided frame has a layout."
|
||||
[objects id]
|
||||
(let [frame (get objects id)]
|
||||
(boolean (and frame (:layout frame)))))
|
||||
|
||||
(defn get-shape-event-name
|
||||
"Returns the event name corresponding to a shape type, or nil if no match."
|
||||
[shape]
|
||||
(cond
|
||||
(cfh/frame-shape? shape) "create-board"
|
||||
(cfh/image-shape? shape) "create-image"
|
||||
(cfh/path-shape? shape) "create-path"
|
||||
(cfh/circle-shape? shape) "create-circle"
|
||||
(cfh/rect-shape? shape) "create-rectangle"
|
||||
(cfh/text-shape? shape) "create-text"
|
||||
:else nil))
|
||||
|
||||
(defn get-selected-type
|
||||
"Returns the type of the shape if only one, or multiple if more than one"
|
||||
[objects selected]
|
||||
(if (= 1 (count selected))
|
||||
(let [shape (get objects (first selected))]
|
||||
(:type shape))
|
||||
"multiple"))
|
||||
|
|
|
|||
|
|
@ -902,26 +902,32 @@
|
|||
undo-id (js/Symbol)]
|
||||
|
||||
(rx/concat
|
||||
(->> orig-shapes
|
||||
(keep (fn [shape]
|
||||
(->> (rx/from orig-shapes)
|
||||
(rx/map (fn [shape]
|
||||
(let [parent-type (cfh/get-shape-type all-objects (:parent-id shape))
|
||||
external-lib? (not= file-id (:component-file shape))
|
||||
origin "workspace:paste"]
|
||||
|
||||
(if (ctc/instance-head? shape)
|
||||
(ptk/event ::ev/event
|
||||
{::ev/name "use-library-component"
|
||||
::ev/origin "paste"
|
||||
:external-library (not= file-id (:component-file shape))
|
||||
:parent-type (ev/get-shape-type all-objects (:parent-id shape))})
|
||||
(when (ev/get-shape-event-name shape)
|
||||
(if (ev/frame-has-layout all-objects (:parent-id shape))
|
||||
(ptk/event ::ev/event
|
||||
{::ev/name "layout-add-element"
|
||||
:element-type (:type shape)
|
||||
:source "paste"
|
||||
:parent-type (ev/get-shape-type all-objects (:parent-id shape))})
|
||||
(ptk/event ::ev/event
|
||||
{::ev/name (ev/get-shape-event-name shape)
|
||||
:parent-type (ev/get-shape-type all-objects (:parent-id shape))
|
||||
:source "paste"})))))))
|
||||
;; NOTE: we don't emit the create-shape event all the time for
|
||||
;; avoid send a lot of events (that are not necessary); this
|
||||
;; decision is made explicitly by the responsible team.
|
||||
(if (ctc/instance-head? shape)
|
||||
(ptk/data-event ::ev/event
|
||||
{::ev/name "use-library-component"
|
||||
::ev/origin origin
|
||||
:is-external-library external-lib?
|
||||
:parent-shape-type parent-type})
|
||||
(if (cfh/has-layout? objects (:parent-id shape))
|
||||
(ptk/data-event ::ev/event
|
||||
{::ev/name "layout-add-element"
|
||||
::ev/origin origin
|
||||
:element-type (get shape :type)
|
||||
:parent-type parent-type})
|
||||
(ptk/data-event ::ev/event
|
||||
{::ev/name "create-shape"
|
||||
::ev/origin origin
|
||||
:shape-type (get shape :type)
|
||||
:parent-shape-type parent-type})))))))
|
||||
|
||||
(rx/of (dwu/start-undo-transaction undo-id)
|
||||
(dch/commit-changes changes)
|
||||
|
|
|
|||
|
|
@ -479,26 +479,35 @@
|
|||
ids)
|
||||
undo-id (js/Symbol)]
|
||||
(rx/concat
|
||||
(->> (map (d/getf objects) ids)
|
||||
(keep (fn [shape]
|
||||
(if (ctk/instance-head? shape)
|
||||
(ptk/event ::ev/event
|
||||
{::ev/name "use-library-component"
|
||||
::ev/origin "duplicate"
|
||||
:parent-type (ev/get-shape-type objects (:parent-id shape))
|
||||
:external-library (not= file-id (:component-file shape))})
|
||||
(when-let [event-name (ev/get-shape-event-name shape)]
|
||||
(if (ev/frame-has-layout objects (:parent-id shape))
|
||||
(ptk/event ::ev/event
|
||||
{::ev/name "layout-add-element"
|
||||
:element-type (:type shape)
|
||||
:source "duplicate"})
|
||||
(ptk/event ::ev/event
|
||||
{::ev/name event-name
|
||||
:parent-type (ev/get-shape-type objects (:parent-id shape))
|
||||
:source "duplicate"}))))))
|
||||
(rx/from))
|
||||
;; Warning: This order is important for the focus mode.
|
||||
(->> (rx/from ids)
|
||||
(rx/map (fn [shape-id]
|
||||
(let [shape (get objects shape-id)
|
||||
parent-type (cfh/get-shape-type objects (:parent-id shape))
|
||||
external-lib? (not= file-id (:component-file shape))
|
||||
origin "workspace:duplicate-shapes"]
|
||||
|
||||
;; NOTE: we don't emit the create-shape event all the time for
|
||||
;; avoid send a lot of events (that are not necessary); this
|
||||
;; decision is made explicitly by the responsible team.
|
||||
(if (ctk/instance-head? shape)
|
||||
(ptk/data-event ::ev/event
|
||||
{::ev/name "use-library-component"
|
||||
::ev/origin origin
|
||||
:is-external-library external-lib?
|
||||
:parent-shape-type parent-type})
|
||||
(if (cfh/has-layout? objects (:parent-id shape))
|
||||
(ptk/data-event ::ev/event
|
||||
{::ev/name "layout-add-element"
|
||||
::ev/origin origin
|
||||
:element-type (get shape :type)
|
||||
:parent-type parent-type})
|
||||
(ptk/data-event ::ev/event
|
||||
{::ev/name "create-shape"
|
||||
::ev/origin origin
|
||||
:shape-type (get shape :type)
|
||||
:parent-shape-type parent-type})))))))
|
||||
|
||||
;; Warning: This order is important for the focus mode.
|
||||
(->> (rx/of
|
||||
(dwu/start-undo-transaction undo-id)
|
||||
(dch/commit-changes changes)
|
||||
|
|
|
|||
|
|
@ -143,19 +143,18 @@
|
|||
(->> (rx/of (dwe/start-edition-mode (:id shape)))
|
||||
(rx/observe-on :async)))
|
||||
|
||||
(when-let [event-name (ev/get-shape-event-name shape)]
|
||||
(if (ev/frame-has-layout objects (:parent-id shape))
|
||||
(rx/of
|
||||
(ptk/event ::ev/event
|
||||
{::ev/name "layout-add-element"
|
||||
:element-type (:type shape)
|
||||
:source "new"}))
|
||||
(rx/of (ptk/data-event ::ev/event
|
||||
{::ev/name "create-shape"
|
||||
::ev/origin "workspace:add-shape"
|
||||
:type (get shape :type)
|
||||
:parent-type (cfh/get-shape-type objects (:parent-id shape))}))
|
||||
|
||||
(when (cfh/has-layout? objects (:parent-id shape))
|
||||
(rx/of (ptk/data-event ::ev/event
|
||||
{::ev/name "layout-add-element"
|
||||
::ev/origin "workspace:add-shape"
|
||||
:element-type (get shape :type)})))))))))
|
||||
|
||||
(rx/of
|
||||
(ptk/event ::ev/event
|
||||
{::ev/name event-name
|
||||
:parent-type (ev/get-shape-type objects (:parent-id shape))
|
||||
:source "new"}))))))))))
|
||||
|
||||
(defn move-shapes-into-frame
|
||||
[frame-id shapes]
|
||||
|
|
@ -298,8 +297,8 @@
|
|||
(ptk/data-event :layout/update {:ids [(:id frame-shape)]})
|
||||
(ptk/event ::ev/event
|
||||
{::ev/name "create-board"
|
||||
:converted-from (ev/get-selected-type objects selected)
|
||||
:parent-type (ev/get-shape-type objects (:parent-id frame-shape))})
|
||||
:converted-from (cfh/get-selected-type objects selected)
|
||||
:parent-type (cfh/get-shape-type objects (:parent-id frame-shape))})
|
||||
(dwu/commit-undo-transaction undo-id))))))))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
|
|
|||
|
|
@ -1087,14 +1087,14 @@
|
|||
(rx/concat
|
||||
(let [shapes (mapv #(get objects %) ids)
|
||||
moved-count (count (filter #(not= (:parent-id %) frame-id) shapes))
|
||||
emit-layout-event? (and (ev/frame-has-layout objects frame-id)
|
||||
emit-layout-event? (and (cfh/has-layout? objects frame-id)
|
||||
(pos? moved-count))]
|
||||
(when emit-layout-event?
|
||||
(rx/of (ptk/event ::ev/event
|
||||
{::ev/name "layout-add-element"
|
||||
:source "move-shapes-to-frame"
|
||||
:element-type (ev/get-selected-type objects ids)
|
||||
:moved moved-count}))))
|
||||
(rx/of (ptk/data-event ::ev/event
|
||||
{::ev/name "layout-add-element"
|
||||
:source "move-shapes-to-frame"
|
||||
:element-type (cfh/get-selected-type objects ids)
|
||||
:moved moved-count}))))
|
||||
|
||||
(when (and (some? frame-id) (d/not-empty? changes))
|
||||
(rx/of (dch/commit-changes changes)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue