3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-03 11:45:54 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix pasted text loses font-family style (#5808)

Browse source
This commit is contained in:
Aitor Moreno 2025-02-11 10:07:59 +01:00 • committed by GitHub
parent 7eefbc5979
commit db55c06c67
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frontend/text-editor/src/editor/content/dom/Content.js
View file

@ -73,10 +73,11 @@ export function mapContentFragmentFromDocument(document, root, styleDefaults) {
currentParagraph = createParagraph(undefined, currentStyle); currentParagraph = createParagraph(undefined, currentStyle);
} }
} }
const inline = createInline(new Text(currentNode.nodeValue), currentStyle); const inline = createInline(new Text(currentNode.nodeValue), currentStyle);
const fontSize = inline.style.getPropertyValue("font-size"); const fontSize = inline.style.getPropertyValue("font-size");
if (!fontSize) console.warn("font-size", fontSize); if (!fontSize) console.warn("font-size", fontSize);
const fontFamily = inline.style.getPropertyValue("font-family");
if (!fontFamily) console.warn("font-family", fontFamily);
currentParagraph.appendChild(inline); currentParagraph.appendChild(inline);
currentNode = nodeIterator.nextNode(); currentNode = nodeIterator.nextNode();

11
frontend/text-editor/src/editor/content/dom/Style.js
View file

@ -23,7 +23,8 @@ export function mergeStyleDeclarations(target, source) {
// for (const styleName of source) { // for (const styleName of source) {
for (let index = 0; index < source.length; index++) { for (let index = 0; index < source.length; index++) {
const styleName = source.item(index); const styleName = source.item(index);
target.setProperty(styleName, source.getPropertyValue(styleName)); const styleValue = source.getPropertyValue(styleName);
target.setProperty(styleName, styleValue);
} }
return target return target
} }
@ -108,9 +109,10 @@ export function getComputedStyle(element) {
inertElement.style.setProperty(styleName, newValue); inertElement.style.setProperty(styleName, newValue);
} }
} else { } else {
const newValue = currentElement.style.getPropertyValue(styleName);
inertElement.style.setProperty( inertElement.style.setProperty(
styleName, styleName,
currentElement.style.getPropertyValue(styleName) newValue
); );
} }
} }
@ -130,9 +132,10 @@ export function getComputedStyle(element) {
* @returns {CSSStyleDeclaration} * @returns {CSSStyleDeclaration}
*/ */
export function normalizeStyles(node, styleDefaults = getStyleDefaultsDeclaration()) { export function normalizeStyles(node, styleDefaults = getStyleDefaultsDeclaration()) {
const computedStyle = getComputedStyle(node.parentElement);
const styleDeclaration = mergeStyleDeclarations( const styleDeclaration = mergeStyleDeclarations(
styleDefaults, styleDefaults,
getComputedStyle(node.parentElement) computedStyle
); );
// If there's a color property, we should convert it to // If there's a color property, we should convert it to
@ -149,7 +152,7 @@ export function normalizeStyles(node, styleDefaults = getStyleDefaultsDeclaratio
// If there's a font-family property and not a --font-id, then // If there's a font-family property and not a --font-id, then
// we remove the font-family because it will not work. // we remove the font-family because it will not work.
const fontFamily = styleDeclaration.getPropertyValue("font-family"); const fontFamily = styleDeclaration.getPropertyValue("font-family");
const fontId = styleDeclaration.getPropertyPriority("--font-id"); const fontId = styleDeclaration.getPropertyValue("--font-id");
if (fontFamily && !fontId) { if (fontFamily && !fontId) {
styleDeclaration.removeProperty("font-family"); styleDeclaration.removeProperty("font-family");
} }