From 94fd17a4678f977218c23f0e9a23897952c1597b Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Sun, 28 May 2023 21:22:48 +0300 Subject: [PATCH] LibWeb: Wrap child text sequences of grid container in anonymous blocks From spec https://drafts.csswg.org/css-grid/#grid-items: "Each in-flow child of a grid container becomes a grid item, and each child text sequence is wrapped in an anonymous block container grid item." Fixes the problem that text sequences inside grid containers are ignored and not displayed. --- .../Layout/expected/grid/anonymous-inline-child.txt | 9 +++++++++ .../LibWeb/Layout/input/grid/anonymous-inline-child.html | 3 +++ Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 Tests/LibWeb/Layout/expected/grid/anonymous-inline-child.txt create mode 100644 Tests/LibWeb/Layout/input/grid/anonymous-inline-child.html diff --git a/Tests/LibWeb/Layout/expected/grid/anonymous-inline-child.txt b/Tests/LibWeb/Layout/expected/grid/anonymous-inline-child.txt new file mode 100644 index 00000000000..d4e452927fb --- /dev/null +++ b/Tests/LibWeb/Layout/expected/grid/anonymous-inline-child.txt @@ -0,0 +1,9 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (0,0) content-size 800x600 [BFC] children: not-inline + BlockContainer at (8,8) content-size 784x17.46875 children: not-inline + Box at (8,8) content-size 784x17.46875 [GFC] children: not-inline + BlockContainer <(anonymous)> at (8,8) content-size 784x17.46875 [BFC] children: inline + line 0 width: 36.84375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 5, rect: [8,8 36.84375x17.46875] + "hello" + TextNode <#text> diff --git a/Tests/LibWeb/Layout/input/grid/anonymous-inline-child.html b/Tests/LibWeb/Layout/input/grid/anonymous-inline-child.html new file mode 100644 index 00000000000..c3799ca7073 --- /dev/null +++ b/Tests/LibWeb/Layout/input/grid/anonymous-inline-child.html @@ -0,0 +1,3 @@ +
hello
\ No newline at end of file diff --git a/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp b/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp index 9b3d88bc7d2..21a897269b0 100644 --- a/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp +++ b/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp @@ -69,7 +69,7 @@ static Layout::Node& insertion_parent_for_inline_node(Layout::NodeWithStyle& lay if (layout_parent.display().is_inline_outside() && layout_parent.display().is_flow_inside()) return layout_parent; - if (layout_parent.display().is_flex_inside()) { + if (layout_parent.display().is_flex_inside() || layout_parent.display().is_grid_inside()) { layout_parent.append_child(layout_parent.create_anonymous_wrapper()); return *layout_parent.last_child(); }