feat(parser): Add isVoidElement method (#785)

fb55 · Apr 22, 2021 · 00ce57a · 00ce57a
1 parent 3562865
commit 00ce57a
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/src/Parser.ts b/src/Parser.ts
@@ -240,6 +240,10 @@ export class Parser {
         this.cbs.ontext?.(data);
     }
 
+    isVoidElement(name: string): boolean {
+        return !this.options.xmlMode && voidElements.has(name);
+    }
+
     onopentagname(name: string): void {
         if (this.lowerCaseTagNames) {
             name = name.toLowerCase();
@@ -259,7 +263,7 @@ export class Parser {
                 this.onclosetag(el);
             }
         }
-        if (this.options.xmlMode || !voidElements.has(name)) {
+        if (!this.isVoidElement(name)) {
             this.stack.push(name);
             if (foreignContextElements.has(name)) {
                 this.foreignContext.push(true);
@@ -277,11 +281,7 @@ export class Parser {
             this.cbs.onopentag?.(this.tagname, this.attribs);
             this.attribs = null;
         }
-        if (
-            !this.options.xmlMode &&
-            this.cbs.onclosetag &&
-            voidElements.has(this.tagname)
-        ) {
+        if (this.cbs.onclosetag && this.isVoidElement(this.tagname)) {
             this.cbs.onclosetag(this.tagname);
         }
         this.tagname = "";
@@ -298,10 +298,7 @@ export class Parser {
         ) {
             this.foreignContext.pop();
         }
-        if (
-            this.stack.length &&
-            (this.options.xmlMode || !voidElements.has(name))
-        ) {
+        if (this.stack.length && !this.isVoidElement(name)) {
             let pos = this.stack.lastIndexOf(name);
             if (pos !== -1) {
                 if (this.cbs.onclosetag) {