wordinweb 0.3.6 → 0.3.7

package/dist/{chunk-WPQ6GPG4.js → chunk-ULPL55MT.js}

@@ -4461,6 +4461,11 @@ function parseParagraph(p, ctx) {
     }
   }
   ensureCaretAnchor(p, para);
+  if (ctx.revisionView === "markup" && pPr) {
+    const markRPr = child(pPr, "rPr");
+    if (markRPr && child(markRPr, "del")) para.markRevision = "del";
+    else if (markRPr && child(markRPr, "ins")) para.markRevision = "ins";
+  }
   return para;
 }
 function hasVisibleContent(c) {
@@ -13851,6 +13856,20 @@ function buildAtoms(doc, para, measurer, fields, fallbackFamily, gridPitch) {
     if (childEl.type === "run") pushRun(childEl);
     else for (const r of childEl.runs) pushRun(r, childEl.href ?? (childEl.anchor ? "#" + childEl.anchor : void 0));
   }
+  if (para.markRevision) {
+    const last = para.children.at(-1);
+    const lastRun = last?.type === "hyperlink" ? last.runs.at(-1) : last;
+    const deleted = para.markRevision === "del";
+    pushRun({
+      type: "run",
+      props: {
+        ...lastRun?.props ?? {},
+        color: deleted ? "#D93025" : "#188038",
+        ...deleted ? { strike: true } : { underline: "single" }
+      },
+      content: [{ kind: "text", text: "\xB6" }]
+    });
+  }
   if (gridPitch) {
     for (let i = 0; i + 1 < atoms.length; i++) {
       const punct = atoms[i];
@@ -25102,8 +25121,32 @@ function mergeParagraphBackward(doc, pEl) {
   const moved = pEl.children.filter((c) => localName(c.name) !== "pPr" && !isPlaceholderRun(c));
   prev.children.push(...moved);
   parent.children.splice(idx, 1);
+  carryMarkRevision(prev, pEl);
   return finishMerge(prev);
 }
+function carryMarkRevision(survivor, gone) {
+  const markOf = (p) => p.children.find((c) => localName(c.name) === "pPr")?.children.find((c) => localName(c.name) === "rPr");
+  const isRev = (c) => localName(c.name) === "ins" || localName(c.name) === "del";
+  const theirs = markOf(gone)?.children.filter(isRev) ?? [];
+  let pPr = survivor.children.find((c) => localName(c.name) === "pPr");
+  let rPr = markOf(survivor);
+  if (!rPr && theirs.length === 0) return;
+  if (!rPr) {
+    const w = survivor.name.includes(":") ? survivor.name.slice(0, survivor.name.indexOf(":") + 1) : "";
+    if (!pPr) {
+      pPr = { name: `${w}pPr`, attrs: {}, children: [], text: "" };
+      survivor.children.unshift(pPr);
+    }
+    rPr = { name: `${w}rPr`, attrs: {}, children: [], text: "" };
+    const at = pPr.children.findIndex((c) => localName(c.name) === "sectPr" || localName(c.name) === "pPrChange");
+    pPr.children.splice(at === -1 ? pPr.children.length : at, 0, rPr);
+  }
+  rPr.children = [...theirs, ...rPr.children.filter((c) => !isRev(c))];
+  if (rPr.children.length === 0 && pPr) {
+    pPr.children.splice(pPr.children.indexOf(rPr), 1);
+    if (pPr.children.length === 0) survivor.children.splice(survivor.children.indexOf(pPr), 1);
+  }
+}
 function firstTextOf(pEl) {
   const walk2 = (el26) => {
     for (const c of el26.children) {
@@ -42034,17 +42077,7 @@ var _DocxEditor = class _DocxEditor {
         if (pEl && firstTextOf(pEl) === caret.t) {
           this.host.history?.checkpoint();
           if (this.clearListAtCaret()) return;
-          const prev = siblingParagraph(this.host.doc, pEl, -1);
-          if (!prev) return;
-          const junction = lastTextOf(prev);
-          const mergeBlockId = this.host.onIntent && this.host.doc.stableIds ? this.host.doc.stableIds.idOf(pEl) : void 0;
-          if (mergeParagraphBackward(this.host.doc, pEl)) {
-            if (mergeBlockId !== void 0) this.host.onIntent?.({ kind: "mergeParagraph", blockId: mergeBlockId });
-            const target = junction && paragraphOf(this.host.doc, junction) ? junction : caret.t;
-            this.caret = { t: target, run: caret.run, offset: target === junction ? target.text.length : 0 };
-            invalidateParagraphSignature(paragraphOf(this.host.doc, target) ?? pEl);
-            this.commit(false, "local", true);
-          }
+          this.mergeIntoPrevious(pEl);
           return;
         }
         if (!this.stepToNeighbor(-1)) return;
@@ -42060,19 +42093,8 @@ var _DocxEditor = class _DocxEditor {
       if (caret.offset >= caret.t.text.length) {
         const pEl = paragraphOf(this.host.doc, caret.t);
         if (pEl && lastTextOf(pEl) === caret.t) {
-          const next = siblingParagraph(this.host.doc, pEl, 1);
-          if (!next) return;
           this.host.history?.checkpoint();
-          const mergeNextId = this.host.onIntent && this.host.doc.stableIds ? this.host.doc.stableIds.idOf(next) : void 0;
-          if (mergeParagraphBackward(this.host.doc, next)) {
-            if (mergeNextId !== void 0) this.host.onIntent?.({ kind: "mergeParagraph", blockId: mergeNextId });
-            if (!paragraphOf(this.host.doc, caret.t)) {
-              const t = firstTextOf(next);
-              if (t) this.caret = { t, run: caret.run, offset: 0 };
-            }
-            invalidateParagraphSignature(paragraphOf(this.host.doc, this.caret?.t ?? caret.t) ?? pEl);
-            this.commit(false, "local", true);
-          }
+          this.mergeNextInto(pEl);
           return;
         }
         if (!this.stepToNeighbor(1)) return;
@@ -42090,6 +42112,44 @@ var _DocxEditor = class _DocxEditor {
   emitDelete(blockId, runId, start, end) {
     if (end > start) this.host.onIntent?.({ kind: "deleteText", blockId, runId, start, end });
   }
+  /** Backspace at the start of `pEl`: merge it into the previous paragraph. */
+  mergeIntoPrevious(pEl) {
+    const caret = this.caret;
+    if (!caret) return;
+    const prev = siblingParagraph(this.host.doc, pEl, -1);
+    if (!prev) return;
+    const junction = lastTextOf(prev);
+    const mergeBlockId = this.host.onIntent && this.host.doc.stableIds ? this.host.doc.stableIds.idOf(pEl) : void 0;
+    if (mergeParagraphBackward(this.host.doc, pEl)) {
+      if (mergeBlockId !== void 0) this.host.onIntent?.({ kind: "mergeParagraph", blockId: mergeBlockId });
+      const target = junction && paragraphOf(this.host.doc, junction) ? junction : caret.t;
+      this.caret = { t: target, run: caret.run, offset: target === junction ? target.text.length : 0 };
+      invalidateParagraphSignature(paragraphOf(this.host.doc, target) ?? pEl);
+      this.commit(false, "local", true);
+    }
+  }
+  /** Delete at the end of `pEl`: merge the next paragraph into it. */
+  mergeNextInto(pEl) {
+    const caret = this.caret;
+    if (!caret) return;
+    const next = siblingParagraph(this.host.doc, pEl, 1);
+    if (!next) return;
+    const mergeNextId = this.host.onIntent && this.host.doc.stableIds ? this.host.doc.stableIds.idOf(next) : void 0;
+    if (mergeParagraphBackward(this.host.doc, next)) {
+      if (mergeNextId !== void 0) this.host.onIntent?.({ kind: "mergeParagraph", blockId: mergeNextId });
+      if (!paragraphOf(this.host.doc, caret.t)) {
+        const t = firstTextOf(next);
+        if (t) this.caret = { t, run: caret.run, offset: 0 };
+      }
+      invalidateParagraphSignature(paragraphOf(this.host.doc, this.caret?.t ?? caret.t) ?? pEl);
+      this.commit(false, "local", true);
+    }
+  }
+  /** True when `pEl`'s paragraph mark is a break this author suggested. */
+  ownSuggestedBreak(pEl) {
+    const mark = paragraphGlyphRevision(pEl, "ins");
+    return !!mark && attr(mark, "author") === this.revisionAuthor;
+  }
   /** Backspace/Delete in suggesting mode: mark one character (or a paragraph
    * mark at a boundary) as a tracked deletion instead of removing it. Skips over
    * text already struck by this author so a repeated press keeps eating real
@@ -42110,6 +42170,10 @@ var _DocxEditor = class _DocxEditor {
           if (this.suggestUnbulletAtCaret()) return;
           const prev = siblingParagraph(doc, pEl, -1);
           if (!prev) return;
+          if (this.ownSuggestedBreak(prev)) {
+            this.mergeIntoPrevious(pEl);
+            return;
+          }
           if (paragraphGlyphRevision(prev, "del")) {
             this.stepToNeighbor(-1);
             this.positionCaret();
@@ -42139,6 +42203,10 @@ var _DocxEditor = class _DocxEditor {
     if (caret.offset >= caret.t.text.length) {
       const pEl = paragraphOf(doc, caret.t);
       if (pEl && lastTextOf(pEl) === caret.t) {
+        if (this.ownSuggestedBreak(pEl)) {
+          this.mergeNextInto(pEl);
+          return;
+        }
         if (paragraphGlyphRevision(pEl, "del")) {
           this.stepToNeighbor(1);
           this.positionCaret();
@@ -56575,4 +56643,4 @@ export {
 cfb/cfb.js:
   (*! crc32.js (C) 2014-present SheetJS -- http://sheetjs.com *)
 */
-//# sourceMappingURL=chunk-WPQ6GPG4.js.map
+//# sourceMappingURL=chunk-ULPL55MT.js.map