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

🐛 Fix problem with create component

Browse source
This commit is contained in:
alonso.torres 2021-05-31 10:45:11 +02:00 • committed by Andrés Moya
parent 3d7a3f27d5
commit 55d2768807
3 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
frontend/src/app/main/data/workspace/libraries.cljs
View file

@ -10,24 +10,21 @@
[app.common.geom.point :as gpt] [app.common.geom.point :as gpt]
[app.common.geom.shapes :as geom] [app.common.geom.shapes :as geom]
[app.common.pages :as cp] [app.common.pages :as cp]
[app.common.pages :as cp]
[app.common.spec :as us] [app.common.spec :as us]
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[app.main.data.messages :as dm] [app.main.data.messages :as dm]
[app.main.data.workspace.changes :as dch] [app.main.data.workspace.changes :as dch]
[app.main.data.workspace.common :as dwc] [app.main.data.workspace.common :as dwc]
[app.main.data.workspace.groups :as dwg]
[app.main.data.workspace.libraries-helpers :as dwlh] [app.main.data.workspace.libraries-helpers :as dwlh]
[app.main.data.workspace.state-helpers :as wsh] [app.main.data.workspace.state-helpers :as wsh]
[app.main.repo :as rp] [app.main.repo :as rp]
[app.main.store :as st] [app.main.store :as st]
[app.main.streams :as ms]
[app.util.color :as color]
[app.util.i18n :refer [tr]] [app.util.i18n :refer [tr]]
[app.util.logging :as log] [app.util.logging :as log]
[app.util.router :as rt] [app.util.router :as rt]
[app.util.time :as dt] [app.util.time :as dt]
[beicon.core :as rx] [beicon.core :as rx]
[cljs.spec.alpha :as s]
[potok.core :as ptk])) [potok.core :as ptk]))
;; Change this to :info :debug or :trace to debug this module ;; Change this to :info :debug or :trace to debug this module
@ -263,10 +260,11 @@
page-id (:current-page-id state) page-id (:current-page-id state)
objects (wsh/lookup-page-objects state page-id) objects (wsh/lookup-page-objects state page-id)
selected (wsh/lookup-selected state) selected (wsh/lookup-selected state)
selected (cp/clean-loops objects selected)] selected (cp/clean-loops objects selected)
(when-not (empty? selected) shapes (dwg/shapes-for-grouping objects selected)]
(when-not (empty? shapes)
(let [[group rchanges uchanges] (let [[group rchanges uchanges]
(dwlh/generate-add-component selected objects page-id file-id)] (dwlh/generate-add-component shapes objects page-id file-id)]
(when-not (empty? rchanges) (when-not (empty? rchanges)
(rx/of (dch/commit-changes {:redo-changes rchanges (rx/of (dch/commit-changes {:redo-changes rchanges
:undo-changes uchanges :undo-changes uchanges

6
frontend/src/app/main/data/workspace/libraries_helpers.cljs
View file

@ -124,10 +124,8 @@
"If there is exactly one id, and it's a group, use it as root. Otherwise, "If there is exactly one id, and it's a group, use it as root. Otherwise,
create a group that contains all ids. Then, make a component with it, create a group that contains all ids. Then, make a component with it,
and link all shapes to their corresponding one in the component." and link all shapes to their corresponding one in the component."
[ids objects page-id file-id] [shapes objects page-id file-id]
(let [shapes (dwg/shapes-for-grouping objects ids) (let [[group rchanges uchanges]
[group rchanges uchanges]
(if (and (= (count shapes) 1) (if (and (= (count shapes) 1)
(= (:type (first shapes)) :group)) (= (:type (first shapes)) :group))
[(first shapes) [] []] [(first shapes) [] []]

19
frontend/tests/app/test_helpers/pages.cljs
View file

@ -82,21 +82,24 @@
([state label ids] (group-shapes state label ids "Group-")) ([state label ids] (group-shapes state label ids "Group-"))
([state label ids prefix] ([state label ids prefix]
(let [page (current-page state) (let [page (current-page state)
shapes (dwg/shapes-for-grouping (:objects page) ids) shapes (dwg/shapes-for-grouping (:objects page) ids)]
(if (empty? shapes)
state
(let [[group rchanges uchanges]
(dwg/prepare-create-group (:objects page) (:id page) shapes prefix true)]
[group rchanges uchanges] (swap! idmap assoc label (:id group))
(dwg/prepare-create-group (:objects page) (:id page) shapes prefix true)] (update state :workspace-data
cp/process-changes rchanges))))))
(swap! idmap assoc label (:id group))
(update state :workspace-data
cp/process-changes rchanges))))
(defn make-component (defn make-component
[state label ids] [state label ids]
(let [page (current-page state) (let [page (current-page state)
objects (wsh/lookup-page-objects state page-id)
shapes (dwg/shapes-for-grouping objects ids)
[group rchanges uchanges] [group rchanges uchanges]
(dwlh/generate-add-component ids (dwlh/generate-add-component shapes
(:objects page) (:objects page)
(:id page) (:id page)
current-file-id)] current-file-id)]