Updated package version + added release notes

QuestPDF.Examples/ElementExamples.cs

@@ -1,9 +1,7 @@
-using System.Linq;
 using QuestPDF.Examples.Engine;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
-using SkiaSharp;
 
 namespace QuestPDF.Examples
 {
@@ -21,25 +19,25 @@ namespace QuestPDF.Examples
         
         //[ShowResult]
         [ImageSize(300, 300)]
-        public void Decoration(IContainer container)
+        public void Section(IContainer container)
         {
             container
                 .Background("#FFF")
                 .Padding(25)
-                .Decoration(decoration =>
+                .Section(section =>
                 {
-                    decoration
+                    section
                         .Header()
                         .Background("#888")
                         .Padding(10)
                         .Text("Notes", TextStyle.Default.Size(16).Color("#FFF"));
                     
-                    decoration
+                    section
                         .Content()
                         .Background("#DDD")
                         .Padding(10)
                         .ExtendVertical()
-                        .Text(Helpers.Placeholders.LoremIpsum());
+                        .Text(TextPlaceholder.LoremIpsum());
                 });
         }
         
@@ -83,12 +81,12 @@ namespace QuestPDF.Examples
                 .Padding(20)
                 .Stack(stack =>
                 {
-                    stack.Item()
+                    stack.Element()
                         .PaddingBottom(10)
                         .AlignCenter()
                         .Text("This Row element is 700pt wide");
 
-                    stack.Item().Row(row =>
+                    stack.Element().Row(row =>
                     {
                         row.ConstantColumn(100)
                             .Background("#DDD")
@@ -121,40 +119,38 @@ namespace QuestPDF.Examples
                     column.Spacing(10);
                     
                     column
-                        .Item()
+                        .Element()
                         .Background("#999")
                         .Height(50);
                     
                     column
-                        .Item()
+                        .Element()
                         .Background("#BBB")
                         .Height(100);
                     
                     column
-                        .Item()
+                        .Element()
                         .Background("#DDD")
                         .Height(150);
                 });
         }
         
-        [ShowResult]
-        [ImageSize(210, 210)]
+        //[ShowResult]
+        [ImageSize(300, 200)]
         public void Debug(IContainer container)
         {
             container
                 .Padding(25)
-                .Debug("Grid example", Colors.Blue.Medium)
-                .Grid(grid =>
+                .Debug()
+                .Padding(-5)
+                .Row(row =>
                 {
-                    grid.Columns(3);
-                    grid.Spacing(5);
-
-                    foreach (var _ in Enumerable.Range(0, 8))
-                        grid.Item().Height(50).Placeholder();
+                    row.RelativeColumn().Padding(5).Extend().Placeholder();
+                    row.RelativeColumn().Padding(5).Extend().Placeholder();
                 });
         }
         
-        //[ShowResult]
+        [ShowResult]
         [ImageSize(300, 200)]
         public void ElementEnd(IContainer container)
         {
@@ -170,150 +166,5 @@ namespace QuestPDF.Examples
                         x.Text(text);
                 });
         }
-        
-        //[ShowResult]
-        [ImageSize(300, 200)]
-        public void GridExample(IContainer container)
-        {
-            var textStyle = TextStyle.Default.Size(14);
-            
-            container
-                .Padding(20)
-                .AlignRight()
-                .Grid(grid =>
-                {
-                    grid.VerticalSpacing(20);
-                    grid.HorizontalSpacing(10);
-                    grid.Columns(12);
-
-                    grid.Item(8).Background("#DDD").Height(50).Padding(5).Text("This is a short text", textStyle);
-                    grid.Item(4).Background("#BBB").Padding(5).Text("Showing how to...", textStyle);
-                    grid.Item(2).Background("#999").Height(50);
-                    grid.Item(4).Background("#AAA").Border(2).BorderColor("#666").Padding(5).Text("...generate", textStyle);
-                    grid.Item(6).Background("#CCC").Padding(5).Text("simple grids", textStyle.Size(18).Bold());
-                    grid.Item(8).Background("#DDD").Height(50);
-                });
-        }
-
-        //[ShowResult]
-        [ImageSize(300, 300)]
-        public void RandomColorMatrix(IContainer container)
-        {
-            container
-                .Padding(25)
-                .Grid(grid =>
-                {
-                    grid.Columns(5);
-                    
-                    Enumerable
-                        .Range(0, 25)
-                        .Select(x => Placeholders.BackgroundColor())
-                        .ToList()
-                        .ForEach(x => grid.Item().Height(50).Background(x));
-                });
-        }
-        
-        //[ShowResult]
-        [ImageSize(450, 150)]
-        public void DefinedColors(IContainer container)
-        {
-            var colors = new[]
-            {
-                Colors.Green.Darken4,
-                Colors.Green.Darken3,
-                Colors.Green.Darken2,
-                Colors.Green.Darken1,
-                
-                Colors.Green.Medium,
-                
-                Colors.Green.Lighten1,
-                Colors.Green.Lighten2,
-                Colors.Green.Lighten3,
-                Colors.Green.Lighten4,
-                Colors.Green.Lighten5,
-                
-                Colors.Green.Accent1,
-                Colors.Green.Accent2,
-                Colors.Green.Accent3,
-                Colors.Green.Accent4,
-            };
-            
-            container
-                .Padding(25)
-                .Height(100)
-                .Row(row =>
-                {
-                    foreach (var color in colors)
-                        row.RelativeColumn().Background(color);
-                });
-        }
-        
-        //[ShowResult]
-        [ImageSize(500, 175)]
-        public void DefinedFonts(IContainer container)
-        {
-            var fonts = new[]
-            {
-                Fonts.Calibri,
-                Fonts.Candara,
-                Fonts.Arial,
-                Fonts.TimesNewRoman,
-                Fonts.Consolas,
-                Fonts.Tahoma,
-                Fonts.Impact,
-                Fonts.Trebuchet,
-                Fonts.ComicSans
-            };
-            
-            container
-                .Padding(25)
-                .Grid(grid =>
-                {
-                    grid.Columns(3);
-
-                    foreach (var font in fonts)
-                    {
-                        grid.Item()
-                            .Border(1)
-                            .BorderColor(Colors.Grey.Medium)
-                            .Padding(10)
-                            .Text(font, TextStyle.Default.FontType(font).Size(16));
-                    }
-                });
-        }
-        
-        //[ShowResult]
-        [ImageSize(300, 300)]
-        public void Layers(IContainer container)
-        {
-            container
-                .Background("#FFF")
-                .Padding(25)
-                .Layers(layers =>
-                {
-                    layers.Layer().Text("Something else");
-                    
-                    layers.PrimaryLayer().Stack(stack =>
-                    {
-                        stack.Item().PaddingTop(20).Text("Text 1");
-                        stack.Item().PaddingTop(40).Text("Text 2");
-                    });
-                    
-                    layers.Layer().Canvas((canvas, size) =>
-                    {
-                        using var paint = new SKPaint
-                        {
-                            Color = SKColors.Red,
-                            StrokeWidth = 5
-                        };
-                        
-                        canvas.Translate(size.Width / 2, size.Height / 2);
-                        canvas.DrawCircle(0, 0, 50, paint);
-                    });
-                    
-                    layers.Layer().Background("#8F00").Extend();
-                    layers.Layer().PaddingTop(40).Text("It works!", TextStyle.Default.Size(24));
-                });
-        }
     }
-}
+}

QuestPDF.Examples/Engine/ExampleTestBase.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using NUnit.Framework;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
@@ -69,7 +70,7 @@ namespace QuestPDF.Examples.Engine
             }
             catch (Exception e)
             {
-                throw new Exception($"Cannot perform test {fileName}", e);
+                throw new Exception($"Cannot perform test ${fileName}", e);
             }
 
             if (showResult)
@@ -85,7 +86,7 @@ namespace QuestPDF.Examples.Engine
             using var surface = SKSurface.Create(imageInfo);
             surface.Canvas.Scale(scalingFactor);
 
-            var canvas = new Drawing.Canvas(surface.Canvas);
+            var canvas = new Canvas(surface.Canvas);
             element?.Draw(canvas, size);
 
             surface.Canvas.Save();

QuestPDF.Examples/FrameExample.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using QuestPDF.Examples.Engine;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
@@ -32,10 +33,10 @@ namespace QuestPDF.Examples
                 {
                     for(var i=1; i<=4; i++)
                     {
-                        stack.Item().Row(row =>
+                        stack.Element().Row(row =>
                         {
-                            row.RelativeColumn(2).LabelCell().Text(Placeholders.Label());
-                            row.RelativeColumn(3).ValueCell().Text(Placeholders.Paragraph());
+                            row.RelativeColumn(2).LabelCell().Text(TextPlaceholder.Label());
+                            row.RelativeColumn(3).ValueCell().Text(TextPlaceholder.Paragraph());
                         });
                     }
                 });

QuestPDF.Examples/LoremPicsumExample.cs

@@ -41,11 +41,11 @@ namespace QuestPDF.Examples
                     column.Spacing(10);
 
                     column
-                        .Item()
+                        .Element()
                         .Component(new LoremPicsum(true));
                     
                     column
-                        .Item()
+                        .Element()
                         .AlignRight()
                         .Text("From Lorem Picsum");
                 });

QuestPDF.Examples/Padding.cs

@@ -43,7 +43,7 @@ namespace QuestPDF.Examples
                 .Stack(column =>
                 {
                     column
-                        .Item()
+                        .Element()
                         .Height(100)
                         .Background("#FFF")
                         
@@ -55,7 +55,7 @@ namespace QuestPDF.Examples
                         .Background("#444");
                     
                     column
-                        .Item()
+                        .Element()
                         .Height(100)
                         .Background("#DDD")
                         
@@ -67,7 +67,7 @@ namespace QuestPDF.Examples
                         .Background("#222");
                     
                     column
-                        .Item()
+                        .Element()
                         .Height(100)
                         .Background("#BBB")
                         
@@ -86,7 +86,7 @@ namespace QuestPDF.Examples
                 .Stack(column =>
                 {
                     column
-                        .Item()
+                        .Element()
                         .Height(150)
                         .Row(row =>
                         {
@@ -108,7 +108,7 @@ namespace QuestPDF.Examples
                         });
                     
                     column
-                        .Item()
+                        .Element()
                         .Height(150)
                         .Row(row =>
                         {

QuestPDF.Examples/TextExample.cs

@@ -1,212 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using QuestPDF.Elements;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-using SkiaSharp;
-
-namespace QuestPDF.Examples
-{
-    public class TextExample : ExampleTestBase
-    {
-        [ShowResult]
-        [ImageSize(1400, 600)]
-        public void OldText(IContainer container)
-        {
-            var fonts = new[]
-            {
-                Fonts.Arial,
-                Fonts.Calibri,
-                Fonts.Cambria,
-                Fonts.Candara,
-                Fonts.ComicSans,
-                Fonts.Consolas,
-                Fonts.Corbel,
-                Fonts.Courier,
-                Fonts.CourierNew,
-                Fonts.Georgia,
-                Fonts.Impact,
-                Fonts.LucidaConsole,
-                Fonts.SegoeSD,
-                Fonts.SegoeUI,
-                Fonts.Tahoma,
-                Fonts.TimesNewRoman,
-                Fonts.TimesRoman,
-                Fonts.Trebuchet,
-                Fonts.Verdana,
-            };
-            
-            container
-                .Padding(50)
-                .Grid(stack =>
-                {
-                    stack.Spacing(10);
-                    stack.Columns(2);
-
-                    foreach (var font in fonts)
-                    {
-                        stack
-                            .Element()
-                            .Box()
-                            .Background(Placeholders.BackgroundColor())
-                            .Text($"Lorem ipsum dolor sit amet {font}", TextStyle.Default.Size(24).FontType(font));
-                    }
-                });
-        }
-        
-        //[ShowResult]
-        [ImageSize(1400, 800)]
-        public void Test(IContainer container)
-        {
-            List<TextElement> Lorem()
-            {
-                return new List<TextElement>
-                {
-                    new TextElement()
-                    {
-                        Style = TextStyle.Default.Size(32).BackgroundColor(Placeholders.BackgroundColor()),
-                        Text = "Podstawowy łaciński Tabela znaków Unicode"
-                    },
-                    new TextElement()
-                    {
-                        Style = TextStyle.Default.FontType("Segoe UI Emoji").Size(32).BackgroundColor(Placeholders.BackgroundColor()),
-                        Text = "✔"
-                    },
-                    new TextElement()
-                    {
-                        Style = TextStyle.Default.FontType("Segoe UI Emoji").Size(32).BackgroundColor(Placeholders.BackgroundColor()),
-                        Text = "🥛"
-                    },
-                    new TextElement()
-                    {
-                        Style = TextStyle.Default.FontType("Segoe UI Emoji").Size(32).BackgroundColor(Placeholders.BackgroundColor()),
-                        Text = "🧀"
-                    },
-                    new TextElement()
-                    {
-                        Style = TextStyle.Default.FontType("Segoe UI Emoji").Size(32).BackgroundColor(Placeholders.BackgroundColor()),
-                        Text = "❤🚵‍♀️"
-                    },
-                    new TextElement()
-                    {
-                        Style = TextStyle.Default.Size(32).BackgroundColor(Placeholders.BackgroundColor()),
-                        Text = "Lorem ipsum "
-                    },
-                    new TextElement()
-                    {
-                        Style = TextStyle.Default.Size(24).BackgroundColor(Placeholders.BackgroundColor()),
-                        Text = " dolor "
-                    },
-                    new TextElement()
-                    {
-                        Style = TextStyle.Default.Size(64).BackgroundColor(Placeholders.BackgroundColor()),
-                        Text = " sijt "
-                    },
-                    new TextElement()
-                    {
-                        Style = TextStyle.Default.Size(32).BackgroundColor(Placeholders.BackgroundColor()),
-                        Text = " amet"
-                    }
-                };
-            }
-
-            Func<List<TextElement>> Source = () => Split(RandomText());
-
-            container
-                .Padding(50)
-                .Box().Border(1).Stack(stack =>
-                    {
-                        stack
-                            .Element()
-                            .Box()
-                            //.Background(Placeholders.BackgroundColor())
-                            .Element(new TextRun()
-                            {
-                                Elements = Lorem()
-                            });
-
-                        stack
-                            .Element()
-                            .Box()
-                            //.Background(Placeholders.BackgroundColor())
-                            .Element(new TextRun()
-                            {
-                                Elements = Source()
-                            });
-
-                        stack
-                            .Element()
-                            .Box()
-                            //.Background(Placeholders.BackgroundColor())
-                            .Element(new TextRun()
-                            {
-                                Elements = Source()
-                            });
-
-                        stack
-                            .Element()
-                            .Box()
-                            //.Background(Placeholders.BackgroundColor())
-                            .Element(new TextRun()
-                            {
-                                Elements = Source()
-                            });
-
-                        stack
-                            .Element()
-                            .Box()
-                            //.Background(Placeholders.BackgroundColor())
-                            .Element(new TextRun()
-                            {
-                                Elements = Source()
-                            });
-
-                        stack
-                            .Element()
-                            .Box()
-                            //.Background(Placeholders.BackgroundColor())
-                            .Element(new TextRun()
-                            {
-                                Elements = Source()
-                            });
-                    });
-        }
-
-        List<TextElement> RandomText()
-        {
-            var sizes = new[] { 24, 32, 48, 64};
-            
-            return Placeholders
-                .Sentence()
-                .Split(" ")
-                .Select(x => new TextElement
-                {
-                    Text = $"{x} ",
-                    Style = TextStyle
-                        .Default
-                        //.Size(sizes[Placeholders.Random.Next(0, 3)])
-                        .Size(24)
-                        .BackgroundColor(Placeholders.BackgroundColor())
-                        //.LineHeight((float)Placeholders.Random.NextDouble() / 2 + 1f)
-                        .LineHeight(1.2f)
-                })
-                .ToList();
-        }
-        
-        List<TextElement> Split(List<TextElement> elements)
-        {
-            return elements
-                .SelectMany(x => x
-                    .Text
-                    .Select(y => new TextElement
-                    {
-                        Style = x.Style,
-                        Text = y.ToString()
-                    }))
-                .ToList();
-        }
-    }
-}

QuestPDF.ReportSample/DataSource.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using QuestPDF.Helpers;
+using QuestPDF.ReportSample.Layouts;
 
 namespace QuestPDF.ReportSample
 {
@@ -17,9 +18,9 @@ namespace QuestPDF.ReportSample
                 Title = "Sample Report Document",
                 HeaderFields = HeaderFields(),
                 
-                LogoData = Helpers.GetImage("Logo.png"),
-                Sections = Enumerable.Range(0, 50).Select(x => GenerateSection()).ToList(),
-                Photos = Enumerable.Range(0, 30).Select(x => GetReportPhotos()).ToList()
+                LogoData = Helpers.GetImage("logo.png"),
+                Sections = Enumerable.Range(0, 8).Select(x => GenerateSection()).ToList(),
+                Photos = Enumerable.Range(0, 8).Select(x => GetReportPhotos()).ToList()
             };
 
             List<ReportHeaderField> HeaderFields()
@@ -40,11 +41,6 @@ namespace QuestPDF.ReportSample
                     {
                         Label = "Date",
                         Value = DateTime.Now.ToString("g")
-                    },
-                    new ReportHeaderField()
-                    {
-                        Label = "Status",
-                        Value = "Completed, found 2 issues"
                     }
                 };
             }
@@ -52,12 +48,12 @@ namespace QuestPDF.ReportSample
             ReportSection GenerateSection()
             {
                 var sectionLength = Helpers.Random.NextDouble() > 0.75
-                    ? Helpers.Random.Next(20, 40)
-                    : Helpers.Random.Next(5, 10);
+                    ? Helpers.Random.Next(10, 20)
+                    : Helpers.Random.Next(3, 11);
                 
                 return new ReportSection
                 {
-                    Title = Placeholders.Label(),
+                    Title = TextPlaceholder.Label(),
                     Parts = Enumerable.Range(0, sectionLength).Select(x => GetRandomElement()).ToList()
                 };
             }
@@ -66,10 +62,10 @@ namespace QuestPDF.ReportSample
             {
                 var random = Helpers.Random.NextDouble();
 
-                if (random < 0.9f)
+                if (random < 0.8f)
                     return GetTextElement();
                 
-                if (random < 0.95f)
+                if (random < 0.9f)
                     return GetMapElement();
                 
                 return GetPhotosElement();
@@ -79,17 +75,19 @@ namespace QuestPDF.ReportSample
             {
                 return new ReportSectionText
                 {
-                    Label = Placeholders.Label(),
-                    Text = Placeholders.Paragraph()
+                    Label = TextPlaceholder.Label(),
+                    Text = TextPlaceholder.Paragraph()
                 };
             }
             
             ReportSectionMap GetMapElement()
             {
+                var rnd = Helpers.Random.Next(0, 64);
+                    
                 return new ReportSectionMap
                 {
                     Label = "Location",
-                    ImageSource = Placeholders.Image,
+                    ImageSource = x => Helpers.GetDocumentMap($"{rnd}.jpg"),
                     Location = Helpers.RandomLocation()
                 };
             }
@@ -100,24 +98,28 @@ namespace QuestPDF.ReportSample
                 {    
                     Label = "Photos",
                     Photos = Enumerable
-                        .Range(0, Helpers.Random.Next(1, 15))
-                        .Select(x => Placeholders.Image(400, 300))
+                        .Range(0, Helpers.Random.Next(1, 10))
+                        .Select(x => Helpers.Random.Next(0, 128))
+                        .Select(x => Helpers.GetPhoto($"{x}.jpg"))
                         .ToList()
                 };
             }
 
             ReportPhoto GetReportPhotos()
             {
+                var photoId = Helpers.Random.Next(0, 128);
+                var mapId = Helpers.Random.Next(0, 64);
+
                 return new ReportPhoto()
                 {
-                    PhotoData = Placeholders.Image(800, 600),
+                    PhotoData = Helpers.GetPhoto($"{photoId}.jpg"),
 
-                    Comments = Placeholders.Sentence(),
+                    Comments = TextPlaceholder.Paragraph(),
                     Date = DateTime.Now - TimeSpan.FromDays(Helpers.Random.NextDouble() * 100),
                     Location = Helpers.RandomLocation(),
 
-                    MapContextSource = x => Placeholders.Image(400, 300),
-                    MapDetailsSource = x => Placeholders.Image(400, 300)
+                    MapContextSource = x => Helpers.GetContextMap($"{mapId}.jpg"),
+                    MapDetailsSource = x => Helpers.GetDetailsMap($"{mapId}.jpg")
                 };
             }
         }

QuestPDF.ReportSample/Helpers.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using QuestPDF.ReportSample.Layouts;
 using SkiaSharp;
 
 namespace QuestPDF.ReportSample
@@ -9,7 +10,13 @@ namespace QuestPDF.ReportSample
         public static Random Random { get; } = new Random();
         
         public static string GetTestItem(string path) => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", path);
-
+        
+        public static byte[] GetDocumentMap(string name) => GetImage(Path.Combine("Maps", "Document", name));
+        public static byte[] GetDetailsMap(string name) => GetImage(Path.Combine("Maps", "Details", name));
+        public static byte[] GetContextMap(string name) => GetImage(Path.Combine("Maps", "Context", name));
+        
+        public static byte[] GetPhoto(string name) => GetImage(Path.Combine("Photos", name));
+        
         public static byte[] GetImage(string name)
         {
             var photoPath = GetTestItem(name);

QuestPDF.ReportSample/Layouts/Helpers.cs

@@ -1,29 +1,27 @@
 using System;
 using QuestPDF.Fluent;
-using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.ReportSample.Layouts
 {
     public static class Helpers
     {
-        static IContainer Cell(this IContainer container, bool background)
+        static IContainer Cell(this IContainer container, string color)
         {
             return container
                 .Border(0.5f)
-                .BorderColor(Colors.Grey.Lighten1)
-                .Background(background ? Colors.Grey.Lighten4 : Colors.White)
+                .Background(color)
                 .Padding(5);
         }
         
-        public static IContainer ValueCell(this IContainer container)
+        public static IContainer LightCell(this IContainer container)
         {
-            return container.Cell(false);
+            return container.Cell("#0000");
         }
         
-        public static IContainer LabelCell(this IContainer container)
+        public static IContainer DarkCell(this IContainer container)
         {
-            return container.Cell(true);
+            return container.Cell("#1000");
         }
         
         public static string Format(this Location location)

QuestPDF.ReportSample/Layouts/PhotoTemplate.cs

@@ -1,5 +1,4 @@
 using QuestPDF.Fluent;
-using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.ReportSample.Layouts
@@ -16,45 +15,47 @@ namespace QuestPDF.ReportSample.Layouts
         public void Compose(IContainer container)
         {
             container
-                .ShowEntire()
                 .Stack(stack =>
                 {
-                    stack.Spacing(5);
-                    stack.Item().Element(PhotoWithMaps);
-                    stack.Item().Element(PhotoDetails);
+                    stack.Element(PhotoWithMaps);
+                    stack.Element(PhotoDetails);
                 });
         }
         
         void PhotoWithMaps(IContainer container)
         {
             container
+                .Padding(-3)
+                .PaddingBottom(3)
                 .Row(row =>
                 {
-                    row.RelativeColumn(2).AspectRatio(4 / 3f).Image(Placeholders.Image);
+                    row.RelativeColumn(2).Padding(3).Component(new ImageTemplate(Model.PhotoData));
 
-                    row.RelativeColumn().PaddingLeft(5).Stack(stack =>
+                    row.RelativeColumn().Stack(stack =>
                     {
-                        stack.Spacing(7f);
-                        
-                        stack.Item().AspectRatio(4 / 3f).Image(Placeholders.Image);
-                        stack.Item().AspectRatio(4 / 3f).Image(Placeholders.Image);
+                        stack.Element().Padding(3).Component(new ImageTemplate(Model.MapDetailsSource));
+                        stack.Element().Padding(3).Component(new ImageTemplate(Model.MapContextSource));
                     });
                 });
         }
 
         void PhotoDetails(IContainer container)
         {
-            container.Border(0.75f).BorderColor(Colors.Grey.Medium).Grid(grid =>
+            container.Stack(stack =>
             {
-                grid.Columns(6);
+                stack.Element().Row(row =>
+                {
+                    row.RelativeColumn().DarkCell().Text("Date", Typography.Normal);
+                    row.RelativeColumn(2).LightCell().Text(Model.Date?.ToString("g") ?? string.Empty, Typography.Normal);
+                    row.RelativeColumn().DarkCell().Text("Location", Typography.Normal);
+                    row.RelativeColumn(2).LightCell().Text(Model.Location.Format(), Typography.Normal);
+                });
                 
-                grid.Item().LabelCell().Text("Date", Typography.Normal);
-                grid.Item(2).ValueCell().Text(Model.Date?.ToString("g") ?? string.Empty, Typography.Normal);
-                grid.Item().LabelCell().Text("Location", Typography.Normal);
-                grid.Item(2).ValueCell().Text(Model.Location.Format(), Typography.Normal);
-                
-                grid.Item().LabelCell().Text("Comments", Typography.Normal);
-                grid.Item(5).ValueCell().Text(Model.Comments, Typography.Normal);
+                stack.Element().Row(row =>
+                {
+                    row.RelativeColumn().DarkCell().Text("Comments", Typography.Normal);
+                    row.RelativeColumn(5).LightCell().Text(Model.Comments, Typography.Normal);
+                });
             });
         }
     }

QuestPDF.ReportSample/Layouts/SectionTemplate.cs

@@ -1,5 +1,6 @@
+using System;
+using System.Linq;
 using QuestPDF.Fluent;
-using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.ReportSample.Layouts
@@ -16,22 +17,22 @@ namespace QuestPDF.ReportSample.Layouts
         public void Compose(IContainer container)
         {
             container
-                .EnsureSpace()
-                .Decoration(decoration =>
+                .MinHeight(100)
+                .Section(section =>
                 {
-                    decoration
+                    section
                         .Header()
                         .PaddingBottom(5)
                         .Text(Model.Title, Typography.Headline);
 
-                    decoration.Content().Border(0.75f).BorderColor(Colors.Grey.Medium).Stack(stack =>
+                    section.Content().PageableStack(stack =>
                     {
                         foreach (var part in Model.Parts)
                         {
-                            stack.Item().Row(row =>
+                            stack.Element().Row(row =>
                             {
-                                row.ConstantColumn(150).LabelCell().Text(part.Label, Typography.Normal);
-                                var frame = row.RelativeColumn().ValueCell();
+                                row.ConstantColumn(150).DarkCell().Text(part.Label, Typography.Normal);
+                                var frame = row.RelativeColumn().LightCell();
                             
                                 if (part is ReportSectionText text)
                                     frame.Text(text.Text, Typography.Normal);
@@ -55,12 +56,12 @@ namespace QuestPDF.ReportSample.Layouts
                 return;
             }
 
-            container.ShowEntire().Stack(stack =>
+            container.PageableStack(stack =>
             {
                 stack.Spacing(5);
                 
-                stack.Item().MaxWidth(250).AspectRatio(4 / 3f).Image(Placeholders.Image);
-                stack.Item().Text(model.Location.Format(), Typography.Normal);
+                stack.Element().Component(new ImageTemplate(model.ImageSource));
+                stack.Element().Text(model.Location.Format(), Typography.Normal);
             });
         }
         
@@ -72,12 +73,21 @@ namespace QuestPDF.ReportSample.Layouts
                 return;
             }
 
-            container.Debug("Photos").Grid(grid =>
+            var rowCount = (int) Math.Ceiling(model.Photos.Count / 3f);
+
+            container.Debug().Padding(-2).PageableStack(stack =>
             {
-                grid.Spacing(5);
-                grid.Columns(3);
-                
-                model.Photos.ForEach(x => grid.Item().AspectRatio(4 / 3f).Image(Placeholders.Image));
+                foreach (var rowId in Enumerable.Range(0, rowCount))
+                {
+                    stack.Element().Row(row =>
+                    {
+                        foreach (var id in Enumerable.Range(0, 3))
+                        {
+                            var data = model.Photos.ElementAtOrDefault(rowId + id); 
+                            row.RelativeColumn().Padding(2).Component(new ImageTemplate(data));
+                        }
+                    });
+                }
             });
         }
     }

QuestPDF.ReportSample/Layouts/StandardReport.cs

@@ -28,61 +28,69 @@ namespace QuestPDF.ReportSample.Layouts
             container
                 .PaddingVertical(40)
                 .PaddingHorizontal(50)
+                
                 .Page(page =>
                 {
-                    page.Header().Element(ComposeHeader);
-                    page.Content().Element(ComposeContent);
+                    page.Header(ComposeHeader);
+                    page.Content(ComposeContent);
                     page.Footer().AlignCenter().PageNumber("Page {number}");
                 });
         }
 
         private void ComposeHeader(IContainer container)
         {
-            container.Stack(stack =>
+            container.Row(row =>
             {
-                stack.Item().Row(row =>
+                row.RelativeColumn().MaxWidth(300).Stack(stack =>
                 {
-                    row.Spacing(50);
+                    stack.Spacing(5);
                     
-                    row.RelativeColumn().PaddingTop(-10).Text(Model.Title, Typography.Title);
-                    row.ConstantColumn(150).ExternalLink("https://www.questpdf.com").Image(Model.LogoData);
-                });
-
-                stack.Item().ShowOnce().PaddingVertical(15).Border(1f).BorderColor(Colors.Grey.Lighten1).ExtendHorizontal();
-                
-                stack.Item().ShowOnce().Grid(grid =>
-                {
-                    grid.Columns(2);
-                    grid.Spacing(5);
-                        
-                    foreach (var field in Model.HeaderFields)
+                    stack
+                        .Element()
+                        .PaddingBottom(5)
+                        .Text(Model.Title, Typography.Title);
+                    
+                    stack.Element().ShowOnce().Stack(table =>
                     {
-                        grid.Item().Stack(row =>
-                        {   
-                            row.Item().AlignLeft().Text(field.Label, Typography.Normal.SemiBold());
-                            row.Item().Text(field.Value, Typography.Normal);
-                        });
-                    }
+                        table.Spacing(5);
+
+                        foreach (var field in Model.HeaderFields)
+                        {
+                            table.Element().Row(row =>
+                            {
+                                row.ConstantColumn(50)
+                                    .AlignLeft()
+                                    .Text($"{field.Label}:", Typography.Normal);
+                                
+                                row.RelativeColumn()
+                                    .PaddingLeft(10)
+                                    .Text(field.Value, Typography.Normal);
+                            });
+                        }
+                    });
+
                 });
+                
+                row.ConstantColumn(150).ExternalLink("https://www.questpdf.com").Image(Model.LogoData);
             });
         }
 
         void ComposeContent(IContainer container)
         {
-            container.PaddingVertical(20).Stack(stack =>
+            container.PaddingVertical(20).PageableStack(stack =>
             {
                 stack.Spacing(20);
 
-                stack.Item().Component(new TableOfContentsTemplate(Model.Sections));
+                stack.Element().Component(new TableOfContentsTemplate(Model.Sections));
                 
                 foreach (var section in Model.Sections)
-                    stack.Item().Location(section.Title).Component(new SectionTemplate(section));
+                    stack.Element().Location(section.Title).Component(new SectionTemplate(section));
 
-                stack.Item().PageBreak();
-                stack.Item().Location("Photos");
+                stack.Element().PageBreak();
+                stack.Element().Location("Photos");
                 
                 foreach (var photo in Model.Photos)
-                    stack.Item().Component(new PhotoTemplate(photo));
+                    stack.Element().Component(new PhotoTemplate(photo));
             });
         }
     }

QuestPDF.ReportSample/Layouts/TableOfContentsTemplate.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
@@ -16,21 +18,21 @@ namespace QuestPDF.ReportSample.Layouts
         public void Compose(IContainer container)
         {
             container
-                .Decoration(decoration =>
+                .Section(section =>
                 {
-                    decoration
+                    section
                         .Header()
                         .PaddingBottom(5)
                         .Text("Table of contents", Typography.Headline);
 
-                    decoration.Content().Stack(stack =>
+                    section.Content().PageableStack(stack =>
                     {
                         stack.Spacing(5);
                         
                         for (var i = 0; i < Sections.Count; i++)
-                            stack.Item().Element(c => DrawLink(c, i+1, Sections[i].Title));
+                            stack.Element(c => DrawLink(c, i+1, Sections[i].Title));
 
-                        stack.Item().Element(c => DrawLink(c, Sections.Count+1, "Photos"));
+                        stack.Element(c => DrawLink(c, Sections.Count+1, "Photos"));
                     });
                 });
         }

QuestPDF.ReportSample/QuestPDF.ReportSample.csproj

@@ -16,6 +16,11 @@
     </ItemGroup>
 
     <ItemGroup>
+      <Folder Include="Resources" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Content Include="Resources\Photos\readme.txt" />
         <Content Include="Resources\**\**">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
@@ -24,8 +29,4 @@
     <ItemGroup>
       <ProjectReference Include="..\QuestPDF\QuestPDF.csproj" />
     </ItemGroup>
-
-    <ItemGroup>
-      <EmbeddedResource Include="Resources\Logo.png" />
-    </ItemGroup>
 </Project>