@lesjoursfr/edith 1.1.0 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@lesjoursfr/edith",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"description": "Simple WYSIWYG editor.",
 	"license": "MIT",
 	"repository": "lesjoursfr/edith",

package/src/core/dom.js

@@ -92,6 +92,31 @@ export function textifyNode(node) {
   return newNode;
 }
 
+/**
+ * Know if a tag si a self-closing tag
+ * @param {String} tagName
+ * @returns {Boolean}
+ */
+export function isSelfClosing(tagName) {
+  return [
+    "AREA",
+    "BASE",
+    "BR",
+    "COL",
+    "EMBED",
+    "HR",
+    "IMG",
+    "INPUT",
+    "KEYGEN",
+    "LINK",
+    "META",
+    "PARAM",
+    "SOURCE",
+    "TRACK",
+    "WBR",
+  ].includes(tagName);
+}
+
 /**
  * Remove all node's child nodes that pass the test implemented by the provided function.
  * @param {Node} node the node to process

package/src/core/edit.js

@@ -6,6 +6,7 @@ import {
   createNodeWith,
   unwrapNode,
   textifyNode,
+  isSelfClosing,
   removeNodes,
   removeEmptyTextNodes,
   removeCommentNodes,
@@ -170,7 +171,7 @@ export function wrapInsideTag(tag, options = {}) {
   range.insertNode(node);
 
   // Remove empty tags
-  removeNodes(parent, (el) => el.textContent.length === 0);
+  removeNodes(parent, (el) => !isSelfClosing(el.tagName) && el.textContent.length === 0);
 
   // Return the node
   selectNodeContents(node);

package/src/ui/editor.js

@@ -1,6 +1,6 @@
 import { EditorView, basicSetup } from "codemirror";
 import { html } from "@codemirror/lang-html";
-import { hasClass, hasTagName, createNodeWith, removeNodesRecursively } from "../core/dom.js";
+import { hasClass, hasTagName, createNodeWith, isSelfClosing, removeNodesRecursively } from "../core/dom.js";
 import {
   wrapInsideTag,
   replaceSelectionByHtml,
@@ -103,7 +103,10 @@ EdithEditor.prototype.getContent = function () {
 
   // Remove empty tags
   const placeholder = createNodeWith("div", { innerHTML: code });
-  removeNodesRecursively(placeholder, (el) => el.nodeType === Node.ELEMENT_NODE && el.textContent.length === 0);
+  removeNodesRecursively(
+    placeholder,
+    (el) => el.nodeType === Node.ELEMENT_NODE && !isSelfClosing(el.tagName) && el.textContent.length === 0
+  );
 
   // Return clean code
   return placeholder.innerHTML