oasis-editor 0.0.95 → 0.0.96

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

@@ -6,7 +6,7 @@
  * statements that pointed there continue to work via the barrel
  * re-export in `src/core/model.ts`.
  */
-export type { EditorUnderlineStyle, EditorLigatures, EditorNumberSpacing, EditorNumberForm, EditorTextLanguage, EditorBorderStyle, EditorEmphasisMark, EditorTabStop, EditorParagraphListStyle, EditorImageCrop, EditorImageFillMode, EditorImageFloatingPosition, EditorImageFloatingLayout, EditorImageRunData, EditorWrapPolygonPoint, EditorFieldData, EditorFieldChar, EditorFootnoteReferenceData, EditorEndnoteReferenceData, EditorRevision, EditorRevisionMetadata, EditorStructuralRevision, EditorPropertyRevision, EditorAsset, EditorFootnoteNumberFormat, EditorFootnoteRestart, EditorDocxWidthValue, EditorTableLayout, EditorTableRowHeightRule, } from './types/primitives.js';
+export type { EditorUnderlineStyle, EditorLigatures, EditorNumberSpacing, EditorNumberForm, EditorTextLanguage, EditorBorderStyle, EditorEmphasisMark, EditorTabStop, EditorParagraphListStyle, EditorImageCrop, EditorImageFillMode, EditorImageFloatingPosition, EditorImageFloatingLayout, EditorImageRunData, EditorWrapPolygonPoint, EditorFieldData, EditorFieldChar, EditorFootnoteReferenceData, EditorEndnoteReferenceData, EditorRevision, EditorRevisionMetadata, EditorStructuralRevision, EditorPropertyRevision, EditorAsset, EditorFootnoteNumberFormat, EditorFootnoteRestart, EditorDocxWidthValue, EditorTableLayout, EditorTableRowHeightRule, EditorGradientStop, EditorTextFill, EditorTextOutline, } from './types/primitives.js';
 export type { EditorTextStyle, EditorParagraphStyle, EditorTableStyle, EditorTableFloatingLayout, EditorTableConditionalFormat, EditorConditionalRowStyle, EditorTableConditionalType, EditorTableConditionalFlags, EditorTableCellStyle, EditorNamedStyle, } from './types/styles.js';
 export type { EditorRunBase, EditorTextRun, EditorTextBoxShape, EditorTextBoxBody, EditorTextBoxData, EditorDropCap, EditorParagraphNode, EditorTableCellNode, EditorTableRowStyle, EditorTableRowNode, EditorTableNode, EditorBlockNode, } from './types/nodes.js';
 export type { RunKind, RunOfKind, RunVisitor } from './runKind.js';

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

@@ -20,6 +20,30 @@ export interface EditorBorderStyle {
 }
 /** `w:em/@w:val`: the emphasis mark drawn over each glyph of a run. */
 export type EditorEmphasisMark = "dot" | "comma" | "circle" | "underDot" | "none";
+/** One color stop in a `w14:gradFill` gradient. `position` is 0–1 (0 = start, 1 = end). */
+export interface EditorGradientStop {
+    position: number;
+    color: string;
+    alpha?: number;
+}
+/**
+ * `w14:textFill` — rich glyph fill that supersedes the plain `w:color`.
+ * Phase 2b: gradient canvas/PDF rendering is deferred; only solid is fully rendered now.
+ */
+export type EditorTextFill = {
+    type: "solid";
+    color: string;
+} | {
+    type: "gradient";
+    stops: EditorGradientStop[];
+    angle?: number;
+};
+/** `w14:textOutline` — real stroke on glyphs, supersedes the legacy boolean `w:outline`. */
+export interface EditorTextOutline {
+    widthPt: number;
+    color?: string;
+    fill?: EditorTextFill;
+}
 export interface EditorTabStop {
     position: number;
     type: "left" | "center" | "right" | "decimal" | "bar" | "clear";

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

@@ -1,4 +1,4 @@
-import { EditorBorderStyle, EditorDocxWidthValue, EditorEmphasisMark, EditorLigatures, EditorNumberForm, EditorNumberSpacing, EditorPropertyRevision, EditorStructuralRevision, EditorTabStop, EditorTextLanguage, EditorUnderlineStyle } from './primitives.js';
+import { EditorBorderStyle, EditorDocxWidthValue, EditorEmphasisMark, EditorLigatures, EditorNumberForm, EditorNumberSpacing, EditorPropertyRevision, EditorStructuralRevision, EditorTabStop, EditorTextFill, EditorTextLanguage, EditorTextOutline, EditorUnderlineStyle } from './primitives.js';
 
 export interface EditorTextStyle {
     styleId?: string;
@@ -50,6 +50,10 @@ export interface EditorTextStyle {
     fontFamily?: string | null;
     fontSize?: number | null;
     color?: string | null;
+    /** `w14:textFill` — supersedes `color` when present (solid or gradient glyph fill). */
+    textFill?: EditorTextFill | null;
+    /** `w14:textOutline` — real stroke on glyphs, supersedes the boolean `outline` when present. */
+    textOutline?: EditorTextOutline | null;
     highlight?: string | null;
     shading?: string | null;
     language?: EditorTextLanguage | null;

package/dist/export/pdf/writer/pdfTypes.d.ts

@@ -69,6 +69,10 @@ export interface OasisPdfTextOptions {
     horizontalScale?: number;
     /** PDF text render mode (`Tr`): 0 fill (default), 1 stroke, 2 fill+stroke. */
     renderMode?: number;
+    /** Stroke color for render modes 1 (stroke) and 2 (fill+stroke). Defaults to `color`. */
+    strokeColor?: string;
+    /** Stroke line width in pt for render modes 1 and 2. Defaults to 3% of fontSize. */
+    strokeWidth?: number;
 }
 export interface OasisPdfImageResource {
     resourceName: string;

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

@@ -9,6 +9,14 @@ export type DocxTextDirection = "lrTb" | "tbRl" | "btLr" | "lrTbV" | "tbRlV";
 /** Validate a raw `w:textDirection/@w:val` token, or return undefined. */
 export declare function parseTextDirection(value: string | null | undefined): DocxTextDirection | undefined;
 export declare function getFirstChildByTagNameNS(element: XmlElement | null | undefined, namespace: string, localName: string): XmlElement | null;
+/**
+ * Finds a direct `w14:localName` child of `element`, also searching inside
+ * `mc:AlternateContent/mc:Choice` branches (which carry w14 markup in files
+ * produced by modern Word). The `mc:Fallback` branch used by
+ * `getChildrenByTagNameNS` would not contain w14 elements, so a separate
+ * helper is needed for these extension elements.
+ */
+export declare function getFirstW14Child(element: XmlElement | null | undefined, localName: string): XmlElement | null;
 export declare function getAttributeValue(element: XmlElement | null, localName: string): string | null;
 export declare function findElementDeep(element: XmlElement, localName: string): XmlElement | null;
 /**

package/dist/{index-BQEtsRa0.js → index-D0bOD23M.js}

@@ -2519,7 +2519,7 @@ function OasisEditorAppLazy(props = {}) {
     onCleanup(() => {
       cancelled = true;
     });
-    import("./OasisEditorApp-C_Ao4zIF.js").then((m) => {
+    import("./OasisEditorApp-CMTq6BTy.js").then((m) => {
       cancelled = true;
       setProgress(1);
       setTimeout(() => setApp(() => m.OasisEditorApp), 180);
@@ -21209,7 +21209,14 @@ function drawParagraph(ctx, paragraph, lines, state, originX, originY, onUpdate,
         italic: Boolean(styles.italic),
         sample: fragment.text.slice(0, 80)
       });
-      ctx.fillStyle = styles.color ?? "#000000";
+      ctx.fillStyle = resolveCanvasTextFill(
+        ctx,
+        styles,
+        line,
+        fragment,
+        originX,
+        originY
+      );
       if (styles.shading) {
         drawFragmentShading(
           ctx,
@@ -21441,8 +21448,36 @@ function drawScaledText(ctx, text, x, y, scale) {
   ctx.fillText(text, 0, 0);
   ctx.restore();
 }
+function resolveCanvasTextFill(ctx, styles, line, fragment, originX, originY) {
+  const fill = styles.textFill;
+  if (!fill) return styles.color ?? "#000000";
+  if (fill.type === "solid") return fill.color;
+  if (fill.stops.length < 2) return styles.color ?? "#000000";
+  const bounds = resolveFragmentPaintBounds(line, fragment);
+  if (!bounds) return fill.stops[0].color;
+  const x0 = originX + bounds.left;
+  const x1 = originX + bounds.right;
+  const y0 = originY + line.top;
+  const y1 = originY + line.top + line.height;
+  const cx = (x0 + x1) / 2;
+  const cy = (y0 + y1) / 2;
+  const angleDeg = fill.angle ?? 0;
+  const rad = angleDeg * Math.PI / 180;
+  const dx = Math.cos(rad) * (x1 - x0) / 2;
+  const dy = Math.sin(rad) * (y1 - y0) / 2;
+  const gradient = ctx.createLinearGradient(cx - dx, cy - dy, cx + dx, cy + dy);
+  for (const stop of fill.stops) {
+    const alpha = stop.alpha ?? 1;
+    const r = Number.parseInt(stop.color.slice(1, 3), 16);
+    const g2 = Number.parseInt(stop.color.slice(3, 5), 16);
+    const b = Number.parseInt(stop.color.slice(5, 7), 16);
+    gradient.addColorStop(stop.position, `rgba(${r},${g2},${b},${alpha})`);
+  }
+  return gradient;
+}
 function drawStyledText(ctx, text, x, y, scale, styles) {
-  if (!styles.outline && !styles.shadow && !styles.emboss && !styles.imprint) {
+  const hasEffects = styles.outline || styles.shadow || styles.emboss || styles.imprint || styles.textOutline;
+  if (!hasEffects) {
     drawScaledText(ctx, text, x, y, scale);
     return;
   }
@@ -21461,7 +21496,20 @@ function drawStyledText(ctx, text, x, y, scale, styles) {
     ctx.shadowOffsetY = 1;
     ctx.shadowBlur = 1;
   }
-  if (styles.outline) {
+  if (styles.textOutline) {
+    ctx.strokeStyle = styles.textOutline.color ?? ctx.fillStyle;
+    ctx.lineWidth = styles.textOutline.widthPt * PX_PER_POINT;
+    drawScaledText(ctx, text, x, y, scale);
+    if (scale === 1) {
+      ctx.strokeText(text, x, y);
+    } else {
+      ctx.save();
+      ctx.translate(x, y);
+      ctx.scale(scale, 1);
+      ctx.strokeText(text, 0, 0);
+      ctx.restore();
+    }
+  } else if (styles.outline) {
     ctx.strokeStyle = ctx.fillStyle;
     ctx.lineWidth = 0.75;
     if (scale === 1) {
@@ -32507,6 +32555,35 @@ function parseTextDirection(value) {
 function getFirstChildByTagNameNS(element, namespace, localName) {
   return getChildrenByTagNameNS(element, namespace, localName)[0] ?? null;
 }
+function getFirstW14Child(element, localName) {
+  if (!element) return null;
+  for (let i = 0; i < element.childNodes.length; i++) {
+    const node = element.childNodes[i];
+    if ((node == null ? void 0 : node.nodeType) !== node.ELEMENT_NODE) continue;
+    const el = node;
+    if (el.namespaceURI === WORD14_NS && el.localName === localName) {
+      return el;
+    }
+    if (el.namespaceURI === MARKUP_COMPAT_NS && el.localName === "AlternateContent") {
+      for (let j = 0; j < el.childNodes.length; j++) {
+        const child = el.childNodes[j];
+        if ((child == null ? void 0 : child.nodeType) !== child.ELEMENT_NODE) continue;
+        const choiceEl = child;
+        if (choiceEl.namespaceURI === MARKUP_COMPAT_NS && choiceEl.localName === "Choice") {
+          for (let k = 0; k < choiceEl.childNodes.length; k++) {
+            const gc = choiceEl.childNodes[k];
+            if ((gc == null ? void 0 : gc.nodeType) !== gc.ELEMENT_NODE) continue;
+            const gcEl = gc;
+            if (gcEl.namespaceURI === WORD14_NS && gcEl.localName === localName) {
+              return gcEl;
+            }
+          }
+        }
+      }
+    }
+  }
+  return null;
+}
 function getAttributeValue(element, localName) {
   if (!element) {
     return null;
@@ -33213,6 +33290,56 @@ function mergeStyles(base, local) {
 function parseShdFill(element) {
   return normalizeImportedHexColor(getAttributeValue(element, "fill"));
 }
+function parseW14SolidFillColor(solidFillEl) {
+  const srgbClr = getFirstChildByTagNameNS(solidFillEl, WORD14_NS, "srgbClr");
+  if (!srgbClr) return null;
+  const val = getAttributeValue(srgbClr, "val");
+  return val ? normalizeImportedHexColor(val) ?? null : null;
+}
+function parseW14TextFill(fillEl) {
+  const solidFill = getFirstChildByTagNameNS(fillEl, WORD14_NS, "solidFill");
+  if (solidFill) {
+    const color = parseW14SolidFillColor(solidFill);
+    if (color) return { type: "solid", color };
+  }
+  const gradFill = getFirstChildByTagNameNS(fillEl, WORD14_NS, "gradFill");
+  if (gradFill) {
+    const gsLst = getFirstChildByTagNameNS(gradFill, WORD14_NS, "gsLst");
+    if (gsLst) {
+      const stops = [];
+      for (let i = 0; i < gsLst.childNodes.length; i++) {
+        const node = gsLst.childNodes[i];
+        if ((node == null ? void 0 : node.nodeType) !== node.ELEMENT_NODE) continue;
+        const gs = node;
+        if (gs.namespaceURI !== WORD14_NS || gs.localName !== "gs") continue;
+        const posVal = getAttributeValue(gs, "pos");
+        const pos = posVal !== null ? Number(posVal) / 1e5 : NaN;
+        if (!Number.isFinite(pos)) continue;
+        const srgbClr = getFirstChildByTagNameNS(gs, WORD14_NS, "srgbClr");
+        if (!srgbClr) continue;
+        const colorVal = getAttributeValue(srgbClr, "val");
+        if (!colorVal) continue;
+        const color = normalizeImportedHexColor(colorVal);
+        if (!color) continue;
+        const alphaEl = getFirstChildByTagNameNS(srgbClr, WORD14_NS, "alpha");
+        const alphaRaw = alphaEl ? getAttributeValue(alphaEl, "val") : null;
+        const alpha = alphaRaw !== null ? Number(alphaRaw) / 1e5 : void 0;
+        const stop = { position: pos, color };
+        if (alpha !== void 0 && Number.isFinite(alpha)) stop.alpha = alpha;
+        stops.push(stop);
+      }
+      if (stops.length > 0) {
+        const linEl = getFirstChildByTagNameNS(gradFill, WORD14_NS, "lin");
+        const angRaw = linEl ? getAttributeValue(linEl, "ang") : null;
+        const angle = angRaw !== null ? Number(angRaw) / 6e4 : void 0;
+        const result = { type: "gradient", stops };
+        if (angle !== void 0 && Number.isFinite(angle)) result.angle = angle;
+        return result;
+      }
+    }
+  }
+  return null;
+}
 function normalizeImportedRunStyle(style2, paragraphStyleId) {
   if (!style2) {
     return void 0;
@@ -33315,6 +33442,8 @@ function normalizeImportedRunStyle(style2, paragraphStyleId) {
     ),
     fontSize: hd(style2.fontSize, effective.fontSize, defaultEffective.fontSize),
     color: dd(effective.color, defaultEffective.color),
+    textFill: dd(effective.textFill, defaultEffective.textFill),
+    textOutline: dd(effective.textOutline, defaultEffective.textOutline),
     highlight: dd(effective.highlight, defaultEffective.highlight),
     shading: dd(effective.shading, defaultEffective.shading),
     language: dd(effective.language, defaultEffective.language),
@@ -33564,6 +33693,28 @@ function parseRunStyle(runProperties, theme) {
       styles.color = themeColor;
     }
   }
+  const textFillEl = getFirstW14Child(runProperties, "textFill");
+  if (textFillEl) {
+    const textFill = parseW14TextFill(textFillEl);
+    if (textFill) styles.textFill = textFill;
+  }
+  const textOutlineEl = getFirstW14Child(runProperties, "textOutline");
+  if (textOutlineEl) {
+    const wAttr = textOutlineEl.getAttributeNS(WORD14_NS, "w");
+    const widthEmu = wAttr !== null ? Number(wAttr) : NaN;
+    const widthPt = Number.isFinite(widthEmu) && widthEmu > 0 ? widthEmu / 12700 : 0.5;
+    const textOutline = { widthPt };
+    const outlineFill = parseW14TextFill(textOutlineEl);
+    if (outlineFill) {
+      textOutline.fill = outlineFill;
+      if (outlineFill.type === "solid") {
+        textOutline.color = outlineFill.color;
+      } else if (outlineFill.type === "gradient" && outlineFill.stops[0]) {
+        textOutline.color = outlineFill.stops[0].color;
+      }
+    }
+    styles.textOutline = textOutline;
+  }
   const highlight = getFirstChildByTagNameNS(
     runProperties,
     WORD_NS,
@@ -37137,7 +37288,7 @@ function importDocxInWorker(buffer, options = {}) {
     const worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "" + new URL("assets/importDocxWorker-DAbfLHtp.js", import.meta.url).href,
+        "" + new URL("assets/importDocxWorker-M34STPYy.js", import.meta.url).href,
         import.meta.url
       ),
       {

package/dist/oasis-editor.js

@@ -1,4 +1,4 @@
-import { O, c6, c7, c8, c9, ca, a8, cb, Q, bR, cc, cd, ce, N, cf, bP, cg, ch, ci, cj, ck, c1, cl, cm, cn, co, cp, cq, cr, cs, ct, cu, cv, cw, ad, cx, c0, cy, c8 as c82, cd as cd2, cf as cf2, co as co2, cq as cq2, cv as cv2, cz, bT, bO, cA, cB, cC, bQ, cD, cE, bS } from "./index-BQEtsRa0.js";
+import { O, c6, c7, c8, c9, ca, a8, cb, Q, bR, cc, cd, ce, N, cf, bP, cg, ch, ci, cj, ck, c1, cl, cm, cn, co, cp, cq, cr, cs, ct, cu, cv, cw, ad, cx, c0, cy, c8 as c82, cd as cd2, cf as cf2, co as co2, cq as cq2, cv as cv2, cz, bT, bO, cA, cB, cC, bQ, cD, cE, bS } from "./index-D0bOD23M.js";
 export {
   O as BalloonShell,
   c6 as Button,