3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-07 14:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix typographies grouping

Browse source
This commit is contained in:
Andrey Antukh 2022-07-06 08:13:29 +02:00
parent 8446df2056
commit b901a10aaa
4 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -7,6 +7,7 @@
- Fix colors from unlinked libs in color selected widget [Taiga #3712](https://tree.taiga.io/project/penpot/issue/3712) - Fix colors from unlinked libs in color selected widget [Taiga #3712](https://tree.taiga.io/project/penpot/issue/3712)
- Fix fill information not complete when paste plain text [Taiga #3680](https://tree.taiga.io/project/penpot/issue/3680) - Fix fill information not complete when paste plain text [Taiga #3680](https://tree.taiga.io/project/penpot/issue/3680)
- Fix problem when resizing groups [Taiga #3702](https://tree.taiga.io/project/penpot/issue/3702) - Fix problem when resizing groups [Taiga #3702](https://tree.taiga.io/project/penpot/issue/3702)
- Fix issues on typographies assets grouping [#2073](https://github.com/penpot/penpot/issues/2073)
## 1.14.1-beta ## 1.14.1-beta

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

@ -234,6 +234,8 @@
(defn- do-update-tipography (defn- do-update-tipography
[it state typography file-id] [it state typography file-id]
(let [data (get state :workspace-data) (let [data (get state :workspace-data)
[path name] (cph/parse-path-name (:name typography))
typography (assoc typography :path path :name name)
changes (-> (pcb/empty-changes it) changes (-> (pcb/empty-changes it)
(pcb/with-library-data data) (pcb/with-library-data data)
(pcb/update-typography typography))] (pcb/update-typography typography))]

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

@ -1562,7 +1562,6 @@
(fn [event] (fn [event]
(on-drop-asset-group event dragging? prefix selected-typographies-paths selected-typographies-full move-typography)))] (on-drop-asset-group event dragging? prefix selected-typographies-paths selected-typographies-full move-typography)))]
[:div {:on-drag-enter on-drag-enter [:div {:on-drag-enter on-drag-enter
:on-drag-leave on-drag-leave :on-drag-leave on-drag-leave
:on-drag-over on-drag-over :on-drag-over on-drag-over
@ -1588,6 +1587,7 @@
[:div.drop-space]) [:div.drop-space])
(for [typography typographies] (for [typography typographies]
[:& typography-item {:typography typography [:& typography-item {:typography typography
:key (dm/str (:id typography))
:file file :file file
:local? local? :local? local?
:handle-change handle-change :handle-change handle-change
@ -1605,6 +1605,7 @@
(when-not (empty? path-item) (when-not (empty? path-item)
[:& typographies-group {:file-id file-id [:& typographies-group {:file-id file-id
:prefix (cph/merge-path-item prefix path-item) :prefix (cph/merge-path-item prefix path-item)
:key (dm/str path-item)
:groups content :groups content
:open-groups open-groups :open-groups open-groups
:file file :file file

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

@ -470,25 +470,19 @@
(when-not (str/blank? name) (when-not (str/blank? name)
(on-change {:name name})))))] (on-change {:name name})))))]
(mf/use-effect (mf/with-effect [editing?]
(mf/deps editing?)
(fn []
(when editing? (when editing?
(reset! open? editing?)))) (reset! open? editing?)))
(mf/use-effect (mf/with-effect [focus-name?]
(mf/deps focus-name?)
(fn []
(when focus-name? (when focus-name?
(tm/schedule (tm/schedule
#(when-let [node (mf/ref-val name-input-ref)] #(when-let [node (mf/ref-val name-input-ref)]
(dom/focus! node) (dom/focus! node)
(dom/select-text! node)))))) (dom/select-text! node)))))
(mf/use-effect (mf/with-effect [on-change]
(mf/deps on-change) (mf/set-ref-val! on-change-ref {:on-change on-change}))
(fn []
(mf/set-ref-val! on-change-ref {:on-change on-change})))
[:* [:*
[:div.element-set-options-group.typography-entry [:div.element-set-options-group.typography-entry