@harbour-enterprises/superdoc 0.21.0-RC2 → 0.21.0-next.2

package/dist/superdoc.umd.js

@@ -19126,7 +19126,7 @@
       navigator.platform
     );
   };
-  const isRegExp = (value) => {
+  const isRegExp$1 = (value) => {
     return Object.prototype.toString.call(value) === "[object RegExp]";
   };
   function objectIncludes(obj1, obj2, options = { strict: true }) {
@@ -19134,7 +19134,7 @@
     if (!keys2.length) return true;
     return keys2.every((key2) => {
       if (options.strict) return obj2[key2] === obj1[key2];
-      if (isRegExp(obj2[key2])) return obj2[key2].test(obj1[key2]);
+      if (isRegExp$1(obj2[key2])) return obj2[key2].test(obj1[key2]);
       return obj2[key2] === obj1[key2];
     });
   }
@@ -31938,6 +31938,18 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       }
     ]
   };
+  const sanitizeDocxMediaName = (value, fallback = "image") => {
+    if (!value) return fallback;
+    const sanitized = value.replace(/[^a-zA-Z0-9_-]/g, "_");
+    return sanitized || fallback;
+  };
+  const getFallbackImageNameFromDataUri = (src = "", fallback = "image") => {
+    if (!src || typeof src !== "string") return fallback;
+    const [prefix2] = src.split(";");
+    const [, maybeType] = prefix2.split("/");
+    const extension = maybeType?.toLowerCase();
+    return extension ? `${fallback}.${extension}` : fallback;
+  };
   const TranslatorTypes = Object.freeze({
     NODE: "node",
     ATTRIBUTE: "attribute"
@@ -32135,6 +32147,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const validXmlAttributes$k = [attrConfig$D];
   const XML_NODE_NAME$s = "w:highlight";
   const SD_ATTR_KEY$f = "highlight";
+  const DISABLED_TOKENS = /* @__PURE__ */ new Set(["transparent", "none", "inherit"]);
   const encode$13 = (params2, encodedAttrs = {}) => {
     const { nodes } = params2;
     const node = nodes?.[0];
@@ -32151,8 +32164,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const highlightValue = attrs.highlight ?? attrs.color ?? null;
     if (!highlightValue) return void 0;
     const normalizedValue = String(highlightValue).trim().toLowerCase();
-    if (!normalizedValue || normalizedValue === "transparent" || normalizedValue === "none") {
-      return void 0;
+    if (!normalizedValue) return void 0;
+    if (DISABLED_TOKENS.has(normalizedValue)) {
+      return {
+        name: XML_NODE_NAME$s,
+        attributes: { "w:val": "none" }
+      };
     }
     const keyword = getDocxHighlightKeywordFromHex(highlightValue);
     if (keyword) {
@@ -35544,7 +35561,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         if (filteredMarks.length !== existingMarks2.length) {
           if (filteredMarks.length) child = { ...child, marks: filteredMarks };
           else {
-            const { marks, ...rest } = child;
+            const { marks: _removedMarks, ...rest } = child;
             child = rest;
           }
         }
@@ -36054,18 +36071,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     return handleImageNode(node, params2, true);
   }
-  const sanitizeDocxMediaName = (value, fallback = "image") => {
-    if (!value) return fallback;
-    const sanitized = value.replace(/[^a-zA-Z0-9_-]/g, "_");
-    return sanitized || fallback;
-  };
-  const getFallbackImageNameFromDataUri = (src = "", fallback = "image") => {
-    if (!src || typeof src !== "string") return fallback;
-    const [prefix2] = src.split(";");
-    const [, maybeType] = prefix2.split("/");
-    const extension = maybeType?.toLowerCase();
-    return extension ? `${fallback}.${extension}` : fallback;
-  };
   const translateImageNode = (params2) => {
     const {
       node: { attrs = {} },
@@ -37273,7 +37278,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
   }
   const inputRuleMatcherHandler = (text, match) => {
-    if (isRegExp(match)) {
+    if (isRegExp$1(match)) {
       return match.exec(text);
     }
     const inputRuleMatch = match(text);
@@ -38994,13 +38999,21 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         markElement.name = "w:rStyle";
         markElement.attributes["w:val"] = attrs.styleId;
         break;
-      case "color":
-        let processedColor = attrs.color.replace(/^#/, "").replace(/;$/, "");
+      case "color": {
+        const rawColor = attrs.color;
+        if (!rawColor) break;
+        const normalized = String(rawColor).trim().toLowerCase();
+        if (normalized === "inherit") {
+          markElement.attributes["w:val"] = "auto";
+          break;
+        }
+        let processedColor = String(rawColor).replace(/^#/, "").replace(/;$/, "");
         if (processedColor.startsWith("rgb")) {
           processedColor = rgbToHex(processedColor);
         }
         markElement.attributes["w:val"] = processedColor;
         break;
+      }
       case "textAlign":
         markElement.attributes["w:val"] = attrs.textAlign;
         break;
@@ -39991,27 +40004,30 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         trackedChange,
         trackedChangeText,
         trackedChangeType,
-        trackedDeletedText
+        trackedDeletedText,
+        isDone: false
       };
     });
     const extendedComments = generateCommentsWithExtendedData({ docx, comments: extractedComments });
     return extendedComments;
   }
   const generateCommentsWithExtendedData = ({ docx, comments }) => {
+    if (!comments?.length) return [];
     const commentsExtended = docx["word/commentsExtended.xml"];
-    if (!commentsExtended) return [];
-    const { elements: initialElements } = commentsExtended;
-    const { elements } = initialElements[0];
+    if (!commentsExtended) return comments.map((comment) => ({ ...comment, isDone: comment.isDone ?? false }));
+    const { elements: initialElements = [] } = commentsExtended;
+    if (!initialElements?.length) return comments.map((comment) => ({ ...comment, isDone: comment.isDone ?? false }));
+    const { elements = [] } = initialElements[0] ?? {};
     const commentEx = elements.filter((el) => el.name === "w15:commentEx");
     return comments.map((comment) => {
       const extendedDef = commentEx.find((ce2) => ce2.attributes["w15:paraId"] === comment.paraId);
-      if (!extendedDef) return { ...comment };
+      if (!extendedDef) return { ...comment, isDone: comment.isDone ?? false };
       const { isDone, paraIdParent } = getExtendedDetails(extendedDef);
       let parentComment;
       if (paraIdParent) parentComment = comments.find((c2) => c2.paraId === paraIdParent);
       const newComment = {
         ...comment,
-        isDone,
+        isDone: isDone ?? false,
         parentCommentId: parentComment?.commentId
       };
       return newComment;
@@ -40820,7 +40836,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         return;
       }
     }
-    static updateDocumentVersion(docx = this.convertedXml, version2 = "0.21.0-RC2") {
+    static updateDocumentVersion(docx = this.convertedXml, version2 = "0.20.2") {
       const customLocation = "docProps/custom.xml";
       if (!docx[customLocation]) {
         docx[customLocation] = generateCustomXml();
@@ -41313,7 +41329,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   function generateCustomXml() {
     return DEFAULT_CUSTOM_XML;
   }
-  function generateSuperdocVersion(pid = 2, version2 = "0.21.0-RC2") {
+  function generateSuperdocVersion(pid = 2, version2 = "0.20.2") {
     return {
       type: "element",
       name: "property",
@@ -45752,17 +45768,18 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     // Mark this node as being the selected node.
     selectNode() {
-      if (this.nodeDOM.nodeType == 1)
+      if (this.nodeDOM.nodeType == 1) {
         this.nodeDOM.classList.add("ProseMirror-selectednode");
-      if (this.contentDOM || !this.node.type.spec.draggable)
-        this.dom.draggable = true;
+        if (this.contentDOM || !this.node.type.spec.draggable)
+          this.nodeDOM.draggable = true;
+      }
     }
     // Remove selected node marking from this node.
     deselectNode() {
       if (this.nodeDOM.nodeType == 1) {
         this.nodeDOM.classList.remove("ProseMirror-selectednode");
         if (this.contentDOM || !this.node.type.spec.draggable)
-          this.dom.removeAttribute("draggable");
+          this.nodeDOM.removeAttribute("draggable");
       }
     }
     get domAtom() {
@@ -47422,7 +47439,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       }
       const target = flushed ? null : event.target;
       const targetDesc = target ? view.docView.nearestDesc(target, true) : null;
-      this.target = targetDesc && targetDesc.dom.nodeType == 1 ? targetDesc.dom : null;
+      this.target = targetDesc && targetDesc.nodeDOM.nodeType == 1 ? targetDesc.nodeDOM : null;
       let { selection } = view.state;
       if (event.button == 0 && targetNode.type.spec.draggable && targetNode.type.spec.selectable !== false || selection instanceof NodeSelection && selection.from <= targetPos && selection.to > targetPos)
         this.mightDrag = {
@@ -55149,6 +55166,33 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     return DecorationSet.create(state2.doc, decorations);
   };
   const CommentMarkName = "commentMark";
+  const resolveCommentMeta = ({ converter, importedId }) => {
+    const comments = converter?.comments || [];
+    const matchingImportedComment = comments.find((c2) => c2.importedId == importedId);
+    const resolvedCommentId = matchingImportedComment?.commentId ?? (importedId ? String(importedId) : v4$1());
+    const internal = matchingImportedComment?.internal ?? matchingImportedComment?.isInternal ?? false;
+    return {
+      resolvedCommentId,
+      importedId,
+      internal,
+      matchingImportedComment
+    };
+  };
+  const ensureFallbackComment = ({ converter, matchingImportedComment, commentId, importedId }) => {
+    if (matchingImportedComment || !converter) return;
+    converter.comments = converter.comments || [];
+    const alreadyExists = converter.comments.some((comment) => comment.commentId === commentId);
+    if (alreadyExists) return;
+    converter.comments.push({
+      commentId,
+      importedId,
+      textJson: null,
+      creatorName: null,
+      creatorEmail: null,
+      createdTime: null,
+      isDone: false
+    });
+  };
   const removeCommentsById = ({ commentId, state: state2, tr, dispatch }) => {
     const positions = getCommentPositionsById(commentId, state2.doc);
     positions.forEach(({ from: from2, to }) => {
@@ -55242,24 +55286,31 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       const { type: type2 } = node;
       const commentNodes = ["commentRangeStart", "commentRangeEnd", "commentReference"];
       if (!commentNodes.includes(type2.name)) return;
-      const matchingImportedComment = converter.comments?.find((c2) => c2.importedId == node.attrs["w:id"]) || {};
-      const { commentId } = matchingImportedComment;
-      if (!commentId) return;
+      const { resolvedCommentId, importedId, internal, matchingImportedComment } = resolveCommentMeta({
+        converter,
+        importedId: node.attrs["w:id"]
+      });
       if (type2.name === "commentRangeStart") {
         toMark.push({
-          "w:id": commentId,
-          importedId: node.attrs["w:id"],
-          internal: false,
+          commentId: resolvedCommentId,
+          importedId,
+          internal,
           start: pos
         });
+        ensureFallbackComment({
+          converter,
+          matchingImportedComment,
+          commentId: resolvedCommentId,
+          importedId
+        });
         toDelete.push({ start: pos, end: pos + 1 });
       } else if (type2.name === "commentRangeEnd") {
-        const itemToMark = toMark.find((p2) => p2.importedId === node.attrs["w:id"]);
+        const itemToMark = toMark.find((p2) => p2.importedId === importedId);
         if (!itemToMark) return;
         const { start: start2 } = itemToMark;
         const markAttrs = {
-          commentId,
-          importedId: node.attrs["w:id"],
+          commentId: itemToMark.commentId,
+          importedId,
           internal: itemToMark.internal
         };
         tr.addMark(start2, pos + 1, schema.marks[CommentMarkName].create(markAttrs));
@@ -58668,7 +58719,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * @returns {Object | void} Migration results
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "0.21.0-RC2");
+      console.debug("[checkVersionMigrations] Current editor version", "0.20.2");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -76546,8 +76597,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   }
   class SearchQuery {
     /**
-    Create a query object.
-    */
+      Create a query object.
+      */
     constructor(config2) {
       this.search = config2.search;
       this.caseSensitive = !!config2.caseSensitive;
@@ -76560,72 +76611,70 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       this.impl = !this.valid ? nullQuery : this.regexp ? new RegExpQuery(this) : new StringQuery(this);
     }
     /**
-    Compare this query to another query.
-    */
+      Compare this query to another query.
+      */
     eq(other) {
       return this.search == other.search && this.replace == other.replace && this.caseSensitive == other.caseSensitive && this.regexp == other.regexp && this.wholeWord == other.wholeWord;
     }
     /**
-    Find the next occurrence of this query in the given range.
-    */
+      Find the next occurrence of this query in the given range.
+      */
     findNext(state2, from2 = 0, to = state2.doc.content.size) {
       for (; ; ) {
-        if (from2 >= to)
-          return null;
+        if (from2 >= to) return null;
         let result = this.impl.findNext(state2, from2, to);
-        if (!result || this.checkResult(state2, result))
-          return result;
+        if (!result || this.checkResult(state2, result)) return result;
         from2 = result.from + 1;
       }
     }
     /**
-    Find the previous occurrence of this query in the given range.
-    Note that, if `to` is given, it should be _less_ than `from`.
-    */
+      Find the previous occurrence of this query in the given range.
+      Note that, if `to` is given, it should be _less_ than `from`.
+      */
     findPrev(state2, from2 = state2.doc.content.size, to = 0) {
       for (; ; ) {
-        if (from2 <= to)
-          return null;
+        if (from2 <= to) return null;
         let result = this.impl.findPrev(state2, from2, to);
-        if (!result || this.checkResult(state2, result))
-          return result;
+        if (!result || this.checkResult(state2, result)) return result;
         from2 = result.to - 1;
       }
     }
     /**
-    @internal
-    */
+      @internal
+      */
     checkResult(state2, result) {
       return (!this.wholeWord || checkWordBoundary(state2, result.from) && checkWordBoundary(state2, result.to)) && (!this.filter || this.filter(state2, result));
     }
     /**
-    @internal
-    */
+      @internal
+      */
     unquote(string) {
       return this.literal ? string : string.replace(/\\([nrt\\])/g, (_2, ch) => ch == "n" ? "\n" : ch == "r" ? "\r" : ch == "t" ? "	" : "\\");
     }
     /**
-    Get the ranges that should be replaced for this result. This can
-    return multiple ranges when `this.replace` contains
-    `$1`/`$&`-style placeholders, in which case the preserved
-    content is skipped by the replacements.
-    
-    Ranges are sorted by position, and `from`/`to` positions all
-    refer to positions in `state.doc`. When applying these, you'll
-    want to either apply them from back to front, or map these
-    positions through your transaction's current mapping.
-    */
+      Get the ranges that should be replaced for this result. This can
+      return multiple ranges when `this.replace` contains
+      `$1`/`$&`-style placeholders, in which case the preserved
+      content is skipped by the replacements.
+      
+      Ranges are sorted by position, and `from`/`to` positions all
+      refer to positions in `state.doc`. When applying these, you'll
+      want to either apply them from back to front, or map these
+      positions through your transaction's current mapping.
+      */
     getReplacements(state2, result) {
       let $from = state2.doc.resolve(result.from);
       let marks = $from.marksAcross(state2.doc.resolve(result.to));
       let ranges = [];
       let frag = Fragment.empty, pos = result.from, { match } = result;
       let groups = match ? getGroupIndices(match) : [[0, result.to - result.from]];
-      let replParts = parseReplacement(this.unquote(this.replace)), groupSpan;
+      let replParts = parseReplacement(this.unquote(this.replace));
       for (let part of replParts) {
         if (typeof part == "string") {
           frag = frag.addToEnd(state2.schema.text(part, marks));
-        } else if (groupSpan = groups[part.group]) {
+        } else {
+          const groupSpan = groups[part.group];
+          if (!groupSpan) continue;
           let from2 = result.matchStart + groupSpan[0], to = result.matchStart + groupSpan[1];
           if (part.copy) {
             frag = frag.append(state2.doc.slice(from2, to).content);
@@ -76655,8 +76704,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     constructor(query) {
       this.query = query;
       let string = query.unquote(query.search);
-      if (!query.caseSensitive)
-        string = string.toLowerCase();
+      if (!query.caseSensitive) string = string.toLowerCase();
       this.string = string;
     }
     findNext(state2, from2, to) {
@@ -76664,17 +76712,26 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         let off2 = Math.max(from2, start2);
         let content = textContent(node).slice(off2 - start2, Math.min(node.content.size, to - start2));
         let index2 = (this.query.caseSensitive ? content : content.toLowerCase()).indexOf(this.string);
-        return index2 < 0 ? null : { from: off2 + index2, to: off2 + index2 + this.string.length, match: null, matchStart: start2 };
+        if (index2 < 0) return null;
+        const startOffset = off2 - start2;
+        const absoluteIndex = startOffset + index2;
+        const fromPos = mapIndexToDocPos(node, start2, absoluteIndex);
+        const toPos = mapIndexToDocPos(node, start2, absoluteIndex + this.string.length);
+        return { from: fromPos, to: toPos, match: null, matchStart: start2 };
       });
     }
     findPrev(state2, from2, to) {
       return scanTextblocks(state2.doc, from2, to, (node, start2) => {
         let off2 = Math.max(start2, to);
         let content = textContent(node).slice(off2 - start2, Math.min(node.content.size, from2 - start2));
-        if (!this.query.caseSensitive)
-          content = content.toLowerCase();
+        if (!this.query.caseSensitive) content = content.toLowerCase();
         let index2 = content.lastIndexOf(this.string);
-        return index2 < 0 ? null : { from: off2 + index2, to: off2 + index2 + this.string.length, match: null, matchStart: start2 };
+        if (index2 < 0) return null;
+        const startOffset = off2 - start2;
+        const absoluteIndex = startOffset + index2;
+        const fromPos = mapIndexToDocPos(node, start2, absoluteIndex);
+        const toPos = mapIndexToDocPos(node, start2, absoluteIndex + this.string.length);
+        return { from: fromPos, to: toPos, match: null, matchStart: start2 };
       });
     }
   }
@@ -76689,7 +76746,11 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         let content = textContent(node).slice(0, Math.min(node.content.size, to - start2));
         this.regexp.lastIndex = from2 - start2;
         let match = this.regexp.exec(content);
-        return match ? { from: start2 + match.index, to: start2 + match.index + match[0].length, match, matchStart: start2 } : null;
+        if (!match) return null;
+        const absoluteIndex = match.index;
+        const fromPos = mapIndexToDocPos(node, start2, absoluteIndex);
+        const toPos = mapIndexToDocPos(node, start2, absoluteIndex + match[0].length);
+        return { from: fromPos, to: toPos, match, matchStart: start2 };
       });
     }
     findPrev(state2, from2, to) {
@@ -76699,18 +76760,20 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         for (let off2 = 0; ; ) {
           this.regexp.lastIndex = off2;
           let next = this.regexp.exec(content);
-          if (!next)
-            break;
+          if (!next) break;
           match = next;
           off2 = next.index + 1;
         }
-        return match ? { from: start2 + match.index, to: start2 + match.index + match[0].length, match, matchStart: start2 } : null;
+        if (!match) return null;
+        const absoluteIndex = match.index;
+        const fromPos = mapIndexToDocPos(node, start2, absoluteIndex);
+        const toPos = mapIndexToDocPos(node, start2, absoluteIndex + match[0].length);
+        return { from: fromPos, to: toPos, match, matchStart: start2 };
       });
     }
   }
   function getGroupIndices(match) {
-    if (match.indices)
-      return match.indices;
+    if (match.indices) return match.indices;
     let result = [[0, match[0].length]];
     for (let i2 = 1, pos = 0; i2 < match.length; i2++) {
       let found2 = match[i2] ? match[0].indexOf(match[i2], pos) : -1;
@@ -76722,10 +76785,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     let result = [], highestSeen = -1;
     function add(text2) {
       let last = result.length - 1;
-      if (last > -1 && typeof result[last] == "string")
-        result[last] += text2;
-      else
-        result.push(text2);
+      if (last > -1 && typeof result[last] == "string") result[last] += text2;
+      else result.push(text2);
     }
     while (text.length) {
       let m2 = /\$([$&\d+])/.exec(text);
@@ -76733,8 +76794,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         add(text);
         return result;
       }
-      if (m2.index > 0)
-        add(text.slice(0, m2.index + (m2[1] == "$" ? 1 : 0)));
+      if (m2.index > 0) add(text.slice(0, m2.index + (m2[1] == "$" ? 1 : 0)));
       if (m2[1] != "$") {
         let n = m2[1] == "&" ? 0 : +m2[1];
         if (highestSeen >= n) {
@@ -76752,30 +76812,50 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     try {
       new RegExp(source, baseFlags);
       return true;
-    } catch (_a2) {
+    } catch {
       return false;
     }
   }
   const TextContentCache = /* @__PURE__ */ new WeakMap();
   function textContent(node) {
     let cached = TextContentCache.get(node);
-    if (cached)
-      return cached;
+    if (cached) return cached;
     let content = "";
     for (let i2 = 0; i2 < node.childCount; i2++) {
       let child = node.child(i2);
-      if (child.isText)
-        content += child.text;
-      else if (child.isLeaf)
-        content += "";
-      else
-        content += " " + textContent(child) + " ";
+      if (child.isText) content += child.text;
+      else if (child.isLeaf) content += "";
+      else if (child.type && child.type.name === "run") content += textContent(child);
+      else content += " " + textContent(child) + " ";
     }
     TextContentCache.set(node, content);
     return content;
   }
+  function mapIndexToDocPos(node, start2, index2) {
+    if (index2 <= 0) return start2;
+    const fullText = textContent(node);
+    if (index2 >= fullText.length) return start2 + node.content.size;
+    let target = start2;
+    let remaining = index2;
+    let found2 = false;
+    node.descendants((child, pos) => {
+      if (found2) return false;
+      if (!child.isText) return true;
+      const len2 = child.text.length;
+      if (remaining <= len2) {
+        target = start2 + pos + remaining;
+        found2 = true;
+        return false;
+      }
+      remaining -= len2;
+      return true;
+    });
+    return found2 ? target : start2 + node.content.size;
+  }
+  const transparentInlineNodes = /* @__PURE__ */ new Set(["run"]);
   function scanTextblocks(node, from2, to, f, nodeStart = 0) {
-    if (node.inlineContent) {
+    const isTransparentInline = node.inlineContent && node.type && transparentInlineNodes.has(node.type.name);
+    if (node.inlineContent && !isTransparentInline) {
       return f(node, nodeStart);
     } else if (!node.isLeaf) {
       if (from2 > to) {
@@ -76784,8 +76864,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           pos -= child.nodeSize;
           if (pos < from2) {
             let result = scanTextblocks(child, from2, to, f, pos + 1);
-            if (result != null)
-              return result;
+            if (result != null) return result;
           }
         }
       } else {
@@ -76794,8 +76873,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           pos += child.nodeSize;
           if (pos > from2) {
             let result = scanTextblocks(child, from2, to, f, start2 + 1);
-            if (result != null)
-              return result;
+            if (result != null) return result;
           }
         }
       }
@@ -76805,8 +76883,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   function checkWordBoundary(state2, pos) {
     let $pos = state2.doc.resolve(pos);
     let before = $pos.nodeBefore, after = $pos.nodeAfter;
-    if (!before || !after || !before.isText || !after.isText)
-      return true;
+    if (!before || !after || !before.isText || !after.isText) return true;
     return !/\p{L}$/u.test(before.text) || !/^\p{L}/u.test(after.text);
   }
   class SearchState {
@@ -76817,14 +76894,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
   }
   function buildMatchDeco(state2, query, range2) {
-    if (!query.valid)
-      return DecorationSet.empty;
+    if (!query.valid) return DecorationSet.empty;
     let deco = [];
     let sel = state2.selection;
     for (let pos = range2 ? range2.from : 0, end2 = range2 ? range2.to : state2.doc.content.size; ; ) {
       let next = query.findNext(state2, pos, end2);
-      if (!next)
-        break;
+      if (!next) break;
       let cls = next.from == sel.from && next.to == sel.to ? "ProseMirror-active-search-match" : "ProseMirror-search-match";
       deco.push(Decoration.inline(next.from, next.to, { class: cls }));
       pos = next.to;
@@ -76843,8 +76918,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         },
         apply(tr, search2, _oldState, state2) {
           let set = tr.getMeta(searchKey);
-          if (set)
-            return new SearchState(set.query, set.range, buildMatchDeco(state2, set.query, set.range));
+          if (set) return new SearchState(set.query, set.range, buildMatchDeco(state2, set.query, set.range));
           if (tr.docChanged || tr.selectionSet) {
             let range2 = search2.range;
             if (range2) {
@@ -76869,6 +76943,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   function setSearchState(tr, query, range2 = null) {
     return tr.setMeta(searchKey, { query, range: range2 });
   }
+  const isRegExp = (value) => Object.prototype.toString.call(value) === "[object RegExp]";
   const Search = Extension.create({
     addStorage() {
       return {
@@ -76938,10 +77013,14 @@ Please report this to https://github.com/markedjs/marked.`, e) {
             let caseSensitive = false;
             let regexp = false;
             const wholeWord = false;
-            if (patternInput instanceof RegExp) {
+            if (isRegExp(patternInput)) {
+              const regexPattern = (
+                /** @type {RegExp} */
+                patternInput
+              );
               regexp = true;
-              pattern = patternInput.source;
-              caseSensitive = !patternInput.flags.includes("i");
+              pattern = regexPattern.source;
+              caseSensitive = !regexPattern.flags.includes("i");
             } else if (typeof patternInput === "string" && /^\/(.+)\/([gimsuy]*)$/.test(patternInput)) {
               const [, body, flags] = patternInput.match(/^\/(.+)\/([gimsuy]*)$/);
               regexp = true;
@@ -79846,7 +79925,7 @@ ${style2}
     if (typeof selector === "string") {
       return document.querySelector(selector);
     }
-    return selector();
+    return selector() || null;
   }
   const LazyTeleport$1 = /* @__PURE__ */ defineComponent({
     name: "LazyTeleport",
@@ -79934,8 +80013,11 @@ ${style2}
   };
   const keepOffsetDirection$1 = {
     top: true,
+    // top++
     bottom: false,
+    // top--
     left: true,
+    // left++
     right: false
     // left--
   };
@@ -81052,7 +81134,6 @@ ${style2}
         return !!element.href && element.rel !== "ignore";
       case "INPUT":
         return element.type !== "hidden" && element.type !== "file";
-      case "BUTTON":
       case "SELECT":
       case "TEXTAREA":
         return true;
@@ -81071,8 +81152,8 @@ ${style2}
         default: true
       },
       onEsc: Function,
-      initialFocusTo: String,
-      finalFocusTo: String,
+      initialFocusTo: [String, Function],
+      finalFocusTo: [String, Function],
       returnFocusOnDeactivated: {
         type: Boolean,
         default: true
@@ -83170,6 +83251,7 @@ ${style2}
     });
   }
   const scrollbarLight$1 = {
+    name: "Scrollbar",
     common: derived$1,
     self: self$6$1
   };
@@ -84685,11 +84767,14 @@ ${style2}
       boxShadow: boxShadow2
     });
   }
-  const popoverLight$1 = {
+  const popoverLight$1 = createTheme$1({
     name: "Popover",
     common: derived$1,
+    peers: {
+      Scrollbar: scrollbarLight$1
+    },
     self: self$5$1
-  };
+  });
   const oppositePlacement$1 = {
     top: "bottom",
     bottom: "top",
@@ -84909,9 +84994,11 @@ ${style2}
       const {
         namespaceRef,
         mergedClsPrefixRef,
-        inlineThemeDisabled
+        inlineThemeDisabled,
+        mergedRtlRef
       } = useConfig$1(props);
       const themeRef = useTheme$1("Popover", "-popover", style$3$1, popoverLight$1, props, mergedClsPrefixRef);
+      const rtlEnabledRef = useRtl$1("Popover", mergedRtlRef, mergedClsPrefixRef);
       const followerRef = ref$1(null);
       const NPopover2 = inject("NPopover");
       const bodyRef = ref$1(null);
@@ -85109,6 +85196,8 @@ ${style2}
               style: props.contentStyle
             }, slots);
             const maybeScrollableBody = props.scrollable ? h$1(XScrollbar$1, {
+              themeOverrides: themeRef.value.peerOverrides.Scrollbar,
+              theme: themeRef.value.peers.Scrollbar,
               contentClass: hasHeaderOrFooter ? void 0 : `${mergedClsPrefix}-popover__content ${(_b = props.contentClass) !== null && _b !== void 0 ? _b : ""}`,
               contentStyle: hasHeaderOrFooter ? void 0 : props.contentStyle
             }, {
@@ -85124,7 +85213,7 @@ ${style2}
             return [maybeScrollableBody, arrow2];
           };
           contentNode = h$1("div", mergeProps({
-            class: [`${mergedClsPrefix}-popover`, `${mergedClsPrefix}-popover-shared`, themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass.value, extraClass.map((v2) => `${mergedClsPrefix}-${v2}`), {
+            class: [`${mergedClsPrefix}-popover`, `${mergedClsPrefix}-popover-shared`, (rtlEnabledRef === null || rtlEnabledRef === void 0 ? void 0 : rtlEnabledRef.value) && `${mergedClsPrefix}-popover--rtl`, themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass.value, extraClass.map((v2) => `${mergedClsPrefix}-${v2}`), {
               [`${mergedClsPrefix}-popover--scrollable`]: props.scrollable,
               [`${mergedClsPrefix}-popover--show-header-or-footer`]: hasHeaderOrFooter,
               [`${mergedClsPrefix}-popover--raw`]: props.raw,
@@ -85148,7 +85237,7 @@ ${style2}
             // The popover class and overlap class must exists, they will be used
             // to place the body & transition animation.
             // Shadow class exists for reuse box-shadow.
-            [`${mergedClsPrefix}-popover-shared`, themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass.value, props.overlap && `${mergedClsPrefix}-popover-shared--overlap`, props.showArrow && `${mergedClsPrefix}-popover-shared--show-arrow`, props.arrowPointToCenter && `${mergedClsPrefix}-popover-shared--center-arrow`],
+            [`${mergedClsPrefix}-popover-shared`, (rtlEnabledRef === null || rtlEnabledRef === void 0 ? void 0 : rtlEnabledRef.value) && `${mergedClsPrefix}-popover--rtl`, themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass.value, props.overlap && `${mergedClsPrefix}-popover-shared--overlap`, props.showArrow && `${mergedClsPrefix}-popover-shared--show-arrow`, props.arrowPointToCenter && `${mergedClsPrefix}-popover-shared--center-arrow`],
             bodyRef,
             styleRef.value,
             handleMouseEnter,
@@ -96276,13 +96365,41 @@ ${reason}`);
       });
       return comments;
     });
+    const normalizeCommentForEditor = (node) => {
+      if (!node || typeof node !== "object") return node;
+      const cloneMarks = (marks) => Array.isArray(marks) ? marks.filter(Boolean).map((mark) => ({
+        ...mark,
+        attrs: mark?.attrs ? { ...mark.attrs } : void 0
+      })) : void 0;
+      const cloneAttrs = (attrs) => attrs && typeof attrs === "object" ? { ...attrs } : void 0;
+      if (!Array.isArray(node.content)) {
+        return {
+          type: node.type,
+          ...node.text !== void 0 ? { text: node.text } : {},
+          ...node.attrs ? { attrs: cloneAttrs(node.attrs) } : {},
+          ...node.marks ? { marks: cloneMarks(node.marks) } : {}
+        };
+      }
+      const normalizedChildren = node.content.map((child) => normalizeCommentForEditor(child)).flat().filter(Boolean);
+      if (node.type === "run") {
+        return normalizedChildren;
+      }
+      return {
+        type: node.type,
+        ...node.attrs ? { attrs: cloneAttrs(node.attrs) } : {},
+        ...node.marks ? { marks: cloneMarks(node.marks) } : {},
+        content: normalizedChildren
+      };
+    };
     const getHTmlFromComment = (commentTextJson) => {
       if (!commentTextJson.content?.length) return;
       try {
+        const normalizedContent = normalizeCommentForEditor(commentTextJson);
+        const schemaContent = Array.isArray(normalizedContent) ? normalizedContent[0] : normalizedContent;
         const editor = new Editor({
           mode: "text",
           isHeadless: true,
-          content: commentTextJson,
+          content: schemaContent,
           loadFromSchema: true,
           extensions: getRichTextExtensions()
         });
@@ -98348,7 +98465,7 @@ ${style2}
     if (typeof selector === "string") {
       return document.querySelector(selector);
     }
-    return selector();
+    return selector() || null;
   }
   const LazyTeleport = /* @__PURE__ */ defineComponent({
     name: "LazyTeleport",
@@ -98436,8 +98553,11 @@ ${style2}
   };
   const keepOffsetDirection = {
     top: true,
+    // top++
     bottom: false,
+    // top--
     left: true,
+    // left++
     right: false
     // left--
   };
@@ -99554,7 +99674,6 @@ ${style2}
         return !!element.href && element.rel !== "ignore";
       case "INPUT":
         return element.type !== "hidden" && element.type !== "file";
-      case "BUTTON":
       case "SELECT":
       case "TEXTAREA":
         return true;
@@ -99573,8 +99692,8 @@ ${style2}
         default: true
       },
       onEsc: Function,
-      initialFocusTo: String,
-      finalFocusTo: String,
+      initialFocusTo: [String, Function],
+      finalFocusTo: [String, Function],
       returnFocusOnDeactivated: {
         type: Boolean,
         default: true
@@ -102349,6 +102468,7 @@ ${style2}
     });
   }
   const scrollbarLight = {
+    name: "Scrollbar",
     common: derived,
     self: self$7
   };
@@ -103853,11 +103973,14 @@ ${style2}
       boxShadow: boxShadow2
     });
   }
-  const popoverLight = {
+  const popoverLight = createTheme({
     name: "Popover",
     common: derived,
+    peers: {
+      Scrollbar: scrollbarLight
+    },
     self: self$6
-  };
+  });
   const oppositePlacement = {
     top: "bottom",
     bottom: "top",
@@ -104077,9 +104200,11 @@ ${style2}
       const {
         namespaceRef,
         mergedClsPrefixRef,
-        inlineThemeDisabled
+        inlineThemeDisabled,
+        mergedRtlRef
       } = useConfig(props);
       const themeRef = useTheme("Popover", "-popover", style$5, popoverLight, props, mergedClsPrefixRef);
+      const rtlEnabledRef = useRtl("Popover", mergedRtlRef, mergedClsPrefixRef);
       const followerRef = ref$1(null);
       const NPopover2 = inject("NPopover");
       const bodyRef = ref$1(null);
@@ -104277,6 +104402,8 @@ ${style2}
               style: props.contentStyle
             }, slots);
             const maybeScrollableBody = props.scrollable ? h$1(XScrollbar, {
+              themeOverrides: themeRef.value.peerOverrides.Scrollbar,
+              theme: themeRef.value.peers.Scrollbar,
               contentClass: hasHeaderOrFooter ? void 0 : `${mergedClsPrefix}-popover__content ${(_b = props.contentClass) !== null && _b !== void 0 ? _b : ""}`,
               contentStyle: hasHeaderOrFooter ? void 0 : props.contentStyle
             }, {
@@ -104292,7 +104419,7 @@ ${style2}
             return [maybeScrollableBody, arrow2];
           };
           contentNode = h$1("div", mergeProps({
-            class: [`${mergedClsPrefix}-popover`, `${mergedClsPrefix}-popover-shared`, themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass.value, extraClass.map((v2) => `${mergedClsPrefix}-${v2}`), {
+            class: [`${mergedClsPrefix}-popover`, `${mergedClsPrefix}-popover-shared`, (rtlEnabledRef === null || rtlEnabledRef === void 0 ? void 0 : rtlEnabledRef.value) && `${mergedClsPrefix}-popover--rtl`, themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass.value, extraClass.map((v2) => `${mergedClsPrefix}-${v2}`), {
               [`${mergedClsPrefix}-popover--scrollable`]: props.scrollable,
               [`${mergedClsPrefix}-popover--show-header-or-footer`]: hasHeaderOrFooter,
               [`${mergedClsPrefix}-popover--raw`]: props.raw,
@@ -104316,7 +104443,7 @@ ${style2}
             // The popover class and overlap class must exists, they will be used
             // to place the body & transition animation.
             // Shadow class exists for reuse box-shadow.
-            [`${mergedClsPrefix}-popover-shared`, themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass.value, props.overlap && `${mergedClsPrefix}-popover-shared--overlap`, props.showArrow && `${mergedClsPrefix}-popover-shared--show-arrow`, props.arrowPointToCenter && `${mergedClsPrefix}-popover-shared--center-arrow`],
+            [`${mergedClsPrefix}-popover-shared`, (rtlEnabledRef === null || rtlEnabledRef === void 0 ? void 0 : rtlEnabledRef.value) && `${mergedClsPrefix}-popover--rtl`, themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass.value, props.overlap && `${mergedClsPrefix}-popover-shared--overlap`, props.showArrow && `${mergedClsPrefix}-popover-shared--show-arrow`, props.arrowPointToCenter && `${mergedClsPrefix}-popover-shared--center-arrow`],
             bodyRef,
             styleRef.value,
             handleMouseEnter,
@@ -106741,7 +106868,8 @@ ${style2}
       closeIconColorPressedLoading: closeIconColorPressed,
       loadingColor: primaryColor,
       lineHeight: lineHeight2,
-      borderRadius
+      borderRadius,
+      border: "0"
     });
   }
   const messageLight = {
@@ -106792,6 +106920,7 @@ ${style2}
  margin-bottom .3s var(--n-bezier);
  padding: var(--n-padding);
  border-radius: var(--n-border-radius);
+ border: var(--n-border);
  flex-wrap: nowrap;
  overflow: hidden;
  max-width: var(--n-max-width);
@@ -106910,6 +107039,7 @@ ${style2}
             fontSize: fontSize2,
             lineHeight: lineHeight2,
             borderRadius,
+            border,
             iconColorInfo,
             iconColorSuccess,
             iconColorWarning,
@@ -106953,7 +107083,8 @@ ${style2}
           "--n-close-icon-color-pressed": closeIconColorPressed,
           "--n-close-icon-color-hover": closeIconColorHover,
           "--n-line-height": lineHeight2,
-          "--n-border-radius": borderRadius
+          "--n-border-radius": borderRadius,
+          "--n-border": border
         };
       });
       const themeClassHandle = inlineThemeDisabled ? useThemeClass("message", computed(() => props.type[0]), cssVarsRef, {}) : void 0;
@@ -109914,7 +110045,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "0.21.0-RC2";
+      this.version = "0.20.2";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;