oasis-editor 0.0.125 → 0.0.127

package/dist/core/model/index.d.ts

@@ -15,7 +15,7 @@ export type { EditorFootnote } from './types/documentFootnotes.js';
 export type { EditorEndnote } from './types/documentEndnotes.js';
 export type { EditorBookmark, EditorBookmarkAnchor, EditorBookmarks, } from './types/documentBookmarks.js';
 export type { EditorComment, EditorCommentAnchor, EditorComments, } from './types/documentComments.js';
-export type { EditorPageMargins, EditorPageSettings, EditorColumnsSettings, EditorSection, EditorFontInfo, EditorFootnoteSettings, EditorFootnotes, EditorEndnoteSettings, EditorEndnotes, EditorDocument, } from './types/document.js';
+export type { EditorPageMargins, EditorPageSettings, EditorColumnsSettings, EditorSection, EditorPageNumbering, EditorSectionVerticalAlign, EditorFontInfo, EditorFootnoteSettings, EditorFootnotes, EditorEndnoteSettings, EditorEndnotes, EditorDocument, } from './types/document.js';
 export type { EditorPosition, EditorSelection, EditorEditingZone, } from './types/selection.js';
 export type { EditorCaretSlot, EditorLayoutFragmentChar, EditorLayoutFragment, EditorLayoutLine, EditorLayoutParagraph, EditorLayoutBlock, TableCellBlockPosition, EditorLayoutPage, EditorLayoutDocument, } from './types/layout.js';
 export type { EditorState } from './editorState.js';

package/dist/core/model/types/document.d.ts

@@ -41,6 +41,28 @@ export interface EditorPageSettings {
     margins: EditorPageMargins;
     columns?: EditorColumnsSettings;
 }
+/**
+ * Page numbering settings for a section (`w:pgNumType`). Preserved for
+ * round-trip; `start` is intended to seed PAGE-field numbering in a future
+ * pass. The `format` string is stored verbatim from the OOXML `ST_NumberFormat`
+ * vocabulary (decimal, upperRoman, lowerLetter, …) so uncommon values survive
+ * round-trip even though the editor only renders a subset.
+ */
+export interface EditorPageNumbering {
+    /** `w:start` — first page number of this section. */
+    start?: number;
+    /** `w:fmt` — page number format (OOXML `ST_NumberFormat` value). */
+    format?: string;
+    /** `w:chapStyle` — heading style id used for chapter-based page numbers. */
+    chapterStyle?: string;
+    /** `w:chapSep` — separator between chapter number and page number. */
+    chapterSeparator?: string;
+}
+/**
+ * Vertical justification of a section's page contents (`w:vAlign`).
+ * `top` is the Word default and is omitted on export.
+ */
+export type EditorSectionVerticalAlign = "top" | "center" | "both" | "bottom";
 export interface EditorSection {
     id: string;
     blocks: EditorBlockNode[];
@@ -51,7 +73,21 @@ export interface EditorSection {
     footer?: EditorBlockNode[];
     firstPageFooter?: EditorBlockNode[];
     evenPageFooter?: EditorBlockNode[];
-    breakType?: "nextPage" | "continuous";
+    /**
+     * How this section *begins* (a page break, a continuous flow, …). Mirrors the
+     * editor's own section-break command. OOXML stores this as `w:type` on the
+     * *previous* section's `w:sectPr`; the importer applies the off-by-one so the
+     * value describes the section it sits on. `nextPage` is the Word default and
+     * is omitted on export. Only `continuous` currently affects layout rendering;
+     * `evenPage`/`oddPage`/`nextColumn` are preserved for round-trip.
+     */
+    breakType?: "nextPage" | "continuous" | "evenPage" | "oddPage" | "nextColumn";
+    /** `w:pgNumType` — page numbering format/start/chapter. Round-trip only. */
+    pageNumbering?: EditorPageNumbering;
+    /** `w:vAlign` — vertical justification of page contents. Round-trip only. */
+    verticalAlignment?: EditorSectionVerticalAlign;
+    /** `w:bidi` — right-to-left section layout. Round-trip only. */
+    bidi?: boolean;
 }
 /**
  * One `w:font` entry from `word/fontTable.xml`: the document's declaration of a

package/dist/core/model/types/styles.d.ts

@@ -122,6 +122,8 @@ export interface EditorParagraphStyle {
      */
     /** `w:suppressLineNumbers/@w:val`: omit this paragraph from section line numbering. */
     suppressLineNumbers?: boolean;
+    /** `w:suppressAutoHyphens/@w:val`: disable auto-hyphenation for this paragraph. */
+    suppressAutoHyphens?: boolean;
     /** `w:bidi/@w:val`: paragraph flows right-to-left. */
     bidi?: boolean;
     /** `w:kinsoku/@w:val`: East Asian line-breaking rule (default on). */

package/dist/import/docx/sectionProperties.d.ts

@@ -1,5 +1,5 @@
 import { Element as XmlElement } from '@xmldom/xmldom';
-import { EditorBlockNode, EditorNamedStyle, EditorPageSettings, EditorParagraphNode } from '../../core/model.js';
+import { EditorBlockNode, EditorNamedStyle, EditorPageNumbering, EditorPageSettings, EditorParagraphNode, EditorSectionVerticalAlign } from '../../core/model.js';
 import { DocxSettings } from './settings.js';
 
 export interface SectionProperties {
@@ -9,6 +9,18 @@ export interface SectionProperties {
     docGridLinePitchPx?: number;
     docGridMode?: "explicit";
     docGridType?: string | null;
+    /**
+     * `w:type` — section break type. In OOXML this sits on the sectPr that
+     * *ends* a section and describes how the *following* section begins; the
+     * import driver applies the off-by-one when building `EditorSection` objects.
+     */
+    breakType?: "nextPage" | "continuous" | "evenPage" | "oddPage" | "nextColumn";
+    /** `w:pgNumType` — page numbering format/start/chapter. Round-trip only. */
+    pageNumbering?: EditorPageNumbering;
+    /** `w:vAlign` — vertical justification of page contents. Round-trip only. */
+    verticalAlignment?: EditorSectionVerticalAlign;
+    /** `w:bidi` — right-to-left section layout. Round-trip only. */
+    bidi?: boolean;
 }
 export declare function parseSectionProperties(sectPr: XmlElement): SectionProperties;
 export declare function parsePageSettings(body: XmlElement | undefined): EditorPageSettings | undefined;

package/dist/{index-JfmhzLRe.js → index-Ceyv5JS5.js}

@@ -2623,7 +2623,7 @@ function OasisEditorAppLazy(props = {}) {
     onCleanup(() => {
       cancelled = true;
     });
-    import("./OasisEditorApp-CZVAf0XI.js").then((m) => {
+    import("./OasisEditorApp-3vvH6KOz.js").then((m) => {
       cancelled = true;
       setProgress(1);
       setTimeout(() => setApp(() => m.OasisEditorApp), 180);
@@ -3367,6 +3367,7 @@ const DEFAULT_PARAGRAPH_STYLE = asRequired({
   textDirection: null,
   outlineLevel: null,
   suppressLineNumbers: false,
+  suppressAutoHyphens: false,
   bidi: false,
   kinsoku: true,
   wordWrap: true,
@@ -14498,7 +14499,11 @@ function composeMeasuredParagraphLines(options) {
   var _a;
   const { paragraph, fragments, styles, contentWidth, defaultTabStop } = options;
   const exclusions = options.exclusions ?? [];
-  const hyphenation = options.hyphenation;
+  const effectiveParagraphStyle = resolveEffectiveParagraphStyle(
+    paragraph.style,
+    styles
+  );
+  const hyphenation = effectiveParagraphStyle.suppressAutoHyphens ? void 0 : options.hyphenation;
   const measuredChars = buildMeasuredChars(paragraph, fragments, styles);
   const tokens = tokenizeMeasuredChars(measuredChars);
   const charByOffset = new Map(
@@ -34270,6 +34275,7 @@ function normalizeImportedParagraphStyle(style2) {
     textDirection: style2.textDirection ?? void 0,
     outlineLevel: style2.outlineLevel ?? void 0,
     suppressLineNumbers: style2.suppressLineNumbers !== void 0 || effective.suppressLineNumbers !== defaultEffective.suppressLineNumbers ? effective.suppressLineNumbers : void 0,
+    suppressAutoHyphens: style2.suppressAutoHyphens !== void 0 || effective.suppressAutoHyphens !== defaultEffective.suppressAutoHyphens ? effective.suppressAutoHyphens : void 0,
     bidi: style2.bidi !== void 0 || effective.bidi !== defaultEffective.bidi ? effective.bidi : void 0,
     kinsoku: style2.kinsoku !== void 0 || effective.kinsoku !== defaultEffective.kinsoku ? effective.kinsoku : void 0,
     wordWrap: style2.wordWrap !== void 0 || effective.wordWrap !== defaultEffective.wordWrap ? effective.wordWrap : void 0,
@@ -34494,6 +34500,13 @@ function parseParagraphStyle$1(paragraphProperties, colors) {
   if (suppressLineNumbers !== void 0) {
     style2.suppressLineNumbers = suppressLineNumbers;
   }
+  const suppressAutoHyphens = parseOnOffProperty(
+    paragraphProperties,
+    "suppressAutoHyphens"
+  );
+  if (suppressAutoHyphens !== void 0) {
+    style2.suppressAutoHyphens = suppressAutoHyphens;
+  }
   const bidi = parseOnOffProperty(paragraphProperties, "bidi");
   if (bidi !== void 0) {
     style2.bidi = bidi;
@@ -34882,6 +34895,30 @@ function parseSectionProperties(sectPr) {
     getAttributeValue(docGrid, "linePitch"),
     Number.NaN
   );
+  const typeElement = getFirstChildByTagNameNS(sectPr, WORD_NS, "type");
+  const typeValue = getAttributeValue(typeElement, "val");
+  const breakType = typeValue === "continuous" || typeValue === "nextPage" || typeValue === "evenPage" || typeValue === "oddPage" || typeValue === "nextColumn" ? typeValue : void 0;
+  const pgNumType = getFirstChildByTagNameNS(sectPr, WORD_NS, "pgNumType");
+  let pageNumbering;
+  if (pgNumType) {
+    const startRaw = getAttributeValue(pgNumType, "start");
+    const start = startRaw !== null ? Number.parseInt(startRaw, 10) : void 0;
+    const format = getAttributeValue(pgNumType, "fmt") ?? void 0;
+    const chapterStyle = getAttributeValue(pgNumType, "chapStyle") ?? void 0;
+    const chapterSeparator = getAttributeValue(pgNumType, "chapSep") ?? void 0;
+    if (start !== void 0 && Number.isFinite(start) || format || chapterStyle || chapterSeparator) {
+      pageNumbering = {
+        ...start !== void 0 && Number.isFinite(start) ? { start } : {},
+        ...format ? { format } : {},
+        ...chapterStyle ? { chapterStyle } : {},
+        ...chapterSeparator ? { chapterSeparator } : {}
+      };
+    }
+  }
+  const vAlignElement = getFirstChildByTagNameNS(sectPr, WORD_NS, "vAlign");
+  const vAlignValue = getAttributeValue(vAlignElement, "val");
+  const verticalAlignment = vAlignValue === "center" || vAlignValue === "both" || vAlignValue === "bottom" ? vAlignValue : void 0;
+  const bidi = parseOnOffProperty(sectPr, "bidi");
   return {
     pageSettings,
     headerRIds,
@@ -34893,7 +34930,11 @@ function parseSectionProperties(sectPr) {
     // Latin line height; treating it as a grid floored every body line to the
     // pitch (e.g. 360 twips = 24px), inflating spacing well beyond Word.
     docGridMode: docGridType === "lines" || docGridType === "linesAndChars" ? "explicit" : void 0,
-    docGridType
+    docGridType,
+    breakType,
+    pageNumbering,
+    verticalAlignment,
+    bidi
   };
 }
 function parsePageSettings(body) {
@@ -37008,7 +37049,7 @@ function parseCommentsXml(commentsXml, commentsExtendedXml) {
   return byDocxId;
 }
 async function importDocxToEditorDocument(buffer, options = {}) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
   (_a = options.onProgress) == null ? void 0 : _a.call(options, "opening-docx");
   const zip = await JSZip.loadAsync(buffer);
   const documentXml = await ((_b = zip.file("word/document.xml")) == null ? void 0 : _b.async("string"));
@@ -37116,6 +37157,17 @@ async function importDocxToEditorDocument(buffer, options = {}) {
       if (parsedParagraph.pageBreakAfter) {
         pendingPageBreakBefore = true;
       }
+      const paragraphProperties = getFirstChildByTagNameNS(
+        element,
+        WORD_NS,
+        "pPr"
+      );
+      const inlineSectPr = paragraphProperties ? getFirstChildByTagNameNS(paragraphProperties, WORD_NS, "sectPr") : null;
+      if (inlineSectPr) {
+        sectionProps.push(parseSectionProperties(inlineSectPr));
+        sectionBlocks.push([]);
+        pendingPageBreakBefore = false;
+      }
       reportBodyProgress();
     } else if (element.localName === "tbl") {
       appendBodyBlock(
@@ -37247,6 +37299,10 @@ async function importDocxToEditorDocument(buffer, options = {}) {
       }
     };
     const pageSettings = normalizePageSettings(rawPageSettings);
+    const breakType = i > 0 ? (_k = sectionProps[i - 1]) == null ? void 0 : _k.breakType : void 0;
+    const pageNumbering = props.pageNumbering;
+    const verticalAlignment = props.verticalAlignment;
+    const bidi = props.bidi;
     sections.push({
       id: `section:${i + 1}`,
       blocks: blocks.length > 0 ? blocks : [createEditorParagraphFromRuns([{ text: "" }])],
@@ -37256,10 +37312,14 @@ async function importDocxToEditorDocument(buffer, options = {}) {
       evenPageHeader: evenPageHeader.length > 0 ? evenPageHeader : void 0,
       footer: footer.length > 0 ? footer : void 0,
       firstPageFooter: firstPageFooter.length > 0 ? firstPageFooter : void 0,
-      evenPageFooter: evenPageFooter.length > 0 ? evenPageFooter : void 0
+      evenPageFooter: evenPageFooter.length > 0 ? evenPageFooter : void 0,
+      ...breakType ? { breakType } : {},
+      ...pageNumbering ? { pageNumbering } : {},
+      ...verticalAlignment ? { verticalAlignment } : {},
+      ...bidi ? { bidi } : {}
     });
   }
-  const footnotesXml = await ((_k = zip.file("word/footnotes.xml")) == null ? void 0 : _k.async("string")) ?? null;
+  const footnotesXml = await ((_l = zip.file("word/footnotes.xml")) == null ? void 0 : _l.async("string")) ?? null;
   const footnotesPartRels = footnotesXml ? await loadPartRelationships(zip, "word/footnotes.xml") : /* @__PURE__ */ new Map();
   const parsedFootnotes = await parseFootnotesXml(
     footnotesXml,
@@ -37274,7 +37334,7 @@ async function importDocxToEditorDocument(buffer, options = {}) {
   }
   const editorFootnotes = Object.keys(parsedFootnotes.footnotes.items).length > 0 || parsedFootnotes.footnotes.separator || parsedFootnotes.footnotes.continuationSeparator || parsedFootnotes.footnotes.settings ? parsedFootnotes.footnotes : void 0;
   remapImportedFootnoteRefsInSections(sections, parsedFootnotes.byDocxId);
-  const endnotesXml = await ((_l = zip.file("word/endnotes.xml")) == null ? void 0 : _l.async("string")) ?? null;
+  const endnotesXml = await ((_m = zip.file("word/endnotes.xml")) == null ? void 0 : _m.async("string")) ?? null;
   const endnotesPartRels = endnotesXml ? await loadPartRelationships(zip, "word/endnotes.xml") : /* @__PURE__ */ new Map();
   const parsedEndnotes = await parseEndnotesXml(
     endnotesXml,
@@ -37291,14 +37351,14 @@ async function importDocxToEditorDocument(buffer, options = {}) {
   remapImportedEndnoteRefsInSections(sections, parsedEndnotes.byDocxId);
   const editorBookmarks = extractBookmarksFromSections(sections);
   const commentRanges = extractCommentRangesFromSections(sections);
-  const commentsXml = await ((_m = zip.file("word/comments.xml")) == null ? void 0 : _m.async("string")) ?? null;
-  const commentsExtendedXml = await ((_n = zip.file("word/commentsExtended.xml")) == null ? void 0 : _n.async("string")) ?? null;
+  const commentsXml = await ((_n = zip.file("word/comments.xml")) == null ? void 0 : _n.async("string")) ?? null;
+  const commentsExtendedXml = await ((_o = zip.file("word/commentsExtended.xml")) == null ? void 0 : _o.async("string")) ?? null;
   const commentBodies = parseCommentsXml(commentsXml, commentsExtendedXml);
   const editorComments = buildEditorComments(commentRanges, commentBodies);
   const shouldPreserveSections = sections.length > 1 || sections.some(
     (section) => {
       var _a2, _b2, _c2, _d2, _e2, _f2;
-      return (((_a2 = section.header) == null ? void 0 : _a2.length) ?? 0) > 0 || (((_b2 = section.firstPageHeader) == null ? void 0 : _b2.length) ?? 0) > 0 || (((_c2 = section.evenPageHeader) == null ? void 0 : _c2.length) ?? 0) > 0 || (((_d2 = section.footer) == null ? void 0 : _d2.length) ?? 0) > 0 || (((_e2 = section.firstPageFooter) == null ? void 0 : _e2.length) ?? 0) > 0 || (((_f2 = section.evenPageFooter) == null ? void 0 : _f2.length) ?? 0) > 0;
+      return (((_a2 = section.header) == null ? void 0 : _a2.length) ?? 0) > 0 || (((_b2 = section.firstPageHeader) == null ? void 0 : _b2.length) ?? 0) > 0 || (((_c2 = section.evenPageHeader) == null ? void 0 : _c2.length) ?? 0) > 0 || (((_d2 = section.footer) == null ? void 0 : _d2.length) ?? 0) > 0 || (((_e2 = section.firstPageFooter) == null ? void 0 : _e2.length) ?? 0) > 0 || (((_f2 = section.evenPageFooter) == null ? void 0 : _f2.length) ?? 0) > 0 || section.breakType !== void 0 || section.pageNumbering !== void 0 || section.verticalAlignment !== void 0 || section.bidi !== void 0;
     }
   );
   const hasAssets = Object.keys(assets.assets).length > 0;
@@ -37501,7 +37561,7 @@ function importDocxInWorker(buffer, options = {}) {
     const worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "" + new URL("assets/importDocxWorker-C9tO3vbp.js", import.meta.url).href,
+        "" + new URL("assets/importDocxWorker-DdpdjbOY.js", import.meta.url).href,
         import.meta.url
       ),
       {

package/dist/oasis-editor.js

@@ -1,4 +1,4 @@
-import { cV, a5, aj, az, at, cW, cX, cY, an, cZ, a6, cE, aA, c_, c$, ay, aq, d0, d1, d2, a4, d3, cC, aC, d4, d5, d6, d7, d8, cQ, d9, da, db, aG, aF, dc, ar, dd, de, df, dg, dh, di, av, as, dj, aJ, aB, aI, aH, am, ax, cP, dk, cW as cW2, d0 as d02, d3 as d32, dc as dc2, dd as dd2, di as di2, dl, cG, cB, dm, dn, dp, cD, dq, dr, cF } from "./index-JfmhzLRe.js";
+import { cV, a5, aj, az, at, cW, cX, cY, an, cZ, a6, cE, aA, c_, c$, ay, aq, d0, d1, d2, a4, d3, cC, aC, d4, d5, d6, d7, d8, cQ, d9, da, db, aG, aF, dc, ar, dd, de, df, dg, dh, di, av, as, dj, aJ, aB, aI, aH, am, ax, cP, dk, cW as cW2, d0 as d02, d3 as d32, dc as dc2, dd as dd2, di as di2, dl, cG, cB, dm, dn, dp, cD, dq, dr, cF } from "./index-Ceyv5JS5.js";
 export {
   cV as ActionRow,
   a5 as BalloonShell,