wordinweb 0.2.2 → 0.2.3

package/dist/{chunk-JGXXZTQE.js → chunk-OIN65MGS.js}

@@ -3930,7 +3930,7 @@ function parseParaChildren(parent, ctx, out, field, bookmarks) {
         const style = (r) => {
           r.props = {
             ...r.props,
-            color: isInsert ? "#C00000" : "#B0261C",
+            color: isInsert ? "#188038" : "#D93025",
             ...isInsert ? { underline: "single" } : { strike: true }
           };
         };
@@ -24176,6 +24176,26 @@ function insertSuggestedText(doc, t, offset, text, meta) {
   if (offset < t.text.length) afterChildren.push(textLike(t, t.name, t.text.slice(offset)));
   afterChildren.push(...following);
   if (afterChildren.length > 0) replacement.push(runLike(rEl, rPr, afterChildren));
+  if (localName(parent.name) === "ins") {
+    const grand = doc.findParentOf(parent);
+    if (!grand) return null;
+    const parentIdx = grand.children.indexOf(parent);
+    if (parentIdx === -1) return null;
+    const insIdx = replacement.indexOf(ins);
+    const before = [...parent.children.slice(0, idx), ...replacement.slice(0, insIdx)];
+    const after = [...replacement.slice(insIdx + 1), ...parent.children.slice(idx + 1)];
+    const outerParts = [];
+    if (before.length > 0) outerParts.push({ ...cloneXml(parent), children: before });
+    outerParts.push(ins);
+    if (after.length > 0) {
+      const afterOuter = { ...cloneXml(parent), children: after };
+      const idKey = Object.keys(afterOuter.attrs).find((key) => localName(key) === "id");
+      if (before.length > 0 && idKey) afterOuter.attrs[idKey] = String(meta.nextId());
+      outerParts.push(afterOuter);
+    }
+    grand.children.splice(parentIdx, 1, ...outerParts);
+    return { t: newT, offset: text.length };
+  }
   parent.children.splice(idx, 1, ...replacement);
   return { t: newT, offset: text.length };
 }
@@ -25409,7 +25429,7 @@ var _DocxEditor = class _DocxEditor {
         this.caret = caret;
         this.positionCaret();
         this.focusText();
-        const ref = revisionForText(this.host.doc, caret.t);
+        const ref = this.revisionAtCaret();
         if (ref) this.showSuggestionPopover(ref, e.clientX, e.clientY);
       } else {
         this.hideCaret();
@@ -28616,7 +28636,7 @@ var _DocxEditor = class _DocxEditor {
   showSuggestionPopover(ref, clientX, clientY) {
     this.dismissSuggestionPopover();
     const isIns = ref.kind === "insertion" || ref.kind === "markInsertion";
-    const ink = isIns ? "#C00000" : "#B0261C";
+    const ink = isIns ? "#188038" : "#D93025";
     const attrEndingWith = (suffix) => {
       const key = Object.keys(ref.el.attrs).find((k) => k.toLowerCase().endsWith(suffix));
       return key ? ref.el.attrs[key] : void 0;
@@ -28671,17 +28691,9 @@ var _DocxEditor = class _DocxEditor {
       });
       btnRow.appendChild(b);
     };
-    if (this.reviewBlockedByCollab()) {
-      const note = document.createElement("div");
-      note.dataset.dxwReviewBlocked = "1";
-      note.style.cssText = "font-size:11.5px;color:#5f6368;line-height:1.35;";
-      note.textContent = "Accept and reject are not available in a shared session yet.";
-      box.appendChild(note);
-    } else {
-      box.appendChild(btnRow);
-      mkBtn("\u2713 Accept", "Accept this suggestion", true, () => this.acceptRevisionRef(ref));
-      mkBtn("\u2717 Reject", "Reject this suggestion", false, () => this.rejectRevisionRef(ref));
-    }
+    box.appendChild(btnRow);
+    mkBtn("\u2713 Accept", "Accept this suggestion", true, () => this.acceptRevisionRef(ref));
+    mkBtn("\u2717 Reject", "Reject this suggestion", false, () => this.rejectRevisionRef(ref));
     document.body.appendChild(box);
     this.suggestionPopover = box;
   }
@@ -29625,27 +29637,16 @@ var _DocxEditor = class _DocxEditor {
     }
     return null;
   }
-  /** True in a live session, where accept/reject would fork the room.
-   *
-   * Collab gate (narrow): the four accept/reject entry points below mutate
-   * host.doc DIRECTLY (no emission), so in a live session they would resolve
-   * the suggestion locally with no peer ever seeing it — refused per the
-   * standing audit rule (no mutation branch without an emission). The
-   * acceptRevision/rejectRevision/acceptAllRevisions INTENTS exist and apply
-   * fine (collab/src/apply.ts), but they address a revision by its index in
-   * collectRevisions order, which the editor has no path to produce here.
-   * Wiring that is known follow-on work. Local mode is unaffected. */
-  reviewBlockedByCollab() {
-    return !!this.host.onIntent;
-  }
   /** Accept (keep insertion / drop deletion) the given revision, or the one at
    * the caret. Re-renders and returns whether anything changed. */
   acceptRevisionRef(ref) {
-    if (this.reviewBlockedByCollab()) return false;
     const target = ref ?? this.revisionAtCaret();
     if (!target) return false;
+    const index = this.host.onIntent ? collectRevisions(this.host.doc).findIndex((item) => item.el === target.el && item.kind === target.kind) : -1;
+    if (this.host.onIntent && index < 0) return false;
     this.host.history?.checkpoint();
     if (!acceptRevision(this.host.doc, target)) return false;
+    if (this.host.onIntent) this.host.onIntent({ kind: "acceptRevision", index });
     this.dismissSuggestionPopover();
     this.host.rerender();
     this.positionCaret();
@@ -29655,11 +29656,13 @@ var _DocxEditor = class _DocxEditor {
   /** Reject (drop insertion / restore deletion) the given revision, or the one
    * at the caret. */
   rejectRevisionRef(ref) {
-    if (this.reviewBlockedByCollab()) return false;
     const target = ref ?? this.revisionAtCaret();
     if (!target) return false;
+    const index = this.host.onIntent ? collectRevisions(this.host.doc).findIndex((item) => item.el === target.el && item.kind === target.kind) : -1;
+    if (this.host.onIntent && index < 0) return false;
     this.host.history?.checkpoint();
     if (!rejectRevision(this.host.doc, target)) return false;
+    if (this.host.onIntent) this.host.onIntent({ kind: "rejectRevision", index });
     this.dismissSuggestionPopover();
     this.host.rerender();
     this.positionCaret();
@@ -29672,10 +29675,10 @@ var _DocxEditor = class _DocxEditor {
   }
   /** Accept every tracked change (one undo step). Returns how many applied. */
   acceptAllRevisions() {
-    if (this.reviewBlockedByCollab()) return 0;
     this.host.history?.checkpoint();
     const n = acceptAllRevisions(this.host.doc);
     if (n === 0) return 0;
+    this.host.onIntent?.({ kind: "acceptAllRevisions" });
     this.dismissSuggestionPopover();
     this.host.rerender();
     this.positionCaret();
@@ -29684,10 +29687,10 @@ var _DocxEditor = class _DocxEditor {
   }
   /** Reject every tracked change (one undo step). Returns how many applied. */
   rejectAllRevisions() {
-    if (this.reviewBlockedByCollab()) return 0;
     this.host.history?.checkpoint();
     const n = rejectAllRevisions(this.host.doc);
     if (n === 0) return 0;
+    this.host.onIntent?.({ kind: "rejectAllRevisions" });
     this.dismissSuggestionPopover();
     this.host.rerender();
     this.positionCaret();
@@ -30172,14 +30175,21 @@ var _DocxEditor = class _DocxEditor {
       return;
     }
     const splitPos = this.host.onIntent ? this.encodeCaretForIntent() : null;
-    const split = this.splitParagraphCore();
+    const splitMeta = this.suggesting && this.host.onIntent ? this.frozenRevMeta() : void 0;
+    const split = this.splitParagraphCore(splitMeta);
     if (split && splitPos && this.host.doc.stableIds && this.host.onIntent) {
       const ids = this.host.doc.stableIds;
       const alloc = this.host.allocIds?.(2) ?? [];
       const newBlockId = ids.assign(split.after, alloc[0]);
       const newRunEl = split.after.children.find((c) => localName(c.name) === "r");
       const newRunId = newRunEl ? ids.assign(newRunEl, alloc[1]) : newBlockId;
-      this.host.onIntent({ kind: "splitParagraph", at: splitPos, newBlockId, newRunId });
+      this.host.onIntent({
+        kind: "splitParagraph",
+        at: splitPos,
+        newBlockId,
+        newRunId,
+        suggest: splitMeta ? { author: splitMeta.author, date: splitMeta.date } : void 0
+      });
     }
     const reparsed = split ? this.host.doc.reparseDirectBodyParagraphSplit(split.before, split.after) : null;
     if (reparsed && split && this.caret) {
@@ -30244,9 +30254,10 @@ var _DocxEditor = class _DocxEditor {
   }
   /** Split the paragraph at the caret without history or commit — shared by
    * Enter and multi-line paste. */
-  splitParagraphCore() {
+  splitParagraphCore(meta) {
     if (!this.caret) return null;
-    const result = applySplitParagraph(this.host.doc, this.caret, this.mutationCtx());
+    const ctx = meta ? { suggesting: true, revMeta: () => meta } : this.mutationCtx();
+    const result = applySplitParagraph(this.host.doc, this.caret, ctx);
     if (!result) return null;
     this.caret = result.caret;
     return { before: result.before, after: result.after };
@@ -35975,7 +35986,7 @@ function DocxToolbar({
       result === "too-large" ? (() => {
         const max = api?.imageMaxBytes() ?? null;
         return max === null ? "That image is too large for this document." : `Images must be under ${formatBytes(max)}.`;
-      })() : result === "unsupported-format" ? "Images in a shared document must be PNG, JPEG, GIF, BMP or WebP." : result === "no-relay" ? "This shared document has no image relay, so images can\u2019t be added to it." : result === "upload-failed" ? "Upload failed \u2014 the image may be too large, or the connection dropped. Try a smaller image." : result === "no-caret" ? "Click in the document before inserting an image." : "That file could not be read as an image."
+      })() : result === "unsupported-format" ? "Images in a shared document must be PNG, JPEG, GIF, BMP or WebP." : result === "no-relay" ? "This shared document has no image relay, so images can\u2019t be added to it." : result === "upload-failed" ? "Upload failed. The image may be too large, or the connection dropped. Try a smaller image." : result === "no-caret" ? "Click in the document before inserting an image." : "That file could not be read as an image."
     );
   };
   const rootRef = useRef2(null);
@@ -36851,6 +36862,8 @@ function DocxView({
   const redrawPresenceRef = useRef3(null);
   const presenceRef = useRef3(void 0);
   presenceRef.current = collab?.presence;
+  const collabRef = useRef3(collab);
+  collabRef.current = collab;
   useEffect3(() => {
     redrawPresenceRef.current?.();
   }, [collab?.presence]);
@@ -37017,14 +37030,15 @@ function DocxView({
     };
     const emitBlockIntents = (targets, make) => {
       const d = docCacheRef.current?.doc;
-      if (!collab || !d?.stableIds) return;
+      const current = collabRef.current;
+      if (!current || !d?.stableIds) return;
       const seen = /* @__PURE__ */ new Set();
       for (const t of targets) {
         const p = paragraphOf(d, t);
         const blockId = p ? d.stableIds.idOf(p) : void 0;
         if (blockId !== void 0 && !seen.has(blockId)) {
           seen.add(blockId);
-          collab.submit(make(blockId));
+          current.submit(make(blockId));
         }
       }
     };
@@ -37034,7 +37048,7 @@ function DocxView({
       const presence = presenceRef.current;
       if (!handle2 || !d || !presence) return;
       drawPresenceSelections(handle2.root, computePresenceSelections(handle2, d, presence));
-      drawPresenceCarets(handle2.root, computePresenceCarets(handle2, d, presence), collab?.participantNames);
+      drawPresenceCarets(handle2.root, computePresenceCarets(handle2, d, presence), collabRef.current?.participantNames);
     };
     redrawPresenceRef.current = drawCollabPresence;
     const rerender = (doc, dirtyBlock, scope = "local", dirtySource) => {
@@ -37170,7 +37184,8 @@ function DocxView({
         };
         const flushPresence = () => {
           presenceQueued = false;
-          if (!collab?.setPresence) return;
+          const current = collabRef.current;
+          if (!current?.setPresence) return;
           const ranges = selectionRanges();
           const last = ranges?.[ranges.length - 1];
           const anchor = presenceCaret ?? (last ? { blockId: last.blockId, runId: last.runId, offset: last.end } : null);
@@ -37178,7 +37193,7 @@ function DocxView({
           const key = pos ? JSON.stringify(pos) : "null";
           if (key === presenceKey) return;
           presenceKey = key;
-          collab.setPresence(pos);
+          current.setPresence(pos);
         };
         const queuePresence = () => {
           if (presenceQueued) return;
@@ -37217,11 +37232,11 @@ function DocxView({
           onStyleShortcut: (styleId) => applyStyleShortcut?.(styleId),
           // Collaboration: forward each local edit as an intent. The editor
           // emits only when doc.stableIds is populated, so enable it here.
-          onIntent: collab ? (intent) => collab.submit(intent) : void 0,
+          onIntent: collab ? (intent) => collabRef.current?.submit(intent) : void 0,
           // Cmd+Z in a room reverses the last SEQUENCED action over the wire;
           // without this hook the editor declines rather than replaying local
           // history (which would fork the room silently).
-          onCollabUndo: collab?.undoLast,
+          onCollabUndo: collab?.undoLast ? () => collabRef.current?.undoLast?.() : void 0,
           // Presence: broadcast the local caret so remote participants can
           // draw this user's cursor (the anchor mirrors the intent addressing).
           // The caret is recorded here and sent by flushPresence together with
@@ -37232,7 +37247,7 @@ function DocxView({
           } : void 0,
           // Disjoint carried-id blocks for the editor's node-creating intents
           // (paragraph split); see EditorHost.allocIds.
-          allocIds: collab?.allocIds,
+          allocIds: collab?.allocIds ? (n) => collabRef.current?.allocIds?.(n) ?? [] : void 0,
           onTextCommand: (command) => {
             const current = apiRef.current;
             if (!current) return;
@@ -37337,27 +37352,30 @@ function DocxView({
         };
         const collabAnchor = (t, offset) => doc.stableIds ? doc.stableIds.encodeCaret(t, offset, (el16) => doc.findParentOf(el16) ?? null) : null;
         const collabOp = (make, at) => {
-          if (!collab?.submitOp || !doc.stableIds) return false;
+          const current = collabRef.current;
+          if (!current?.submitOp || !doc.stableIds) return false;
           const target = at !== void 0 ? at : insertionTarget();
           if (!target) return true;
           const anchor = collabAnchor(target.t, target.offset);
           if (!anchor) return true;
-          const intent = make(anchor, (n) => collab.allocIds?.(n) ?? []);
+          const intent = make(anchor, (n) => current.allocIds?.(n) ?? []);
           if (!intent) return true;
           history.checkpoint();
-          collab.submitOp(intent);
+          current.submitOp(intent);
           return true;
         };
         const collabDocOp = (make) => {
-          if (!collab?.submitOp || !doc.stableIds) return false;
-          const intent = make((n) => collab.allocIds?.(n) ?? []);
+          const current = collabRef.current;
+          if (!current?.submitOp || !doc.stableIds) return false;
+          const intent = make((n) => current.allocIds?.(n) ?? []);
           if (!intent) return true;
           history.checkpoint();
-          collab.submitOp(intent);
+          current.submitOp(intent);
           return true;
         };
         const collabBlockOp = (targets, make) => {
-          if (!collab?.submitOp || !doc.stableIds) return false;
+          const current = collabRef.current;
+          if (!current?.submitOp || !doc.stableIds) return false;
           const submitted = /* @__PURE__ */ new Set();
           let any = false;
           for (const t of targets) {
@@ -37368,18 +37386,19 @@ function DocxView({
             if (!intent) continue;
             if (!any) history.checkpoint();
             any = true;
-            collab.submitOp(intent);
+            current.submitOp(intent);
           }
           return true;
         };
-        const captureFormatIds = (segs) => collab && doc.stableIds ? segs.map((seg) => ({
+        const captureFormatIds = (segs) => collabRef.current && doc.stableIds ? segs.map((seg) => ({
           runId: seg.run.src ? doc.stableIds.idOf(seg.run.src) : void 0,
           blockId: seg.run.srcParent ? doc.stableIds.idOf(seg.run.srcParent) : void 0,
           runLen: seg.run.src ? runWireLength(seg.run.src) : 0,
           cumStart: seg.run.src && seg.t ? wireOffsetOf(seg.run.src, seg.t, seg.start) ?? seg.start : seg.start
         })) : [];
         const emitFormatIntents = (segs, preIds, formatted, patch) => {
-          if (!collab || !doc.stableIds) return;
+          const current = collabRef.current;
+          if (!current || !doc.stableIds) return;
           const spanByRun = /* @__PURE__ */ new Map();
           segs.forEach((seg, i) => {
             const pre = preIds[i];
@@ -37402,18 +37421,18 @@ function DocxView({
             const cumEnd = cumStart + (seg.end - seg.start);
             const whole = !seg.t || span.lo <= 0 && span.hi >= runLen || (segCountByRun.get(runId) ?? 1) > 1;
             if (whole) {
-              collab.submit({ kind: "formatRun", blockId, runId, patch });
+              current.submit({ kind: "formatRun", blockId, runId, patch });
               return;
             }
             const before = cumStart > 0;
             const after = cumEnd < runLen;
-            const alloc = collab.allocIds?.((before ? 1 : 0) + 1 + (after ? 1 : 0)) ?? [];
+            const alloc = current.allocIds?.((before ? 1 : 0) + 1 + (after ? 1 : 0)) ?? [];
             let k = 0;
             const beforeId = before ? alloc[k++] : void 0;
             const middleId = alloc[k++];
             const afterId = after ? alloc[k++] : void 0;
             if (middleId === void 0) return;
-            collab.submit({ kind: "formatRange", blockId, runId, start: cumStart, end: cumEnd, patch, beforeId, middleId, afterId });
+            current.submit({ kind: "formatRange", blockId, runId, start: cumStart, end: cumEnd, patch, beforeId, middleId, afterId });
             const middleT = formatted[i]?.t;
             const middleRun = middleT ? doc.findParentOf(middleT) : null;
             const parent = middleRun ? doc.findParentOf(middleRun) : null;
@@ -37567,7 +37586,7 @@ function DocxView({
             return true;
           },
           updateSelectedChart: (data) => {
-            if (collab?.submitOp) return false;
+            if (collabRef.current?.submitOp) return false;
             const source2 = editor?.getSelectedDrawingSource();
             if (!source2) return false;
             history.checkpoint();
@@ -37587,7 +37606,7 @@ function DocxView({
             return true;
           },
           updateSelectedSmartArt: (data) => {
-            if (collab?.submitOp) return false;
+            if (collabRef.current?.submitOp) return false;
             const source2 = editor?.getSelectedDrawingSource();
             if (!source2) return false;
             history.checkpoint();
@@ -37598,7 +37617,7 @@ function DocxView({
           },
           getSelectedSmartArt: () => editor?.getSelectedSmartArtData() ?? null,
           insertModel3D: async (file, poster) => {
-            if (collab?.submitOp) return false;
+            if (collabRef.current?.submitOp) return false;
             const target = insertionTarget();
             if (!target) return false;
             const preview = poster ?? await objectPoster("3D model", "Double-click in Word to explore", "\u25C7");
@@ -37610,7 +37629,7 @@ function DocxView({
             return true;
           },
           insertOnlineVideo: async (url) => {
-            if (collab?.submitOp) return false;
+            if (collabRef.current?.submitOp) return false;
             const target = insertionTarget();
             if (!target) return false;
             const preview = await objectPoster("Online video", url, "\u25B6");
@@ -37621,7 +37640,7 @@ function DocxView({
             return true;
           },
           insertEmbeddedObject: async (file, filename) => {
-            if (collab?.submitOp) return false;
+            if (collabRef.current?.submitOp) return false;
             const target = insertionTarget();
             if (!target) return false;
             const name = filename ?? (file instanceof File ? file.name : "embedded-file.bin");
@@ -37642,7 +37661,7 @@ function DocxView({
           getSelectedSmartArtTextFormat: () => editor?.getSelectedSmartArtTextFormat() ?? null,
           setSelectedSmartArtTextFormat: (patch) => editor?.setSelectedSmartArtTextFormat(patch) ?? false,
           addComment: (text) => {
-            if (collab?.submitOp) return false;
+            if (collabRef.current?.submitOp) return false;
             const segs = editor?.getSelectionSegments() ?? [];
             const segments = segs.length > 0 ? segs : handle ? selectionToSegments(handle.bindings) : [];
             if (segments.length === 0) return false;
@@ -37684,12 +37703,12 @@ function DocxView({
             const caret = editor?.getCaretTarget();
             return caret ? cellShadingAt(doc, caret.t) : void 0;
           },
-          imageAccept: () => collab?.submitOp && doc.stableIds ? COLLAB_IMAGE_ACCEPT : LOCAL_IMAGE_ACCEPT,
-          imageMaxBytes: () => collab?.submitOp && doc.stableIds ? collab.mediaMaxBlobBytes ?? null : null,
+          imageAccept: () => collabRef.current?.submitOp && doc.stableIds ? COLLAB_IMAGE_ACCEPT : LOCAL_IMAGE_ACCEPT,
+          imageMaxBytes: () => collabRef.current?.submitOp && doc.stableIds ? collabRef.current.mediaMaxBlobBytes ?? null : null,
           insertImage: async (file) => {
             const caret = insertionTarget() ?? documentStart();
             if (!caret) return "no-caret";
-            const maxBytes = collab?.submitOp && doc.stableIds ? collab.mediaMaxBlobBytes ?? null : null;
+            const maxBytes = collabRef.current?.submitOp && doc.stableIds ? collabRef.current.mediaMaxBlobBytes ?? null : null;
             if (typeof maxBytes === "number" && file.size > maxBytes) return "too-large";
             const bytes2 = new Uint8Array(await file.arrayBuffer());
             const isSvg = file.type === "image/svg+xml";
@@ -37702,11 +37721,12 @@ function DocxView({
             const maxW = sp ? sp.pageWidth - sp.marginLeft - sp.marginRight : 624;
             const scale = Math.min(1, maxW / naturalWidth);
             const ext = file.type === "image/svg+xml" ? "svg" : (file.type.split("/")[1] ?? "png").replace("jpeg", "jpg");
-            if (collab?.submitOp && doc.stableIds) {
+            const current = collabRef.current;
+            if (current?.submitOp && doc.stableIds) {
               bmp?.close();
-              if (!collab.uploadMedia) return "no-relay";
+              if (!current.uploadMedia) return "no-relay";
               if (!COLLAB_IMAGE_EXTS.includes(ext)) return "unsupported-format";
-              const media = await collab.uploadMedia(bytes2);
+              const media = await current.uploadMedia(bytes2);
               if (!media) return "upload-failed";
               const w = naturalWidth * scale;
               const h2 = naturalHeight * scale;
@@ -38287,6 +38307,7 @@ export {
   acceptRevision,
   rejectRevision,
   acceptAllRevisions,
+  rejectAllRevisions,
   applyInsertText,
   applyDeleteRange,
   applySplitParagraph,
@@ -38321,4 +38342,4 @@ export {
 cfb/cfb.js:
   (*! crc32.js (C) 2014-present SheetJS -- http://sheetjs.com *)
 */
-//# sourceMappingURL=chunk-JGXXZTQE.js.map
+//# sourceMappingURL=chunk-OIN65MGS.js.map