From e3b740b8e104addffe4248db1ee4eac01c7ee84f Mon Sep 17 00:00:00 2001
From: mkm17 <kornetmichal@gmail.com>
Date: Sat, 13 Jul 2024 11:02:28 +0200
Subject: [PATCH] Update Page.cs and CanvasColumn.cs to handle collapsible
 sections correctly

---
 .../Model/SharePoint/Pages/Internal/CanvasColumn.cs  | 12 ++++++++++++
 .../PnP.Core/Model/SharePoint/Pages/Internal/Page.cs |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/CanvasColumn.cs b/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/CanvasColumn.cs
index 258f3cc700..d435e0e6f1 100644
--- a/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/CanvasColumn.cs
+++ b/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/CanvasColumn.cs
@@ -151,6 +151,18 @@ internal string ToHtml()
                     }
                 };
 
+                if (Section.Collapsible)
+                {
+                    clientSideCanvasPosition.ZoneGroupMetadata = new SectionZoneGroupMetadata()
+                    {
+                        IsExpanded = Section.IsExpanded,
+                        DisplayName = Section.DisplayName,
+                        ShowDividerLine = Section.ShowDividerLine,
+                        IconAlignment = Section.IconAlignment == IconAlignment.Right ? "right" : "left",
+                        Type = 1,
+                    };
+                }
+
                 var jsonControlData = JsonSerializer.Serialize(clientSideCanvasPosition);
 
                 html.Append($@"<div {CanvasControlAttribute}="""" {CanvasDataVersionAttribute}=""{DataVersion}"" {ControlDataAttribute}=""{jsonControlData.Replace("\"", "&quot;")}""></div>");
diff --git a/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/Page.cs b/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/Page.cs
index 1bfb3acb66..0245c6423d 100644
--- a/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/Page.cs
+++ b/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/Page.cs
@@ -1235,6 +1235,8 @@ private void LoadFromHtml(string html, string pageHeaderHtml)
                             }
                         }
 
+                        ApplyCollapsibleSectionSettings(sectionData.ZoneGroupMetadata, currentSection);
+                        
                         ICanvasColumn currentColumn = null;
                         if (sectionData.Position != null)
                         {