diff --git a/frontend/src/app/main/snap.cljs b/frontend/src/app/main/snap.cljs index 374ec676b..4715b1780 100644 --- a/frontend/src/app/main/snap.cljs +++ b/frontend/src/app/main/snap.cljs @@ -83,14 +83,15 @@ (defn get-snap-points [page-id frame-id remove-snap? zoom 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?))))) + (let [ranges [[(- value (/ 0.5 zoom)) (+ value (/ 0.5 zoom))]]] + (->> (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?)))))) (defn- search-snap [page-id frame-id points coord remove-snap? zoom] diff --git a/frontend/src/app/worker/snaps.cljs b/frontend/src/app/worker/snaps.cljs index c9dccd96b..ceecc5b89 100644 --- a/frontend/src/app/worker/snaps.cljs +++ b/frontend/src/app/worker/snaps.cljs @@ -28,7 +28,8 @@ [{:keys [page-id frame-id axis ranges bounds] :as message}] (let [match-bounds? (fn [[_ data]] - (some #(grc/contains-point? bounds %) (map :pt data)))] + (some #(or (= :guide (:type %)) + (grc/contains-point? bounds (:pt %))) data))] (->> (into [] (comp (mapcat #(sd/query @state page-id frame-id axis %)) (distinct))