Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-22 22:49:01 -05:00
Code Issues Activity

🐛 Fix drag and drop font assets in groups

Browse source
This commit is contained in:
Pablo Alba 2022-07-14 09:56:33 +02:00 • committed by Andrey Antukh
parent 08c0070f22
commit 58f93d2177
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.md
View file

@ -36,7 +36,8 @@
- Fix problem with line-height and texts [Taiga #3578](https://tree.taiga.io/project/penpot/issue/3578) - Fix problem with line-height and texts [Taiga #3578](https://tree.taiga.io/project/penpot/issue/3578)
- Fix moving frame-guides outside frames [Taiga #3839](https://tree.taiga.io/project/penpot/issue/3839) - Fix moving frame-guides outside frames [Taiga #3839](https://tree.taiga.io/project/penpot/issue/3839)
- Fix problem with 180 degree rotations [#2082](https://github.com/penpot/penpot/issues/2082) - Fix problem with 180 degree rotations [#2082](https://github.com/penpot/penpot/issues/2082)
- Fix font rendering on grid thumbnails [Taiga #3473](https://tree.taiga.io/project/penpot/issue/3473)
- Fix Drag and drop font assets in groups
### :arrow_up: Deps updates ### :arrow_up: Deps updates
### :heart: Community contributions by (Thank you!) ### :heart: Community contributions by (Thank you!)

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

@ -1621,6 +1621,17 @@
local-data (mf/deref typography-data) local-data (mf/deref typography-data)
menu-state (mf/use-state auto-pos-menu-state) 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 (= (:name typography) name)
typography
(assoc typography :path path :name name))))
typographies (->> typographies
(map extract-path-if-missing))
groups (group-assets typographies reverse-sort?) groups (group-assets typographies reverse-sort?)
selected-typographies (:typographies selected-assets) selected-typographies (:typographies selected-assets)

3
frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
View file

@ -10,7 +10,6 @@
[app.common.data :as d] [app.common.data :as d]
[app.common.data.macros :as dm] [app.common.data.macros :as dm]
[app.common.exceptions :as ex] [app.common.exceptions :as ex]
[app.common.pages.helpers :as cph]
[app.common.text :as txt] [app.common.text :as txt]
[app.main.data.fonts :as fts] [app.main.data.fonts :as fts]
[app.main.data.shortcuts :as dsc] [app.main.data.shortcuts :as dsc]
@ -565,7 +564,7 @@
[:input.element-name.adv-typography-name [:input.element-name.adv-typography-name
{:type "text" {:type "text"
:ref name-input-ref :ref name-input-ref
:default-value (cph/merge-path-item (:path typography) (:name typography)) :default-value (:name typography)
:on-blur on-name-blur}] :on-blur on-name-blur}]
[:div.element-set-actions-button [:div.element-set-actions-button