Skip to content
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.

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

Fix (WooCommerce): remove css styles displayed on shop page #3381

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
13 changes: 10 additions & 3 deletions src/css-optimize.php
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,19 @@ public static function parse_block_style( $block, &$style_arr ) {
* @return void
*/
public function load_cached_css_for_post() {
// DEV NOTE: If we'll also do this for wp_template and
// DEV NOTE #1: If we'll also do this for wp_template and
// wp_template_part then we might need to use the actions:
// render_block_core_template_part_post and
// render_block_core_template_part_file
if ( is_singular() && ! is_preview() && ! is_attachment() ) {
$post_id = get_the_ID();
// DEV NOTE #2: Check for WooCommerce Shop Page as well
if ( ( is_singular() && ! is_preview() && ! is_attachment() ) || ( function_exists('is_shop' ) && is_shop() ) ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition is becoming long and hard to read, can we split this to make it more readable? I feel uneasy that we're mingling WooCommerce code inside our normal behavior, let's add a filter so that we can split woocommerce compatibility into it's own file - we can add a src/compatibility/woocommerce.php and place the necessary compatibility code there.

$optimize_css = is_singular() && ! is_preview() && ! is_attachment();
$optimize_css = apply_filters( 'stackable/load_cached_css_for_post', $optimize_css );
if ( $optimize_css ) {
    // ...

if ( function_exists('is_shop' ) && is_shop() ) {
// use wc_get_page_id() instead of get_the_ID() because
// the latter returns the product page ID instead of the shop page ID
$post_id = wc_get_page_id( 'shop' );
} else {
$post_id = get_the_ID();
}
$this->optimized_css = get_post_meta( $post_id, 'stackable_optimized_css', true );

if ( ! empty( $this->optimized_css ) ) {
Expand Down
23 changes: 23 additions & 0 deletions src/kses.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,29 @@
exit;
}

/**
* In WooCommerce Shop page, <style> tags are stripped out and the CSS styles are displayed in the frontend.
* This function removes the <style> tags and CSS styles before they are stripped out.
*/
if ( ! function_exists( 'stackable_pre_kses_woocomerce_shop' ) ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this code from here to the new src/compatibility/woocommerce.php file suggested above?


function stackable_pre_kses_woocomerce_shop( $content, $allowed_html, $context ) {
// Check if we are on the WooCommerce Shop page
if ( function_exists('is_shop' ) && is_shop() ) {
$optimized_css = get_post_meta( wc_get_page_id( 'shop' ), 'stackable_optimized_css', true );

// remove CSS before kses strips out <style> tags
if ( ! empty( $optimized_css ) ) {
$content = str_replace( '<style>' . $optimized_css . '</style>', '', $content );
}

}
return $content;
}

add_filter('pre_kses', 'stackable_pre_kses_woocomerce_shop', 10, 3);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See whether you can check for the existence of the is_shop function prior to doing the add_filter

}

if ( ! function_exists( 'stackable_allow_wp_kses_allowed_html' ) ) {

/**
Expand Down
Loading