3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-22 00:47:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fixes problems with snaps

Browse source
This commit is contained in:
alonso.torres 2020-05-07 12:22:39 +02:00
parent dc97056fcf
commit b8d30466bb
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/uxbox/main/ui/workspace/drawarea.cljs
View file

@ -167,7 +167,7 @@
(rx/concat (rx/concat
(->> mouse (->> mouse
(rx/take 1) (rx/take 1)
(rx/map (fn [pt] #(initialize-drawing % pt frame-id)))) (rx/map (fn [pt] #(initialize-drawing % pt (or frame-id uuid/zero)))))
(->> mouse (->> mouse
(rx/with-latest vector ms/mouse-position-ctrl) (rx/with-latest vector ms/mouse-position-ctrl)
(rx/map (fn [[pt ctrl?]] #(update-drawing % initial snap-data pt ctrl?))) (rx/map (fn [[pt ctrl?]] #(update-drawing % initial snap-data pt ctrl?)))

2
frontend/src/uxbox/util/geom/snap.cljs
View file

@ -69,7 +69,7 @@
(let [modified-path (gsh/transform-apply-modifiers shape) (let [modified-path (gsh/transform-apply-modifiers shape)
shape-center (gsh/center modified-path)] shape-center (gsh/center modified-path)]
(case (:type shape) (case (:type shape)
:frame (frame-snap-points shape) :frame (-> modified-path gsh/shape->rect-shape frame-snap-points)
(:path :curve) (into #{shape-center} (-> modified-path gsh/shape->rect-shape :segments)) (:path :curve) (into #{shape-center} (-> modified-path gsh/shape->rect-shape :segments))
(into #{shape-center} (-> modified-path :segments))))) (into #{shape-center} (-> modified-path :segments)))))

7
frontend/src/uxbox/util/range_tree.js
View file

@ -358,7 +358,12 @@ goog.scope(function() {
} }
return vec(result); return vec(result);
}; };
self.range_query = (tree, from_value, to_value) => vec(tree.rangeQuery(from_value, to_value)); self.range_query = (tree, from_value, to_value) => {
if (!tree) {
return vec();
}
return vec(tree.rangeQuery(from_value, to_value))
};
self.empty_QMARK_ = (tree) => tree.isEmpty(); self.empty_QMARK_ = (tree) => tree.isEmpty();
self.height = (tree) => tree.height(); self.height = (tree) => tree.height();
self.print = (tree) => printTree(tree.root); self.print = (tree) => printTree(tree.root);

5
frontend/tests/uxbox/test_util_range_tree.cljs
View file

@ -173,7 +173,10 @@
(rt/insert 175 :g))] (rt/insert 175 :g))]
(t/is (= (rt/range-query tree -100 0) [])) (t/is (= (rt/range-query tree -100 0) []))
(t/is (= (rt/range-query tree 200 300) [])) (t/is (= (rt/range-query tree 200 300) []))
(t/is (= (rt/range-query tree 200 0) []))))) (t/is (= (rt/range-query tree 200 0) []))))
(t/testing "Range query over null should return empty"
(t/is (= (rt/range-query nil 0 100) []))))
(t/deftest test-balanced-tree (t/deftest test-balanced-tree
(t/testing "Creates a worst-case BST and probes for a balanced height" (t/testing "Creates a worst-case BST and probes for a balanced height"