fastmail#472 fixed contenteditable=false elements being merged when t…

…hey shouldn't, fixed compilation error caused by missing nullcheck
MrAlexand0r · Nov 29, 2024 · 2293b4a · 2293b4a
1 parent bb795b0
commit 2293b4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/source/Editor.ts b/source/Editor.ts
@@ -2122,7 +2122,7 @@ class Squire {
                 break;
             }
 
-            if (!(child as HTMLElement).isContentEditable) {
+            if (child && !(child as HTMLElement).isContentEditable) {
                 replaceWith(child, document.createTextNode('') as Text);
                 break;
             }

diff --git a/source/node/Node.ts b/source/node/Node.ts
@@ -42,7 +42,8 @@ const areAlike = (
         return (
             node.nodeName !== 'A' &&
             node.className === node2.className &&
-            node.style.cssText === node2.style.cssText
+            node.style.cssText === node2.style.cssText &&
+            (node as HTMLElement).isContentEditable && (node2 as HTMLElement).isContentEditable
         );
     }
     return true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -2122,7 +2122,7 @@ class Squire { @@
                     break;
                 }
-                if (!(child as HTMLElement).isContentEditable) {
+                if (child && !(child as HTMLElement).isContentEditable) {
                     replaceWith(child, document.createTextNode('') as Text);
                     break;
                 }
@@ Expand Down @@