@harbour-enterprises/superdoc 0.25.0 → 0.26.0-next.1

package/dist/super-editor/chunks/{editor-CoX24lXQ.js → editor-CeTu_f0L.js}

@@ -9,12 +9,12 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
-var _Attribute_static, getGlobalAttributes_fn, getNodeAndMarksAttributes_fn, _Schema_static, createNodesSchema_fn, createMarksSchema_fn, _events, _ExtensionService_instances, setupExtensions_fn, attachEditorEvents_fn, _editor, _stateValidators, _xmlValidators, _requiredNodeTypes, _requiredMarkTypes, _SuperValidator_instances, initializeValidators_fn, collectValidatorRequirements_fn, analyzeDocument_fn, _commandService, _Editor_instances, initContainerElement_fn, init_fn, initRichText_fn, onFocus_fn, checkHeadless_fn, registerCopyHandler_fn, insertNewFileData_fn, registerPluginByNameIfNotExists_fn, createExtensionService_fn, createCommandService_fn, createConverter_fn, initMedia_fn, initFonts_fn, checkFonts_fn, determineUnsupportedFontsWithLocalFonts_fn, determineUnsupportedFontsWithCanvas_fn, createSchema_fn, generatePmData_fn, createView_fn, onCollaborationReady_fn, initComments_fn, initPagination_fn, dispatchTransaction_fn, handleNodeSelection_fn, prepareDocumentForImport_fn, prepareDocumentForExport_fn, endCollaboration_fn, validateDocumentInit_fn, validateDocumentExport_fn, initDevTools_fn, _DocumentSectionView_instances, init_fn2, addToolTip_fn, _ListItemNodeView_instances, init_fn3, _FieldAnnotationView_instances, createAnnotation_fn, _AutoPageNumberNodeView_instances, renderDom_fn, scheduleUpdateNodeStyle_fn;
+var _Attribute_static, getGlobalAttributes_fn, getNodeAndMarksAttributes_fn, _Schema_static, createNodesSchema_fn, createMarksSchema_fn, _events, _ExtensionService_instances, setupExtensions_fn, attachEditorEvents_fn, _editor, _stateValidators, _xmlValidators, _requiredNodeTypes, _requiredMarkTypes, _SuperValidator_instances, initializeValidators_fn, collectValidatorRequirements_fn, analyzeDocument_fn, _commandService, _Editor_instances, initContainerElement_fn, init_fn, initRichText_fn, onFocus_fn, checkHeadless_fn, registerCopyHandler_fn, insertNewFileData_fn, registerPluginByNameIfNotExists_fn, createExtensionService_fn, createCommandService_fn, createConverter_fn, initMedia_fn, initFonts_fn, checkFonts_fn, determineUnsupportedFonts_fn, createSchema_fn, generatePmData_fn, createView_fn, onCollaborationReady_fn, initComments_fn, initPagination_fn, dispatchTransaction_fn, handleNodeSelection_fn, prepareDocumentForImport_fn, prepareDocumentForExport_fn, endCollaboration_fn, validateDocumentInit_fn, validateDocumentExport_fn, initDevTools_fn, _DocumentSectionView_instances, init_fn2, addToolTip_fn, _ListItemNodeView_instances, init_fn3, _FieldAnnotationView_instances, createAnnotation_fn, _AutoPageNumberNodeView_instances, renderDom_fn, scheduleUpdateNodeStyle_fn;
 import * as Y from "yjs";
 import { UndoManager, Item as Item$1, ContentType, Text as Text$1, XmlElement, encodeStateAsUpdate } from "yjs";
-import { P as PluginKey, a as Plugin, M as Mapping, N as NodeSelection, S as Selection, T as TextSelection, b as Slice, D as DOMSerializer, F as Fragment, c as DOMParser$1, d as Mark$1, e as dropPoint, A as AllSelection, p as process$1, B as Buffer2, f as callOrGet, g as getExtensionConfigField, h as getMarkType, i as getMarksFromSelection, j as getNodeType, k as getSchemaTypeNameByName, l as Schema$1, m as cleanSchemaItem, n as canSplit, o as defaultBlockAt$1, q as liftTarget, r as canJoin, s as joinPoint, t as replaceStep$1, R as ReplaceAroundStep$1, u as isTextSelection, v as getMarkRange, w as isMarkActive, x as isNodeActive, y as deleteProps, z as processContent, C as ReplaceStep, E as NodeRange, G as findWrapping, L as ListHelpers, H as findParentNode, I as isMacOS, J as isIOS, K as getSchemaTypeByName, O as inputRulesPlugin, Q as TrackDeleteMarkName, U as TrackInsertMarkName, V as v4, W as TrackFormatMarkName, X as comments_module_events, Y as findMark, Z as objectIncludes, _ as AddMarkStep, $ as RemoveMarkStep, a0 as twipsToLines, a1 as pixelsToTwips, a2 as helpers, a3 as posToDOMRect, a4 as CommandService, a5 as SuperConverter, a6 as createDocument, a7 as createDocFromMarkdown, a8 as createDocFromHTML, a9 as EditorState, aa as hasSomeParentWithClass, ab as isActive, ac as unflattenListsInHtml, ad as parseSizeUnit, ae as minMax, af as getLineHeightValueString, ag as updateDOMAttributes, ah as findChildren$5, ai as htmlHandler, aj as generateRandomSigned32BitIntStrId, ak as InputRule, al as kebabCase, am as findParentNodeClosestToPos, an as getListItemStyleDefinitions, ao as docxNumberigHelpers, ap as parseIndentElement, aq as combineIndents, ar as twipsToPixels, as as PIXELS_PER_INCH, at as SelectionRange, au as Transform, av as isInTable$1, aw as generateDocxRandomId, ax as insertNewRelationship, ay as inchesToPixels } from "./converter-gSy6s2VK.js";
+import { P as PluginKey, a as Plugin, M as Mapping, N as NodeSelection, S as Selection, T as TextSelection, b as Slice, D as DOMSerializer, F as Fragment, c as DOMParser$1, d as Mark$1, e as dropPoint, A as AllSelection, p as process$1, B as Buffer2, f as callOrGet, g as getExtensionConfigField, h as getMarkType, i as getMarksFromSelection, j as getNodeType, k as getSchemaTypeNameByName, l as Schema$1, m as cleanSchemaItem, n as canSplit, o as defaultBlockAt$1, q as liftTarget, r as canJoin, s as joinPoint, t as replaceStep$1, R as ReplaceAroundStep$1, u as isTextSelection, v as getMarkRange, w as isMarkActive, x as isNodeActive, y as deleteProps, z as processContent, C as ReplaceStep, E as NodeRange, G as findWrapping, L as ListHelpers, H as findParentNode, I as isMacOS, J as isIOS, K as getSchemaTypeByName, O as inputRulesPlugin, Q as TrackDeleteMarkName, U as TrackInsertMarkName, V as v4, W as TrackFormatMarkName, X as comments_module_events, Y as findMark, Z as objectIncludes, _ as AddMarkStep, $ as RemoveMarkStep, a0 as twipsToLines, a1 as pixelsToTwips, a2 as helpers, a3 as posToDOMRect, a4 as CommandService, a5 as SuperConverter, a6 as createDocument, a7 as createDocFromMarkdown, a8 as createDocFromHTML, a9 as EditorState, aa as hasSomeParentWithClass, ab as isActive, ac as unflattenListsInHtml, ad as parseSizeUnit, ae as minMax, af as getLineHeightValueString, ag as updateDOMAttributes, ah as findChildren$5, ai as htmlHandler, aj as generateRandomSigned32BitIntStrId, ak as InputRule, al as kebabCase, am as findParentNodeClosestToPos, an as getListItemStyleDefinitions, ao as docxNumberigHelpers, ap as parseIndentElement, aq as combineIndents, ar as twipsToPixels, as as PIXELS_PER_INCH, at as SelectionRange, au as Transform, av as isInTable$1, aw as generateDocxRandomId, ax as insertNewRelationship, ay as inchesToPixels } from "./converter-khE-H7hH.js";
 import { ref, computed, createElementBlock, openBlock, withModifiers, Fragment as Fragment$1, renderList, normalizeClass, createCommentVNode, toDisplayString, createElementVNode, createApp } from "vue";
-import { D as DocxZipper } from "./docx-zipper-CceGxV02.js";
+import { D as DocxZipper } from "./docx-zipper-KoUEtzIj.js";
 var GOOD_LEAF_SIZE = 200;
 var RopeSequence = function RopeSequence2() {
 };
@@ -14294,7 +14294,9 @@ const _Editor = class _Editor extends EventEmitter {
       isHeaderFooterChanged: false,
       isCustomXmlChanged: false,
       focusTarget: null,
-      permissionResolver: null
+      permissionResolver: null,
+      // header/footer editors may have parent(main) editor set
+      parentEditor: null
     });
     __privateMethod(this, _Editor_instances, initContainerElement_fn).call(this, options);
     __privateMethod(this, _Editor_instances, checkHeadless_fn).call(this, options);
@@ -15056,7 +15058,7 @@ const _Editor = class _Editor extends EventEmitter {
    * @returns {Object | void} Migration results
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "0.24.0");
+    console.debug("[checkVersionMigrations] Current editor version", "0.25.0");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -15271,9 +15273,6 @@ init_fn = function() {
   this.emit("beforeCreate", { editor: this });
   this.on("contentError", this.options.onContentError);
   this.mount(this.options.element);
-  if (!this.options.isHeadless) {
-    __privateMethod(this, _Editor_instances, checkFonts_fn).call(this);
-  }
   this.on("create", this.options.onCreate);
   this.on("update", this.options.onUpdate);
   this.on("selectionUpdate", this.options.onSelectionUpdate);
@@ -15295,8 +15294,12 @@ init_fn = function() {
   if (!this.options.isHeadless) {
     this.initializeCollaborationData();
     this.initDefaultStyles();
+    __privateMethod(this, _Editor_instances, checkFonts_fn).call(this);
   }
-  if (!this.options.ydoc || this.options.markdown || this.options.html) {
+  const shouldMigrateListsOnInit = Boolean(
+    this.options.markdown || this.options.html || this.options.loadFromSchema || this.options.jsonOverride || this.options.mode === "html" || this.options.mode === "text"
+  );
+  if (shouldMigrateListsOnInit) {
     this.migrateListsToV2();
   }
   this.setDocumentMode(this.options.documentMode);
@@ -15490,58 +15493,17 @@ checkFonts_fn = async function() {
   if (this.options.isHeadless) {
     return;
   }
-  const fontsUsedInDocument = this.converter.getDocumentFonts();
-  if (!("queryLocalFonts" in window)) {
-    console.warn("[SuperDoc] Could not get access to local fonts. Using fallback solution.");
-    const unsupportedFonts = __privateMethod(this, _Editor_instances, determineUnsupportedFontsWithCanvas_fn).call(this, fontsUsedInDocument);
-    this.emit("fonts-resolved", {
-      documentFonts: fontsUsedInDocument,
-      unsupportedFonts
-    });
-    return;
-  }
-  const localFontAccess = await navigator.permissions.query({ name: "local-fonts" });
-  if (localFontAccess.state === "denied") {
-    console.warn("[SuperDoc] Could not get access to local fonts. Using fallback solution.");
-    const unsupportedFonts = __privateMethod(this, _Editor_instances, determineUnsupportedFontsWithCanvas_fn).call(this, fontsUsedInDocument);
-    this.emit("fonts-resolved", {
-      documentFonts: fontsUsedInDocument,
-      unsupportedFonts
-    });
-    return;
-  }
   try {
-    const localFonts = await window.queryLocalFonts();
-    const uniqueLocalFonts = [...new Set(localFonts.map((font) => font.family))];
-    const unsupportedFonts = __privateMethod(this, _Editor_instances, determineUnsupportedFontsWithLocalFonts_fn).call(this, fontsUsedInDocument, uniqueLocalFonts);
+    const fontsUsedInDocument = this.converter.getDocumentFonts();
+    const unsupportedFonts = __privateMethod(this, _Editor_instances, determineUnsupportedFonts_fn).call(this, fontsUsedInDocument);
     this.emit("fonts-resolved", {
       documentFonts: fontsUsedInDocument,
       unsupportedFonts
     });
   } catch {
-    console.warn("[SuperDoc] Could not get access to local fonts. Using fallback solution.");
-    const unsupportedFonts = __privateMethod(this, _Editor_instances, determineUnsupportedFontsWithCanvas_fn).call(this, fontsUsedInDocument);
-    this.emit("fonts-resolved", {
-      documentFonts: fontsUsedInDocument,
-      unsupportedFonts
-    });
+    console.warn("[SuperDoc] Could not determine document fonts and unsupported fonts");
   }
 };
-/**
- * Determines which fonts used in the document are not available locally nor imported.
- *
- * @param {string[]} fonts - Array of font family names used in the document.
- * @param {string[]} localFonts - Array of local font family names available on the system.
- * @returns {string[]} Array of font names that are unsupported.
- */
-determineUnsupportedFontsWithLocalFonts_fn = function(fonts, localFonts) {
-  const unsupportedFonts = fonts.filter((font) => {
-    const isLocalFont = localFonts.includes(font);
-    const isFontImported = this.fontsImported.includes(font);
-    return !isLocalFont && !isFontImported;
-  });
-  return unsupportedFonts;
-};
 /**
  * Determines which fonts used in the document are not supported
  * by attempting to render them on a canvas.
@@ -15551,7 +15513,7 @@ determineUnsupportedFontsWithLocalFonts_fn = function(fonts, localFonts) {
  * @param {string[]} fonts - Array of font family names used in the document.
  * @returns {string[]} Array of unsupported font family names.
  */
-determineUnsupportedFontsWithCanvas_fn = function(fonts) {
+determineUnsupportedFonts_fn = function(fonts) {
   const unsupportedFonts = fonts.filter((font) => {
     const canRender = canRenderFont(font);
     const isFontImported = this.fontsImported.includes(font);
@@ -15660,6 +15622,9 @@ onCollaborationReady_fn = function({ editor, ydoc }) {
   if (this.options.collaborationIsReady) return;
   console.debug("🔗 [super-editor] Collaboration ready");
   __privateMethod(this, _Editor_instances, validateDocumentInit_fn).call(this);
+  if (this.options.ydoc) {
+    this.migrateListsToV2();
+  }
   this.options.onCollaborationReady({ editor, ydoc });
   this.options.collaborationIsReady = true;
   this.options.initialState = this.state;
@@ -17639,10 +17604,27 @@ function getStructuredContentBlockTags(state) {
   const result = findChildren$5(state.doc, (node) => node.type.name === "structuredContentBlock");
   return result;
 }
+function getStructuredContentTablesById(id, state) {
+  if (!id || !state) return [];
+  const blocks = getStructuredContentTagsById(id, state).filter(
+    ({ node }) => node.type.name === "structuredContentBlock"
+  );
+  if (!blocks.length) return [];
+  const { pos: blockPos, node: blockNode } = blocks[0];
+  const tablesInBlock = [];
+  blockNode.descendants((child, relPos) => {
+    if (child.type.name === "table") {
+      const absPos = blockPos + 1 + relPos;
+      tablesInBlock.push({ node: child, pos: absPos });
+    }
+  });
+  return tablesInBlock;
+}
 const structuredContentHelpers = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   getStructuredContentBlockTags,
   getStructuredContentInlineTags,
+  getStructuredContentTablesById,
   getStructuredContentTags,
   getStructuredContentTagsById
 }, Symbol.toStringTag, { value: "Module" }));
@@ -17839,6 +17821,36 @@ const StructuredContentCommands = Extension.create({
           tr.replaceWith(posFrom, posTo, content);
         }
         return true;
+      },
+      /**
+       * Append multiple rows to the end of a table inside a structured content block.
+       * Each inner array represents the cell values for one new row.
+       * @category Command
+       * @param {StructuredContentTableAppendRowsOptions} options - Append configuration
+       * @example
+       * editor.commands.appendRowsToStructuredContentTable({
+       *   id: 'block-123',
+       *   tableIndex: 0,
+       *   rows: [['A', 'B'], ['C', 'D']],
+       *   copyRowStyle: true,
+       * });
+       */
+      appendRowsToStructuredContentTable: ({ id, tableIndex = 0, rows = [], copyRowStyle = false }) => ({ state, commands: commands2, dispatch }) => {
+        const normalized = normalizeRowsInput(rows);
+        if (!normalized.length) return true;
+        const tables = getStructuredContentTablesById(id, state);
+        if (!tables.length || tableIndex < 0 || tableIndex >= tables.length) return true;
+        const { node: tableNode, pos: tablePos } = tables[tableIndex];
+        if (dispatch) {
+          return commands2.appendRowsWithContent({ tablePos, tableNode, valueRows: normalized, copyRowStyle });
+        }
+        return commands2.appendRowsWithContent({
+          tablePos,
+          tableNode,
+          valueRows: normalized,
+          copyRowStyle,
+          dispatch: false
+        });
       }
     };
   },
@@ -17848,6 +17860,15 @@ const StructuredContentCommands = Extension.create({
     };
   }
 });
+const normalizeRowsInput = (rowsOrValues) => {
+  if (!Array.isArray(rowsOrValues) || !rowsOrValues.length) {
+    return [];
+  }
+  if (Array.isArray(rowsOrValues[0])) {
+    return rowsOrValues;
+  }
+  return [rowsOrValues];
+};
 class DocumentSectionView {
   constructor(node, getPos, decorations, editor) {
     __privateAdd(this, _DocumentSectionView_instances);
@@ -23600,6 +23621,107 @@ function cellWrapping($pos) {
   }
   return null;
 }
+function resolveTable(tr, tablePos, tableNode) {
+  if (tableNode && tableNode.type && tableNode.type.name === "table") {
+    return tableNode;
+  }
+  if (typeof tablePos === "number") {
+    const current = tr.doc.nodeAt(tablePos);
+    if (current && current.type.name === "table") {
+      return current;
+    }
+  }
+  return null;
+}
+function pickTemplateRowForAppend(tableNode, schema) {
+  const RowType = schema.nodes.tableRow;
+  const rows = [];
+  tableNode.descendants((child) => {
+    if (child.type === RowType) rows.push(child);
+  });
+  if (!rows.length) return null;
+  for (let i = rows.length - 1; i >= 0; i--) {
+    const r2 = rows[i];
+    const hasBodyCell = r2.content?.content?.some((c) => c.type.name === "tableCell");
+    if (hasBodyCell) return r2;
+  }
+  return rows[rows.length - 1];
+}
+function extractRowTemplateFormatting(cellNode, schema) {
+  const ParagraphType = schema.nodes.paragraph;
+  let blockType = ParagraphType;
+  let blockAttrs = null;
+  let textMarks = [];
+  const blocks = cellNode?.content?.content || [];
+  for (const block of blocks) {
+    const isParagraphish = block.type === ParagraphType || block.type.name === "heading";
+    if (isParagraphish) {
+      blockType = block.type || ParagraphType;
+      blockAttrs = block.attrs || null;
+    }
+    let foundText = null;
+    block.descendants?.((n) => {
+      if (!foundText && n.isText) foundText = n;
+    });
+    if (foundText) {
+      textMarks = foundText.marks ? Array.from(foundText.marks) : [];
+      break;
+    }
+  }
+  if (!blockType || !blockType.validContent) blockType = ParagraphType;
+  return { blockType, blockAttrs, textMarks };
+}
+function buildFormattedCellBlock(schema, value, { blockType, blockAttrs, textMarks }, copyRowStyle = false) {
+  const text = typeof value === "string" ? value : value == null ? "" : String(value);
+  const marks = copyRowStyle ? textMarks || [] : [];
+  const textNode = schema.text(text, marks);
+  const type = blockType || schema.nodes.paragraph;
+  return type.createAndFill(blockAttrs || null, textNode);
+}
+function buildRowFromTemplateRow({ schema, tableNode, templateRow, values, copyRowStyle = false }) {
+  const RowType = schema.nodes.tableRow;
+  const CellType = schema.nodes.tableCell;
+  const HeaderType = schema.nodes.tableHeader;
+  const map2 = TableMap.get(tableNode);
+  const totalColumns = map2.width;
+  const byColumns = Array.isArray(values) && values.length === totalColumns;
+  const newCells = [];
+  let columnCursor = 0;
+  templateRow.content.content.forEach((cellNode, cellIndex) => {
+    const isHeaderCell = cellNode.type === HeaderType;
+    const targetCellType = isHeaderCell ? CellType : cellNode.type;
+    const attrs = { ...cellNode.attrs };
+    const formatting = extractRowTemplateFormatting(cellNode, schema);
+    let cellValue = "";
+    if (byColumns) {
+      const span = Math.max(1, attrs.colspan || 1);
+      cellValue = values[columnCursor] ?? "";
+      columnCursor += span;
+    } else {
+      cellValue = Array.isArray(values) ? values[cellIndex] ?? "" : "";
+    }
+    const content = buildFormattedCellBlock(schema, cellValue, formatting, copyRowStyle);
+    const newCell = targetCellType.createAndFill(attrs, content);
+    if (newCell) newCells.push(newCell);
+  });
+  return RowType.createAndFill(null, newCells);
+}
+function insertRowsAtTableEnd({ tr, tablePos, tableNode, rows }) {
+  if (!rows || !rows.length) return;
+  const RowTypeName = "tableRow";
+  let lastRowRelPos = 0;
+  let lastRowNode = null;
+  tableNode.descendants((child, relPos) => {
+    if (child.type.name === RowTypeName) {
+      lastRowRelPos = relPos;
+      lastRowNode = child;
+    }
+  });
+  if (!lastRowNode) return;
+  const lastRowAbsEnd = tablePos + 1 + lastRowRelPos + lastRowNode.nodeSize;
+  const frag = Fragment.fromArray(rows);
+  tr.insert(lastRowAbsEnd, frag);
+}
 const Table = Node$1.create({
   name: "table",
   content: "tableRow+",
@@ -23759,6 +23881,47 @@ const Table = Node$1.create({
   },
   addCommands() {
     return {
+      /**
+       * Append multiple rows to the end of a table in a single transaction.
+       * @category Command
+       * @param {appendRowsWithContentOptions} options - Append configuration
+       * @example
+       * editor.commands.appendRowsWithContent({ tablePos, valueRows: [['A','B'], ['C','D']], copyRowStyle: true })
+       */
+      appendRowsWithContent: ({ tablePos, tableNode, valueRows = [], copyRowStyle = false }) => ({ editor, chain }) => {
+        if (typeof tablePos !== "number" && !tableNode || !Array.isArray(valueRows) || !valueRows.length) {
+          return false;
+        }
+        return chain().command(({ tr, dispatch }) => {
+          const workingTable = resolveTable(tr, tablePos, tableNode);
+          if (!workingTable) return false;
+          const templateRow = pickTemplateRowForAppend(workingTable, editor.schema);
+          if (!templateRow) return false;
+          const newRows = valueRows.map(
+            (vals) => buildRowFromTemplateRow({
+              schema: editor.schema,
+              tableNode: workingTable,
+              templateRow,
+              values: vals,
+              copyRowStyle
+            })
+          ).filter(Boolean);
+          if (!newRows.length) return false;
+          let resolvedTablePos = tablePos;
+          if (typeof resolvedTablePos !== "number" && workingTable) {
+            const tables = editor.getNodesOfType("table");
+            const match = workingTable ? tables.find((t) => t.node.eq(workingTable)) : tables[0];
+            resolvedTablePos = match?.pos ?? null;
+          }
+          if (typeof resolvedTablePos !== "number") {
+            return false;
+          }
+          if (dispatch) {
+            insertRowsAtTableEnd({ tr, tablePos, tableNode: workingTable, rows: newRows });
+          }
+          return true;
+        }).run();
+      },
       /**
        * Insert a new table into the document
        * @category Command
@@ -26665,58 +26828,6 @@ const registerImages = async (foundImages, editor, view) => {
     }
   });
 };
-const normalizeWrap = (attrs = {}) => {
-  const wrap = attrs.wrap;
-  if (wrap?.type && wrap.type !== "Inline") {
-    return {
-      type: wrap.type,
-      attrs: wrap.attrs ?? {}
-    };
-  }
-  if (wrap?.type === "Inline" && Object.keys(wrap.attrs ?? {}).length) {
-    return {
-      type: "Inline",
-      attrs: wrap.attrs
-    };
-  }
-  if (!wrap && attrs.wrapText) {
-    return {
-      type: "Square",
-      attrs: {
-        wrapText: attrs.wrapText
-      }
-    };
-  }
-  if (!wrap && attrs.wrapTopAndBottom) {
-    return {
-      type: "TopAndBottom",
-      attrs: {}
-    };
-  }
-  if (wrap?.type === "Inline") {
-    return {
-      type: "Inline",
-      attrs: wrap.attrs ?? {}
-    };
-  }
-  return {
-    type: "Inline",
-    attrs: {}
-  };
-};
-const normalizeMarginOffset = (marginOffset = {}) => {
-  const { left: left2, horizontal, ...rest } = marginOffset;
-  return {
-    ...rest,
-    horizontal: horizontal ?? left2
-  };
-};
-const getNormalizedImageAttrs = (attrs = {}) => {
-  return {
-    wrap: normalizeWrap(attrs),
-    marginOffset: normalizeMarginOffset(attrs.marginOffset ?? {})
-  };
-};
 const ImagePositionPluginKey = new PluginKey("ImagePosition");
 const ImagePositionPlugin = ({ editor }) => {
   const { view } = editor;
@@ -26729,8 +26840,9 @@ const ImagePositionPlugin = ({ editor }) => {
         return DecorationSet.empty;
       },
       apply(tr, oldDecorationSet, oldState, newState) {
-        if (!tr.docChanged) return oldDecorationSet;
+        if (!tr.docChanged && !shouldUpdate) return oldDecorationSet;
         const decorations = getImagePositionDecorations(newState, view);
+        shouldUpdate = false;
         return DecorationSet.create(newState.doc, decorations);
       }
     },
@@ -26739,7 +26851,6 @@ const ImagePositionPlugin = ({ editor }) => {
         update: (view2, lastState) => {
           const pagination = PaginationPluginKey.getState(lastState);
           if (shouldUpdate) {
-            shouldUpdate = false;
             const decorations = getImagePositionDecorations(lastState, view2);
             const updateTransaction = view2.state.tr.setMeta(ImagePositionPluginKey, { decorations });
             view2.dispatch(updateTransaction);
@@ -26765,41 +26876,35 @@ const getImagePositionDecorations = (state, view) => {
       let className = "";
       const { vRelativeFrom, alignH } = node.attrs.anchorData;
       const { size, padding } = node.attrs;
-      const { marginOffset } = getNormalizedImageAttrs(node.attrs);
       const pageBreak = findPreviousDomNodeWithClass(view, pos, "pagination-break-wrapper");
-      if (pageBreak) {
-        switch (alignH) {
-          case "left":
-            style += "float: left; left: 0; margin-left: 0; ";
-            break;
-          case "right":
-            style += "float: right; right: 0; margin-right: 0; ";
-            break;
-          case "center":
-            style += "display: block; margin-left: auto; margin-right: auto; ";
-            break;
+      if (pageBreak && vRelativeFrom === "margin" && alignH) {
+        const topPos = pageBreak?.offsetTop + pageBreak?.offsetHeight;
+        let horizontalAlignment = `${alignH}: 0;`;
+        if (alignH === "center") horizontalAlignment = "left: 50%; transform: translateX(-50%);";
+        style += vRelativeFrom === "margin" ? `position: absolute; top: ${topPos}px; ${horizontalAlignment}` : "";
+        const nextPos = view.posAtDOM(pageBreak, 1);
+        if (nextPos < 0) {
+          const $pos = view.state.doc.resolve(pos);
+          decorations.push(
+            Decoration.node(pos - 1, pos + $pos.parent.nodeSize - 1, {
+              style: `height: ${size.height + parseInt(padding.top) + parseInt(padding.bottom)}px`
+            })
+          );
         }
-        const topPos = marginOffset.top !== void 0 ? marginOffset.top : pageBreak?.offsetTop + pageBreak?.offsetHeight;
-        style += vRelativeFrom === "margin" ? `position: absolute; top: ${topPos}px; ` : "";
-        if (vRelativeFrom === "margin") {
-          const nextPos = view.posAtDOM(pageBreak, 1);
-          if (nextPos < 0) {
-            const $pos = view.state.doc.resolve(pos);
-            decorations.push(
-              Decoration.node(pos - 1, pos + $pos.parent.nodeSize - 1, {
-                style: `height: ${size.height + parseInt(padding.top) + parseInt(padding.bottom)}px`
-              })
-            );
-          }
-          const imageBlock = document.createElement("div");
-          imageBlock.className = "anchor-image-placeholder";
-          imageBlock.style.float = alignH;
-          imageBlock.style.width = size.width + parseInt(padding[alignH]) + "px";
-          imageBlock.style.height = size.height + parseInt(padding.top) + parseInt(padding.bottom) + "px";
-          decorations.push(Decoration.widget(nextPos, imageBlock, { key: "stable-key" }));
+        const imageBlock = document.createElement("div");
+        imageBlock.className = "anchor-image-placeholder";
+        imageBlock.style.float = alignH === "left" || alignH === "right" ? alignH : "none";
+        let paddingHorizontal;
+        if (alignH === "center") {
+          paddingHorizontal = (parseInt(padding.left) || 0) + (parseInt(padding.right) || 0);
+        } else {
+          paddingHorizontal = parseInt(padding[alignH]) || 0;
         }
+        imageBlock.style.width = size.width + paddingHorizontal + "px";
+        imageBlock.style.height = size.height + parseInt(padding.top) + parseInt(padding.bottom) + "px";
+        decorations.push(Decoration.widget(nextPos, imageBlock, { key: "stable-key" }));
+        decorations.push(Decoration.inline(pos, pos + node.nodeSize, { style, class: className }));
       }
-      decorations.push(Decoration.inline(pos, pos + node.nodeSize, { style, class: className }));
     }
   });
   return decorations;
@@ -26824,6 +26929,58 @@ const findPreviousDomNodeWithClass = (view, pos, className) => {
   }
   return null;
 };
+const normalizeWrap = (attrs = {}) => {
+  const wrap = attrs.wrap;
+  if (wrap?.type && wrap.type !== "Inline") {
+    return {
+      type: wrap.type,
+      attrs: wrap.attrs ?? {}
+    };
+  }
+  if (wrap?.type === "Inline" && Object.keys(wrap.attrs ?? {}).length) {
+    return {
+      type: "Inline",
+      attrs: wrap.attrs
+    };
+  }
+  if (!wrap && attrs.wrapText) {
+    return {
+      type: "Square",
+      attrs: {
+        wrapText: attrs.wrapText
+      }
+    };
+  }
+  if (!wrap && attrs.wrapTopAndBottom) {
+    return {
+      type: "TopAndBottom",
+      attrs: {}
+    };
+  }
+  if (wrap?.type === "Inline") {
+    return {
+      type: "Inline",
+      attrs: wrap.attrs ?? {}
+    };
+  }
+  return {
+    type: "Inline",
+    attrs: {}
+  };
+};
+const normalizeMarginOffset = (marginOffset = {}) => {
+  const { left: left2, horizontal, ...rest } = marginOffset;
+  return {
+    ...rest,
+    horizontal: horizontal ?? left2
+  };
+};
+const getNormalizedImageAttrs = (attrs = {}) => {
+  return {
+    wrap: normalizeWrap(attrs),
+    marginOffset: normalizeMarginOffset(attrs.marginOffset ?? {})
+  };
+};
 const getRotationMargins = (w, h, angleDegrees) => {
   const rad = angleDegrees * (Math.PI / 180);
   const cos = Math.abs(Math.cos(rad));
@@ -27032,27 +27189,15 @@ const Image = Node$1.create({
             style += "float: right;";
             floatRight = true;
           } else if (["largest", "bothSides"].includes(attrs.wrapText)) {
-            const pageStyles2 = this.editor?.converter?.pageStyles;
-            if (pageStyles2?.pageSize && pageStyles2?.pageMargins && size.width) {
-              const pageWidth = inchesToPixels(pageStyles2.pageSize.width);
-              const leftMargin = inchesToPixels(pageStyles2.pageMargins.left);
-              const rightMargin = inchesToPixels(pageStyles2.pageMargins.right);
-              const contentWidth = pageWidth - leftMargin - rightMargin;
-              const imageWidth = size.width + (attrs.distLeft || 0) + (attrs.distRight || 0);
-              const leftSpace = marginOffset.horizontal;
-              const rightSpace = contentWidth - leftSpace - imageWidth;
-              if (rightSpace < 0) {
-                style += "float: left;";
-              } else if (rightSpace > leftSpace) {
-                style += "float: left;";
-              } else {
-                style += "float: right;";
-                floatRight = true;
-                baseHorizontal = rightSpace;
-              }
-            } else {
-              style += "float: left;";
-            }
+            const pageStylesData2 = getDataFromPageStyles({
+              editor: this.editor,
+              marginOffset,
+              size,
+              attrs
+            });
+            style += pageStylesData2.style;
+            floatRight = pageStylesData2.floatRight;
+            baseHorizontal = pageStylesData2.baseHorizontal;
           }
           if (attrs.distTop) margin.top += attrs.distTop;
           if (attrs.distBottom) margin.bottom += attrs.distBottom;
@@ -27062,27 +27207,15 @@ const Image = Node$1.create({
         case "Through":
         case "Tight":
           style += "clear: both;";
-          const pageStyles = this.editor?.converter?.pageStyles;
-          if (pageStyles?.pageSize && pageStyles?.pageMargins && size.width) {
-            const pageWidth = inchesToPixels(pageStyles.pageSize.width);
-            const leftMargin = inchesToPixels(pageStyles.pageMargins.left);
-            const rightMargin = inchesToPixels(pageStyles.pageMargins.right);
-            const contentWidth = pageWidth - leftMargin - rightMargin;
-            const imageWidth = size.width + (attrs.distLeft || 0) + (attrs.distRight || 0);
-            const leftSpace = marginOffset.horizontal;
-            const rightSpace = contentWidth - leftSpace - imageWidth;
-            if (rightSpace < 0) {
-              style += "float: left;";
-            } else if (rightSpace > leftSpace) {
-              style += "float: left;";
-            } else {
-              style += "float: right;";
-              floatRight = true;
-              baseHorizontal = rightSpace;
-            }
-          } else {
-            style += "float: left;";
-          }
+          const pageStylesData = getDataFromPageStyles({
+            editor: this.editor,
+            marginOffset,
+            size,
+            attrs
+          });
+          style += pageStylesData.style;
+          floatRight = pageStylesData.floatRight;
+          baseHorizontal = pageStylesData.baseHorizontal;
           if (attrs.distTop) margin.top += attrs.distTop;
           if (attrs.distBottom) margin.bottom += attrs.distBottom;
           if (attrs.distLeft) margin.left += attrs.distLeft;
@@ -27119,6 +27252,22 @@ const Image = Node$1.create({
     }
     const hasAnchorData = Boolean(anchorData);
     const hasMarginOffsets = marginOffset?.horizontal != null || marginOffset?.top != null;
+    if (hasAnchorData) {
+      switch (anchorData.hRelativeFrom) {
+        case "page":
+          const pageStyles = this.editor?.converter?.pageStyles || this.editor?.options.parentEditor?.converter?.pageStyles;
+          margin.left -= inchesToPixels(pageStyles?.pageMargins?.left) || 0;
+          break;
+        case "margin":
+          if (anchorData.alignH === "center") {
+            style += "position: absolute; left: 50%; transform: translateX(-50%);";
+          }
+          if (anchorData.alignH === "left" || anchorData.alignH === "right") {
+            style += `position: absolute; ${anchorData.alignH}: 0;`;
+          }
+          break;
+      }
+    }
     if (hasAnchorData || hasMarginOffsets) {
       const relativeFromPageV = anchorData?.vRelativeFrom === "page";
       const maxMarginV = 500;
@@ -27267,6 +27416,37 @@ const Image = Node$1.create({
     return [ImageRegistrationPlugin({ editor: this.editor }), ImagePositionPlugin({ editor: this.editor })];
   }
 });
+const getDataFromPageStyles = ({ editor, marginOffset, size, attrs }) => {
+  let style = "";
+  let floatRight = false;
+  let baseHorizontal = marginOffset?.horizontal || 0;
+  const pageStyles = editor?.converter?.pageStyles || editor?.options.parentEditor?.converter?.pageStyles;
+  if (pageStyles?.pageSize && pageStyles?.pageMargins && size.width) {
+    const pageWidth = inchesToPixels(pageStyles.pageSize.width);
+    const leftMargin = inchesToPixels(pageStyles.pageMargins.left);
+    const rightMargin = inchesToPixels(pageStyles.pageMargins.right);
+    const contentWidth = pageWidth - leftMargin - rightMargin;
+    const imageWidth = size.width + (attrs.distLeft || 0) + (attrs.distRight || 0);
+    const leftSpace = marginOffset.horizontal;
+    const rightSpace = contentWidth - leftSpace - imageWidth;
+    if (rightSpace < 0) {
+      style += "float: left;";
+    } else if (rightSpace > leftSpace) {
+      style += "float: left;";
+    } else {
+      style += "float: right;";
+      floatRight = true;
+      baseHorizontal = rightSpace;
+    }
+  } else {
+    style += "float: left;";
+  }
+  return {
+    style,
+    floatRight,
+    baseHorizontal
+  };
+};
 const ACCEPT_IMAGE_TYPES = [".jpg", ".jpeg", ".png", "image/jpeg", "image/png"];
 const getFileOpener = () => {
   let fileInput = document.createElement("input");
@@ -29388,6 +29568,15 @@ const TrackChanges = Extension.create({
         const { from: from2, to } = state.selection;
         return commands2.acceptTrackedChangesBetween(from2, to);
       },
+      acceptTrackedChangeFromToolbar: () => ({ state, commands: commands2 }) => {
+        const commentsPluginState = CommentsPluginKey.getState(state);
+        const activeThreadId = commentsPluginState?.activeThreadId;
+        if (activeThreadId && commentsPluginState?.trackedChanges?.[activeThreadId]) {
+          return commands2.acceptTrackedChangeById(activeThreadId);
+        } else {
+          return commands2.acceptTrackedChangeBySelection();
+        }
+      },
       acceptTrackedChangeById: (id) => ({ state, tr, commands: commands2 }) => {
         const toResolve = getChangesByIdToResolve(state, id) || [];
         return toResolve.map(({ from: from2, to }) => {
@@ -29416,6 +29605,15 @@ const TrackChanges = Extension.create({
         const { from: from2, to } = state.selection;
         return commands2.rejectTrackedChangesBetween(from2, to);
       },
+      rejectTrackedChangeFromToolbar: () => ({ state, commands: commands2 }) => {
+        const commentsPluginState = CommentsPluginKey.getState(state);
+        const activeThreadId = commentsPluginState?.activeThreadId;
+        if (activeThreadId && commentsPluginState?.trackedChanges?.[activeThreadId]) {
+          return commands2.rejectTrackedChangeById(activeThreadId);
+        } else {
+          return commands2.rejectTrackedChangeOnSelection();
+        }
+      },
       rejectAllTrackedChanges: () => ({ state, commands: commands2 }) => {
         const from2 = 0, to = state.doc.content.size;
         return commands2.rejectTrackedChangesBetween(from2, to);
@@ -34709,7 +34907,7 @@ const nodeResizer = (nodeNames = ["image"], editor) => {
           return oldState;
         }
         if (typeof document === "undefined" || editor.options.isHeadless) return oldState;
-        if (editor.options.documentMode === "viewing" || !editor.isEditable) {
+        if (!editor.options.isHeaderOrFooter && (editor.options.documentMode === "viewing" || !editor.isEditable)) {
           return DecorationSet.empty;
         }
         const { selection } = newState;
@@ -35059,6 +35257,7 @@ const getStarterExtensions = () => {
 export {
   Attribute as A,
   CommentsPluginKey as C,
+  DecorationSet as D,
   Editor as E,
   Mark as M,
   Node$1 as N,
@@ -35079,14 +35278,15 @@ export {
   collectTrackedChangesForContext as k,
   getStarterExtensions as l,
   getRichTextExtensions as m,
-  Extension as n,
-  index$1 as o,
-  index as p,
-  AnnotatorHelpers as q,
+  Decoration as n,
+  Extension as o,
+  index$1 as p,
+  index as q,
   replaceSelectionWithImagePlaceholder as r,
   shouldBypassContextMenu as s,
-  SectionHelpers as t,
+  AnnotatorHelpers as t,
   useHighContrastMode as u,
-  getAllowedImageDimensions as v,
+  SectionHelpers as v,
+  getAllowedImageDimensions as w,
   yUndoPluginKey as y
 };