mirror of
https://github.com/SerenityOS/serenity
synced 2024-07-21 18:15:58 +00:00
LibWeb: Implement @supports selector(.foo)
This is defined in https://www.w3.org/TR/css-conditional-4/#at-supports-ext which just became a CR. :^)
This commit is contained in:
parent
c50ea8c1dd
commit
7880718fa8
|
@ -25,6 +25,23 @@
|
|||
}
|
||||
}
|
||||
|
||||
/* Selectors */
|
||||
@supports selector(.simple) {
|
||||
.p5 {
|
||||
background-color: lime;
|
||||
}
|
||||
}
|
||||
@supports selector(a#more > .complicated.case:nth-child(42)) {
|
||||
.p6 {
|
||||
background-color: lime;
|
||||
}
|
||||
}
|
||||
@supports selector(.easy) or selector(.....nope) {
|
||||
.p7 {
|
||||
background-color: lime;
|
||||
}
|
||||
}
|
||||
|
||||
.negative {
|
||||
background-color: red;
|
||||
}
|
||||
|
@ -48,6 +65,21 @@
|
|||
background-color: lime;
|
||||
}
|
||||
}
|
||||
@supports selector(.....nope) {
|
||||
.n5 {
|
||||
background-color: lime;
|
||||
}
|
||||
}
|
||||
@supports selector(::-webkit-input-placeholder) {
|
||||
.n6 {
|
||||
background-color: lime;
|
||||
}
|
||||
}
|
||||
@supports selector(32) or selector(thing[foo??????bar]) {
|
||||
.n7 {
|
||||
background-color: lime;
|
||||
}
|
||||
}
|
||||
|
||||
.success {
|
||||
background-color: lime;
|
||||
|
@ -63,16 +95,24 @@
|
|||
<p class="p2">@supports (color: green) and (width: 50px)</p>
|
||||
<p class="p3">@supports (color: green) or (flogwizzle: purple)</p>
|
||||
<p class="p4">@supports (not (flogwizzle: purple))</p>
|
||||
<p class="p5">@supports selector(.simple)</p>
|
||||
<p class="p6">@supports selector(a#more > .complicated.case:nth-child(42))</p>
|
||||
<p class="p7">@supports selector(.easy) or selector(.....nope)</p>
|
||||
|
||||
<h1>These should all be red</h1>
|
||||
<p class="negative n1">@supports (not (color: green))</p>
|
||||
<p class="negative n2">@supports (color: green) and (width: 50px) or (color: green)</p>
|
||||
<p class="negative n3">@supports (width: yellow) or (height: green)</p>
|
||||
<p class="negative n4">@supports (flogwizzle: purple)</p>
|
||||
<p class="negative n5">@supports selector(.....nope)</p>
|
||||
<p class="negative n6">@supports selector(::-webkit-input-placeholder)</p>
|
||||
<p class="negative n7">@supports selector(32) or selector(thing[foo??????bar])</p>
|
||||
|
||||
<h1>Testing CSS.supports(property, value)</h1>
|
||||
<p>These should all be green, meaning they returned true</p>
|
||||
<ul id="property-success">
|
||||
</ul>
|
||||
<p>These should all be red, meaning they returned false</p>
|
||||
<ul id="property-failure">
|
||||
</ul>
|
||||
|
||||
|
@ -118,7 +158,10 @@
|
|||
"color: green",
|
||||
"(color: green) and (width: 50px)",
|
||||
"(color: green) or (flogwizzle: purple)",
|
||||
"not (flogwizzle: purple)"
|
||||
"not (flogwizzle: purple)",
|
||||
"selector(.simple)",
|
||||
"selector(a#more > .complicated.case:nth-child(42))",
|
||||
"selector(.easy) or selector(.....nope)"
|
||||
];
|
||||
for (let text of should_succeed) {
|
||||
let success = CSS.supports(text);
|
||||
|
@ -133,7 +176,10 @@
|
|||
"not (color: green)",
|
||||
"(color: green) and (width: 50px) or (color: green)",
|
||||
"(width: yellow) or (height: green)",
|
||||
"flogwizzle: purple"
|
||||
"flogwizzle: purple",
|
||||
"selector(.....nope)",
|
||||
"selector(::-webkit-input-placeholder)",
|
||||
"selector(32) or selector(thing[foo??????bar])"
|
||||
];
|
||||
for (let text of should_fail) {
|
||||
let success = CSS.supports(text);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
||||
* Copyright (c) 2020-2021, the SerenityOS developers.
|
||||
* Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org>
|
||||
* Copyright (c) 2021-2022, Sam Atkins <atkinssj@serenityos.org>
|
||||
* Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
|
@ -1309,12 +1309,23 @@ Optional<Supports::Feature> Parser::parse_supports_feature(TokenStream<StyleComp
|
|||
// `<supports-decl>`
|
||||
if (first_token.is_block() && first_token.block().is_paren()) {
|
||||
TokenStream block_tokens { first_token.block().values() };
|
||||
// FIXME: Parsing and then converting back to a string is weird.
|
||||
if (auto declaration = consume_a_declaration(block_tokens); declaration.has_value()) {
|
||||
return Supports::Feature {
|
||||
.declaration = declaration->to_string()
|
||||
Supports::Declaration { declaration->to_string() }
|
||||
};
|
||||
}
|
||||
}
|
||||
// `<supports-selector-fn>`
|
||||
if (first_token.is_function() && first_token.function().name().equals_ignoring_case("selector"sv)) {
|
||||
// FIXME: Parsing and then converting back to a string is weird.
|
||||
StringBuilder builder;
|
||||
for (auto const& item : first_token.function().values())
|
||||
builder.append(item.to_string());
|
||||
return Supports::Feature {
|
||||
Supports::Selector { builder.to_string() }
|
||||
};
|
||||
}
|
||||
|
||||
tokens.rewind_to_position(start_position);
|
||||
return {};
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org>
|
||||
* Copyright (c) 2021-2022, Sam Atkins <atkinssj@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
@ -50,10 +50,27 @@ bool Supports::InParens::evaluate() const
|
|||
});
|
||||
}
|
||||
|
||||
bool Supports::Feature::evaluate() const
|
||||
bool Supports::Declaration::evaluate() const
|
||||
{
|
||||
auto style_property = Parser({}, declaration).parse_as_declaration();
|
||||
return style_property.has_value();
|
||||
}
|
||||
|
||||
bool Supports::Selector::evaluate() const
|
||||
{
|
||||
auto style_property = Parser({}, selector).parse_as_selector();
|
||||
return style_property.has_value();
|
||||
}
|
||||
|
||||
bool Supports::Feature::evaluate() const
|
||||
{
|
||||
return value.visit(
|
||||
[&](Declaration const& declaration) {
|
||||
return declaration.evaluate();
|
||||
},
|
||||
[&](Selector const& selector) {
|
||||
return selector.evaluate();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org>
|
||||
* Copyright (c) 2021-2022, Sam Atkins <atkinssj@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
@ -16,16 +16,26 @@
|
|||
|
||||
namespace Web::CSS {
|
||||
|
||||
// https://www.w3.org/TR/css-conditional-3/#at-supports
|
||||
// https://www.w3.org/TR/css-conditional-4/#at-supports
|
||||
class Supports final : public RefCounted<Supports> {
|
||||
friend class Parser;
|
||||
|
||||
public:
|
||||
struct Feature {
|
||||
struct Declaration {
|
||||
String declaration;
|
||||
bool evaluate() const;
|
||||
};
|
||||
|
||||
struct Selector {
|
||||
String selector;
|
||||
bool evaluate() const;
|
||||
};
|
||||
|
||||
struct Feature {
|
||||
Variant<Declaration, Selector> value;
|
||||
bool evaluate() const;
|
||||
};
|
||||
|
||||
struct Condition;
|
||||
struct InParens {
|
||||
Variant<NonnullOwnPtr<Condition>, Feature, GeneralEnclosed> value;
|
||||
|
|
Loading…
Reference in a new issue