ooxml-core 1.12.1 → 1.12.2

package/dist/pptx/editor/render/table-style-editor-edit.cjs

@@ -1,14 +1,36 @@
 'use strict';
 
-var chunk2V76L5AE_cjs = require('../../../chunk-2V76L5AE.cjs');
+var chunkWVXCHFRU_cjs = require('../../../chunk-WVXCHFRU.cjs');
 var chunkMGOBGX4A_cjs = require('../../../chunk-MGOBGX4A.cjs');
+var pptx = require('ooxml-core/pptx');
 
-// pptx/editor/render/table-style-editor-edit.ts
-function patchBorderSide(borders, side, patch) {
-  const current = borders?.[side] ?? {};
-  return { ...borders, [side]: { ...current, ...patch } };
+function patchBorderSide(borders, side, patch, formatScheme) {
+  const { lnRef, ...current } = borders?.[side] ?? {};
+  if (!lnRef) {
+    return { ...borders, [side]: { ...current, ...patch } };
+  }
+  const concrete = Object.keys(current).length > 0;
+  const colourOnly = patch.fill !== void 0 && Object.keys(patch).every((key) => key === "fill" || key === "color");
+  if (colourOnly && !formatScheme && !concrete) {
+    return { ...borders, [side]: { lnRef: { ...lnRef, color: patch.fill } } };
+  }
+  const resolved = formatScheme ? pptx.resolveTableStyleLineRef(lnRef, formatScheme, void 0) : void 0;
+  const fromTheme = {};
+  if (resolved?.width !== void 0) {
+    fromTheme.width = resolved.width;
+  }
+  if (resolved?.dash !== void 0) {
+    fromTheme.dash = resolved.dash;
+  }
+  if (resolved?.noFill) {
+    fromTheme.noFill = true;
+  }
+  const colour = pptx.resolveTableStyleLineRefColor(lnRef, formatScheme);
+  const base = colour && current.fill === void 0 && current.color === void 0 && !resolved?.noFill ? { ...fromTheme, ...current, ...colour } : { ...fromTheme, ...current };
+  return { ...borders, [side]: { ...base, ...patch } };
 }
-function applyTableStyleFieldEdit(entry, part, edit) {
+function applyTableStyleFieldEdit(entry, part, edit, context = {}) {
+  const { formatScheme } = context;
   if (part === "background") {
     return applyBackgroundEdit(entry, edit);
   }
@@ -19,7 +41,7 @@ function applyTableStyleFieldEdit(entry, part, edit) {
   const cell3DKey = `${part}Cell3D`;
   switch (edit.kind) {
     case "fillColor":
-      keyed[fillKey] = chunk2V76L5AE_cjs.colorToFill(edit.hex, edit.ref);
+      keyed[fillKey] = chunkWVXCHFRU_cjs.colorToFill(edit.hex, edit.ref);
       break;
     case "fillNone": {
       const current = keyed[fillKey];
@@ -45,7 +67,7 @@ function applyTableStyleFieldEdit(entry, part, edit) {
       };
       break;
     case "textColor": {
-      const fill = chunk2V76L5AE_cjs.colorToFill(edit.hex, edit.ref);
+      const fill = chunkWVXCHFRU_cjs.colorToFill(edit.hex, edit.ref);
       keyed[textKey] = {
         ...keyed[textKey],
         fontSchemeColor: fill.schemeColor,
@@ -59,28 +81,32 @@ function applyTableStyleFieldEdit(entry, part, edit) {
       keyed[bordersKey] = patchBorderSide(
         keyed[bordersKey],
         edit.side,
-        { fill: chunk2V76L5AE_cjs.colorToFill(edit.hex, edit.ref), color: edit.ref ? void 0 : edit.hex }
+        { fill: chunkWVXCHFRU_cjs.colorToFill(edit.hex, edit.ref), color: edit.ref ? void 0 : edit.hex },
+        formatScheme
       );
       break;
     case "borderWidth":
       keyed[bordersKey] = patchBorderSide(
         keyed[bordersKey],
         edit.side,
-        { width: edit.width }
+        { width: edit.width },
+        formatScheme
       );
       break;
     case "borderDash":
       keyed[bordersKey] = patchBorderSide(
         keyed[bordersKey],
         edit.side,
-        { dash: edit.dash }
+        { dash: edit.dash },
+        formatScheme
       );
       break;
     case "borderNone":
       keyed[bordersKey] = patchBorderSide(
         keyed[bordersKey],
         edit.side,
-        { noFill: edit.noFill }
+        { noFill: edit.noFill },
+        formatScheme
       );
       break;
     case "cell3DBevelWidth":
@@ -121,7 +147,7 @@ function applyBackgroundEdit(entry, edit) {
   const current = entry.tableBackground;
   let nextBackground = current;
   if (edit.kind === "fillColor") {
-    nextBackground = { ...current, fill: chunk2V76L5AE_cjs.colorToFill(edit.hex, edit.ref), fillRef: void 0 };
+    nextBackground = { ...current, fill: chunkWVXCHFRU_cjs.colorToFill(edit.hex, edit.ref), fillRef: void 0 };
   } else if (edit.kind === "fillNone") {
     nextBackground = {
       ...current,

package/dist/pptx/editor/render/table-style-editor-edit.d.ts

@@ -1,5 +1,5 @@
 import { TableStyleBorderSide, TableStyleEditorPartId } from "./table-style-editor-parts.js";
-import { ParsedTableStyleBorders, ParsedTableStyleEntry, ParsedTableStyleFill, ParsedTableStyleText, PptxTableCell3D, PptxThemeColorRef } from "ooxml-core/pptx";
+import { ParsedTableStyleBorders, ParsedTableStyleEntry, ParsedTableStyleFill, ParsedTableStyleText, PptxTableCell3D, PptxThemeColorRef, PptxThemeFormatScheme } from "ooxml-core/pptx";
 //#region pptx/editor/render/table-style-editor-edit.d.ts
 export type TableStyleEditorFieldEdit = {
   readonly kind: 'fillColor';
@@ -63,6 +63,15 @@ export interface TableStyleEditorEditResult {
   /** The SDK-shaped patch, for a caller that runs edits through `set_table_style_section` instead. */
   readonly payload: TableStyleSectionEditPayload;
 }
+/** What the edit path knows about the theme, for sides that reference it. */
+export interface TableStyleEditContext {
+  /**
+   * The theme's `a:fmtScheme`. With it, editing one facet of a theme line
+   * reference (`a:lnRef`) starts from the referenced line, so the facets the
+   * edit does not touch (width, dash) keep the theme's values.
+   */
+  readonly formatScheme?: PptxThemeFormatScheme;
+}
 /**
  * Apply one field edit to `entry`'s `part`, returning the new entry plus the
  * SDK-shaped payload. `part === 'background'` only honours `fillColor` /
@@ -70,6 +79,6 @@ export interface TableStyleEditorEditResult {
  * kind on the background part is a no-op (returns `entry` unchanged, payload
  * with no facets set) so a caller does not need to pre-filter by part.
  */
-export declare function applyTableStyleFieldEdit(entry: ParsedTableStyleEntry, part: TableStyleEditorPartId, edit: TableStyleEditorFieldEdit): TableStyleEditorEditResult;
+export declare function applyTableStyleFieldEdit(entry: ParsedTableStyleEntry, part: TableStyleEditorPartId, edit: TableStyleEditorFieldEdit, context?: TableStyleEditContext): TableStyleEditorEditResult;
 //#endregion
 //# sourceMappingURL=table-style-editor-edit.d.ts.map

package/dist/pptx/editor/render/table-style-editor-edit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table-style-editor-edit.d.ts","names":[],"sources":["../../../../pptx/editor/render/table-style-editor-edit.ts"],"mappings":";;;YA2BY;WAEA;WACA;WACA,KAAK;;WAEH;WAA2B;;WAC3B;WAA2B;;WAC3B;WAA6B;;WAC7B;WAAgC;;WAElC;WACA;WACA,KAAK;;WAGL;WACA,MAAM;WACN;WACA,KAAK;;WAEH;WAA8B,MAAM;WAA+B;;WACnE;WAA6B,MAAM;WAA+B;;WAClE;WAA6B,MAAM;WAA+B;;WAClE;WAAmC;;WACnC;WAAoC;;WACpC;WAAoC;;;iBAGjC;WACP;WACA;WACA,OAAO;WACP,OAAO;WACP,UAAU;WACV,SAAS;;iBAGF;;WAEP,OAAO;;WAEP,SAAS;;;;;;;;;wBA6BH,yBACf,OAAO,uBACP,MAAM,wBACN,MAAM,4BACJ"}
+{"version":3,"file":"table-style-editor-edit.d.ts","names":[],"sources":["../../../../pptx/editor/render/table-style-editor-edit.ts"],"mappings":";;;YA6BY;WAEA;WACA;WACA,KAAK;;WAEH;WAA2B;;WAC3B;WAA2B;;WAC3B;WAA6B;;WAC7B;WAAgC;;WAElC;WACA;WACA,KAAK;;WAGL;WACA,MAAM;WACN;WACA,KAAK;;WAEH;WAA8B,MAAM;WAA+B;;WACnE;WAA6B,MAAM;WAA+B;;WAClE;WAA6B,MAAM;WAA+B;;WAClE;WAAmC;;WACnC;WAAoC;;WACpC;WAAoC;;;iBAGjC;WACP;WACA;WACA,OAAO;WACP,OAAO;WACP,UAAU;WACV,SAAS;;iBAGF;;WAEP,OAAO;;WAEP,SAAS;;;iBAcF;;;;;;WAMP,eAAe;;;;;;;;;wBAwDT,yBACf,OAAO,uBACP,MAAM,wBACN,MAAM,2BACN,UAAS,wBACP"}

package/dist/pptx/editor/render/table-style-editor-edit.mjs

@@ -1,12 +1,34 @@
-import { colorToFill } from '../../../chunk-DC4JDONB.mjs';
+import { colorToFill } from '../../../chunk-V57HCOUM.mjs';
 import { isTableStylePartName } from '../../../chunk-WA6RZWZD.mjs';
+import { resolveTableStyleLineRef, resolveTableStyleLineRefColor } from 'ooxml-core/pptx';
 
-// pptx/editor/render/table-style-editor-edit.ts
-function patchBorderSide(borders, side, patch) {
-  const current = borders?.[side] ?? {};
-  return { ...borders, [side]: { ...current, ...patch } };
+function patchBorderSide(borders, side, patch, formatScheme) {
+  const { lnRef, ...current } = borders?.[side] ?? {};
+  if (!lnRef) {
+    return { ...borders, [side]: { ...current, ...patch } };
+  }
+  const concrete = Object.keys(current).length > 0;
+  const colourOnly = patch.fill !== void 0 && Object.keys(patch).every((key) => key === "fill" || key === "color");
+  if (colourOnly && !formatScheme && !concrete) {
+    return { ...borders, [side]: { lnRef: { ...lnRef, color: patch.fill } } };
+  }
+  const resolved = formatScheme ? resolveTableStyleLineRef(lnRef, formatScheme, void 0) : void 0;
+  const fromTheme = {};
+  if (resolved?.width !== void 0) {
+    fromTheme.width = resolved.width;
+  }
+  if (resolved?.dash !== void 0) {
+    fromTheme.dash = resolved.dash;
+  }
+  if (resolved?.noFill) {
+    fromTheme.noFill = true;
+  }
+  const colour = resolveTableStyleLineRefColor(lnRef, formatScheme);
+  const base = colour && current.fill === void 0 && current.color === void 0 && !resolved?.noFill ? { ...fromTheme, ...current, ...colour } : { ...fromTheme, ...current };
+  return { ...borders, [side]: { ...base, ...patch } };
 }
-function applyTableStyleFieldEdit(entry, part, edit) {
+function applyTableStyleFieldEdit(entry, part, edit, context = {}) {
+  const { formatScheme } = context;
   if (part === "background") {
     return applyBackgroundEdit(entry, edit);
   }
@@ -57,28 +79,32 @@ function applyTableStyleFieldEdit(entry, part, edit) {
       keyed[bordersKey] = patchBorderSide(
         keyed[bordersKey],
         edit.side,
-        { fill: colorToFill(edit.hex, edit.ref), color: edit.ref ? void 0 : edit.hex }
+        { fill: colorToFill(edit.hex, edit.ref), color: edit.ref ? void 0 : edit.hex },
+        formatScheme
       );
       break;
     case "borderWidth":
       keyed[bordersKey] = patchBorderSide(
         keyed[bordersKey],
         edit.side,
-        { width: edit.width }
+        { width: edit.width },
+        formatScheme
       );
       break;
     case "borderDash":
       keyed[bordersKey] = patchBorderSide(
         keyed[bordersKey],
         edit.side,
-        { dash: edit.dash }
+        { dash: edit.dash },
+        formatScheme
       );
       break;
     case "borderNone":
       keyed[bordersKey] = patchBorderSide(
         keyed[bordersKey],
         edit.side,
-        { noFill: edit.noFill }
+        { noFill: edit.noFill },
+        formatScheme
       );
       break;
     case "cell3DBevelWidth":

package/dist/pptx/editor/render/text-runs-style-patch.d.ts

@@ -1,5 +1,5 @@
 import { i as TextStyle } from "../../chunks/text-D49FKllA.js";
-import { _ as PptxElementWithText, m as PptxElement } from "../../chunks/elements-DD3UGOMd.js";
+import { _ as PptxElementWithText, m as PptxElement } from "../../chunks/elements-DmbzOhFu.js";
 //#region pptx/editor/render/text-runs-style-patch.d.ts
 /** Immutable whole-text edit, using the pre-edit body style for run inheritance. */
 export declare function textRunsStylePatch(element: PptxElement, updates: Partial<TextStyle>): Pick<Partial<PptxElementWithText>, 'textStyle' | 'textSegments'>;

package/dist/pptx/editor/render/text-style-scope.d.ts

@@ -1,5 +1,5 @@
 import { i as TextStyle, r as TextSegment } from "../../chunks/text-D49FKllA.js";
-import { m as PptxElement } from "../../chunks/elements-DD3UGOMd.js";
+import { m as PptxElement } from "../../chunks/elements-DmbzOhFu.js";
 import { TextDecorationFlag } from "./text-content-style.js";
 //#region pptx/editor/render/text-style-scope.d.ts
 /**

package/dist/pptx/index.cjs

@@ -76722,14 +76722,23 @@ function parseSolidFillStyle(solidFill3) {
     ...alpha !== void 0 ? { alpha } : {}
   };
 }
+function parseLineRef(lnRef) {
+  const idx = parseInt(String(lnRef?.["@_idx"] ?? ""), 10);
+  if (!lnRef || !Number.isFinite(idx)) {
+    return void 0;
+  }
+  const hex3 = String(lnRef["a:srgbClr"]?.["@_val"] ?? "").trim();
+  const color2 = parseSolidFillStyle(lnRef) ?? (hex3 ? { schemeColor: "", color: hex3.startsWith("#") ? hex3 : `#${hex3}` } : void 0);
+  return { lnRef: color2 ? { idx, color: color2 } : { idx } };
+}
 function parseBorderSide(side) {
   if (!side) {
     return void 0;
   }
-  const ln = side["a:ln"];
-  if (!ln) {
-    return void 0;
+  if (side["a:ln"] === void 0) {
+    return parseLineRef(side["a:lnRef"]);
   }
+  const ln = typeof side["a:ln"] === "object" ? side["a:ln"] : {};
   const border = {};
   let has = false;
   if (ln["a:noFill"] !== void 0) {
@@ -142109,8 +142118,8 @@ function buildFallbackTransition(transitionNode) {
     }
     fallback[key2] = value;
   }
-  const hasChild = Object.keys(fallback).some((key2) => !key2.startsWith("@_"));
-  if (!hasChild) {
+  const hasChild2 = Object.keys(fallback).some((key2) => !key2.startsWith("@_"));
+  if (!hasChild2) {
     fallback["p:fade"] = {};
   }
   return fallback;
@@ -144004,6 +144013,16 @@ var init_PptxHandlerRuntimeSaveHandoutMaster = __esm({
 // pptx/core/core/runtime/table-style-border-write.ts
 function mergeBorderSideXml(border, existingSide) {
   const existing = existingSide && typeof existingSide === "object" && !Array.isArray(existingSide) ? existingSide : {};
+  const concrete = border.width !== void 0 || border.dash !== void 0 || border.fill !== void 0 || border.color !== void 0 || border.noFill !== void 0;
+  if (border.lnRef && !concrete) {
+    delete existing["a:ln"];
+    const ref = { "@_idx": String(border.lnRef.idx) };
+    if (border.lnRef.color) {
+      Object.assign(ref, colorChoiceXml(border.lnRef.color));
+    }
+    existing["a:lnRef"] = ref;
+    return existing;
+  }
   delete existing["a:lnRef"];
   const ln = ensureChild2(existing, "a:ln");
   if (border.width !== void 0) {
@@ -157587,6 +157606,108 @@ var init_table_style_editor = __esm({
   }
 });
 
+// pptx/core/core/runtime/table-style-line-ref.ts
+function hasChild(rawNode, key2) {
+  return !!rawNode && typeof rawNode === "object" && Object.prototype.hasOwnProperty.call(rawNode, key2) && rawNode[key2] !== void 0;
+}
+function linePlaceholderColor(rawNode) {
+  if (!rawNode || typeof rawNode !== "object") {
+    return void 0;
+  }
+  const solidFill3 = rawNode["a:solidFill"];
+  const schemeClr = solidFill3?.["a:schemeClr"];
+  return schemeClr?.["@_val"] === "phClr" ? schemeClr : void 0;
+}
+function resolveTableStyleLineRef(lnRef, formatScheme, colorMap) {
+  if (lnRef.idx === 0) {
+    return { noFill: true };
+  }
+  const line2 = formatScheme?.lineStyles[lnRef.idx - 1];
+  if (!line2) {
+    return void 0;
+  }
+  if (hasChild(line2.rawNode, "a:noFill")) {
+    return { noFill: true };
+  }
+  const border = {};
+  if (line2.width !== void 0) {
+    border.width = line2.width;
+  }
+  if (line2.dash && line2.dash !== "solid") {
+    border.dash = line2.dash;
+  }
+  const placeholder = linePlaceholderColor(line2.rawNode);
+  const base = placeholder ? refColor(lnRef, colorMap) : void 0;
+  if (base && placeholder) {
+    border.color = applyDrawingColorTransforms(base, placeholder);
+  } else if (line2.color) {
+    border.color = line2.color;
+  }
+  return border;
+}
+function foldPercent(a, b) {
+  if (a === void 0 || b === void 0) {
+    return a ?? b;
+  }
+  return Math.round(a * b / 1e5);
+}
+function refBorderColor(ref) {
+  if (ref?.schemeColor) {
+    return { fill: ref };
+  }
+  return ref?.color ? { color: ref.color } : void 0;
+}
+function resolveTableStyleLineRefColor(lnRef, formatScheme) {
+  const ref = lnRef.color;
+  const line2 = lnRef.idx > 0 ? formatScheme?.lineStyles[lnRef.idx - 1] : void 0;
+  const solidFill3 = line2?.rawNode?.["a:solidFill"];
+  const own = parseSolidFillStyle(solidFill3);
+  if (!own) {
+    const hex3 = String(solidFill3?.["a:srgbClr"]?.["@_val"] ?? "");
+    return hex3 ? { color: hex3.startsWith("#") ? hex3 : `#${hex3}` } : refBorderColor(ref);
+  }
+  if (own.schemeColor !== "phClr") {
+    return { fill: own };
+  }
+  if (!ref?.schemeColor) {
+    return refBorderColor(ref);
+  }
+  const fill = { schemeColor: ref.schemeColor };
+  const tint = foldPercent(ref.tint, own.tint);
+  const shade = foldPercent(ref.shade, own.shade);
+  const alpha = own.alpha ?? ref.alpha;
+  if (tint !== void 0) {
+    fill.tint = tint;
+  }
+  if (shade !== void 0) {
+    fill.shade = shade;
+  }
+  if (alpha !== void 0) {
+    fill.alpha = alpha;
+  }
+  return { fill };
+}
+function refColor(lnRef, colorMap) {
+  const color2 = lnRef.color;
+  const base = color2?.schemeColor ? colorMap?.[color2.schemeColor] : color2?.color;
+  if (!base || !color2) {
+    return base;
+  }
+  const transforms = {};
+  for (const key2 of ["tint", "shade", "alpha"]) {
+    if (color2[key2] !== void 0) {
+      transforms[`a:${key2}`] = { "@_val": String(color2[key2]) };
+    }
+  }
+  return Object.keys(transforms).length > 0 ? applyDrawingColorTransforms(base, transforms) : base;
+}
+var init_table_style_line_ref = __esm({
+  "pptx/core/core/runtime/table-style-line-ref.ts"() {
+    init_color();
+    init_table_style_border_parse();
+  }
+});
+
 // pptx/core/core/index.ts
 var init_core2 = __esm({
   "pptx/core/core/index.ts"() {
@@ -157600,6 +157721,7 @@ var init_core2 = __esm({
     init_auto_number_sequence();
     init_table_style_editor();
     init_table_style_entry_parse();
+    init_table_style_line_ref();
   }
 });
 
@@ -179673,7 +179795,10 @@ exports.resolveReferenceUriToPart = resolveReferenceUriToPart;
 exports.resolveSmartArtEffectIntensity = resolveSmartArtEffectIntensity;
 exports.resolveSmartArtNodeCoherent3DOff = resolveSmartArtNodeCoherent3DOff;
 exports.resolveSmartArtNodeStyleRoles = resolveSmartArtNodeStyleRoles;
+exports.resolveTableBackgroundFillRef = resolveTableBackgroundFillRef;
 exports.resolveTableCellStyle = resolveTableCellStyle;
+exports.resolveTableStyleLineRef = resolveTableStyleLineRef;
+exports.resolveTableStyleLineRefColor = resolveTableStyleLineRefColor;
 exports.resolveThemeColorRef = resolveThemeColorRef;
 exports.resolveVisibilitySetTiming = resolveVisibilitySetTiming;
 exports.rgb = rgb;