0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-12 15:51:37 -05:00

🐛 Fix ungroup typography when editing

This commit is contained in:
Eva 2022-02-10 13:51:07 +01:00 committed by Andrés Moya
parent 5a5222a97a
commit 03242e1a9c
3 changed files with 7 additions and 6 deletions

View file

@ -27,6 +27,7 @@
### :bug: Bugs fixed ### :bug: Bugs fixed
- Fixed ungroup typography when editing it [Taiga #2391](https://tree.taiga.io/project/penpot/issue/2391)
- Fixed error when trying to post an empty comment [Taiga #2603](https://tree.taiga.io/project/penpot/issue/2603) - Fixed error when trying to post an empty comment [Taiga #2603](https://tree.taiga.io/project/penpot/issue/2603)
- Fixed missing translation strings [Taiga #2786](https://tree.taiga.io/project/penpot/issue/2786) - Fixed missing translation strings [Taiga #2786](https://tree.taiga.io/project/penpot/issue/2786)
- Fixed color palette outside viewport [Taiga #2715](https://tree.taiga.io/project/penpot/issue/2715) - Fixed color palette outside viewport [Taiga #2715](https://tree.taiga.io/project/penpot/issue/2715)

View file

@ -245,9 +245,7 @@
(ptk/reify ::update-typography (ptk/reify ::update-typography
ptk/WatchEvent ptk/WatchEvent
(watch [it state _] (watch [it state _]
(let [[path name] (cph/parse-path-name (:name typography)) (let [prev (get-in state [:workspace-data :typographies (:id typography)])
typography (assoc typography :path path :name name)
prev (get-in state [:workspace-data :typographies (:id typography)])
rchg {:type :mod-typography rchg {:type :mod-typography
:typography typography} :typography typography}
uchg {:type :mod-typography uchg {:type :mod-typography

View file

@ -471,7 +471,8 @@
(fn [event] (fn [event]
(let [content (dom/get-target-val event)] (let [content (dom/get-target-val event)]
(when-not (str/blank? content) (when-not (str/blank? content)
(on-change {:name content}))))) (let [[path name] (cph/parse-path-name content)]
(on-change {:name name :path path}))))))
handle-go-to-edit handle-go-to-edit
(fn [] (fn []
@ -510,8 +511,9 @@
(let [content (mf/ref-val name-ref)] (let [content (mf/ref-val name-ref)]
;; On destroy we check if it changed ;; On destroy we check if it changed
(when (and (some? content) (not= content (:name typography))) (when (and (some? content) (not= content (:name typography)))
(let [{:keys [on-change]} (mf/ref-val on-change-ref)] (let [{:keys [on-change]} (mf/ref-val on-change-ref)
(on-change {:name content}))))))) [path name] (cph/parse-path-name content)]
(on-change {:name name :path path})))))))
[:* [:*
[:div.element-set-options-group.typography-entry [:div.element-set-options-group.typography-entry