CalvinBackup/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-03-13 13:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse Source
This commit is contained in:
Alejandro Alonso
2023-01-02 14:18:00 +01:00
parent 07ac43ec0e b5e53b57d1
commit aa56e2cdcf
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/app/main/snap.cljs
View File

@@ -79,11 +79,13 @@
:else zero)))
(defn get-snap-points [page-id frame-id remove-snap? zoom point coord]
(let [value (get point coord)]
(let [value (get point coord)
vbox @refs/vbox]
(->> (uw/ask! {:cmd :snaps/range-query
:page-id page-id
:frame-id frame-id
:axis coord
:bounds vbox
:ranges [[(- value (/ 0.5 zoom)) (+ value (/ 0.5 zoom))]]})
(rx/take 1)
(rx/map (remove-from-snap-points remove-snap?)))))
@@ -94,11 +96,13 @@
ranges (->> points
(map coord)
(mapv #(vector (- % snap-accuracy)
(+ % snap-accuracy))))]
(+ % snap-accuracy))))
vbox @refs/vbox]
(->> (uw/ask! {:cmd :snaps/range-query
:page-id page-id
:frame-id frame-id
:axis coord
:bounds vbox
:ranges ranges})
(rx/take 1)
(rx/map (remove-from-snap-points remove-snap?))

16
frontend/src/app/worker/snaps.cljs
View File

@@ -6,6 +6,7 @@
(ns app.worker.snaps
(:require
[app.common.geom.shapes.rect :as gpr]
[app.util.snap-data :as sd]
[app.worker.impl :as impl]
[okulary.core :as l]))
@@ -24,11 +25,14 @@
nil)
(defmethod impl/handler :snaps/range-query
[{:keys [page-id frame-id axis ranges] :as message}]
(into []
(comp (mapcat #(sd/query @state page-id frame-id axis %))
(distinct))
ranges))
[{:keys [page-id frame-id axis ranges bounds] :as message}]
(let [match-bounds?
(fn [[_ data]]
(some #(gpr/contains-point? bounds %) (map :pt data)))]
(->> (into []
(comp (mapcat #(sd/query @state page-id frame-id axis %))
(distinct))
ranges)
(filter match-bounds?))))