mirror of
https://github.com/penpot/penpot.git
synced 2025-08-02 08:19:27 +02:00
🎉 Allow to create a nested component in one step
This commit is contained in:
parent
4ad27c3fca
commit
9725dd5fff
6 changed files with 143 additions and 59 deletions
|
@ -4,6 +4,7 @@
|
|||
[app.common.geom.point :as gpt]
|
||||
[app.common.pages.helpers :as cph]
|
||||
[app.common.types.container :as ctn]
|
||||
[app.common.types.file :as ctf]
|
||||
[app.main.data.workspace :as dw]
|
||||
[app.main.data.workspace.groups :as dwg]
|
||||
[app.main.data.workspace.libraries :as dwl]
|
||||
|
@ -33,6 +34,11 @@
|
|||
|
||||
store (the/prepare-store state done
|
||||
(fn [new-state]
|
||||
;; Uncomment to debug
|
||||
;; (ctf/dump-tree (get new-state :workspace-data)
|
||||
;; (get new-state :current-page-id)
|
||||
;; (get new-state :workspace-libraries))
|
||||
|
||||
; Expected shape tree:
|
||||
;
|
||||
; [Page]
|
||||
|
@ -40,7 +46,7 @@
|
|||
; Rect-2 #--> Rect-2
|
||||
; Rect-1 ---> Rect-1
|
||||
;
|
||||
; [Rect-1]
|
||||
; [Rect-2]
|
||||
; Rect-2
|
||||
; Rect-1
|
||||
;
|
||||
|
@ -55,7 +61,7 @@
|
|||
|
||||
(t/is (= (:name shape1) "Rect-1"))
|
||||
(t/is (= (:name group) "Rect-2"))
|
||||
(t/is (= (:name component) "Rect-1"))
|
||||
(t/is (= (:name component) "Rect-2"))
|
||||
(t/is (= (:name c-shape1) "Rect-1"))
|
||||
(t/is (= (:name c-group) "Rect-2"))
|
||||
|
||||
|
@ -207,6 +213,70 @@
|
|||
(dwl/add-component)
|
||||
:the/end))))
|
||||
|
||||
(t/deftest test-add-component-from-component
|
||||
(t/async
|
||||
done
|
||||
(let [state (-> thp/initial-state
|
||||
(thp/sample-page)
|
||||
(thp/sample-shape :shape1 :rect
|
||||
{:name "Rect-1"})
|
||||
(thp/make-component :instance1 :component1
|
||||
[(thp/id :shape1)]))
|
||||
|
||||
store (the/prepare-store state done
|
||||
(fn [new-state]
|
||||
; Expected shape tree:
|
||||
;
|
||||
; [Page]
|
||||
; Root Frame
|
||||
; Rect-3 #--> Rect-3
|
||||
; Rect-2 @--> Rect-2
|
||||
; Rect-1 ---> Rect-1
|
||||
;
|
||||
; [Rect-2]
|
||||
; Rect-2
|
||||
; Rect-1
|
||||
;
|
||||
; [Rect-2]
|
||||
; Rect-3
|
||||
; Rect-2 @--> Rect-2
|
||||
; Rect-1 ---> Rect-1
|
||||
;
|
||||
(let [[[instance1 shape1]
|
||||
[c-instance1 c-shape1]
|
||||
component1]
|
||||
(thl/resolve-instance-and-main
|
||||
new-state
|
||||
(thp/id :instance1)
|
||||
true)
|
||||
|
||||
[[instance2 instance1' shape1']
|
||||
[c-instance2 c-instance1' c-shape1']
|
||||
component2]
|
||||
(thl/resolve-instance-and-main
|
||||
new-state
|
||||
(:parent-id instance1))]
|
||||
|
||||
(t/is (= (:name shape1) "Rect-1"))
|
||||
(t/is (= (:name instance1) "Rect-2"))
|
||||
(t/is (= (:name component1) "Rect-2"))
|
||||
(t/is (= (:name c-shape1) "Rect-1"))
|
||||
(t/is (= (:name c-instance1) "Rect-2"))
|
||||
|
||||
(t/is (= (:name shape1') "Rect-1"))
|
||||
(t/is (= (:name instance1') "Rect-2"))
|
||||
(t/is (= (:name instance2) "Rect-3"))
|
||||
(t/is (= (:name component2) "Rect-3"))
|
||||
(t/is (= (:name c-shape1') "Rect-1"))
|
||||
(t/is (= (:name c-instance1') "Rect-2"))
|
||||
(t/is (= (:name c-instance2) "Rect-3")))))]
|
||||
|
||||
(ptk/emit!
|
||||
store
|
||||
(dw/select-shape (thp/id :instance1))
|
||||
(dwl/add-component)
|
||||
:the/end))))
|
||||
|
||||
(t/deftest test-rename-component
|
||||
(t/async
|
||||
done
|
||||
|
@ -269,7 +339,7 @@
|
|||
; Rect-2
|
||||
; Rect-1
|
||||
;
|
||||
; [Rect-2]
|
||||
; [Rect-3]
|
||||
; Rect-2
|
||||
; Rect-1
|
||||
;
|
||||
|
@ -293,7 +363,7 @@
|
|||
new-state
|
||||
new-component-id)]
|
||||
|
||||
(t/is (= (:name component2) "Rect-2")))))]
|
||||
(t/is (= (:name component2) "Rect-3")))))]
|
||||
|
||||
(ptk/emit!
|
||||
store
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue