From fb38d00536befeb5aebcf26c12132c8e8f0fcc92 Mon Sep 17 00:00:00 2001
From: Gervwyk <gervwyk@gmail.com>
Date: Fri, 24 Jun 2022 16:22:32 +0200
Subject: [PATCH] fix(client): Fix layout on skeleton containers.

---
 packages/client/src/block/LoadingContainer.js | 4 ++--
 packages/client/src/block/LoadingList.js      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/block/LoadingContainer.js b/packages/client/src/block/LoadingContainer.js
index 861a8c9801..0b241f9a0c 100644
--- a/packages/client/src/block/LoadingContainer.js
+++ b/packages/client/src/block/LoadingContainer.js
@@ -38,7 +38,7 @@ const LoadingContainer = ({
         area={layoutParamsToArea({
           area: skeleton.areas[areaKey] || {},
           areaKey,
-          layout: blockLayout ?? {},
+          layout: skeleton.layout ?? blockLayout,
         })}
         areaStyle={[areaStyle, skeleton.areas[areaKey] && skeleton.areas[areaKey].style]}
         highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
@@ -63,7 +63,7 @@ const LoadingContainer = ({
       blockStyle={skeleton.style ?? blockStyle}
       highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
       id={`s-bl-${blockId}-${skeleton.id}`}
-      layout={blockLayout ?? {}}
+      layout={skeleton.layout ?? blockLayout}
       makeCssClass={makeCssClass}
     >
       <Component
diff --git a/packages/client/src/block/LoadingList.js b/packages/client/src/block/LoadingList.js
index 1149cd8b71..f0dd9b2474 100644
--- a/packages/client/src/block/LoadingList.js
+++ b/packages/client/src/block/LoadingList.js
@@ -39,7 +39,7 @@ const LoadingList = ({
           area={layoutParamsToArea({
             area: skeleton.areas[areaKey] ?? {},
             areaKey,
-            layout: blockLayout ?? {},
+            layout: skeleton.layout ?? blockLayout,
           })}
           areaStyle={[areaStyle, skeleton.areas[areaKey] && skeleton.areas[areaKey].style]}
           highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
@@ -66,7 +66,7 @@ const LoadingList = ({
       blockStyle={skeleton.style ?? blockStyle}
       highlightBorders={lowdefy.lowdefyGlobal.highlightBorders}
       id={`s-bl-${blockId}-${skeleton.id}`}
-      layout={blockLayout ?? {}}
+      layout={skeleton.layout ?? blockLayout}
       makeCssClass={makeCssClass}
     >
       <Component