From ddc78a62bab82b4f58db93b76b480307e959f347 Mon Sep 17 00:00:00 2001 From: SanderLeenders Date: Wed, 18 Oct 2023 14:43:40 +0200 Subject: [PATCH 1/2] Added CSS.escape to font-family.ts Added CSS.escape to renderHTML. Prevents invalid css when using fonts with numbers in their names, like https://fonts.google.com/specimen/Exo+2 --- packages/extension-font-family/src/font-family.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/extension-font-family/src/font-family.ts b/packages/extension-font-family/src/font-family.ts index 0e29cb6b19..3f844b6434 100644 --- a/packages/extension-font-family/src/font-family.ts +++ b/packages/extension-font-family/src/font-family.ts @@ -44,7 +44,7 @@ export const FontFamily = Extension.create({ } return { - style: `font-family: ${attributes.fontFamily}`, + style: `font-family: ${CSS.escape(attributes.fontFamily)}`, } }, }, From d7f1476db2f6dffb349a91024df97b50964c54a8 Mon Sep 17 00:00:00 2001 From: Sander Date: Fri, 17 Nov 2023 11:55:18 +0100 Subject: [PATCH 2/2] Added CSS.escape to font-family.ts per font-family name. --- packages/extension-font-family/src/font-family.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/extension-font-family/src/font-family.ts b/packages/extension-font-family/src/font-family.ts index 3f844b6434..da5f8488f3 100644 --- a/packages/extension-font-family/src/font-family.ts +++ b/packages/extension-font-family/src/font-family.ts @@ -44,7 +44,7 @@ export const FontFamily = Extension.create({ } return { - style: `font-family: ${CSS.escape(attributes.fontFamily)}`, + style: `font-family: ${attributes.fontFamily.split(',').map((fontFamily: string) => CSS.escape(fontFamily.trim())).join(', ')}`, } }, },