ats-form-react-pdf-layout 4.4.4 → 4.4.5

package/lib/index.js

@@ -2577,6 +2577,24 @@ const warnUnavailableSpace = (node) => {
     // eslint-disable-next-line no-console
     console.warn(`Node of type ${node.type} can't wrap between pages and it's bigger than available page height`);
 };
+const breakableViewChild = (children, height, path = '', currentChildren) => {
+    for (let i = 0; i < children.length; i += 1) {
+        if (children[i].type !== 'VIEW')
+            continue;
+        if (shouldBreak(children[i], children.slice(i + 1, height), height, currentChildren)) {
+            return {
+                child: children[i],
+                path: `${path}/${i}`,
+            };
+        }
+        if (children[i].children && children[i].children.length > 0) {
+            const breakable = breakableViewChild(children[i].children, height, `${path}/${i}`, currentChildren);
+            if (breakable)
+                return breakable;
+        }
+    }
+    return null;
+};
 const splitNodes = (height, contentArea, nodes) => {
     const currentChildren = [];
     const nextChildren = [];
@@ -2588,6 +2606,9 @@ const splitNodes = (height, contentArea, nodes) => {
         const nodeHeight = child.box.height;
         const isOutside = height <= nodeTop;
         const shouldBreak$1 = shouldBreak(child, futureNodes, height, currentChildren);
+        const firstBreakableViewChild = child.children &&
+            child.children.length > 0 &&
+            breakableViewChild(child.children, height, '', currentChildren);
         const prevChild = nodes.length > 0 && i > 0 ? nodes[i - 1] : undefined;
         const shouldSplit = height + SAFETY_THRESHOLD < nodeTop + nodeHeight;
         const canWrap = getWrap(child, prevChild, currentChildren);
@@ -2608,6 +2629,7 @@ const splitNodes = (height, contentArea, nodes) => {
                 currentChildren.push(child);
                 nextChildren.push(...futureNodes);
                 warnUnavailableSpace(child);
+                break;
             }
             else {
                 // We don't want to break non wrapable nodes, so we just let them be.
@@ -2621,8 +2643,8 @@ const splitNodes = (height, contentArea, nodes) => {
                 const next = Object.assign({}, child, { box, props });
                 currentChildren.push(...futureFixedNodes);
                 nextChildren.push(next, ...futureNodes);
+                break;
             }
-            break;
         }
         if (shouldBreak$1) {
             const box = Object.assign({}, child.box, { top: child.box.top - height });
@@ -2635,7 +2657,7 @@ const splitNodes = (height, contentArea, nodes) => {
             nextChildren.push(next, ...futureNodes);
             break;
         }
-        if (shouldSplit) {
+        if (shouldSplit || firstBreakableViewChild) {
             const [currentChild, nextChild] = split(child, height, contentArea);
             // 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) {
@@ -2644,10 +2666,10 @@ const splitNodes = (height, contentArea, nodes) => {
                 //   currentChildren.push(child, ...futureFixedNodes);
                 //   nextChildren.push(...futureNodes);
                 // } else {
-                const box = Object.assign({}, child.box, {
-                    top: child.box.top - height,
+                const box = Object.assign({}, nextChild.box, {
+                    top: nextChild.box.top - height,
                 });
-                const next = Object.assign({}, child, { box });
+                const next = Object.assign({}, nextChild, { box });
                 currentChildren.push(...futureFixedNodes);
                 nextChildren.push(next, ...futureNodes);
                 // }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ats-form-react-pdf-layout",
-  "version": "4.4.4",
+  "version": "4.4.5",
   "license": "MIT",
   "description": "Resolve document component's layout",
   "author": "Diego Muracciole <diegomuracciole@gmail.com>",