Merge pull request #15 from alfattack/page-break-inside

mstancombe · web-flow · commit e132e9229cb3 · 2024-08-19T22:38:44.000+10:00
Support page-break-inside: avoid
diff --git a/Source/Demos/HtmlRenderer.Demo.Common/TestSamples/36.Breaking pages 3 - Divs.htm b/Source/Demos/HtmlRenderer.Demo.Common/TestSamples/36.Breaking pages 3 - Divs.htm
diff --git a/Source/Demos/HtmlRenderer.Demo.Common/TestSamples/38. Breaking Pages 4 - Divs.htm b/Source/Demos/HtmlRenderer.Demo.Common/TestSamples/38. Breaking Pages 4 - Divs.htm
@@ -0,0 +1,37 @@
+﻿<html>
+<body>
+    <div style="height: 826px; background-color: indianred; page-break-inside: avoid;">
+        This is on page 1
+    </div>
+
+    <div style="height: 900px; background-color: purple; page-break-inside: avoid;">
+        This is on page 2
+    </div>
+
+    <div style="height: 700px; background-color: red;">
+        This is on page 3.
+    </div>
+
+    <div style="page-break-inside: avoid; height: 1500px; background-color: blue; padding: 10px;">
+        This is on page 4.
+
+        <div style="height: 500px; background-color: yellow;">
+            This is also on page 4
+        </div>
+
+        <div style="height: 400px; background-color: aqua; page-break-inside: avoid;">
+            This is on page 5
+        </div>
+    </div>
+
+    <div style="background-color: orange; padding: 10px; page-break-inside: avoid;">
+        <div>
+            This is on page 6
+        </div>
+
+        <div style="background-color:yellowgreen;width:90px;height: 1000px;">
+        </div>
+    </div>
+
+</body>
+</html>
diff --git a/Source/Demos/HtmlRenderer.Demo.Console/Program.cs b/Source/Demos/HtmlRenderer.Demo.Console/Program.cs
@@ -24,7 +24,7 @@
 foreach (var htmlSample in samples)
 {
     ////Just doing one test here.  Comment this for all of them.
-    if (!htmlSample.FullName.Contains("37", StringComparison.OrdinalIgnoreCase)) continue;
+    if (!htmlSample.FullName.Contains("38")) continue;
 
     //await skia.GenerateSampleAsync(htmlSample);
     //await svgSkia.GenerateSampleAsync(htmlSample);
diff --git a/Source/HtmlRenderer/Core/Dom/CssBox.cs b/Source/HtmlRenderer/Core/Dom/CssBox.cs
@@ -700,6 +700,13 @@ protected virtual async Task PerformLayoutImpAsync(RGraphics g)
                         {
                             this.BreakPage(true);
                         }
+                        else if (this.PageBreakInside == CssConstants.Avoid
+                            && ActualHeight + Location.Y > HtmlContainer.PageSize.Height
+                            && prevSibling != null)
+                        {
+                            // handle page break avoiding.
+                            this.BreakPage(true);
+                        }
 
                         //Start with the assumption this is zero height.
                         ActualBottom = Location.Y;

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`foreach (var htmlSample in samples)`
`25`	`25`	`{`
`26`	`26`	`////Just doing one test here. Comment this for all of them.`
`27`		`- if (!htmlSample.FullName.Contains("37", StringComparison.OrdinalIgnoreCase)) continue;`
	`27`	`+ if (!htmlSample.FullName.Contains("38")) continue;`
`28`	`28`
`29`	`29`	`//await skia.GenerateSampleAsync(htmlSample);`
`30`	`30`	`//await svgSkia.GenerateSampleAsync(htmlSample);`
Original file line number	Diff line number	Diff line change
`@@ -700,6 +700,13 @@ protected virtual async Task PerformLayoutImpAsync(RGraphics g)`
`700`	`700`	`{`
`701`	`701`	`this.BreakPage(true);`
`702`	`702`	`}`
	`703`	`+ else if (this.PageBreakInside == CssConstants.Avoid`
	`704`	`+ && ActualHeight + Location.Y > HtmlContainer.PageSize.Height`
	`705`	`+ && prevSibling != null)`
	`706`	`+ {`
	`707`	`+ // handle page break avoiding.`
	`708`	`+ this.BreakPage(true);`
	`709`	`+ }`
`703`	`710`
`704`	`711`	`//Start with the assumption this is zero height.`
`705`	`712`	`ActualBottom = Location.Y;`