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

Deselect all auto removed groups in drag & drop operations.

Browse source 
This fixes strange corner case that causes enabling
the grouping button when no visible shape is selected.
This commit is contained in:
Andrey Antukh 2017-03-10 12:49:26 +01:00
parent cc0b61f122
commit 57e98487e1
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
3 changed files with 111 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/uxbox/main/data/shapes_impl.cljs
View file

@ -154,7 +154,8 @@
[state {:keys [group] :as shape}] [state {:keys [group] :as shape}]
(if-let [group' (get-in state [:shapes group])] (if-let [group' (get-in state [:shapes group])]
(if (empty? (:items group')) (if (empty? (:items group'))
(dissoc-shape state group') (-> (dissoc-shape state group')
(update-in [:workspace :selected] disj (:id group')))
state) state)
state)) state))

3
frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs
View file

@ -84,7 +84,8 @@
:path i/curve :path i/curve
:rect i/box :rect i/box
:text i/text :text i/text
:group i/folder)) :group i/folder
nil))
;; --- Shape Name (Component) ;; --- Shape Name (Component)

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

@ -105,12 +105,16 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; drop shape: move shape before other shape ;; drop shape: move shape before other shape
(t/deftest drop-shape-test1 (t/deftest drop-shape-test1
(let [initial {:pages {1 {:id 1 :shapes [1 2 3]}} (let [initial {:pages {1 {:id 1 :shapes [1 2 3]}}
:shapes {1 {:id 1 :page 1} :shapes {1 {:id 1 :page 1}
2 {:id 2 :page 1} 2 {:id 2 :page 1}
3 {:id 3 :page 1}}} 3 {:id 3 :page 1}}}
expected (assoc-in initial [:pages 1 :shapes] [3 1 2]) 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)] result (impl/drop-shape initial 3 1 :before)]
;; (pprint expected) ;; (pprint expected)
;; (pprint result) ;; (pprint result)
@ -118,12 +122,17 @@
(t/is (vector? (get-in result [:pages 1 :shapes]))))) (t/is (vector? (get-in result [:pages 1 :shapes])))))
;; drop shape: move shape after other shape ;; drop shape: move shape after other shape
(t/deftest drop-shape-test2 (t/deftest drop-shape-test2
(let [initial {:pages {1 {:id 1 :shapes [1 2 3]}} (let [initial {:pages {1 {:id 1 :shapes [1 2 3]}}
:shapes {1 {:id 1 :page 1} :shapes {1 {:id 1 :page 1}
2 {:id 2 :page 1} 2 {:id 2 :page 1}
3 {:id 3 :page 1}}} 3 {:id 3 :page 1}}}
expected (assoc-in initial [:pages 1 :shapes] [1 3 2])
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)] result (impl/drop-shape initial 3 1 :after)]
;; (pprint expected) ;; (pprint expected)
;; (pprint result) ;; (pprint result)
@ -131,35 +140,39 @@
(t/is (vector? (get-in result [:pages 1 :shapes]))))) (t/is (vector? (get-in result [:pages 1 :shapes])))))
;; drop shape: move shape before other shape that is part of group. ;; drop shape: move shape before other shape that is part of group.
(t/deftest drop-shape-test3 (t/deftest drop-shape-test3
(let [initial {:pages {1 {:id 1 :shapes [1 3 4]}} (let [initial {:pages {1 {:id 1 :shapes [1 3 4]}}
:shapes {1 {:id 1 :page 1 :shapes {1 {:id 1 :page 1 :type :group :items [2]}
:type :group 2 {:id 2 :page 1 :group 1}
:items [2]} 3 {:id 3 :page 1}
2 {:id 2 :page 1 :group 1} 4 {:id 4 :page 1}}}
3 {:id 3 :page 1}
4 {:id 4 :page 1}}} expected {:pages {1 {:id 1, :shapes [1 4]}},
expected (-> initial :shapes {1 {:id 1, :page 1, :type :group, :items [3 2]},
(assoc-in [:pages 1 :shapes] [1 4]) 2 {:id 2, :page 1, :group 1},
(assoc-in [:shapes 1 :items] [3 2]) 3 {:id 3, :page 1, :group 1},
(assoc-in [:shapes 3 :group] 1)) 4 {:id 4, :page 1}}}
result (impl/drop-shape initial 3 2 :before)] result (impl/drop-shape initial 3 2 :before)]
;; (pprint expected)
;; (pprint result)
(t/is (= result expected)) (t/is (= result expected))
(t/is (vector? (get-in result [:pages 1 :shapes]))))) (t/is (vector? (get-in result [:pages 1 :shapes])))))
;; drop shape: move shape inside group ;; drop shape: move shape inside group
(t/deftest drop-shape-test4 (t/deftest drop-shape-test4
(let [initial {:pages {1 {:id 1 :shapes [1 3 4]}} (let [initial {:pages {1 {:id 1 :shapes [1 3 4]}}
:shapes {1 {:id 1 :page 1 :shapes {1 {:id 1 :page 1 :type :group :items [2]}
:type :group 2 {:id 2 :page 1 :group 1}
:items [2]} 3 {:id 3 :page 1}
2 {:id 2 :page 1 :group 1} 4 {:id 4 :page 1}}}
3 {:id 3 :page 1} expected {:pages {1 {:id 1, :shapes [1 4]}},
4 {:id 4 :page 1}}} :shapes {1 {:id 1, :page 1, :type :group, :items [2 3]},
expected (-> initial 2 {:id 2, :page 1, :group 1},
(assoc-in [:pages 1 :shapes] [1 4]) 3 {:id 3, :page 1, :group 1},
(assoc-in [:shapes 1 :items] [2 3]) 4 {:id 4, :page 1}}}
(assoc-in [:shapes 3 :group] 1))
result (impl/drop-shape initial 3 1 :inside)] result (impl/drop-shape initial 3 1 :inside)]
;; (pprint expected) ;; (pprint expected)
;; (pprint result) ;; (pprint result)
@ -167,37 +180,36 @@
(t/is (vector? (get-in result [:pages 1 :shapes]))))) (t/is (vector? (get-in result [:pages 1 :shapes])))))
;; drop shape: move shape outside of group ;; drop shape: move shape outside of group
(t/deftest drop-shape-test5 (t/deftest drop-shape-test5
(let [initial {:pages {1 {:id 1 :shapes [1 4]}} (let [initial {:workspace {:selected #{1}}
:shapes {1 {:id 1 :page 1 :pages {1 {:id 1 :shapes [1 3]}}
:type :group :shapes {1 {:id 1 :page 1 :type :group :items [2]}
:items [2 3]} 2 {:id 2 :page 1 :group 1}
2 {:id 2 :page 1 :group 1} 3 {:id 3 :page 1}}}
3 {:id 3 :page 1 :group 1} expected {:workspace {:selected #{}}
4 {:id 4 :page 1}}} :pages {1 {:id 1, :shapes [3 2]}},
expected (-> initial :shapes {2 {:id 2, :page 1},
(assoc-in [:pages 1 :shapes] [1 4 3]) 3 {:id 3, :page 1}}}
(assoc-in [:shapes 1 :items] [2]) result (impl/drop-shape initial 2 3 :after)]
(update-in [:shapes 3] dissoc :group)) ;; (pprint expected)
result (impl/drop-shape initial 3 4 :after)] ;; (pprint result)
(t/is (= result expected)) (t/is (= result expected))
(t/is (vector? (get-in result [:pages 1 :shapes]))))) (t/is (vector? (get-in result [:pages 1 :shapes])))))
;; drop shape: move group inside group ;; drop shape: move group inside group
(t/deftest drop-shape-test6 (t/deftest drop-shape-test6
(let [initial {:pages {1 {:id 1 :shapes [1 2]}} (let [initial {:pages {1 {:id 1 :shapes [1 2]}}
:shapes {1 {:id 1 :page 1 :shapes {1 {:id 1 :page 1 :type :group :items [3]}
:type :group 2 {:id 2 :page 1 :type :group :items [4]}
:items [3]} 3 {:id 3 :page 1 :group 1}
2 {:id 2 :page 1 4 {:id 4 :page 1 :group 2}}}
:type :group expected {:pages {1 {:id 1, :shapes [1]}},
:items [4]} :shapes {1 {:id 1, :page 1, :type :group, :items [3 2]},
3 {:id 3 :page 1 :group 1} 2 {:id 2, :page 1, :type :group, :items [4], :group 1},
4 {:id 4 :page 1 :group 2}}} 3 {:id 3, :page 1, :group 1},
expected (-> initial 4 {:id 4, :page 1, :group 2}}}
(assoc-in [:pages 1 :shapes] [1])
(assoc-in [:shapes 1 :items] [3 2])
(assoc-in [:shapes 2 :group] 1))
result (impl/drop-shape initial 2 3 :after)] result (impl/drop-shape initial 2 3 :after)]
;; (pprint expected) ;; (pprint expected)
;; (pprint result) ;; (pprint result)
@ -205,21 +217,20 @@
(t/is (vector? (get-in result [:pages 1 :shapes]))))) (t/is (vector? (get-in result [:pages 1 :shapes])))))
;; drop shape: move group outside group ;; drop shape: move group outside group
(t/deftest drop-shape-test7 (t/deftest drop-shape-test7
(let [initial {:pages {1 {:id 1 :shapes [1 3]}} (let [initial {:workspace {:selected #{}}
:shapes {1 {:id 1 :page 1 :pages {1 {:id 1 :shapes [1 3]}}
:type :group :shapes {1 {:id 1 :page 1 :type :group :items [2]}
:items [2]} 2 {:id 2 :page 1 :group 1 :type :group :items [4]}
2 {:id 2 :page 1 3 {:id 3 :page 1}
:group 1 4 {:id 4 :page 1 :group 2}}}
:type :group
:items [4]} expected {:workspace {:selected #{}},
3 {:id 3 :page 1} :pages {1 {:id 1, :shapes [2 3]}},
4 {:id 4 :page 1 :group 2}}} :shapes {2 {:id 2, :page 1, :type :group, :items [4]},
expected (-> initial 3 {:id 3, :page 1},
(assoc-in [:pages 1 :shapes] [2 3]) 4 {:id 4, :page 1, :group 2}}}
(update-in [:shapes] dissoc 1)
(update-in [:shapes 2] dissoc :group))
result (impl/drop-shape initial 2 1 :after)] result (impl/drop-shape initial 2 1 :after)]
;; (pprint expected) ;; (pprint expected)
;; (pprint result) ;; (pprint result)
@ -227,47 +238,45 @@
(t/is (vector? (get-in result [:pages 1 :shapes]))))) (t/is (vector? (get-in result [:pages 1 :shapes])))))
;; drop shape: move shape to neested group ;; drop shape: move shape to neested group
(t/deftest drop-shape-test8 (t/deftest drop-shape-test8
(let [initial {:pages {1 {:id 1 :shapes [1 5 6]}} (let [initial {:pages {1 {:id 1 :shapes [1 5 6]}}
:shapes {1 {:id 1 :page 1 :shapes {1 {:id 1 :page 1 :type :group :items [2]}
:type :group 2 {:id 2 :page 1 :type :group :group 1 :items [3 4]}
:items [2]} 3 {:id 3 :page 1 :group 2}
2 {:id 2 :page 1 4 {:id 4 :page 1 :group 2}
:group 1 5 {:id 5 :page 1}
:type :group 6 {:id 6 :page 1}}}
:items [3 4]}
3 {:id 3 :page 1 :group 2} expected {:pages {1 {:id 1, :shapes [1 5]}},
4 {:id 4 :page 1 :group 2} :shapes {1 {:id 1, :page 1, :type :group, :items [2]},
5 {:id 5 :page 1} 2 {:id 2, :page 1, :type :group, :group 1, :items [3 4 6]},
6 {:id 6 :page 1}}} 3 {:id 3, :page 1, :group 2},
expected (-> initial 4 {:id 4, :page 1, :group 2},
(assoc-in [:pages 1 :shapes] [1 5]) 5 {:id 5, :page 1},
(update-in [:shapes 2 :items] conj 6) 6 {:id 6, :page 1, :group 2}}}
(update-in [:shapes 6] assoc :group 2))
result (impl/drop-shape initial 6 4 :after)] result (impl/drop-shape initial 6 4 :after)]
;; (pprint expected) ;; (pprint expected)
;; (pprint result) ;; (pprint result)
(t/is (= result expected)))) (t/is (= result expected))))
;; drop shape: move shape to neested group ;; drop shape: move shape to neested group
(t/deftest drop-shape-test9 (t/deftest drop-shape-test9
(let [initial {:pages {1 {:id 1 :shapes [1]}} (let [initial {:pages {1 {:id 1 :shapes [1]}}
:shapes {1 {:id 1 :page 1 :shapes {1 {:id 1 :page 1 :type :group :items [2 5 6]}
:type :group 2 {:id 2 :page 1 :type :group :group 1 :items [3 4]}
:items [2 5 6]} 3 {:id 3 :page 1 :group 2}
2 {:id 2 :page 1 4 {:id 4 :page 1 :group 2}
:group 1 5 {:id 5 :page 1 :group 1}
:type :group 6 {:id 6 :page 1 :group 1}}}
:items [3 4]} expected {:pages {1 {:id 1, :shapes [1]}},
3 {:id 3 :page 1 :group 2} :shapes {1 {:id 1, :page 1, :type :group, :items [2 5]},
4 {:id 4 :page 1 :group 2} 2 {:id 2, :page 1, :type :group, :group 1, :items [3 4 6]},
5 {:id 5 :page 1 :group 1} 3 {:id 3, :page 1, :group 2},
6 {:id 6 :page 1 :group 1}}} 4 {:id 4, :page 1, :group 2},
expected (-> initial 5 {:id 5, :page 1, :group 1},
(assoc-in [:pages 1 :shapes] [1]) 6 {:id 6, :page 1, :group 2}}}
(assoc-in [:shapes 2 :items] [3 4 6])
(assoc-in [:shapes 1 :items] [2 5])
(update-in [:shapes 6] assoc :group 2))
result (impl/drop-shape initial 6 4 :after)] result (impl/drop-shape initial 6 4 :after)]
;; (pprint expected) ;; (pprint expected)
;; (pprint result) ;; (pprint result)
@ -299,8 +308,10 @@
(t/is (= result expected)))) (t/is (= result expected))))
;; delete shape: delete from group ;; delete shape: delete from group
(t/deftest delete-shape-test2 (t/deftest delete-shape-test2
(let [initial {:pages {1 {:id 1 :shapes [1 3 4]}} (let [initial {:workspace {:selected #{}}
:pages {1 {:id 1 :shapes [1 3 4]}}
:shapes {1 {:id 1 :page 1 :shapes {1 {:id 1 :page 1
:type :group :type :group
:items [2]} :items [2]}
@ -308,7 +319,8 @@
3 {:id 3 :page 1} 3 {:id 3 :page 1}
4 {:id 4 :page 1}}} 4 {:id 4 :page 1}}}
shape (get-in initial [:shapes 2]) shape (get-in initial [:shapes 2])
expected {:pages {1 {:id 1 :shapes [3 4]}} expected {:workspace {:selected #{}}
:pages {1 {:id 1 :shapes [3 4]}}
:shapes {3 {:id 3 :page 1} :shapes {3 {:id 3 :page 1}
4 {:id 4 :page 1}}} 4 {:id 4 :page 1}}}
result (impl/dissoc-shape initial shape)] result (impl/dissoc-shape initial shape)]