Skip to content

Block Preview is missing columnSpan #281 #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rickbutterfield merged 1 commit into from
Apr 11, 2026
Merged

Block Preview is missing columnSpan #281 #282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/Umbraco.Community.BlockPreview/Services/BlockPreviewService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,8 @@ private string GetNoModelsErrorMessage()
{
if (layoutItem.ContentKey == blockInstance.ContentKey)
{
blockInstance.RowSpan = layoutItem.RowSpan!.Value;
blockInstance.ColumnSpan = layoutItem.ColumnSpan!.Value;
blockInstance.RowSpan = layoutItem.RowSpan ?? 1;
blockInstance.ColumnSpan = layoutItem.ColumnSpan ?? 12;
return layoutItem;
}
else
Expand All @@ -520,8 +520,8 @@ private string GetNoModelsErrorMessage()
foreach (var item in area.Items)
{
if (item.ContentKey != blockInstance.ContentKey) continue;
blockInstance.RowSpan = item.RowSpan!.Value;
blockInstance.ColumnSpan = item.ColumnSpan!.Value;
blockInstance.RowSpan = item.RowSpan ?? 1;
blockInstance.ColumnSpan = item.ColumnSpan ?? layoutItem.ColumnSpan ?? 12;
return layoutItem;
}
}
Expand Down Expand Up @@ -623,10 +623,13 @@ private void ConfigureBlockInstanceAreas(
BlockItemData? areaSettingsData = blockValue.BlockValue?.SettingsData.FirstOrDefault(x => x.Key == item.ContentKey);
IPublishedElement? areaSettingsElement = areaSettingsData != null ? _blockDataConverter.ConvertToElement(areaSettingsData, content) : default;

return new BlockGridItem(item.ContentKey, areaContentElement!, item.SettingsKey, areaSettingsElement!);
var gridItem = new BlockGridItem(item.ContentKey, areaContentElement!, item.SettingsKey, areaSettingsElement!);
gridItem.RowSpan = item.RowSpan ?? 1;
gridItem.ColumnSpan = item.ColumnSpan ?? areaConfig.ColumnSpan ?? 12;
return gridItem;
}).WhereNotNull().ToList();

return new BlockGridArea(new List<BlockGridItem>(area.Items.Count()), areaConfig.Alias!, areaConfig.RowSpan!.Value, areaConfig.ColumnSpan!.Value);
return new BlockGridArea(items, areaConfig.Alias!, areaConfig.RowSpan ?? 1, areaConfig.ColumnSpan ?? 12);
}).WhereNotNull().ToArray();
}

Expand Down