forge-edit 0.1.0-beta.14 → 0.1.0-beta.15

package/dist/index.js

@@ -4076,33 +4076,44 @@ function nn(e, t, n = {}) {
 //#endregion
 //#region src/components/shared/toolbar/Style/Hooks/styleLogic.jsx
 function rn(e) {
+	let t = window.getSelection(), n = document.createRange(), r = e;
+	for (; r.lastChild && r.lastChild.nodeName !== "BR";) r = r.lastChild;
+	r.nodeType === 3 ? (n.setStart(r, r.textContent.length), n.collapse(!0)) : r.lastChild && r.lastChild.nodeName === "BR" ? (n.setStart(r, r.childNodes.length - 1), n.collapse(!0)) : (n.selectNodeContents(r), n.collapse(!1)), t.removeAllRanges(), t.addRange(n);
+}
+function an(e) {
 	let t = window.getSelection();
 	if (!t || !t.rangeCount) return;
 	let n = t.getRangeAt(0).commonAncestorContainer;
 	n.nodeType === 3 && (n = n.parentElement);
 	let r = n.closest("p, h1, h2, h3, h4, h5, h6, blockquote, pre");
 	if (r) {
-		let n = document.createElement(e);
-		for (; r.firstChild;) n.appendChild(r.firstChild);
-		r.replaceWith(n);
-		let i = document.createRange();
-		i.selectNodeContents(n), i.collapse(!1), t.removeAllRanges(), t.addRange(i);
+		let t = r.textContent.trim().length > 0, n = document.createElement(e);
+		if (t) for (; r.firstChild;) {
+			let e = r.firstChild;
+			if (e.nodeName === "BR" && r.childNodes.length === 1) {
+				r.removeChild(e);
+				continue;
+			}
+			n.appendChild(e);
+		}
+		else n.innerHTML = "<br>";
+		r.replaceWith(n), rn(n);
 	}
 }
-function an(e) {
+function Z(e) {
 	if (!e) return;
 	let t = e.querySelector("[data-command='style']"), n = e.querySelector(".forge-dropdown-style");
 	!t || !n || (Qe(t, n), n.querySelectorAll(".forge-dropdown-item").forEach((e) => {
 		e.addEventListener("mousedown", (r) => {
 			r.preventDefault(), r.stopPropagation();
 			let i = e.dataset.value || e.getAttribute("data-value");
-			i && rn(i), n.classList.remove("is-open"), t.classList.remove("is-active");
+			i && an(i), n.classList.remove("is-open"), t.classList.remove("is-active");
 		});
 	}));
 }
 //#endregion
 //#region src/components/shared/i18n/index.js
-var Z = {
+var on = {
 	en: {
 		style: "Style",
 		normal: "Normal",
@@ -4175,28 +4186,70 @@ var Z = {
 		codeview: "عرض الكود",
 		help: "مساعدة"
 	}
-}, on = "en";
-function sn(e, t) {
-	return (Z[e] || Z[on])[t] || Z[on][t] || t;
+}, sn = "en";
+function cn(e, t) {
+	return (on[e] || on[sn])[t] || on[sn][t] || t;
 }
 //#endregion
 //#region src/components/shared/i18n/apply.js
-function cn(e, t) {
+function ln(e, t) {
 	e.querySelectorAll("[data-i18n]").forEach((e) => {
-		e.textContent = sn(t, e.getAttribute("data-i18n"));
+		e.textContent = cn(t, e.getAttribute("data-i18n"));
 	});
 }
 //#endregion
 //#region src/components/shared/toolbar/Style/Utils/ensureParagraph.jsx
-function ln(e) {
+function un(e) {
 	if (e && !(e.children.length > 0 || e.textContent.trim().length > 0)) {
 		let t = document.createElement("p");
 		t.innerHTML = "<br>", e.appendChild(t);
 	}
 }
 //#endregion
+//#region src/components/shared/toolbar/Style/Utils/enterKeyHandler.jsx
+var dn = [
+	"h1",
+	"h2",
+	"h3",
+	"h4",
+	"h5",
+	"h6",
+	"blockquote",
+	"pre"
+];
+function fn(e, t) {
+	let n = e.nodeType === 3 ? e.parentNode : e;
+	for (; n && n !== t;) {
+		if (n.nodeType === 1 && dn.includes(n.tagName.toLowerCase())) return n;
+		n = n.parentNode;
+	}
+	return null;
+}
+function pn(e) {
+	let t = window.getSelection(), n = document.createRange();
+	n.selectNodeContents(e), n.collapse(!0), t.removeAllRanges(), t.addRange(n);
+}
+function mn(e) {
+	if (!e) return () => {};
+	let t = (t) => {
+		if (t.key !== "Enter" || t.shiftKey) return;
+		let n = window.getSelection();
+		if (!n || !n.rangeCount) return;
+		let r = n.getRangeAt(0), i = fn(r.startContainer, e);
+		if (!i) return;
+		t.preventDefault();
+		let a = document.createRange();
+		a.setStart(r.endContainer, r.endOffset), a.setEndAfter(i.lastChild || i);
+		let o = a.extractContents(), s = document.createElement("p");
+		o.textContent.trim().length === 0 ? s.innerHTML = "<br>" : s.appendChild(o), i.nextSibling ? i.parentNode.insertBefore(s, i.nextSibling) : i.parentNode.appendChild(s), i.textContent.trim().length === 0 && i.childNodes.length === 0 && (i.innerHTML = "<br>"), pn(s);
+	};
+	return e.addEventListener("keydown", t), () => {
+		e.removeEventListener("keydown", t);
+	};
+}
+//#endregion
 //#region src/components/shared/toolbar/Hooks/contentClick.js
-function un(e) {
+function hn(e) {
 	e.addEventListener("click", (t) => {
 		if (t.target === e) {
 			let t = window.getSelection();
@@ -4213,7 +4266,7 @@ function un(e) {
 }
 //#endregion
 //#region src/components/shared/toolbar/ImagePopover/Components/ImagePopover.jsx
-function dn({ target: e, onClose: t, onResize: n, onFloat: r, onRemove: i }) {
+function gn({ target: e, onClose: t, onResize: n, onFloat: r, onRemove: i }) {
 	let a = q(null);
 	if (!e) return null;
 	let o = e.getBoundingClientRect(), s = {
@@ -4348,7 +4401,7 @@ function dn({ target: e, onClose: t, onResize: n, onFloat: r, onRemove: i }) {
 }
 //#endregion
 //#region src/components/shared/toolbar/ImagePopover/Hooks/useImagePopover.jsx
-function fn() {
+function _n() {
 	let [e, t] = G(null), [n, r] = G(!1);
 	return K(() => {
 		let e = (e) => {
@@ -4383,12 +4436,12 @@ function fn() {
 }
 //#endregion
 //#region src/components/shared/toolbar/ImagePopover/Components/index.jsx
-function pn() {
-	return /* @__PURE__ */ R(dn, { ...fn() });
+function vn() {
+	return /* @__PURE__ */ R(gn, { ..._n() });
 }
 //#endregion
 //#region src/components/light/index.jsx
-function mn(e) {
+function yn(e) {
 	return {
 		getHTML() {
 			return e.innerHTML;
@@ -4405,7 +4458,7 @@ function mn(e) {
 		}
 	};
 }
-function hn(e) {
+function bn(e) {
 	let t = e.lang || "en", n = e.dir || "ltr", r = { current: null }, i = /* @__PURE__ */ R("div", {
 		className: "forge-editor forge-editor--light flex flex-col w-full rounded-[3px] border border-[#ddd] bg-white box-border align-top min-h-[120px]",
 		lang: t,
@@ -4418,28 +4471,28 @@ function hn(e) {
 				"data-placeholder": e.placeholder || ""
 			}),
 			/* @__PURE__ */ R(en, {}),
-			/* @__PURE__ */ R(pn, {})
+			/* @__PURE__ */ R(vn, {})
 		]
 	}), a = document.createElement("div");
 	I(i, a);
 	let o = a.firstElementChild, s = o.querySelector(".forge-editor__content");
-	r.current = s, ln(s), un(s);
+	r.current = s, un(s), hn(s), mn(s);
 	let c = o.querySelector(".forge-toolbar-style");
-	c && an(c);
+	c && Z(c);
 	let l = o.querySelector(".forge-editor__toolbar");
-	l && cn(l, t);
+	l && ln(l, t);
 	let u = o.querySelector(".forge-statusbar");
 	return u && nn(u, o, { minHeight: 120 }), {
 		element: o,
-		...mn(s)
+		...yn(s)
 	};
 }
 //#endregion
 //#region src/main/index.jsx
-function gn(e) {
+function xn(e) {
 	let t = l(e);
 	if (t.type === "light") {
-		let { element: n, getHTML: r, setHTML: i, getText: a, getSelection: o } = hn(t);
+		let { element: n, getHTML: r, setHTML: i, getText: a, getSelection: o } = bn(t);
 		return e.innerHTML = "", e.appendChild(n), n.style.width = t.width, n.style.height = t.height, {
 			element: n,
 			getHTML: r,
@@ -4452,13 +4505,13 @@ function gn(e) {
 }
 //#endregion
 //#region src/main/main.jsx
-var _n = document.querySelectorAll("forge-editor"), vn = [];
-_n.forEach((e) => {
-	let t = gn(e);
-	t && vn.push(t);
-}), window.forgeEditors = vn;
-var yn = document.getElementById("get-html-btn"), bn = document.getElementById("html-output");
-yn && bn && vn[0] && yn.addEventListener("click", () => {
-	bn.value = vn[0].getHTML();
+var Sn = document.querySelectorAll("forge-editor"), Cn = [];
+Sn.forEach((e) => {
+	let t = xn(e);
+	t && Cn.push(t);
+}), window.forgeEditors = Cn;
+var wn = document.getElementById("get-html-btn"), Tn = document.getElementById("html-output");
+wn && Tn && Cn[0] && wn.addEventListener("click", () => {
+	Tn.value = Cn[0].getHTML();
 });
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "forge-edit",
-    "version": "0.1.0-beta.14",
+    "version": "0.1.0-beta.15",
     "description": "A lightweight WYSIWYG editor built with Preact",
     "main": "./dist/index.js",
     "module": "./dist/index.js",