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

✨ Create nested frames from selection

Browse source
This commit is contained in:
alonso.torres 2022-06-06 21:45:14 +02:00
parent c8ad379bf8
commit 79a46efa35
4 changed files with 46 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1673,20 +1673,22 @@
(watch [_ state _]
(let [page-id (:current-page-id state)
objects (wsh/lookup-page-objects state page-id)
shapes (cph/get-immediate-children objects)
selected (wsh/lookup-selected state)
selected-objs (map #(get objects %) selected)
has-frame? (some #(= (:type %) :frame) selected-objs)]
(when (not (or (empty? selected) has-frame?))
selected-objs (map #(get objects %) selected)]
(when (d/not-empty? selected)
(let [srect (gsh/selection-rect selected-objs)
frame-id (:frame-id (first shapes))
frame-id (get-in objects [(first selected) :frame-id])
parent-id (get-in objects [(first selected) :parent-id])
shape (-> (cp/make-minimal-shape :frame)
(merge {:x (:x srect) :y (:y srect) :width (:width srect) :height (:height srect)})
(assoc :frame-id frame-id)
(assoc :frame-id frame-id :parent-id parent-id)
(cond-> (not= frame-id uuid/zero)
(assoc :fills [] :hide-in-viewer true))
(cp/setup-rect-selrect))]
(rx/of
(dwu/start-undo-transaction)
(dwc/add-shape shape)
(dwc/move-shapes-into-frame (:id shape) selected)
(dwu/commit-undo-transaction))))))))

5
frontend/src/app/main/data/workspace/common.cljs
View file

@ -313,7 +313,10 @@
selected)
changes (-> (pcb/empty-changes it page-id)
(pcb/add-object shape #_{:index (when (= :frame (:type shape)) 0)}))]
(pcb/with-objects objects)
(pcb/add-object shape)
(cond-> (some? (:parent-id attrs))
(pcb/change-parent (:parent-id attrs) [shape])))]
(rx/concat
(rx/of (dch/commit-changes changes)

34
frontend/src/app/main/ui/workspace/viewport/actions.cljs
View file

@ -8,6 +8,7 @@
(:require
[app.common.geom.point :as gpt]
[app.common.math :as mth]
[app.common.pages.helpers :as cph]
[app.common.uuid :as uuid]
[app.config :as cfg]
[app.main.data.workspace :as dw]
@ -165,6 +166,7 @@
(defn on-double-click
[hover hover-ids drawing-path? objects edition]
(mf/use-callback
(mf/deps @hover @hover-ids drawing-path? edition)
(fn [event]
@ -174,30 +176,28 @@
alt? (kbd/alt? event)
meta? (kbd/meta? event)
{:keys [id type] :as shape} @hover
{:keys [id type] :as shape} (or @hover (get objects (first @hover-ids)))
frame? (= :frame type)
group? (= :group type)]
editable? (contains? #{:text :rect :path :image :circle} type)]
(st/emit! (ms/->MouseEvent :double-click ctrl? shift? alt? meta?))
;; Emit asynchronously so the double click to exit shapes won't break
(timers/schedule
#(when (and (not drawing-path?) shape)
(cond
frame?
(st/emit! (dw/select-shape id shift?))
(fn []
(when (and (not drawing-path?) shape)
(cond
(and editable? (not= id edition))
(st/emit! (dw/select-shape id)
(dw/start-editing-selected))
(and group? (> (count @hover-ids) 1))
(let [selected (get objects (second @hover-ids))]
(reset! hover selected)
(reset! hover-ids (into [] (rest @hover-ids)))
(st/emit! (dw/select-shape (:id selected))))
(not= id edition)
(st/emit! (dw/select-shape id)
(dw/start-editing-selected)))))))))
:else
(let [;; We only get inside childrens of the hovering shape
hover-ids (->> @hover-ids (filter (partial cph/is-child? objects id)))
selected (get objects (if (> (count hover-ids) 1) (second hover-ids) (first hover-ids)))]
(when (some? selected)
(reset! hover selected)
(st/emit! (dw/select-shape (:id selected)))))))))))))
(defn on-context-menu
[hover hover-ids]