Skip to content

Style Engine: Add a WP_Style_Engine_Processor object #42463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aristath merged 11 commits into from
Jul 19, 2022
Merged

Style Engine: Add a WP_Style_Engine_Processor object #42463

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
725b2fb
Add a WP_Style_Engine_Renderer object
aristath Jul 15, 2022
64ed041
Better use of the engine objects
aristath Jul 15, 2022
317457e
Added tests
ramonjd Jul 18, 2022
5baaf51
Updating method name to add_declarations after rebase
ramonjd Jul 18, 2022
73c3036
no need to use md5
aristath Jul 18, 2022
ff058f7
No need for an extra method
aristath Jul 18, 2022
f89d1ba
renaming stuff
aristath Jul 18, 2022
ab0e6e5
micro-optimization
aristath Jul 18, 2022
19a0d4d
rename Renderer to Processor
aristath Jul 18, 2022
a4c3cbc
:facepalm: forgot to rename files on inclusion
aristath Jul 18, 2022
f8fa57d
some inline comments
aristath Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updating method name to add_declarations after rebase
  • Loading branch information
@ramonjd
ramonjd committed Jul 18, 2022
commit 5baaf51caf8bcb8124ef71b4ce65a48f109c2f81
2 changes: 1 addition & 1 deletion packages/style-engine/class-wp-style-engine-renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private function combine_rules_selectors() {
$new_rule = $this->store->add_rule( implode( ',', $duplicates ) );
// Set the declarations. The extra check is in place because `add_rule` in the store can return `null`.
if ( $new_rule ) {
$new_rule->set_declarations( $declarations );
$new_rule->add_declarations( $declarations );
}
}
}
Expand Down
22 changes: 11 additions & 11 deletions packages/style-engine/phpunit/class-wp-style-engine-renderer-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ class WP_Style_Engine_Renderer_Test extends WP_UnitTestCase {
public function test_return_store_rules_as_css() {
$a_nice_store = WP_Style_Engine_CSS_Rules_Store_Gutenberg::get_store( 'nice' );
$a_nice_renderer = new WP_Style_Engine_Renderer_Gutenberg( $a_nice_store );
$a_nice_store->add_rule( '.a-nice-rule' )->set_declarations(
$a_nice_store->add_rule( '.a-nice-rule' )->add_declarations(
array(
'color' => 'var(--nice-color)',
'background-color' => 'purple',
)
);
$a_nice_store->add_rule( '.a-nicer-rule' )->set_declarations(
$a_nice_store->add_rule( '.a-nicer-rule' )->add_declarations(
array(
'font-family' => 'Nice sans',
'font-size' => '1em',
Expand All @@ -43,13 +43,13 @@ public function test_return_store_rules_as_css() {
public function test_dedupe_and_merge_css_declarations() {
$an_excellent_store = WP_Style_Engine_CSS_Rules_Store_Gutenberg::get_store( 'excellent' );
$an_excellent_renderer = new WP_Style_Engine_Renderer_Gutenberg( $an_excellent_store );
$an_excellent_store->add_rule( '.an-excellent-rule' )->set_declarations(
$an_excellent_store->add_rule( '.an-excellent-rule' )->add_declarations(
array(
'color' => 'var(--excellent-color)',
'border-style' => 'dotted',
)
);
$an_excellent_store->add_rule( '.an-excellent-rule' )->set_declarations(
$an_excellent_store->add_rule( '.an-excellent-rule' )->add_declarations(
array(
'color' => 'var(--excellent-color)',
'border-style' => 'dotted',
Expand All @@ -59,7 +59,7 @@ public function test_dedupe_and_merge_css_declarations() {

$this->assertEquals( '.an-excellent-rule {color: var(--excellent-color); border-style: dotted; border-color: brown;}', $an_excellent_renderer->get_css() );

$an_excellent_store->add_rule( '.an-excellent-rule' )->set_declarations(
$an_excellent_store->add_rule( '.an-excellent-rule' )->add_declarations(
array(
'color' => 'var(--excellent-color)',
'border-style' => 'dashed',
Expand All @@ -76,13 +76,13 @@ public function test_dedupe_and_merge_css_declarations() {
public function test_combine_css_rules() {
$a_sweet_store = WP_Style_Engine_CSS_Rules_Store_Gutenberg::get_store( 'sweet' );
$a_sweet_renderer = new WP_Style_Engine_Renderer_Gutenberg( $a_sweet_store );
$a_sweet_store->add_rule( '.a-sweet-rule' )->set_declarations(
$a_sweet_store->add_rule( '.a-sweet-rule' )->add_declarations(
array(
'color' => 'var(--sweet-color)',
'background-color' => 'purple',
)
);
$a_sweet_store->add_rule( '#an-even-sweeter-rule > marquee' )->set_declarations(
$a_sweet_store->add_rule( '#an-even-sweeter-rule > marquee' )->add_declarations(
array(
'color' => 'var(--sweet-color)',
'background-color' => 'purple',
Expand All @@ -98,25 +98,25 @@ public function test_combine_css_rules() {
public function test_store_combined_css_rules() {
$a_lovely_store = WP_Style_Engine_CSS_Rules_Store_Gutenberg::get_store( 'lovely' );
$a_lovely_renderer = new WP_Style_Engine_Renderer_Gutenberg( $a_lovely_store );
$a_lovely_store->add_rule( '.a-lovely-rule' )->set_declarations(
$a_lovely_store->add_rule( '.a-lovely-rule' )->add_declarations(
array(
'border-color' => 'purple',
)
);
$a_lovely_store->add_rule( '.a-lovelier-rule' )->set_declarations(
$a_lovely_store->add_rule( '.a-lovelier-rule' )->add_declarations(
array(
'border-color' => 'purple',
)
);

$this->assertEquals( '.a-lovely-rule,.a-lovelier-rule {border-color: purple;}', $a_lovely_renderer->get_css() );

$a_lovely_store->add_rule( '.a-most-lovely-rule' )->set_declarations(
$a_lovely_store->add_rule( '.a-most-lovely-rule' )->add_declarations(
array(
'border-color' => 'purple',
)
);
$a_lovely_store->add_rule( '.a-perfectly-lovely-rule' )->set_declarations(
$a_lovely_store->add_rule( '.a-perfectly-lovely-rule' )->add_declarations(
array(
'border-color' => 'purple',
)
Expand Down