We use cookies to ensure you get the best experience on our website
首页 发现 帮助
注册 登录
0ct0pu5
/
ladybird
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

LibWeb: Set correct longhand values when using grid-placement shorthand

According to https://www.w3.org/TR/css-grid-2/#placement-shorthands
when setting the 'grid-row' and 'grid-column' shorthand property to a
single <custom-ident> value, both 'grid-row-start'/'grid-column-start'
and 'grid-row-end'/'grid-column-end' should be set to that
<custom_ident>.
Adam Harald Jørgensen 10 月之前
父节点
77718c0a66
当前提交
3e92ec80f3
共有 4 个文件被更改，包括 67 次插入 和 2 次删除
分列视图 显示文件统计
  1. 27 0
      Tests/LibWeb/Layout/expected/grid/grid-placement-shorthand-single-custom-ident.txt
  2. 34 0
      Tests/LibWeb/Layout/input/grid/grid-placement-shorthand-single-custom-ident.html
  3. 5 1
      Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
  4. 1 1
      Userland/Libraries/LibWeb/CSS/Parser/Parser.h

+ 27 - 0
Tests/LibWeb/Layout/expected/grid/grid-placement-shorthand-single-custom-ident.txt
查看文件 

@@ -0,0 +1,27 @@
 
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
 
+  BlockContainer <html> at (0,0) content-size 800x133 [BFC] children: not-inline
 
+    BlockContainer <body> at (8,8) content-size 784x117 children: not-inline
 
+      Box <div.grid-container> at (8,8) content-size 784x117 [GFC] children: not-inline
 
+        BlockContainer <(anonymous)> (not painted) [BFC] children: inline
 
+          TextNode <#text>
 
+        BlockContainer <div.headline> at (8,8) content-size 100x17 [BFC] children: inline
 
+          frag 0 from TextNode start: 0, length: 8, rect: [8,8 65.28125x17] baseline: 13.296875
 
+              "Headline"
 
+          TextNode <#text>
 
+        BlockContainer <(anonymous)> (not painted) [BFC] children: inline
 
+          TextNode <#text>
 
+        BlockContainer <div.content> at (8,25) content-size 400x100 [BFC] children: inline
 
+          frag 0 from TextNode start: 0, length: 7, rect: [8,25 62.328125x17] baseline: 13.296875
 
+              "Content"
 
+          TextNode <#text>
 
+        BlockContainer <(anonymous)> (not painted) [BFC] children: inline
 
+          TextNode <#text>
 
+
 
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
 
+  PaintableWithLines (BlockContainer<HTML>) [0,0 800x133]
 
+    PaintableWithLines (BlockContainer<BODY>) [8,8 784x117]
 
+      PaintableBox (Box<DIV>.grid-container) [8,8 784x117]
 
+        PaintableWithLines (BlockContainer<DIV>.headline) [8,8 100x17]
 
+          TextPaintable (TextNode<#text>)
 
+        PaintableWithLines (BlockContainer<DIV>.content) [8,25 400x100]
 
+          TextPaintable (TextNode<#text>)

+ 34 - 0
Tests/LibWeb/Layout/input/grid/grid-placement-shorthand-single-custom-ident.html
查看文件 

@@ -0,0 +1,34 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+<style>
 
+    .grid-container {
 
+        display: grid;
 
+        grid-template-rows:
 
+                [headline-start]
 
+                auto
 
+                [headline-end content-start]
 
+                auto
 
+                [content-end];
 
+        grid-template-columns:
 
+                [content-start title-start]
 
+                100px
 
+                [title-end]
 
+                repeat(3, 100px)
 
+                [content-end];
 
+    }
 
+    .headline {
 
+        grid-row: headline;
 
+        grid-column: title;
 
+        background-color: lightsalmon;
 
+    }
 
+    .content {
 
+        height: 100px;
 
+        grid-row: content;
 
+        grid-column: content;
 
+        background-color: lightblue;
 
+    }
 
+</style>
 
+<div class="grid-container">
 
+    <div class="headline">Headline</div>
 
+    <div class="content">Content</div>
 
+</div>

+ 5 - 1
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
查看文件 

@@ -6795,7 +6795,7 @@ RefPtr<CSSStyleValue> Parser::parse_grid_auto_track_sizes(TokenStream<ComponentV
 
     return GridTrackSizeListStyleValue::create(GridTrackSizeList(move(track_list)));
 
 }
 
 
-RefPtr<CSSStyleValue> Parser::parse_grid_track_placement(TokenStream<ComponentValue>& tokens)
 
+RefPtr<GridTrackPlacementStyleValue> Parser::parse_grid_track_placement(TokenStream<ComponentValue>& tokens)
 
 {
 
     // FIXME: This shouldn't be needed. Right now, the below code returns a CSSStyleValue even if no tokens are consumed!
 
     if (!tokens.has_next_token())
 
@@ -6924,6 +6924,10 @@ RefPtr<CSSStyleValue> Parser::parse_grid_track_placement_shorthand_value(Propert
 
     auto parsed_start_value = parse_grid_track_placement(track_start_placement_token_stream);
 
     if (parsed_start_value && track_end_placement_tokens.is_empty()) {
 
         transaction.commit();
 
+        if (parsed_start_value->grid_track_placement().has_identifier()) {
 
+            auto custom_ident = parsed_start_value.release_nonnull();
 
+            return ShorthandStyleValue::create(property_id, { start_property, end_property }, { custom_ident, custom_ident });
 
+        }
 
         return ShorthandStyleValue::create(property_id,
 
             { start_property, end_property },
 
             { parsed_start_value.release_nonnull(), GridTrackPlacementStyleValue::create(GridTrackPlacement::make_auto()) });

+ 1 - 1
Userland/Libraries/LibWeb/CSS/Parser/Parser.h
查看文件 

@@ -322,7 +322,7 @@ private:
 
     RefPtr<CSSStyleValue> parse_grid_auto_track_sizes(TokenStream<ComponentValue>&);
 
     RefPtr<GridAutoFlowStyleValue> parse_grid_auto_flow_value(TokenStream<ComponentValue>&);
 
     RefPtr<CSSStyleValue> parse_grid_track_size_list_shorthand_value(PropertyID, TokenStream<ComponentValue>&);
 
-    RefPtr<CSSStyleValue> parse_grid_track_placement(TokenStream<ComponentValue>&);
 
+    RefPtr<GridTrackPlacementStyleValue> parse_grid_track_placement(TokenStream<ComponentValue>&);
 
     RefPtr<CSSStyleValue> parse_grid_track_placement_shorthand_value(PropertyID, TokenStream<ComponentValue>&);
 
     RefPtr<CSSStyleValue> parse_grid_template_areas_value(TokenStream<ComponentValue>&);
 
     RefPtr<CSSStyleValue> parse_grid_area_shorthand_value(TokenStream<ComponentValue>&);

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5