@companix/uikit 0.1.12 → 0.1.13

package/dist/WriteBar/Editor.d.ts

@@ -31,4 +31,9 @@ export declare class Editor {
     private checkContentChanged;
     private resolveDomPosition;
 }
+interface TextChunk {
+    kind: 'Text';
+    text: string;
+}
+export declare const toTextChunksLite: (input: string) => TextChunk[];
 export {};

package/dist/WriteBar/utils.d.ts

@@ -1,5 +1,3 @@
-export declare const isTextNode: (node: Node) => node is Text;
-export declare const isElementNode: (node: Node) => node is Element;
 export declare const getNodeTextContent: (node: Node) => string;
 export declare const getEditorSelection: (root: HTMLElement) => {
     range: Range;

package/dist/bundle.es41.js

@@ -1,6 +1,7 @@
-import { onElementKeyDownFactory as m } from "./bundle.es71.js";
-import { getEditorSelection as r, normalizeEditorText as l, getNodeTextContent as h, scrollSelectionIntoView as c, getTextSelectionOffsets as u, isElementNode as f } from "./bundle.es72.js";
-class C {
+import { escape as u, unescape as f, isElementNode as g } from "@companix/utils-browser";
+import { onElementKeyDownFactory as v } from "./bundle.es71.js";
+import { getEditorSelection as l, normalizeEditorText as a, getNodeTextContent as h, scrollSelectionIntoView as d, getTextSelectionOffsets as E } from "./bundle.es72.js";
+class k {
   element;
   prevText = "";
   prevTextSelection = { from: 0, to: 0 };
@@ -21,7 +22,7 @@ class C {
     };
   }
   onKeyCombo(e) {
-    const t = m(e);
+    const t = v(e);
     return this.element.addEventListener("keydown", t), this.handlers.keyCombo = e, () => {
       this.handlers.keyCombo = void 0, this.element.removeEventListener("keydown", t);
     };
@@ -42,13 +43,18 @@ class C {
     };
   }
   setSelection(e) {
-    const t = r(this.element);
+    const t = l(this.element);
     if (!("selection" in t)) return;
     const n = document.createRange(), s = this.resolveDomPosition(e.from), o = this.resolveDomPosition(e.to);
     n.setStart(s.container, s.offset), n.setEnd(o.container, o.offset), t.selection.removeAllRanges(), t.selection.addRange(n);
   }
+  // вставить переданный текст в текущую выделенную область/позицию курсора внутри contenteditable
   insertAtSelection(e, t) {
-    t && this.setSelection(t), this.checkContentChanged();
+    t && this.setSelection(t);
+    const n = C(u(e));
+    for (const s of n)
+      s.kind === "Text" && document.execCommand("insertText", !1, f(s.text));
+    this.checkContentChanged();
   }
   removeFormat() {
     document.execCommand("removeFormat");
@@ -57,7 +63,7 @@ class C {
     const s = !this.isFocused() && !n;
     this.element.innerText = "";
     const o = document.activeElement, i = this.element.inputMode;
-    s && (this.element.inputMode = "none"), this.element.focus(), document.execCommand("removeFormat"), t ? document.execCommand("inserthtml", !1, e) : this.insertAtSelection(l(e)), s && (this.element.blur(), this.element.inputMode = i, o?.focus?.()), this.checkContentChanged();
+    s && (this.element.inputMode = "none"), this.element.focus(), document.execCommand("removeFormat"), t ? document.execCommand("inserthtml", !1, e) : this.insertAtSelection(a(e)), s && (this.element.blur(), this.element.inputMode = i, o?.focus?.()), this.checkContentChanged();
   }
   getText() {
     let e = "";
@@ -67,7 +73,7 @@ class C {
     );
     for (; t.nextNode(); )
       e += h(t.currentNode);
-    return l(e);
+    return a(e);
   }
   getHtml() {
     return this.element.innerHTML;
@@ -76,18 +82,18 @@ class C {
     const e = this.element.innerHTML, t = /<img class="Emoji .+?" src=".+?" alt=".+?">/, n = /alt=".+?"/, s = (o) => {
       const i = o.match(t);
       if (!i?.[0]) return o;
-      const a = i[0].match(n);
-      if (!a?.[0]) return o;
-      const d = a[0].replace("alt=", "").replaceAll('"', "");
-      return s(o.replace(i[0], d));
+      const c = i[0].match(n);
+      if (!c?.[0]) return o;
+      const m = c[0].replace("alt=", "").replaceAll('"', "");
+      return s(o.replace(i[0], m));
     };
     return s(e);
   }
   focus(e = !1) {
     if (this.isFocused()) return;
     this.element.focus();
-    const t = r(this.element);
-    "selection" in t && (t.selection.selectAllChildren(this.element), e ? t.selection.collapseToStart() : t.selection.collapseToEnd(), c());
+    const t = l(this.element);
+    "selection" in t && (t.selection.selectAllChildren(this.element), e ? t.selection.collapseToStart() : t.selection.collapseToEnd(), d());
   }
   isFocused() {
     return document.activeElement === this.element;
@@ -101,7 +107,7 @@ class C {
     if (!t) return;
     const n = t.getData("text");
     if (n) {
-      this.insertAtSelection(n), c();
+      this.insertAtSelection(n), d();
       return;
     }
   };
@@ -117,9 +123,9 @@ class C {
     n && (t.selectNode(e.target), t.collapse(e.offsetX <= 8), n.removeAllRanges(), n.addRange(t));
   };
   checkContentChanged = () => {
-    const e = l(this.getText()), t = r(this.element);
+    const e = a(this.getText()), t = l(this.element);
     if (!("range" in t)) return;
-    const n = u(this.element, t.range);
+    const n = E(this.element, t.range);
     if (e === this.prevText && n.from === this.prevTextSelection.from && n.to === this.prevTextSelection.to)
       return;
     const s = e === `
@@ -139,7 +145,7 @@ class C {
     for (; t.nextNode(); ) {
       const s = t.currentNode, o = h(s).length;
       if (o >= n)
-        return f(s) && s.nodeName === "BR" && (n -= 1), {
+        return g(s) && s.nodeName === "BR" && (n -= 1), {
           container: s,
           offset: Math.max(n, 0)
         };
@@ -151,6 +157,8 @@ class C {
     };
   }
 }
+const C = (r) => r ? [{ kind: "Text", text: r }] : [];
 export {
-  C as Editor
+  k as Editor,
+  C as toTextChunksLite
 };

package/dist/bundle.es72.js

@@ -1,44 +1,43 @@
-const l = (e) => e.nodeType === Node.TEXT_NODE, c = (e) => e.nodeType === Node.ELEMENT_NODE, a = (e) => l(e) ? e.nodeValue || "" : c(e) && e.nodeName === "IMG" ? e.getAttribute("alt") || "" : c(e) && e.nodeName === "DIV" || c(e) && e.nodeName === "BR" && !(e.parentElement && c(e.parentElement) && e.parentElement.nodeName === "DIV" && e.parentElement.getAttribute("contenteditable") !== "true") ? `
-` : "", u = (e) => {
-  const t = document.getSelection();
-  if (!t || t.rangeCount === 0)
+import { isTextNode as s, isElementNode as i } from "@companix/utils-browser";
+const a = (t) => s(t) ? t.nodeValue || "" : i(t) && t.nodeName === "IMG" ? t.getAttribute("alt") || "" : i(t) && t.nodeName === "DIV" || i(t) && t.nodeName === "BR" && !(t.parentElement && i(t.parentElement) && t.parentElement.nodeName === "DIV" && t.parentElement.getAttribute("contenteditable") !== "true") ? `
+` : "", m = (t) => {
+  const e = document.getSelection();
+  if (!e || e.rangeCount === 0)
     return {};
-  const n = t.getRangeAt(0);
-  return n && e.contains(n.commonAncestorContainer) ? { range: n, selection: t } : {};
-}, s = (e, t, n) => {
-  let r = n, o = t;
-  e === t && (r = 0, o = e.childNodes[n]);
-  const i = document.createTreeWalker(e, NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_TEXT);
-  for (; i.nextNode(); ) {
-    if (i.currentNode === o)
+  const n = e.getRangeAt(0);
+  return n && t.contains(n.commonAncestorContainer) ? { range: n, selection: e } : {};
+}, l = (t, e, n) => {
+  let r = n, o = e;
+  t === e && (r = 0, o = t.childNodes[n]);
+  const c = document.createTreeWalker(t, NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_TEXT);
+  for (; c.nextNode(); ) {
+    if (c.currentNode === o)
       return r;
-    r += a(i.currentNode).length;
+    r += a(c.currentNode).length;
   }
   return r;
-}, m = (e, t) => {
-  const n = s(e, t.startContainer, t.startOffset);
+}, f = (t, e) => {
+  const n = l(t, e.startContainer, e.startOffset);
   return {
     from: n,
-    to: t.collapsed ? n : s(e, t.endContainer, t.endOffset)
+    to: e.collapsed ? n : l(t, e.endContainer, e.endOffset)
   };
-}, f = () => {
-  const e = window.getSelection();
-  if (!e || !e.rangeCount) return;
-  const t = e.getRangeAt(0);
-  if (t.commonAncestorContainer === document) return;
-  const n = t.commonAncestorContainer.parentElement;
+}, g = () => {
+  const t = window.getSelection();
+  if (!t || !t.rangeCount) return;
+  const e = t.getRangeAt(0);
+  if (e.commonAncestorContainer === document) return;
+  const n = e.commonAncestorContainer.parentElement;
   if (!n) return;
-  const r = n.getBoundingClientRect(), o = t.getBoundingClientRect().bottom - r.bottom;
+  const r = n.getBoundingClientRect(), o = e.getBoundingClientRect().bottom - r.bottom;
   o > 0 && n.scrollBy({ top: o });
-}, d = (e) => e.replace(/&nbsp;/gi, " ").replace(/<br\s*\/?>/gi, `
+}, d = (t) => t.replace(/&nbsp;/gi, " ").replace(/<br\s*\/?>/gi, `
 `);
 export {
-  u as getEditorSelection,
+  m as getEditorSelection,
   a as getNodeTextContent,
-  s as getPlainTextOffset,
-  m as getTextSelectionOffsets,
-  c as isElementNode,
-  l as isTextNode,
+  l as getPlainTextOffset,
+  f as getTextSelectionOffsets,
   d as normalizeEditorText,
-  f as scrollSelectionIntoView
+  g as scrollSelectionIntoView
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@companix/uikit",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "main": "./dist/bundle.es.js",
   "module": "./dist/bundle.es.js",
   "types": "./dist/index.d.ts",