Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-10 00:40:30 -05:00
Code Issues Activity

Merge pull request #1080 from penpot/enhancement/incremental-area-selection

Browse source 
Incremental area selection
This commit is contained in:
Andrey Antukh 2021-07-08 23:08:06 +02:00 committed by GitHub
commit dc089ba84a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 41 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.md
View file

@ -14,7 +14,8 @@
- Preserve components if possible, when pasted into a different file [Taiga #1063](https://tree.taiga.io/project/penpot/issue/1063).
- Add the ability to offload file data to a cheaper storage when file becomes inactive.
- Import/Export Penpot files from dashboard.
- Double click won't make a shape a path until you change a node [Taiga #]
- Double click won't make a shape a path until you change a node [Taiga #1796](https://tree.taiga.io/project/penpot/us/1796)
- Incremental area selection [#779](https://github.com/penpot/penpot/discussions/779)
### :bug: Bugs fixed

1
common/src/app/common/geom/shapes.cljc
View file

@ -208,3 +208,4 @@
(d/export gin/overlaps?)
(d/export gin/has-point?)
(d/export gin/has-point-rect?)
(d/export gin/rect-contains-shape?)

6
common/src/app/common/geom/shapes/intersect.cljc
View file

@ -302,3 +302,9 @@
(let [lines (points->lines (:points shape))]
;; TODO: Will only work for simple shapes
(is-point-inside-evenodd? point lines)))
(defn rect-contains-shape?
[rect shape]
(->> shape
:points
(every? (partial has-point-rect? rect))))

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

@ -1843,7 +1843,7 @@
(d/export dwc/select-shapes)
(d/export dws/shift-select-shapes)
(d/export dws/duplicate-selected)
(d/export dws/handle-selection)
(d/export dws/handle-area-selection)
(d/export dws/select-inside-group)
(d/export dwd/select-for-drawing)
(d/export dwc/clear-edition-mode)

2
frontend/src/app/main/data/workspace/path.cljs
View file

@ -28,7 +28,7 @@
(d/export edition/move-selected)
;; Selection
(d/export selection/handle-selection)
(d/export selection/handle-area-selection)
(d/export selection/select-node)
(d/export selection/path-handler-enter)
(d/export selection/path-handler-leave)

4
frontend/src/app/main/data/workspace/path/selection.cljs
View file

@ -101,12 +101,12 @@
(update [_ state]
(update state :workspace-local dissoc :selrect))))
(defn handle-selection
(defn handle-area-selection
[shift?]
(letfn [(valid-rect? [{width :width height :height}]
(or (> width 10) (> height 10)))]
(ptk/reify ::handle-selection
(ptk/reify ::handle-area-selection
ptk/WatchEvent
(watch [_ _ stream]
(let [stop? (fn [event] (or (dwc/interrupt? event) (ms/mouse-up? event)))

27
frontend/src/app/main/data/workspace/selection.cljs
View file

@ -45,7 +45,7 @@
(update [_ state]
(assoc-in state [:workspace-local :selrect] selrect))))
(defn handle-selection
(defn handle-area-selection
[preserve?]
(letfn [(data->selrect [data]
(let [start (:start data)
@ -59,10 +59,11 @@
:y start-y
:width (mth/abs (- end-x start-x))
:height (mth/abs (- end-y start-y))}))]
(ptk/reify ::handle-selection
(ptk/reify ::handle-area-selection
ptk/WatchEvent
(watch [_ _ stream]
(let [stop? (fn [event] (or (dwc/interrupt? event) (ms/mouse-up? event)))
(watch [_ state stream]
(let [zoom (get-in state [:workspace-local :zoom] 1)
stop? (fn [event] (or (dwc/interrupt? event) (ms/mouse-up? event)))
stoper (->> stream (rx/filter stop?))]
(rx/concat
(when-not preserve?
@ -74,11 +75,16 @@
{:start pos :stop pos}))
nil)
(rx/map data->selrect)
(rx/filter #(or (> (:width %) 10)
(> (:height %) 10)))
(rx/map update-selrect)
(rx/filter #(or (> (:width %) (/ 10 zoom))
(> (:height %) (/ 10 zoom))))
(rx/flat-map
(fn [selrect]
(rx/of (update-selrect selrect)
(select-shapes-by-current-selrect preserve?))))
(rx/take-until stoper))
(rx/of (select-shapes-by-current-selrect preserve?))))))))
(rx/of (update-selrect nil))))))))
;; --- Toggle shape's selection status (selected or deselected)
@ -214,11 +220,12 @@
selrect (get-in state [:workspace-local :selrect])
blocked? (fn [id] (get-in objects [id :blocked] false))]
(rx/merge
(rx/of (update-selrect nil))
(when selrect
(->> (uw/ask! {:cmd :selection/query
:page-id page-id
:rect selrect})
:rect selrect
:include-frames? true
:full-frame? true})
(rx/map #(cp/clean-loops objects %))
(rx/map #(into initial-set (filter (comp not blocked?)) %))
(rx/map select-shapes))))))))

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

@ -67,10 +67,10 @@
node-editing?
;; Handle path node area selection
(st/emit! (dwdp/handle-selection shift?))
(st/emit! (dwdp/handle-area-selection shift?))
(or (not id) (and frame? (not selected?)))
(st/emit! (dw/handle-selection shift?))
(st/emit! (dw/handle-area-selection shift?))
(not drawing-tool)
(st/emit! (when (or shift? (not selected?))

14
frontend/src/app/worker/selection.cljs
View file

@ -84,7 +84,7 @@
(create-index new-objects)))
(defn- query-index
[{index :index z-index :z-index} rect frame-id include-frames? include-groups? reverse?]
[{index :index z-index :z-index} rect frame-id include-frames? full-frame? include-groups? reverse?]
(let [result (-> (qdt/search index (clj->js rect))
(es6-iterator-seq))
@ -97,7 +97,11 @@
(case (:type shape)
:frame include-frames?
:group include-groups?
true)))
true)
(or (not full-frame?)
(not= :frame (:type shape))
(gsh/rect-contains-shape? rect shape))))
overlaps?
(fn [shape]
@ -151,10 +155,10 @@
nil)
(defmethod impl/handler :selection/query
[{:keys [page-id rect frame-id include-frames? include-groups? reverse?]
:or {include-groups? true reverse? false} :as message}]
[{:keys [page-id rect frame-id include-frames? full-frame? include-groups? reverse?]
:or {include-groups? true reverse? false include-frames? false full-frame? false} :as message}]
(when-let [index (get @state page-id)]
(query-index index rect frame-id include-frames? include-groups? reverse?)))
(query-index index rect frame-id include-frames? full-frame? include-groups? reverse?)))
(defmethod impl/handler :selection/query-z-index
[{:keys [page-id objects ids]}]