RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:37:36 +00:00
Code Issues Activity Actions

LibWeb: Add support for implicit grid lines formed by grid areas in GFC

Browse source 
According to spec each grid area implicitly defines 4 additional named
lines that could be used to specify items position.
This commit is contained in:
Aliaksandr Kalenik 2024-01-08 03:50:12 +01:00 • committed by Andreas Kling
parent 92bf7d3ba7
commit 6480ed20b8
3 changed files with 92 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Tests/LibWeb/Layout/expected/grid/implicit-lines.txt Normal file
View file

@ -0,0 +1,30 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x236 [BFC] children: not-inline
BlockContainer <body> at (8,8) content-size 784x220 children: not-inline
Box <div.grid-container> at (8,8) content-size 784x220 [GFC] children: not-inline
BlockContainer <div.item2> at (405,8) content-size 387x100 [BFC] children: inline
line 0 width: 49.1875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 6, rect: [405,8 49.1875x17.46875]
"Item 2"
TextNode <#text>
BlockContainer <div.item1> at (8,8) content-size 387x210 [BFC] children: inline
line 0 width: 46.71875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 6, rect: [8,8 46.71875x17.46875]
"Item 1"
TextNode <#text>
BlockContainer <div.item3> at (405,118) content-size 387x100 [BFC] children: inline
line 0 width: 49.1875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 6, rect: [405,118 49.1875x17.46875]
"Item 2"
TextNode <#text>
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x236]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x220]
PaintableBox (Box<DIV>.grid-container) [8,8 784x220]
PaintableWithLines (BlockContainer<DIV>.item2) [405,8 387x100]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.item1) [8,8 387x210]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.item3) [405,118 387x100]
TextPaintable (TextNode<#text>)

34
Tests/LibWeb/Layout/input/grid/implicit-lines.html Normal file
View file

@ -0,0 +1,34 @@
<!DOCTYPE html><html lang="en"><style>
.grid-container {
display: grid;
grid-template-columns: 1fr 1fr;
grid-template-rows: 100px 100px;
gap: 10px;
height: 220px;
grid-template-areas:
"one two"
"one three";
}
.item1 {
background-color: lightblue;
grid-row-start: one-start;
grid-row-end: one-end;
grid-column-start: one-start;
grid-column-end: one-end;
}
.item2 {
background-color: lightcoral;
grid-area: two;
}
.item3 {
background-color: lightgreen;
grid-row-start: three-start;
grid-row-end: three-end;
grid-column-start: three-start;
grid-column-end: three-end;
}
</style>
<div class="grid-container"><div class="item2">Item 2</div><div class="item1">Item 1</div><div class="item3">Item 2</div></div>

30
Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
View file

@ -1406,6 +1406,32 @@ void GridFormattingContext::build_grid_areas()
find_area_rectangle(x, y, name); find_area_rectangle(x, y, name);
} }
} }
size_t max_column_line_index_of_area = 0;
size_t max_row_line_index_of_area = 0;
for (auto const& grid_area : m_grid_areas) {
max_column_line_index_of_area = max(max_column_line_index_of_area, grid_area.value.column_end);
max_row_line_index_of_area = max(max_row_line_index_of_area, grid_area.value.row_end);
}
if (max_column_line_index_of_area >= m_column_lines.size())
m_column_lines.resize(max_column_line_index_of_area + 1);
if (max_row_line_index_of_area >= m_row_lines.size())
m_row_lines.resize(max_row_line_index_of_area + 1);
// https://www.w3.org/TR/css-grid-2/#implicitly-assigned-line-name
// 7.3.2. Implicitly-Assigned Line Names
// The grid-template-areas property generates implicitly-assigned line names from the named grid areas in the
// template. For each named grid area foo, four implicitly-assigned line names are created: two named foo-start,
// naming the row-start and column-start lines of the named grid area, and two named foo-end, naming the row-end
// and column-end lines of the named grid area.
for (auto const& it : m_grid_areas) {
auto const& grid_area = it.value;
m_column_lines[grid_area.column_start].names.append(MUST(String::formatted("{}-start", grid_area.name)));
m_column_lines[grid_area.column_end].names.append(MUST(String::formatted("{}-end", grid_area.name)));
m_row_lines[grid_area.row_start].names.append(MUST(String::formatted("{}-start", grid_area.name)));
m_row_lines[grid_area.row_end].names.append(MUST(String::formatted("{}-end", grid_area.name)));
}
} }
void GridFormattingContext::place_grid_items() void GridFormattingContext::place_grid_items()
@ -1439,8 +1465,6 @@ void GridFormattingContext::place_grid_items()
m_occupation_grid = OccupationGrid(column_tracks_count, row_tracks_count); m_occupation_grid = OccupationGrid(column_tracks_count, row_tracks_count);
build_grid_areas();
// https://drafts.csswg.org/css-grid/#auto-placement-algo // https://drafts.csswg.org/css-grid/#auto-placement-algo
// 8.5. Grid Item Placement Algorithm // 8.5. Grid Item Placement Algorithm
@ -1927,6 +1951,8 @@ void GridFormattingContext::run(Box const&, LayoutMode, AvailableSpace const& av
init_grid_lines(GridDimension::Column); init_grid_lines(GridDimension::Column);
init_grid_lines(GridDimension::Row); init_grid_lines(GridDimension::Row);
build_grid_areas();
auto const& grid_computed_values = grid_container().computed_values(); auto const& grid_computed_values = grid_container().computed_values();
// NOTE: We store explicit grid sizes to later use in determining the position of items with negative index. // NOTE: We store explicit grid sizes to later use in determining the position of items with negative index.