github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-01 19:06:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix ctrl+b for editor v2

Browse Source
This commit is contained in:
Alejandro Alonso 2025-08-08 09:59:06 +02:00
parent 132069472c
commit de637fcf4e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/src/app/main/data/workspace/text/shortcuts.cljs
View File

@ -102,14 +102,14 @@
(and remove-italic? (not bold?)) ;; it is italic, set it to regular (and remove-italic? (not bold?)) ;; it is italic, set it to regular
(choose-regular))) (choose-regular)))
new-weight (when new-variant new-variant (when new-variant
(->> (:variants font) (->> (:variants font)
(filter #(= (:id %) new-variant)) (filter #(= (:id %) new-variant))
first first))]
:weight))]
(when new-variant (when new-variant
{:font-variant-id new-variant, {:font-variant-id (:id new-variant)
:font-weight new-weight}))) :font-weight (:weight new-variant)
:font-style (:style new-variant)})))
(defn calculate-text-values (defn calculate-text-values
@ -117,7 +117,8 @@
(let [state-map (if (features/active-feature? @st/state "text-editor/v2") (let [state-map (if (features/active-feature? @st/state "text-editor/v2")
(deref refs/workspace-v2-editor-state) (deref refs/workspace-v2-editor-state)
(deref refs/workspace-editor-state)) (deref refs/workspace-editor-state))
editor-state (get state-map (:id shape)) editor-state (when-not (features/active-feature? @st/state "text-editor/v2")
(get state-map (:id shape)))
editor-instance (when (features/active-feature? @st/state "text-editor/v2") editor-instance (when (features/active-feature? @st/state "text-editor/v2")
(deref refs/workspace-editor))] (deref refs/workspace-editor))]
(d/merge (d/merge
@ -206,7 +207,10 @@
(not-empty)) (not-empty))
;; Check if we're actually editing text content (not just selecting text shapes) ;; Check if we're actually editing text content (not just selecting text shapes)
editing-text? (some? (deref refs/workspace-editor)) ;; Handle both text-editor/v1 and text-editor/v2
editing-text? (if (features/active-feature? @st/state "text-editor/v2")
(some? (deref refs/workspace-v2-editor-state))
(some? (deref refs/workspace-editor)))
props (if (> (count text-shapes) 1) props (if (> (count text-shapes) 1)
(blend-props text-shapes props) (blend-props text-shapes props)