@json-to-office/core-docx 4.2.0 → 4.4.0

package/dist/plugin/example/index.js

@@ -9307,6 +9307,15 @@ function compileColumns(component, scope) {
   if (configs.length === 0) return [];
   const available = getAvailableWidthTwips(ctx.theme, ctx.themeName);
   const { widths, gaps } = columnMetrics(configs, props.gap, available);
+  const stated = widths.map(
+    (width, index) => width + gaps[index] / 2 + (index > 0 ? gaps[index - 1] / 2 : 0)
+  );
+  const statedTotal = stated.reduce((sum, cell) => sum + cell, 0);
+  const scale = statedTotal > available ? available / statedTotal : 1;
+  const exact = stated.map((cell) => cell * scale);
+  const cells = exact.map((cell) => Math.round(cell));
+  const total = exact.reduce((sum, cell) => sum + cell, 0);
+  cells[cells.length - 1] += Math.round(total) - cells.reduce((a, b) => a + b, 0);
   const contents = configs.map(() => []);
   const children = component.children ?? [];
   children.forEach((child, index) => {
@@ -9318,7 +9327,7 @@ function compileColumns(component, scope) {
       kind: "table",
       id: scope.id,
       path: path3,
-      columnGrid: { unit: "twips", values: [] },
+      columnGrid: { unit: "twips", values: cells },
       width: { kind: "percent", value: 100 },
       layout: "fixed",
       borders: NO_BORDERS,
@@ -9343,7 +9352,7 @@ function compileColumns(component, scope) {
                   children: []
                 }
               ],
-              widthTwips: widths[index],
+              widthTwips: cells[index],
               margins: {
                 topTwips: 0,
                 rightTwips: gaps[index] / 2,
@@ -9921,6 +9930,11 @@ function compileList(component, scope, referencePrefix = "list", explicitLevels)
   const props = component.props ?? {};
   const items = props.items ?? [];
   if (items.length === 0) return [];
+  const base = runFormatting3(
+    props.font ?? {},
+    props,
+    ctx
+  );
   const notes = createNoteBinding(props.footnotes, props.endnotes, ctx);
   const reference = declareNumbering(
     props,
@@ -9956,17 +9970,21 @@ function compileList(component, scope, referencePrefix = "list", explicitLevels)
       paragraphNode(
         { ctx, path: itemPath, id: `${scope.id}:i${index}` },
         revision === void 0 ? parseInline(text, {
-          base: {},
+          base,
           hyperlinks: true,
           ...notes ? { resolveNote: notes.resolve } : {},
           resolvePlaceholder: placeholderResolver(ctx),
           resolveCrossReference: crossReferenceResolver(ctx, itemPath)
-        }) : compileRevision(revision, {}, ctx),
+        }) : compileRevision(revision, base, ctx),
         {
           styleId: "Normal",
           formatting: {
             alignment: compileAlignment(props.alignment) ?? "left",
-            spacing: itemSpacing(props.spacing, index, items.length)
+            spacing: itemSpacing(props.spacing, index, items.length),
+            // Every item carries the flags, not just the first: keeping a list
+            // with what introduces it means keeping it whole.
+            ...props.keepNext !== void 0 ? { keepNext: props.keepNext } : {},
+            ...props.keepLines !== void 0 ? { keepLines: props.keepLines } : {}
           },
           ...commentIds && index === firstRendered ? { commentOpen: commentIds } : {},
           ...commentIds && index === lastRendered ? { commentClose: commentIds } : {},
@@ -11679,12 +11697,6 @@ function determineComponentLayout(component) {
     }
     return "single";
   }
-  if ("children" in component && component.children) {
-    const hasColumns = component.children.some(
-      (child) => isColumnsComponent(child)
-    );
-    return hasColumns ? "multi-column" : "single";
-  }
   return "single";
 }
 function processLayoutComponents(components) {