@rnichi11/react-column-pdf-layout 4.4.4-rnichi.0 → 4.5.0

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference path="../globals.d.ts" />
 /// <reference types="node" />
-import { Style, SafeStyle, Transform } from '@react-pdf/stylesheet';
+import { Style, SafeStyle, Transform } from '@rnichi11/react-column-pdf-stylesheet';
 import { YogaNode } from 'yoga-layout/load';
 import * as React from 'react';
 import * as P from '@react-pdf/primitives';

package/lib/index.js

@@ -1,6 +1,6 @@
 import { upperFirst, capitalize, parseFloat as parseFloat$1, without, pick, compose, evolve, mapValues, matchPercent, castArray, isNil, omit, asyncCompose } from '@react-pdf/fns';
 import * as P from '@react-pdf/primitives';
-import resolveStyle, { transformColor, flatten } from '@react-pdf/stylesheet';
+import resolveStyle, { transformColor, flatten } from '@rnichi11/react-column-pdf-stylesheet';
 import layoutEngine, { fontSubstitution, wordHyphenation, scriptItemizer, textDecoration, justification, linebreaker, bidi, fromFragments } from '@rnichi11/react-column-pdf-textkit';
 import * as Yoga from 'yoga-layout/load';
 import { loadYoga as loadYoga$1 } from 'yoga-layout/load';
@@ -2987,6 +2987,7 @@ const allFixed = (nodes) => nodes.every(isFixed);
 const isDynamic = (node) => node.props && 'render' in node.props;
 const relayoutPage = compose(resolveTextLayout, resolvePageDimensions, resolveInheritance);
 const relayoutDynamicPage = compose(resolveTextLayout, resolvePageDimensions, resolveInheritance, resolvePageStyles);
+const relayoutDynamicPageForIndices = compose(resolveTextLayout, resolvePageDimensions, resolveInheritance);
 const warnUnavailableSpace = (node) => {
     console.warn(`Node of type ${node.type} can't wrap between pages and it's bigger than available page height`);
 };
@@ -3032,31 +3033,9 @@ const splitNodes = (height, contentArea, nodes, fontStore, containerWidth) => {
             nextChildren.push(next, ...futureNodes);
             break;
         }
-        if (shouldSplit) {
-            const [currentChild, nextChild] = split(child, height, contentArea, fontStore, undefined, containerWidth);
-            // All children are moved to the next page, it doesn't make sense to show the parent on the current page
-            if (child.children.length > 0 && currentChild.children.length === 0) {
-                // But if the current page is empty then we can just include the parent on the current page
-                if (currentChildren.length === 0) {
-                    currentChildren.push(child, ...futureFixedNodes);
-                    nextChildren.push(...futureNodes);
-                }
-                else {
-                    const box = Object.assign({}, child.box, {
-                        top: child.box.top - height,
-                    });
-                    const next = Object.assign({}, child, { box });
-                    currentChildren.push(...futureFixedNodes);
-                    nextChildren.push(next, ...futureNodes);
-                }
-                break;
-            }
-            if (currentChild)
-                currentChildren.push(currentChild);
-            if (nextChild)
-                nextChildren.push(nextChild);
-            continue;
-        }
+        // Handle multi-column containers before generic split logic.
+        // `child.box.height` here comes from pre-column layout and can overestimate
+        // required height, which would trigger premature page splits.
         if (isView(child) &&
             (child.props?.columns ?? 1) > 1 &&
             fontStore) {
@@ -3091,16 +3070,41 @@ const splitNodes = (height, contentArea, nodes, fontStore, containerWidth) => {
                     children: overflowChildren,
                     box: { ...viewChild.box, top: 0 },
                 });
-                currentChildren.push(currentViewWithCols);
+                // Keep fixed siblings (eg fixed footers/headers) on current page too.
+                currentChildren.push(currentViewWithCols, ...futureFixedNodes);
                 nextChildren.push(nextViewWithOverflow, ...futureNodes);
                 break;
             }
             const childToPush = transformViewToColumns(viewChild, height - nodeTop, contentArea, fontStore, containerWidth);
             currentChildren.push(childToPush);
+            continue;
         }
-        else {
-            currentChildren.push(child);
+        if (shouldSplit) {
+            const [currentChild, nextChild] = split(child, height, contentArea, fontStore, undefined, containerWidth);
+            // All children are moved to the next page, it doesn't make sense to show the parent on the current page
+            if (child.children.length > 0 && currentChild.children.length === 0) {
+                // But if the current page is empty then we can just include the parent on the current page
+                if (currentChildren.length === 0) {
+                    currentChildren.push(child, ...futureFixedNodes);
+                    nextChildren.push(...futureNodes);
+                }
+                else {
+                    const box = Object.assign({}, child.box, {
+                        top: child.box.top - height,
+                    });
+                    const next = Object.assign({}, child, { box });
+                    currentChildren.push(...futureFixedNodes);
+                    nextChildren.push(next, ...futureNodes);
+                }
+                break;
+            }
+            if (currentChild)
+                currentChildren.push(currentChild);
+            if (nextChild)
+                nextChildren.push(nextChild);
+            continue;
         }
+        currentChildren.push(child);
     }
     return [currentChildren, nextChildren];
 };
@@ -3199,9 +3203,12 @@ const resolveDynamicNodes = (props, node) => {
     const lines = isNodeDynamic ? null : node.lines;
     return Object.assign({}, node, { box, lines, children });
 };
-const resolveDynamicPage = (props, page, fontStore, yoga) => {
+const resolveDynamicPage = (props, page, fontStore, yoga, options) => {
     if (shouldResolveDynamicNodes(page)) {
         const resolvedPage = resolveDynamicNodes(props, page);
+        if (options?.resolveStyles === false) {
+            return relayoutDynamicPageForIndices(resolvedPage, fontStore, yoga);
+        }
         return relayoutDynamicPage(resolvedPage, fontStore, yoga);
     }
     return page;
@@ -3237,7 +3244,9 @@ const resolvePageIndices = (fontStore, yoga, page, pageNumber, pages) => {
         subPageNumber: page.subPageNumber + 1,
         subPageTotalPages: page.subPageTotalPages,
     };
-    return resolveDynamicPage(props, page, fontStore, yoga);
+    return resolveDynamicPage(props, page, fontStore, yoga, {
+        resolveStyles: false,
+    });
 };
 const assocSubPageData = (subpages) => {
     return subpages.map((page, i) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnichi11/react-column-pdf-layout",
-  "version": "4.4.4-rnichi.0",
+  "version": "4.5.0",
   "license": "MIT",
   "description": "Multi-column layout engine for react-column-pdf",
   "author": "rnichi1",
@@ -23,9 +23,9 @@
     "@react-pdf/fns": "3.1.2",
     "@react-pdf/image": "^3.0.4",
     "@react-pdf/primitives": "^4.1.1",
-    "@react-pdf/stylesheet": "^6.1.2",
+    "@rnichi11/react-column-pdf-stylesheet": "^6.2.0",
     "@rnichi11/react-column-pdf-textkit": "6.1.1",
-    "@react-pdf/types": "^2.9.2",
+    "@react-pdf/types": "^2.9.3",
     "emoji-regex-xs": "^1.0.0",
     "queue": "^6.0.1",
     "yoga-layout": "^3.2.1"