fix(client): Fix layout on skeleton containers.

lowdefy · Jun 24, 2022 · fb38d00 · fb38d00
1 parent 06b7cb1
commit fb38d00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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