We use cookies to ensure you get the best experience on our website
Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
0ct0pu5
/
ladybird
1
0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

LibWeb: Add support for parsing place-content shorthand CSS property

FalseHonesty 2 gadi atpakaļ
vecāks
23be1c5482
revīzija
dcead6f5eb
12 mainītis faili ar 139 papildinājumiem un 0 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 9 0
      Tests/LibWeb/Layout/expected/place-content-shorthand-property.txt
  2. 9 0
      Tests/LibWeb/Layout/input/place-content-shorthand-property.html
  3. 1 0
      Userland/Libraries/LibWeb/CMakeLists.txt
  4. 27 0
      Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
  5. 1 0
      Userland/Libraries/LibWeb/CSS/Parser/Parser.h
  6. 8 0
      Userland/Libraries/LibWeb/CSS/Properties.json
  7. 14 0
      Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
  8. 7 0
      Userland/Libraries/LibWeb/CSS/StyleValue.cpp
  9. 4 0
      Userland/Libraries/LibWeb/CSS/StyleValue.h
  10. 16 0
      Userland/Libraries/LibWeb/CSS/StyleValues/PlaceContentStyleValue.cpp
  11. 42 0
      Userland/Libraries/LibWeb/CSS/StyleValues/PlaceContentStyleValue.h
  12. 1 0
      Userland/Libraries/LibWeb/Forward.h

+ 9 - 0
Tests/LibWeb/Layout/expected/place-content-shorthand-property.txt
Parādīt failu 

@@ -0,0 +1,9 @@
 
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
 
+  BlockContainer <html> at (1,1) content-size 798x37.46875 [BFC] children: not-inline
 
+    BlockContainer <body> at (10,10) content-size 780x19.46875 children: not-inline
 
+      Box <div.container> at (11,11) content-size 800x17.46875 flex-container(row) [FFC] children: not-inline
 
+        BlockContainer <(anonymous)> at (392.210937,11) content-size 37.578125x17.46875 flex-item [BFC] children: inline
 
+          line 0 width: 37.578125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
 
+            frag 0 from TextNode start: 0, length: 4, rect: [392.210937,11 37.578125x17.46875]
 
+              "Text"
 
+          TextNode <#text>

+ 9 - 0
Tests/LibWeb/Layout/input/place-content-shorthand-property.html
Parādīt failu 

@@ -0,0 +1,9 @@
 
+<!DOCTYPE html><style>
 
+* { border: 1px solid black; }
 
+.container {
 
+    background: pink;
 
+    display: flex;
 
+    width: 100vw;
 
+    place-content: center;
 
+}
 
+</style><div class="container">Text

+ 1 - 0
Userland/Libraries/LibWeb/CMakeLists.txt
Parādīt failu 

@@ -101,6 +101,7 @@ set(SOURCES
 
     CSS/StyleValues/ListStyleStyleValue.cpp
 
     CSS/StyleValues/NumericStyleValue.cpp
 
     CSS/StyleValues/OverflowStyleValue.cpp
 
+    CSS/StyleValues/PlaceContentStyleValue.cpp
 
     CSS/StyleValues/PositionStyleValue.cpp
 
     CSS/StyleValues/RadialGradientStyleValue.cpp
 
     CSS/StyleValues/RectStyleValue.cpp

+ 27 - 0
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
Parādīt failu 

@@ -68,6 +68,7 @@
 
 #include <LibWeb/CSS/StyleValues/NumericStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/OverflowStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
 
+#include <LibWeb/CSS/StyleValues/PlaceContentStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/PositionStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/RadialGradientStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/RectStyleValue.h>
 
@@ -6105,6 +6106,28 @@ ErrorOr<RefPtr<StyleValue>> Parser::parse_overflow_value(Vector<ComponentValue>
 
     return nullptr;
 
 }
 
 
+ErrorOr<RefPtr<StyleValue>> Parser::parse_place_content_value(Vector<ComponentValue> const& component_values)
 
+{
 
+    if (component_values.size() > 2)
 
+        return nullptr;
 
+
 
+    auto tokens = TokenStream { component_values };
 
+    auto maybe_align_content_value = TRY(parse_css_value_for_property(PropertyID::AlignContent, tokens));
 
+    if (!maybe_align_content_value)
 
+        return nullptr;
 
+
 
+    if (component_values.size() == 1) {
 
+        if (!property_accepts_identifier(PropertyID::JustifyContent, maybe_align_content_value->to_identifier()))
 
+            return nullptr;
 
+        return PlaceContentStyleValue::create(*maybe_align_content_value, *maybe_align_content_value);
 
+    }
 
+
 
+    auto maybe_justify_content_value = TRY(parse_css_value_for_property(PropertyID::JustifyContent, tokens));
 
+    if (!maybe_justify_content_value)
 
+        return nullptr;
 
+    return PlaceContentStyleValue::create(maybe_align_content_value.release_nonnull(), maybe_justify_content_value.release_nonnull());
 
+}
 
+
 
 ErrorOr<RefPtr<StyleValue>> Parser::parse_text_decoration_value(Vector<ComponentValue> const& component_values)
 
 {
 
     RefPtr<StyleValue> decoration_line;
 
@@ -7227,6 +7250,10 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue>> Parser::parse_css_value(Property
 
         if (auto parsed_value = FIXME_TRY(parse_overflow_value(component_values)))
 
             return parsed_value.release_nonnull();
 
         return ParseError::SyntaxError;
 
+    case PropertyID::PlaceContent:
 
+        if (auto parsed_value = FIXME_TRY(parse_place_content_value(component_values)))
 
+            return parsed_value.release_nonnull();
 
+        return ParseError::SyntaxError;
 
     case PropertyID::TextDecoration:
 
         if (auto parsed_value = FIXME_TRY(parse_text_decoration_value(component_values)))
 
             return parsed_value.release_nonnull();

+ 1 - 0
Userland/Libraries/LibWeb/CSS/Parser/Parser.h
Parādīt failu 

@@ -317,6 +317,7 @@ private:
 
     ErrorOr<RefPtr<StyleValue>> parse_font_family_value(TokenStream<ComponentValue>&);
 
     ErrorOr<RefPtr<StyleValue>> parse_list_style_value(Vector<ComponentValue> const&);
 
     ErrorOr<RefPtr<StyleValue>> parse_overflow_value(Vector<ComponentValue> const&);
 
+    ErrorOr<RefPtr<StyleValue>> parse_place_content_value(Vector<ComponentValue> const&);
 
     enum class AllowInsetKeyword {
 
         No,
 
         Yes,

+ 8 - 0
Userland/Libraries/LibWeb/CSS/Properties.json
Parādīt failu 

@@ -1543,6 +1543,14 @@
 
       "unitless-length"
 
     ]
 
   },
 
+  "place-content": {
 
+    "inherited": false,
 
+    "initial": "normal",
 
+    "longhands": [
 
+      "align-content",
 
+      "justify-content"
 
+    ]
 
+  },
 
   "pointer-events": {
 
     "affects-layout": false,
 
     "inherited": true,

+ 14 - 0
Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
Parādīt failu 

@@ -50,6 +50,7 @@
 
 #include <LibWeb/CSS/StyleValues/NumericStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/OverflowStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
 
+#include <LibWeb/CSS/StyleValues/PlaceContentStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/PositionStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/RectStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/StyleValueList.h>
 
@@ -343,6 +344,19 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope
 
         return;
 
     }
 
 
+    if (property_id == CSS::PropertyID::PlaceContent) {
 
+        if (value.is_place_content()) {
 
+            auto const& place_content = value.as_place_content();
 
+            style.set_property(CSS::PropertyID::AlignContent, place_content.align_content());
 
+            style.set_property(CSS::PropertyID::JustifyContent, place_content.justify_content());
 
+            return;
 
+        }
 
+
 
+        style.set_property(CSS::PropertyID::AlignContent, value);
 
+        style.set_property(CSS::PropertyID::JustifyContent, value);
 
+        return;
 
+    }
 
+
 
     if (property_id == CSS::PropertyID::Border) {
 
         set_property_expanding_shorthands(style, CSS::PropertyID::BorderTop, value, document, declaration);
 
         set_property_expanding_shorthands(style, CSS::PropertyID::BorderRight, value, document, declaration);

+ 7 - 0
Userland/Libraries/LibWeb/CSS/StyleValue.cpp
Parādīt failu 

@@ -46,6 +46,7 @@
 
 #include <LibWeb/CSS/StyleValues/NumericStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/OverflowStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
 
+#include <LibWeb/CSS/StyleValues/PlaceContentStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/PositionStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/RadialGradientStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/RectStyleValue.h>
 
@@ -295,6 +296,12 @@ PercentageStyleValue const& StyleValue::as_percentage() const
 
     return static_cast<PercentageStyleValue const&>(*this);
 
 }
 
 
+PlaceContentStyleValue const& StyleValue::as_place_content() const
 
+{
 
+    VERIFY(is_place_content());
 
+    return static_cast<PlaceContentStyleValue const&>(*this);
 
+}
 
+
 
 PositionStyleValue const& StyleValue::as_position() const
 
 {
 
     VERIFY(is_position());

+ 4 - 0
Userland/Libraries/LibWeb/CSS/StyleValue.h
Parādīt failu 

@@ -123,6 +123,7 @@ public:
 
         Numeric,
 
         Overflow,
 
         Percentage,
 
+        PlaceContent,
 
         Position,
 
         RadialGradient,
 
         Rect,
 
@@ -177,6 +178,7 @@ public:
 
     bool is_numeric() const { return type() == Type::Numeric; }
 
     bool is_overflow() const { return type() == Type::Overflow; }
 
     bool is_percentage() const { return type() == Type::Percentage; }
 
+    bool is_place_content() const { return type() == Type::PlaceContent; }
 
     bool is_position() const { return type() == Type::Position; }
 
     bool is_radial_gradient() const { return type() == Type::RadialGradient; }
 
     bool is_rect() const { return type() == Type::Rect; }
 
@@ -230,6 +232,7 @@ public:
 
     NumericStyleValue const& as_numeric() const;
 
     OverflowStyleValue const& as_overflow() const;
 
     PercentageStyleValue const& as_percentage() const;
 
+    PlaceContentStyleValue const& as_place_content() const;
 
     PositionStyleValue const& as_position() const;
 
     RadialGradientStyleValue const& as_radial_gradient() const;
 
     RectStyleValue const& as_rect() const;
 
@@ -280,6 +283,7 @@ public:
 
     NumericStyleValue& as_numeric() { return const_cast<NumericStyleValue&>(const_cast<StyleValue const&>(*this).as_numeric()); }
 
     OverflowStyleValue& as_overflow() { return const_cast<OverflowStyleValue&>(const_cast<StyleValue const&>(*this).as_overflow()); }
 
     PercentageStyleValue& as_percentage() { return const_cast<PercentageStyleValue&>(const_cast<StyleValue const&>(*this).as_percentage()); }
 
+    PlaceContentStyleValue& as_place_content() { return const_cast<PlaceContentStyleValue&>(const_cast<StyleValue const&>(*this).as_place_content()); }
 
     PositionStyleValue& as_position() { return const_cast<PositionStyleValue&>(const_cast<StyleValue const&>(*this).as_position()); }
 
     RadialGradientStyleValue& as_radial_gradient() { return const_cast<RadialGradientStyleValue&>(const_cast<StyleValue const&>(*this).as_radial_gradient()); }
 
     RectStyleValue& as_rect() { return const_cast<RectStyleValue&>(const_cast<StyleValue const&>(*this).as_rect()); }

+ 16 - 0
Userland/Libraries/LibWeb/CSS/StyleValues/PlaceContentStyleValue.cpp
Parādīt failu 

@@ -0,0 +1,16 @@
 
+/*
 
+ * Copyright (c) 2023, Hunter Salyer <thefalsehonesty@gmail.com>
 
+ *
 
+ * SPDX-License-Identifier: BSD-2-Clause
 
+ */
 
+
 
+#include "PlaceContentStyleValue.h"
 
+
 
+namespace Web::CSS {
 
+
 
+ErrorOr<String> PlaceContentStyleValue::to_string() const
 
+{
 
+    return String::formatted("{} {}", TRY(m_properties.align_content->to_string()), TRY(m_properties.justify_content->to_string()));
 
+}
 
+
 
+}

+ 42 - 0
Userland/Libraries/LibWeb/CSS/StyleValues/PlaceContentStyleValue.h
Parādīt failu 

@@ -0,0 +1,42 @@
 
+/*
 
+ * Copyright (c) 2023, Hunter Salyer <thefalsehonesty@gmail.com>
 
+ *
 
+ * SPDX-License-Identifier: BSD-2-Clause
 
+ */
 
+
 
+#pragma once
 
+
 
+#include <LibWeb/CSS/StyleValue.h>
 
+
 
+namespace Web::CSS {
 
+
 
+class PlaceContentStyleValue final : public StyleValueWithDefaultOperators<PlaceContentStyleValue> {
 
+public:
 
+    static ErrorOr<ValueComparingNonnullRefPtr<PlaceContentStyleValue>> create(ValueComparingNonnullRefPtr<StyleValue> align_content, ValueComparingNonnullRefPtr<StyleValue> justify_content)
 
+    {
 
+        return adopt_nonnull_ref_or_enomem(new (nothrow) PlaceContentStyleValue(move(align_content), move(justify_content)));
 
+    }
 
+    virtual ~PlaceContentStyleValue() override = default;
 
+
 
+    ValueComparingNonnullRefPtr<StyleValue> align_content() const { return m_properties.align_content; }
 
+    ValueComparingNonnullRefPtr<StyleValue> justify_content() const { return m_properties.justify_content; }
 
+
 
+    virtual ErrorOr<String> to_string() const override;
 
+
 
+    bool properties_equal(PlaceContentStyleValue const& other) const { return m_properties == other.m_properties; };
 
+
 
+private:
 
+    PlaceContentStyleValue(ValueComparingNonnullRefPtr<StyleValue> align_content, ValueComparingNonnullRefPtr<StyleValue> justify_content)
 
+        : StyleValueWithDefaultOperators(Type::PlaceContent)
 
+        , m_properties { .align_content = move(align_content), .justify_content = move(justify_content) }
 
+    {
 
+    }
 
+
 
+    struct Properties {
 
+        ValueComparingNonnullRefPtr<StyleValue> align_content;
 
+        ValueComparingNonnullRefPtr<StyleValue> justify_content;
 
+        bool operator==(Properties const&) const = default;
 
+    } m_properties;
 
+};
 
+
 
+}

+ 1 - 0
Userland/Libraries/LibWeb/Forward.h
Parādīt failu 

@@ -135,6 +135,7 @@ class OverflowStyleValue;
 
 class Percentage;
 
 class PercentageOrCalculated;
 
 class PercentageStyleValue;
 
+class PlaceContentStyleValue;
 
 class PositionStyleValue;
 
 class PropertyOwningCSSStyleDeclaration;
 
 class RadialGradientStyleValue;

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