Decide if element is bold by getComputedStyle (#2453) (#2579)

* Decide if element is bold by getComputedStyle (#2453) * Use getComputedStyle() for italics too (dae)
ankitects · Oct 2, 2024 · 9ced6be · 9ced6be
1 parent 2ac2758
commit 9ced6be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ts/editor/editor-toolbar/BoldButton.svelte b/ts/editor/editor-toolbar/BoldButton.svelte
@@ -17,8 +17,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             return match.remove();
         }
 
-        const fontWeight = element.style.fontWeight;
-        if (fontWeight === "bold" || Number(fontWeight) >= 700) {
+        const fontWeight = getComputedStyle(element).fontWeight;
+        const threshold = 700;
+        if (fontWeight && Number(fontWeight) >= threshold) {
             return match.clear((): void => {
                 if (
                     removeStyleProperties(element, "font-weight") &&

diff --git a/ts/editor/editor-toolbar/ItalicButton.svelte b/ts/editor/editor-toolbar/ItalicButton.svelte
@@ -17,7 +17,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             return match.remove();
         }
 
-        if (["italic", "oblique"].includes(element.style.fontStyle)) {
+        const fontStyle = getComputedStyle(element).fontStyle;
+        if (["italic", "oblique"].includes(fontStyle)) {
             return match.clear((): void => {
                 if (
                     removeStyleProperties(element, "font-style") &&