@ai-matrx/office 0.8.43 → 0.8.45

package/dist/docs.js

@@ -322,9 +322,12 @@ var DocumentModel = class {
     const cs = view.port.commandService;
     if (typeof cs.beforeCommandExecuted !== "function" || typeof cs.onCommandExecuted !== "function") return () => {
     };
-    const before = cs.beforeCommandExecuted((info) => {
+    const before = cs.beforeCommandExecuted((info, options) => {
       if (info.type === COMMAND_TYPE) view.commands.push(info.id);
-      else if (info.id === RICH_TEXT_EDITING_ID && this.otListeners.size && !this.relaying) {
+      else if (info.id === RICH_TEXT_EDITING_ID && !this.relaying && !options?.fromCollab && !options?.onlyLocal) {
+        keepInsideTheBody(info.params, () => view.port.snapshot());
+      }
+      if (info.id === RICH_TEXT_EDITING_ID && this.otListeners.size && !this.relaying) {
         try {
           const snap = view.port.snapshot();
           view.pre = snap ? structuredClone(snap) : null;
@@ -511,7 +514,7 @@ var DocumentModel = class {
     this.stored = snapshot;
     this.relaying = true;
     try {
-      for (const view of this.views.values()) view.port.remount(snapshot);
+      for (const view of this.views.values()) remountKeepingCaret(view.port, snapshot);
       this.parked?.remount(snapshot);
     } finally {
       this.relaying = false;
@@ -615,7 +618,7 @@ var DocumentModel = class {
       this.savedFingerprint = contentFingerprint(s2);
       this.relaying = true;
       try {
-        for (const view of this.views.values()) view.port.remount(s2);
+        for (const view of this.views.values()) remountKeepingCaret(view.port, s2);
         this.parked?.remount(s2);
       } finally {
         this.relaying = false;
@@ -729,6 +732,62 @@ var DocumentModel = class {
     this.pageClose = null;
   }
 };
+var lastTextOffset = (dataStream) => Math.max(0, dataStream.length - 2);
+function mapOffsetThroughReplace(before, after, offset) {
+  const max = Math.min(before.length, after.length);
+  let pre = 0;
+  while (pre < max && before[pre] === after[pre]) pre++;
+  let suf = 0;
+  while (suf < max - pre && before[before.length - 1 - suf] === after[after.length - 1 - suf]) suf++;
+  const at = offset <= pre ? offset : offset >= before.length - suf ? after.length - (before.length - offset) : after.length - suf;
+  return Math.max(0, Math.min(at, lastTextOffset(after)));
+}
+function remountKeepingCaret(port, snapshot) {
+  let sel = null;
+  let before = null;
+  try {
+    sel = port.selection?.get() ?? null;
+    before = port.snapshot()?.body?.dataStream ?? null;
+  } catch {
+    sel = null;
+  }
+  port.remount(snapshot);
+  const after = snapshot.body?.dataStream;
+  if (!sel?.length || before == null || typeof after !== "string" || sel.some((r) => r.segmentId)) return;
+  try {
+    port.selection?.set(
+      sel.map((r) => ({ startOffset: mapOffsetThroughReplace(before, after, r.startOffset), endOffset: mapOffsetThroughReplace(before, after, r.endOffset) }))
+    );
+  } catch (error) {
+    console.warn("[document-model] could not carry this view's caret into the replaced document", error);
+  }
+}
+function keepInsideTheBody(params, current) {
+  const p = params;
+  if (!p || p.segmentId || !Array.isArray(p.actions) || p.actions[0] !== "body") return;
+  const sub = p.actions[1];
+  if (!sub || sub.et !== "text-x" || !Array.isArray(sub.e)) return;
+  let doc = null;
+  try {
+    doc = current();
+  } catch {
+    return;
+  }
+  const ds = doc?.body?.dataStream;
+  if (typeof ds !== "string" || !ds.endsWith("\r\n")) return;
+  const last = lastTextOffset(ds);
+  let pos = 0;
+  let past = false;
+  for (const a of sub.e) {
+    if (a.t === "i" && pos > last) past = true;
+    if (a.t !== "i") pos += a.len;
+  }
+  if (!past) return;
+  const inserts = sub.e.filter((a) => a.t === "i");
+  const plain = sub.e.every((a) => a.t === "i" || a.t === "r" && a.body == null);
+  console.warn("[document-model] an edit aimed past the end of the document was kept inside it", { at: pos, length: ds.length });
+  p.actions = inserts.length === 1 && plain ? ["body", { ...sub, e: [...last ? [{ t: "r", len: last }] : [], inserts[0]] }] : [];
+}
 function moveRangesThroughBodyEdit(ranges, actions) {
   const a = actions;
   if (!Array.isArray(a) || a[0] !== "body") return null;
@@ -1107,9 +1166,11 @@ export {
   getDocument,
   getLatestDocumentSnapshot,
   isDocsAnchorOnlyOp,
+  keepInsideTheBody,
   listAccessibleDocuments,
   listDocumentSnapshots,
   listTrashedDocuments,
+  mapOffsetThroughReplace,
   moveDocument,
   movePeerRangesThroughBodyEdit,
   moveRangesThroughBodyEdit,