github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-10 14:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix previous styles lost when changing selected text

Browse Source
This commit is contained in:
Aitor Moreno 2026-01-07 12:18:05 +01:00 committed by Alejandro Alonso
parent 51635770ce
commit 2c9159288f
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -29,7 +29,7 @@
- Fix missing text color token from selected shapes in selected colors list [Taiga #12956](https://tree.taiga.io/project/penpot/issue/12956) - Fix missing text color token from selected shapes in selected colors list [Taiga #12956](https://tree.taiga.io/project/penpot/issue/12956)
- Fix dropdown option width in Guides columns dropdown [Taiga #12959](https://tree.taiga.io/project/penpot/issue/12959) - Fix dropdown option width in Guides columns dropdown [Taiga #12959](https://tree.taiga.io/project/penpot/issue/12959)
- Fix typos on download modal [Taiga #12865](https://tree.taiga.io/project/penpot/issue/12865) - Fix typos on download modal [Taiga #12865](https://tree.taiga.io/project/penpot/issue/12865)
- Fix problem with text editor maintaining previous styles [Taiga #12835](https://tree.taiga.io/project/penpot/issue/12835)
## 2.12.1 ## 2.12.1

38
frontend/text-editor/src/editor/controllers/SelectionController.js
View File

@ -242,7 +242,6 @@ export class SelectionController extends EventTarget {
continue; continue;
} }
let styleValue = element.style.getPropertyValue(styleName); let styleValue = element.style.getPropertyValue(styleName);
if (styleName === "font-family") { if (styleName === "font-family") {
styleValue = sanitizeFontFamily(styleValue); styleValue = sanitizeFontFamily(styleValue);
} }
@ -277,22 +276,29 @@ export class SelectionController extends EventTarget {
this.#applyDefaultStylesToCurrentStyle(); this.#applyDefaultStylesToCurrentStyle();
const root = startNode.parentElement.parentElement.parentElement; const root = startNode.parentElement.parentElement.parentElement;
this.#applyStylesFromElementToCurrentStyle(root); this.#applyStylesFromElementToCurrentStyle(root);
// FIXME: I don't like this approximation. Having to iterate nodes twice if (startNode === endNode) {
// is bad for performance. I think we need another way of "computing" const paragraph = startNode.parentElement.parentElement;
// the cascade.
for (const textNode of this.#textNodeIterator.iterateFrom(
startNode,
endNode,
)) {
const paragraph = textNode.parentElement.parentElement;
this.#applyStylesFromElementToCurrentStyle(paragraph); this.#applyStylesFromElementToCurrentStyle(paragraph);
} const textSpan = startNode.parentElement;
for (const textNode of this.#textNodeIterator.iterateFrom( this.#applyStylesFromElementToCurrentStyle(textSpan);
startNode, } else {
endNode, // FIXME: I don't like this approximation. Having to iterate nodes twice
)) { // is bad for performance. I think we need another way of "computing"
const textSpan = textNode.parentElement; // the cascade.
this.#mergeStylesFromElementToCurrentStyle(textSpan); for (const textNode of this.#textNodeIterator.iterateFrom(
startNode,
endNode,
)) {
const paragraph = textNode.parentElement.parentElement;
this.#applyStylesFromElementToCurrentStyle(paragraph);
}
for (const textNode of this.#textNodeIterator.iterateFrom(
startNode,
endNode,
)) {
const textSpan = textNode.parentElement;
this.#mergeStylesFromElementToCurrentStyle(textSpan);
}
} }
return this; return this;
} }