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

package/lib/index.js

@@ -3032,31 +3032,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) {
@@ -3097,10 +3075,34 @@ const splitNodes = (height, contentArea, nodes, fontStore, containerWidth) => {
             }
             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];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnichi11/react-column-pdf-layout",
-  "version": "4.4.4-rnichi.0",
+  "version": "4.4.4",
   "license": "MIT",
   "description": "Multi-column layout engine for react-column-pdf",
   "author": "rnichi1",