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

✨ Improve shapes vertical ordering implementation.

Browse source
This commit is contained in:
Andrey Antukh 2019-10-17 16:46:10 +02:00
parent 6f2c952b4b
commit 097a6c924a
4 changed files with 47 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

79
frontend/test/uxbox/tests/test_main_data_shapes_impl.cljs
View file

@ -100,85 +100,6 @@
;; (pprint result)
(t/is (= result expected))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Drop Shape (drag and drop and sorted)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; drop shape: move shape before other shape
(t/deftest drop-shape-test1
(let [initial {:pages {1 {:id 1 :shapes [1 2 3]}}
:shapes {1 {:id 1 :page 1}
2 {:id 2 :page 1}
3 {:id 3 :page 1}}}
expected {:pages {1 {:id 1, :shapes [3 1 2]}},
:shapes {1 {:id 1, :page 1},
2 {:id 2, :page 1},
3 {:id 3, :page 1}}}
result (impl/drop-shape initial 3 1 :before)]
;; (pprint expected)
;; (pprint result)
(t/is (= result expected))
(t/is (vector? (get-in result [:pages 1 :shapes])))))
;; drop shape: move shape after other shape
(t/deftest drop-shape-test2
(let [initial {:pages {1 {:id 1 :shapes [1 2 3]}}
:shapes {1 {:id 1 :page 1}
2 {:id 2 :page 1}
3 {:id 3 :page 1}}}
expected {:pages {1 {:id 1, :shapes [1 3 2]}},
:shapes {1 {:id 1, :page 1},
2 {:id 2, :page 1},
3 {:id 3, :page 1}}}
result (impl/drop-shape initial 3 1 :after)]
;; (pprint expected)
;; (pprint result)
(t/is (= result expected))
(t/is (vector? (get-in result [:pages 1 :shapes])))))
;; drop shape: move shape before other shape that is part of group.
(t/deftest drop-shape-test3
(let [initial {:pages {1 {:id 1 :shapes [1 3 4]}}
:shapes {1 {:id 1 :page 1 :type :group :items [2]}
2 {:id 2 :page 1 :group 1}
3 {:id 3 :page 1}
4 {:id 4 :page 1}}}
expected {:pages {1 {:id 1, :shapes [1 4]}},
:shapes {1 {:id 1, :page 1, :type :group, :items [3 2]},
2 {:id 2, :page 1, :group 1},
3 {:id 3, :page 1, :group 1},
4 {:id 4, :page 1}}}
result (impl/drop-shape initial 3 2 :before)]
;; (pprint expected)
;; (pprint result)
(t/is (= result expected))
(t/is (vector? (get-in result [:pages 1 :shapes])))))
;; drop shape: move shape inside group
(t/deftest drop-shape-test4
(let [initial {:pages {1 {:id 1 :shapes [1 3 4]}}
:shapes {1 {:id 1 :page 1 :type :group :items [2]}
2 {:id 2 :page 1 :group 1}
3 {:id 3 :page 1}
4 {:id 4 :page 1}}}
expected {:pages {1 {:id 1, :shapes [1 4]}},
:shapes {1 {:id 1, :page 1, :type :group, :items [2 3]},
2 {:id 2, :page 1, :group 1},
3 {:id 3, :page 1, :group 1},
4 {:id 4, :page 1}}}
result (impl/drop-shape initial 3 1 :inside)]
;; (pprint expected)
;; (pprint result)
(t/is (= result expected))
(t/is (vector? (get-in result [:pages 1 :shapes])))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Delete Shape
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;