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

✨ Multiple cells selection and area

Browse source
This commit is contained in:
alonso.torres 2023-09-14 10:57:42 +02:00
parent 322767701c
commit 17f35cda15
12 changed files with 288 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

17
common/src/app/common/geom/shapes/transforms.cljc
View file

@ -104,14 +104,15 @@
(defn absolute-move
"Move the shape to the exactly specified position."
[shape pos]
(let [x (dm/get-prop pos :x)
y (dm/get-prop pos :y)
sr (dm/get-prop shape :selrect)
px (dm/get-prop sr :x)
py (dm/get-prop sr :y)
dx (- (d/check-num x) px)
dy (- (d/check-num y) py)]
(move shape (gpt/point dx dy))))
(when shape
(let [x (dm/get-prop pos :x)
y (dm/get-prop pos :y)
sr (dm/get-prop shape :selrect)
px (dm/get-prop sr :x)
py (dm/get-prop sr :y)
dx (- (d/check-num x) px)
dy (- (d/check-num y) py)]
(move shape (gpt/point dx dy)))))
;; --- Transformation matrix operations

106
common/src/app/common/types/shape/layout.cljc
View file

@ -13,8 +13,6 @@
[app.common.schema :as sm]
[app.common.uuid :as uuid]))
;; FIXME: need proper schemas
;; :layout ;; :flex, :grid in the future
;; :layout-flex-dir ;; :row, :row-reverse, :column, :column-reverse
;; :layout-gap-type ;; :simple, :multiple
@ -698,13 +696,17 @@
(defn- reorder-grid-track
[prop parent from-index to-index]
(-> parent
(update prop
(fn [tracks]
(let [tr (nth tracks from-index)]
(-> tracks
(assoc from-index nil)
(d/insert-at-index (inc to-index) [tr])
(d/vec-without-nils)))))))
(update
prop
(fn [tracks]
(let [tr (nth tracks from-index)]
(mapv
second
(-> tracks
(d/enumerate) ;; make unique so the insert-at-index won't remove the value
(assoc from-index nil)
(d/insert-at-index (inc to-index) [[nil tr]])
(d/vec-without-nils))))))))
(defn reorder-grid-column
[parent from-index to-index]
@ -846,7 +848,9 @@
cells
(let [next-free (first free-cells)
current (first pending)
cells (update-in cells [next-free :shapes] conj current)]
cells (-> cells
(update-in [next-free :shapes] conj current)
(assoc-in [next-free :position] :auto))]
(recur cells (rest free-cells) (rest pending)))))]
;; TODO: Remove after testing
@ -870,7 +874,7 @@
(let [cell-from (get cells idx)
cell-to (get cells (inc idx))
cell (assoc cell-to :shapes (:shapes cell-from))
cell (assoc cell-to :shapes (:shapes cell-from) :position (:position cell-from))
parent (assoc-in parent [:layout-grid-cells (:id cell)] cell)
result-cells (assoc result-cells (inc idx) cell)]
@ -882,7 +886,7 @@
(recur parent result-cells (inc idx))))))]
[(assoc-in parent [:layout-grid-cells (get-in cells [index :id]) :shapes] [])
(assoc-in result-cells [index :shapes] [])]))))
(update result-cells index assoc :shapes [] :position :auto)]))))
(defn in-cell?
@ -912,7 +916,7 @@
[start-index start-cell] (seek-indexed-cell cells row column)]
(if (some? start-cell)
(let [ ;; start-index => to-index is the range where the shapes inserted will be added
(let [;; start-index => to-index is the range where the shapes inserted will be added
to-index (min (+ start-index (count shape-ids)) (dec (count cells)))]
;; Move shift the `shapes` attribute between cells
@ -920,7 +924,8 @@
(map vector shape-ids)
(reduce (fn [[parent cells] [shape-id idx]]
(let [[parent cells] (free-cell-push parent cells idx)]
[(assoc-in parent [:layout-grid-cells (get-in cells [idx :id]) :shapes] [shape-id])
[(update-in parent [:layout-grid-cells (get-in cells [idx :id])]
assoc :position :manual :shapes [shape-id])
cells]))
[parent cells])
(first)))
@ -1044,9 +1049,17 @@
(defn swap-shapes
[parent id-from id-to]
(-> parent
(assoc-in [:layout-grid-cells id-from :shapes] (dm/get-in parent [:layout-grid-cells id-to :shapes]))
(assoc-in [:layout-grid-cells id-to :shapes] (dm/get-in parent [:layout-grid-cells id-from :shapes]))))
(let [cell-to (dm/get-in parent [:layout-grid-cells id-to])
cell-from (dm/get-in parent [:layout-grid-cells id-from])]
(-> parent
(update-in [:layout-grid-cells id-from]
assoc
:shapes (:shapes cell-to)
:podition (:position cell-to))
(update-in [:layout-grid-cells id-to]
assoc
:shapes (:shapes cell-from)
:position (:position cell-from)))))
(defn add-children-to-cell
[frame children objects [row column :as cell]]
@ -1106,3 +1119,62 @@
(< (inc index) (+ column column-span)))))
(map second)
(mapcat :shapes)))
(defn cells-coordinates
"Given a group of cells returns the coordinates that define"
[cells]
(loop [cells (seq cells)
result
{:first-row ##Inf
:first-column ##Inf
:last-row ##-Inf
:last-column ##-Inf
:cell-coords #{}}]
(if (empty? cells)
result
(let [{:keys [first-row last-row first-column last-column cell-coords]} result
current (first cells)
first-row
(if (< (:row current) first-row)
(:row current)
first-row)
last-row
(if (> (+ (:row current) (:row-span current) -1) last-row)
(+ (:row current) (:row-span current) -1)
last-row)
first-column
(if (< (:column current) first-column)
(:column current)
first-column)
last-column
(if (> (+ (:column current) (:column-span current) -1) last-column)
(+ (:column current) (:column-span current) -1)
last-column)
cell-coords
(into cell-coords
(for [r (range (:row current) (+ (:row current) (:row-span current)))
c (range (:column current) (+ (:column current) (:column-span current)))]
[r c]))]
(recur (rest cells)
(assoc result
:first-row first-row
:last-row last-row
:first-column first-column
:last-column last-column
:cell-coords cell-coords))))))
(defn valid-area-cells?
[cells]
(let [{:keys [first-row last-row first-column last-column cell-coords]} (cells-coordinates cells)]
(every?
#(contains? cell-coords %)
(for [r (range first-row (inc last-row))
c (range first-column (inc last-column))]
[r c]))))