github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-05-23 08:53:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7610 from mdbenito/fix/conflicting-selection-shortcut-text-shape

Browse Source 
🐛 Fix conflicting shortcut in text editor
This commit is contained in:
Alejandro Alonso 2025-10-29 08:45:05 +01:00 committed by GitHub
commit e18aef1d39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -11,6 +11,7 @@
### :sparkles: New features & Enhancements ### :sparkles: New features & Enhancements
### :bug: Bugs fixed ### :bug: Bugs fixed
- Fix text line-height values are wrong [Taiga #12252](https://tree.taiga.io/project/penpot/issue/12252) - Fix text line-height values are wrong [Taiga #12252](https://tree.taiga.io/project/penpot/issue/12252)
- Fix pan cursor not disabling viewport guides [Github #6985](https://github.com/penpot/penpot/issues/6985) - Fix pan cursor not disabling viewport guides [Github #6985](https://github.com/penpot/penpot/issues/6985)
@ -19,7 +20,7 @@
- Fix on copy instance inside a components chain touched are missing [Taiga #12371](https://tree.taiga.io/project/penpot/issue/12371) - Fix on copy instance inside a components chain touched are missing [Taiga #12371](https://tree.taiga.io/project/penpot/issue/12371)
- Fix problem with multiple selection and shadows [Github #7437](https://github.com/penpot/penpot/issues/7437) - Fix problem with multiple selection and shadows [Github #7437](https://github.com/penpot/penpot/issues/7437)
- Fix search shortcut [Taiga #10265](https://tree.taiga.io/project/penpot/issue/10265) - Fix search shortcut [Taiga #10265](https://tree.taiga.io/project/penpot/issue/10265)
- Fix shortcut conflict in text editor (increase/decrease font size vs word selection)
## 2.11.0 (Unreleased) ## 2.11.0 (Unreleased)

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

@ -231,13 +231,13 @@
:subsections [:text-editor] :subsections [:text-editor]
:fn #(update-attrs-when-no-readonly {:text-decoration "toggle-line-through"})} :fn #(update-attrs-when-no-readonly {:text-decoration "toggle-line-through"})}
:font-size-inc {:tooltip (ds/meta-shift ds/right-arrow) :font-size-inc {:tooltip (ds/meta-shift ">")
:command (ds/c-mod "shift+right") :command (ds/c-mod "shift+.")
:subsections [:text-editor] :subsections [:text-editor]
:fn #(update-attrs-when-no-readonly {:font-size-inc true})} :fn #(update-attrs-when-no-readonly {:font-size-inc true})}
:font-size-dec {:tooltip (ds/meta-shift ds/left-arrow) :font-size-dec {:tooltip (ds/meta-shift "<")
:command (ds/c-mod "shift+left") :command (ds/c-mod "shift+,")
:subsections [:text-editor] :subsections [:text-editor]
:fn #(update-attrs-when-no-readonly {:font-size-dec true})} :fn #(update-attrs-when-no-readonly {:font-size-dec true})}

6
frontend/src/app/util/text_editor.cljs
View File

@ -101,8 +101,10 @@
(impl/updateBlockData state block-key (clj->js attrs))))) (impl/updateBlockData state block-key (clj->js attrs)))))
state (impl/applyInlineStyle state (legacy.txt/attrs-to-styles attrs)) state (impl/applyInlineStyle state (legacy.txt/attrs-to-styles attrs))
selected (impl/getSelectedBlocks state)] selection-after-apply (impl/getSelection state)
(reduce update-blocks state selected))) selected (impl/getSelectedBlocks state)
state (reduce update-blocks state selected)]
(impl/setSelection state selection-after-apply)))
(defn update-editor-current-inline-styles-fn (defn update-editor-current-inline-styles-fn
[state update-fn] [state update-fn]