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

🎉 Allow to create a nested component in one step

Browse source
This commit is contained in:
Andrés Moya 2022-08-16 15:15:02 +02:00
parent 4ad27c3fca
commit 9725dd5fff
6 changed files with 143 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

53
frontend/test/app/test_helpers/libraries.cljs
View file

@ -77,39 +77,44 @@
(defn resolve-instance-and-main
"Get the shape with the given id and all its children, and also
the main component and all its shapes."
[state root-inst-id]
(let [page (thp/current-page state)
root-inst (ctn/get-shape page root-inst-id)
([state root-inst-id]
(resolve-instance-and-main state root-inst-id false))
libs (wsh/get-libraries state)
component (cph/get-component libs (:component-id root-inst))
([state root-inst-id subinstance?]
(let [page (thp/current-page state)
root-inst (ctn/get-shape page root-inst-id)
shapes-inst (cph/get-children-with-self (:objects page) root-inst-id)
shapes-main (cph/get-children-with-self (:objects component) (:shape-ref root-inst))
libs (wsh/get-libraries state)
component (cph/get-component libs (:component-id root-inst))
unique-refs (into #{} (map :shape-ref) shapes-inst)
shapes-inst (cph/get-children-with-self (:objects page) root-inst-id)
shapes-main (cph/get-children-with-self (:objects component) (:shape-ref root-inst))
main-exists? (fn [shape]
(let [component-shape
(cph/get-component-shape (:objects page) shape)
unique-refs (into #{} (map :shape-ref) shapes-inst)
component
(cph/get-component libs (:component-id component-shape))
main-exists? (fn [shape]
(let [component-shape
(cph/get-component-shape (:objects page) shape)
main-shape
(ctn/get-shape component (:shape-ref shape))]
component
(cph/get-component libs (:component-id component-shape))
(t/is (some? main-shape))))]
main-shape
(ctn/get-shape component (:shape-ref shape))]
;; Validate that the instance tree is well constructed
(is-instance-root (first shapes-inst))
(run! is-instance-inner (rest shapes-inst))
(t/is (= (count shapes-inst)
(count shapes-main)
(count unique-refs)))
(run! main-exists? shapes-inst)
(t/is (some? main-shape))))]
[shapes-inst shapes-main component]))
;; Validate that the instance tree is well constructed
(if subinstance?
(is-instance-subroot (first shapes-inst))
(is-instance-root (first shapes-inst)))
(run! is-instance-inner (rest shapes-inst))
(t/is (= (count shapes-inst)
(count shapes-main)
(count unique-refs)))
(run! main-exists? shapes-inst)
[shapes-inst shapes-main component])))
(defn resolve-instance-and-main-allow-dangling
"Get the shape with the given id and all its children, and also