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

bug: Fix Grouping typographies by drag & drop does not work (again)

Browse source
This commit is contained in:
Pablo Alba 2022-09-06 11:29:18 +02:00 • committed by Alejandro Alonso
parent 19a9440f11
commit f7aba14f76
3 changed files with 13 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,6 +87,15 @@
(update [_ state]
(assoc-in state [:workspace-global :assets-files-open file-id :groups box path] open?))))
(defn extract-path-if-missing
[item]
(let [[path name] (cph/parse-path-name (:name item))]
(if (and
(= (:name item) name)
(contains? item :path))
item
(assoc item :path path :name name))))
(defn default-color-name [color]
(or (:color color)
(case (get-in color [:gradient :type])
@ -235,8 +244,7 @@
(defn- do-update-tipography
[it state typography file-id]
(let [data (get state :workspace-data)
[path name] (cph/parse-path-name (:name typography))
typography (assoc typography :path path :name name)
typography (extract-path-if-missing typography)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/update-typography typography))]

24
frontend/src/app/main/ui/workspace/sidebar/assets.cljs
View file

@ -891,18 +891,8 @@
multi-assets? (or (seq (:components selected-assets))
(seq (:colors selected-assets))
(seq (:typographies selected-assets)))
extract-path-if-missing
(fn [graphic]
(let [[path name] (cph/parse-path-name (:name graphic))]
(if (and
(= (:name graphic) name)
(contains? graphic :path))
graphic
(assoc graphic :path path :name name))))
objects (->> objects
(map extract-path-if-missing))
(map dwl/extract-path-if-missing))
groups (group-assets objects reverse-sort?)
@ -1633,18 +1623,8 @@
local-data (mf/deref typography-data)
menu-state (mf/use-state auto-pos-menu-state)
extract-path-if-missing
(fn [typography]
(let [[path name] (cph/parse-path-name (:name typography))]
(if (and
(= (:name typography) name)
(contains? typography :path))
typography
(assoc typography :path path :name name))))
typographies (->> typographies
(map extract-path-if-missing))
(map dwl/extract-path-if-missing))
groups (group-assets typographies reverse-sort?)