@automattic/newspack-blocks 1.67.0 → 1.68.0

package/dist/{donateCheckoutModal.asset.php → modal.asset.php}

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '6ff1ed9230f6ab63475d777dd66b58b6');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '04d35452766297fb31a594fc50807f06');

package/dist/modal.css

@@ -0,0 +1 @@
+@-webkit-keyframes spin{0%{transform:rotate(0deg)}50%{transform:rotate(180deg)}to{transform:rotate(1turn)}}@keyframes spin{0%{transform:rotate(0deg)}50%{transform:rotate(180deg)}to{transform:rotate(1turn)}}.newspack-blocks-checkout-modal{position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,.75);z-index:99999}.newspack-blocks-checkout-modal__content{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:calc(100vw - 32px);max-width:580px;min-height:200px;max-height:calc(100vh - 32px);background:#fff;border-radius:5px}.newspack-blocks-checkout-modal__content>:not(.newspack-blocks-checkout-modal__close){width:100%;height:100%;border:0;border-radius:5px}.newspack-blocks-checkout-modal__spinner{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:100%;height:100%;display:flex;align-items:center;justify-content:center;background:#fff;border-radius:5px}.newspack-blocks-checkout-modal__spinner>span{width:25px;height:25px;border:2px solid #fff;border-top-color:#767676;border-radius:50%;-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}.newspack-blocks-checkout-modal__close{position:absolute;top:0;right:0;padding:8px;border:0;background:transparent;color:#111;cursor:pointer}.newspack-blocks-checkout-modal__close:focus,.newspack-blocks-checkout-modal__close:hover{color:#767676}.newspack-blocks-checkout-modal__close svg{display:block}@media(max-width:600px){.newspack-blocks-checkout-modal__content{max-width:100%;width:100%;border-radius:0;top:auto;bottom:0;left:0;transform:none}.newspack-blocks-checkout-modal__content>:not(.newspack-blocks-checkout-modal__close){border-radius:0}}

package/dist/modal.js

@@ -0,0 +1 @@
+(()=>{"use strict";var e={r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},t={};e.r(t);var n,o;function c(e){var t=e.querySelector("iframe");t&&(t.src="about:blank"),document.body.classList.remove("newspack-modal-checkout-open"),n.disconnect(),e.style.display="none"}o=function(){var e=document.querySelector(".newspack-blocks-checkout-modal");if(e){var t=document.querySelector(".newspack-blocks-checkout-modal__spinner"),o="newspack_modal_checkout",a=document.createElement("input");a.type="hidden",a.name="modal_checkout",a.value="1";var r=e.querySelector(".newspack-blocks-checkout-modal__content"),d=document.createElement("iframe");d.name=o,r.appendChild(d),document.querySelectorAll(".wpbnbd.wpbnbd--platform-wc,.wp-block-newspack-blocks-checkout-button").forEach((function(c){c.querySelectorAll("form").forEach((function(c){c.appendChild(a.cloneNode()),c.target=o,c.addEventListener("submit",(function(){t.style.display="flex",e.style.display="block",document.body.classList.add("newspack-modal-checkout-open"),n=new ResizeObserver((function(e){if(e&&e.length){var t=e[0].contentRect;t&&(r.style.height=t.top+t.bottom+"px")}})),d.addEventListener("load",(function(){var e=d.contentWindow.location;if(window.newspackReaderActivation&&e.href.indexOf("order-received")>-1){var o=window.newspackReaderActivation,c=new Proxy(new URLSearchParams(e.search),{get:function(e,t){return e.get(t)}});c.email&&(o.setReaderEmail(c.email),o.setAuthenticated(!0))}var a=d.contentWindow.document.querySelector("#newspack_modal_checkout");a&&n.observe(a),t.style.display="none"}))}))}))})),e.addEventListener("click",(function(t){t.target===e&&c(e)})),e.querySelectorAll(".newspack-blocks-checkout-modal__close").forEach((function(t){t.addEventListener("click",(function(t){t.preventDefault(),c(e)}))}))}},"undefined"!=typeof document&&("complete"!==document.readyState&&"interactive"!==document.readyState?document.addEventListener("DOMContentLoaded",o):o());var a=window;for(var r in t)a[r]=t[r];t.__esModule&&Object.defineProperty(a,"__esModule",{value:!0})})();

package/dist/modal.rtl.css

@@ -0,0 +1 @@
+@-webkit-keyframes spin{0%{transform:rotate(0deg)}50%{transform:rotate(-180deg)}to{transform:rotate(-1turn)}}@keyframes spin{0%{transform:rotate(0deg)}50%{transform:rotate(-180deg)}to{transform:rotate(-1turn)}}.newspack-blocks-checkout-modal{position:fixed;top:0;right:0;width:100%;height:100%;background:rgba(0,0,0,.75);z-index:99999}.newspack-blocks-checkout-modal__content{position:absolute;top:50%;right:50%;transform:translate(50%,-50%);width:calc(100vw - 32px);max-width:580px;min-height:200px;max-height:calc(100vh - 32px);background:#fff;border-radius:5px}.newspack-blocks-checkout-modal__content>:not(.newspack-blocks-checkout-modal__close){width:100%;height:100%;border:0;border-radius:5px}.newspack-blocks-checkout-modal__spinner{position:absolute;top:50%;right:50%;transform:translate(50%,-50%);width:100%;height:100%;display:flex;align-items:center;justify-content:center;background:#fff;border-radius:5px}.newspack-blocks-checkout-modal__spinner>span{width:25px;height:25px;border:2px solid #fff;border-top-color:#767676;border-radius:50%;-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}.newspack-blocks-checkout-modal__close{position:absolute;top:0;left:0;padding:8px;border:0;background:transparent;color:#111;cursor:pointer}.newspack-blocks-checkout-modal__close:focus,.newspack-blocks-checkout-modal__close:hover{color:#767676}.newspack-blocks-checkout-modal__close svg{display:block}@media(max-width:600px){.newspack-blocks-checkout-modal__content{max-width:100%;width:100%;border-radius:0;top:auto;bottom:0;right:0;transform:none}.newspack-blocks-checkout-modal__content>:not(.newspack-blocks-checkout-modal__close){border-radius:0}}

package/dist/modalCheckout.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '72f30e0b69b7efc6a193f4883a6d428d');

package/dist/modalCheckout.js

@@ -0,0 +1 @@
+(()=>{"use strict";var e={r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},o={};e.r(o);var r=window;for(var t in o)r[t]=o[t];o.__esModule&&Object.defineProperty(r,"__esModule",{value:!0})})();

package/includes/class-modal-checkout.php

@@ -0,0 +1,383 @@
+<?php
+/**
+ * Newspack Blocks Modal Checkout
+ *
+ * @package Newspack_Blocks
+ */
+
+namespace Newspack_Blocks;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Modal Checkout Class.
+ */
+final class Modal_Checkout {
+	/**
+	 * Whether the modal checkout has been enqueued.
+	 *
+	 * @var boolean
+	 */
+	private static $has_modal = false;
+
+	/**
+	 * Initialize hooks.
+	 */
+	public static function init() {
+		add_action( 'template_redirect', [ __CLASS__, 'process_checkout_request' ] );
+		add_action( 'wp_footer', [ __CLASS__, 'render_modal_markup' ], 100 );
+		add_action( 'wp_enqueue_scripts', [ __CLASS__, 'enqueue_scripts' ] );
+		add_filter( 'show_admin_bar', [ __CLASS__, 'show_admin_bar' ] );
+		add_action( 'template_include', [ __CLASS__, 'get_checkout_template' ] );
+		add_filter( 'woocommerce_get_return_url', [ __CLASS__, 'woocommerce_get_return_url' ], 10, 2 );
+		add_filter( 'wc_get_template', [ __CLASS__, 'wc_get_template' ], 10, 2 );
+		add_filter( 'woocommerce_checkout_get_value', [ __CLASS__, 'woocommerce_checkout_get_value' ], 10, 2 );
+	}
+
+	/**
+	 * Process checkout request for modal.
+	 */
+	public static function process_checkout_request() {
+		$is_newspack_checkout = filter_input( INPUT_GET, 'newspack_checkout', FILTER_SANITIZE_NUMBER_INT );
+		$product_id           = filter_input( INPUT_GET, 'product_id', FILTER_SANITIZE_NUMBER_INT );
+		if ( ! $is_newspack_checkout || ! $product_id ) {
+			return;
+		}
+
+		\WC()->cart->empty_cart();
+
+		$referer    = wp_get_referer();
+		$params     = [];
+		$parsed_url = wp_parse_url( $referer );
+
+		// Get URL params appended to the referer URL.
+		if ( ! empty( $parsed_url['query'] ) ) {
+			wp_parse_str( $parsed_url['query'], $params );
+		}
+
+		if ( function_exists( 'wpcom_vip_url_to_postid' ) ) {
+			$referer_post_id = wpcom_vip_url_to_postid( $referer );
+		} else {
+			$referer_post_id = url_to_postid( $referer ); // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.url_to_postid_url_to_postid
+		}
+
+		$referer_tags       = [];
+		$referer_categories = [];
+		$tags               = get_the_tags( $referer_post_id );
+		if ( $tags && ! empty( $tags ) ) {
+			$referer_tags = array_map(
+				function ( $item ) {
+					return $item->slug;
+				},
+				$tags
+			);
+		}
+
+		$categories = get_the_category( $referer_post_id );
+		if ( $categories && ! empty( $categories ) ) {
+			$referer_categories = array_map(
+				function ( $item ) {
+					return $item->slug;
+				},
+				$categories
+			);
+		}
+
+		$cart_item_data = [ 'referer' => $referer ];
+
+		$newspack_popup_id = filter_input( INPUT_GET, 'newspack_popup_id', FILTER_SANITIZE_NUMBER_INT );
+		if ( $newspack_popup_id ) {
+			$cart_item_data['newspack_popup_id'] = $newspack_popup_id;
+		}
+
+		/** Apply NYP custom price */
+		if ( class_exists( 'WC_Name_Your_Price_Helpers' ) ) {
+			$is_product_nyp = \WC_Name_Your_Price_Helpers::is_nyp( $product_id );
+			$price          = filter_input( INPUT_GET, 'price', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
+			if ( $is_product_nyp ) {
+				if ( empty( $price ) ) {
+					$price = \WC_Name_Your_Price_Helpers::get_suggested_price( $product_id );
+				}
+				$min_price = \WC_Name_Your_Price_Helpers::get_minimum_price( $product_id );
+				$max_price = \WC_Name_Your_Price_Helpers::get_maximum_price( $product_id );
+				$price     = ! empty( $max_price ) ? min( $price, $max_price ) : $price;
+				$price     = ! empty( $min_price ) ? max( $price, $min_price ) : $price;
+
+				$cart_item_data['nyp'] = (float) \WC_Name_Your_Price_Helpers::standardize_number( $price );
+			}
+		}
+
+		\WC()->cart->add_to_cart( $product_id, 1, 0, [], $cart_item_data );
+
+		$query_args = [];
+
+		if ( ! empty( $referer_tags ) ) {
+			$query_args['referer_tags'] = implode( ',', $referer_tags );
+		}
+		if ( ! empty( $referer_categories ) ) {
+			$query_args['referer_categories'] = implode( ',', $referer_categories );
+		}
+		$query_args['modal_checkout'] = 1;
+
+		// Pass through UTM params so they can be forwarded to the WooCommerce checkout flow.
+		foreach ( $params as $param => $value ) {
+			if ( 'utm' === substr( $param, 0, 3 ) ) {
+				$param                = sanitize_text_field( $param );
+				$query_args[ $param ] = sanitize_text_field( $value );
+			}
+		}
+
+		$checkout_url = add_query_arg(
+			$query_args,
+			\wc_get_page_permalink( 'checkout' )
+		);
+
+		// Redirect to checkout.
+		\wp_safe_redirect( apply_filters( 'newspack_blocks_checkout_url', $checkout_url ) );
+		exit;
+	}
+
+	/**
+	 * Render the markup necessary for the modal checkout.
+	 */
+	public static function render_modal_markup() {
+		if ( ! self::$has_modal ) {
+			return;
+		}
+		?>
+		<div class="newspack-blocks-checkout-modal" style="display: none;">
+			<div class="newspack-blocks-checkout-modal__content">
+				<a href="#" class="newspack-blocks-checkout-modal__close">
+					<span class="screen-reader-text"><?php esc_html_e( 'Close', 'newspack-blocks' ); ?></span>
+					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" role="img" aria-hidden="true" focusable="false">
+						<path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"/>
+					</svg>
+				</a>
+				<div class="newspack-blocks-checkout-modal__spinner">
+					<span></span>
+				</div>
+			</div>
+		</div>
+		<?php
+	}
+
+	/**
+	 * Enqueue scripts for the checkout page rendered in a modal.
+	 */
+	public static function enqueue_scripts() {
+		if ( ! function_exists( 'is_checkout' ) || ! is_checkout() ) {
+			return;
+		}
+		if ( ! isset( $_REQUEST['modal_checkout'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			return;
+		}
+		wp_enqueue_script(
+			'newspack-blocks-modal-checkout',
+			plugins_url( 'dist/modalCheckout.js', \NEWSPACK_BLOCKS__PLUGIN_FILE ),
+			[],
+			\NEWSPACK_BLOCKS__VERSION,
+			true
+		);
+		wp_enqueue_style(
+			'newspack-blocks-modal-checkout',
+			plugins_url( 'dist/modalCheckout.css', \NEWSPACK_BLOCKS__PLUGIN_FILE ),
+			[],
+			\NEWSPACK_BLOCKS__VERSION
+		);
+	}
+
+	/**
+	 * Enqueue script for triggering modal checkout.
+	 */
+	public static function enqueue_modal() {
+		self::$has_modal = true;
+		wp_enqueue_script(
+			'newspack-blocks-modal',
+			plugins_url( 'dist/modal.js', \NEWSPACK_BLOCKS__PLUGIN_FILE ),
+			[],
+			\NEWSPACK_BLOCKS__VERSION,
+			true
+		);
+		wp_enqueue_style(
+			'newspack-blocks-modal',
+			plugins_url( 'dist/modal.css', \NEWSPACK_BLOCKS__PLUGIN_FILE ),
+			[],
+			\NEWSPACK_BLOCKS__VERSION
+		);
+	}
+
+	/**
+	 * Use stripped down template for modal checkout.
+	 *
+	 * @param string $template The template to render.
+	 *
+	 * @return string
+	 */
+	public static function get_checkout_template( $template ) {
+		if ( ! function_exists( 'is_checkout' ) || ! function_exists( 'is_order_received_page' ) ) {
+			return $template;
+		}
+		if ( ! is_checkout() && ! is_order_received_page() ) {
+			return $template;
+		}
+		if ( ! isset( $_REQUEST['modal_checkout'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			return $template;
+		}
+		ob_start();
+		wp_head();
+		while ( have_posts() ) {
+			the_post();
+			echo '<div id="newspack_modal_checkout">';
+			the_content();
+			echo '</div>';
+		}
+		wp_footer();
+		ob_end_flush();
+	}
+
+
+	/**
+	 * Return URL for modal checkout "thank you" page.
+	 *
+	 * @param string $url The URL to redirect to.
+	 *
+	 * @return string
+	 */
+	public static function woocommerce_get_return_url( $url ) {
+		if ( ! isset( $_REQUEST['modal_checkout'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			return $url;
+		}
+		return add_query_arg(
+			[
+				'modal_checkout' => '1',
+				'email'          => isset( $_REQUEST['billing_email'] ) ? rawurlencode( sanitize_email( wp_unslash( $_REQUEST['billing_email'] ) ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			],
+			$url
+		);
+	}
+
+	/**
+	 * Use modal checkout template when rendering the checkout form.
+	 *
+	 * @param string $located       Template file.
+	 * @param string $template_name Template name.
+	 *
+	 * @return string Template file.
+	 */
+	public static function wc_get_template( $located, $template_name ) {
+		if ( 'checkout/form-checkout.php' === $template_name && isset( $_REQUEST['modal_checkout'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			$located = NEWSPACK_BLOCKS__PLUGIN_DIR . 'src/modal-checkout/templates/checkout-form.php';
+		}
+		return $located;
+	}
+
+	/**
+	 * Disable admin bar for modal checkout.
+	 *
+	 * @param bool $show Whether to show the admin bar.
+	 *
+	 * @return bool
+	 */
+	public static function show_admin_bar( $show ) {
+		if ( ! isset( $_REQUEST['modal_checkout'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			return $show;
+		}
+		return false;
+	}
+
+	/**
+	 * Check the nonce for the edit billing request.
+	 *
+	 * @return bool
+	 */
+	private static function validate_edit_billing_request() {
+		if ( ! isset( $_REQUEST['newspack_blocks_edit_billing_nonce'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			return false;
+		}
+		if ( ! wp_verify_nonce( sanitize_key( $_REQUEST['newspack_blocks_edit_billing_nonce'] ), 'newspack_blocks_edit_billing' ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Modify WC checkout field value.
+	 *
+	 * @param null   $value Value.
+	 * @param string $input Input name.
+	 *
+	 * @return string|null Value or null if unaltered.
+	 */
+	public static function woocommerce_checkout_get_value( $value, $input ) {
+		if ( ! isset( $_REQUEST['modal_checkout'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			return null;
+		}
+		$valid_request = self::validate_edit_billing_request(); // This performs nonce verification.
+		if ( ! $valid_request ) {
+			return null;
+		}
+		if ( isset( $_REQUEST[ $input ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			$value = sanitize_text_field( wp_unslash( $_REQUEST[ $input ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		}
+		return $value;
+	}
+
+	/**
+	 * Get the prefilled values for billing fields.
+	 *
+	 * @return array
+	 */
+	public static function get_prefilled_fields() {
+		$checkout        = \WC()->checkout();
+		$fields          = $checkout->get_checkout_fields( 'billing' );
+		$customer        = new \WC_Customer( get_current_user_id() );
+		$customer_fields = $customer->get_billing();
+		// If the user is logged in and there's no billing email, use the user's email.
+		if ( is_user_logged_in() && empty( $customer_fields['email'] ) ) {
+			$customer_fields['email'] = $customer->get_email();
+		}
+		$valid_request    = self::validate_edit_billing_request();
+		$prefilled_fields = [];
+		foreach ( $fields as $key => $field ) {
+			$key = str_replace( 'billing_', '', $key );
+			if ( $valid_request && isset( $_REQUEST[ 'billing_' . $key ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				$value = sanitize_text_field( wp_unslash( $_REQUEST[ 'billing_' . $key ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			} elseif ( isset( $customer_fields[ $key ] ) ) {
+				$value = $customer_fields[ $key ];
+			}
+			$prefilled_fields[ $key ] = $value;
+		}
+		return $prefilled_fields;
+	}
+
+	/**
+	 * Whether the current checkout session has all required billing fields filled.
+	 *
+	 * @return bool
+	 */
+	public static function has_filled_required_fields() {
+		$checkout        = \WC()->checkout();
+		$fields          = $checkout->get_checkout_fields( 'billing' );
+		$required        = array_filter(
+			$fields,
+			function( $field ) {
+				return isset( $field['required'] ) && $field['required'];
+			}
+		);
+		$required_keys   = array_keys( $required );
+		$customer_fields = self::get_prefilled_fields();
+		$is_request      = self::validate_edit_billing_request();
+		foreach ( $required_keys as $key ) {
+			$key = str_replace( 'billing_', '', $key );
+			if ( empty( $customer_fields[ $key ] ) ) {
+				if ( $is_request ) {
+					/* translators: %s: field name */
+					wc_add_notice( sprintf( __( '%s is a required field.', 'newspack-blocks' ), $fields[ 'billing_' . $key ]['label'] ), 'error' );
+				}
+				return false;
+			}
+		}
+		return true;
+	}
+}
+Modal_Checkout::init();

package/includes/class-newspack-blocks.php

@@ -242,6 +242,10 @@ class Newspack_Blocks {
 				$localized_data['author_custom_fields'] = \Newspack\Authors_Custom_Fields::get_custom_fields();
 			}
 
+			if ( class_exists( 'Newspack_Multibranded_Site\Customizations\Theme_Colors' ) ) {
+				$localized_data['multibranded_sites_enabled'] = true;
+			}
+
 			wp_localize_script(
 				'newspack-blocks-editor',
 				'newspack_blocks_data',
@@ -285,12 +289,12 @@ class Newspack_Blocks {
 	 * Can the tiers-based layout of the Donate block be rendered?
 	 */
 	public static function can_render_tiers_based_layout() {
-		if ( method_exists( '\Newspack\AMP_Enhancements', 'is_amp_plus_configured' ) ) {
+		if ( ! is_plugin_active( 'amp/amp.php' ) ) {
+			return true;
+		} elseif ( method_exists( '\Newspack\AMP_Enhancements', 'is_amp_plus_configured' ) ) {
 			return \Newspack\AMP_Enhancements::is_amp_plus_configured();
-		} else {
-			return ! is_plugin_active( 'amp/amp.php' );
 		}
-		return true;
+		return false;
 	}
 
 	/**
@@ -587,6 +591,7 @@ class Newspack_Blocks {
 		$authors             = isset( $attributes['authors'] ) ? $attributes['authors'] : array();
 		$categories          = isset( $attributes['categories'] ) ? $attributes['categories'] : array();
 		$tags                = isset( $attributes['tags'] ) ? $attributes['tags'] : array();
+		$brands              = isset( $attributes['brands'] ) ? $attributes['brands'] : array();
 		$tag_exclusions      = isset( $attributes['tagExclusions'] ) ? $attributes['tagExclusions'] : array();
 		$category_exclusions = isset( $attributes['categoryExclusions'] ) ? $attributes['categoryExclusions'] : array();
 		$specific_posts      = isset( $attributes['specificPosts'] ) ? $attributes['specificPosts'] : array();
@@ -620,7 +625,6 @@ class Newspack_Blocks {
 					get_the_ID() ? [ get_the_ID() ] : []
 				);
 			}
-
 			if ( $categories && count( $categories ) ) {
 				$args['category__in'] = $categories;
 			}
@@ -633,7 +637,18 @@ class Newspack_Blocks {
 			if ( $category_exclusions && count( $category_exclusions ) ) {
 				$args['category__not_in'] = $category_exclusions;
 			}
-
+			if ( class_exists( 'Newspack_Multibranded_Site\Customizations\Theme_Colors' ) ) {
+				if ( $brands && count( $brands ) ) {
+					$args['tax_query'] = [ // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query
+						[
+							'taxonomy'         => 'brand',
+							'field'            => 'term_id',
+							'terms'            => $brands,
+							'include_children' => false,
+						],
+					];
+				}
+			}
 			$is_co_authors_plus_active = class_exists( 'CoAuthors_Guest_Authors' );
 
 			if ( $authors && count( $authors ) ) {
@@ -789,6 +804,15 @@ class Newspack_Blocks {
 			}
 		}
 
+		if ( class_exists( 'Newspack_Multibranded_Site\Customizations\Theme_Colors' ) ) {
+			$brands = get_the_terms( $post_id, 'brand' );
+			if ( ! empty( $brands ) ) {
+				foreach ( $brands as $brand ) {
+					$classes[] = 'brands-' . $brand->slug;
+				}
+			}
+		}
+
 		$post_type = get_post_type( $post_id );
 		if ( false !== $post_type ) {
 			$classes[] = 'type-' . $post_type;

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.blog/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         1.67.0
+ * Version:         1.68.0
  *
  * @package         Newspack_Blocks
  */
@@ -15,11 +15,12 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '1.67.0' );
+define( 'NEWSPACK_BLOCKS__VERSION', '1.68.0' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-patterns.php';
+require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-modal-checkout.php';
 
 // REST Controller for Articles Block.
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'src/blocks/homepage-articles/class-wp-rest-newspack-articles-controller.php';

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "1.67.0",
+	"version": "1.68.0",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.2.0",
 		"@testing-library/dom": "^8.20.0",
 		"@testing-library/user-event": "^14.4.3",
-		"@types/lodash": "^4.14.192",
+		"@types/lodash": "^4.14.194",
 		"@types/lodash.debounce": "^4.0.7",
 		"eslint": "^7.32.0",
 		"fetch-mock-jest": "^1.5.1",
@@ -28,7 +28,7 @@
 		"redux": "^4.2.1",
 		"redux-saga": "^1.2.3",
 		"regenerator-runtime": "^0.13.11",
-		"swiper": "9.2.0"
+		"swiper": "9.2.4"
 	},
 	"scripts": {
 		"cm": "newspack-scripts commit",

package/src/blocks/carousel/edit.js

@@ -48,6 +48,16 @@ import { postsBlockSelector, postsBlockDispatch, shouldReflow } from '../homepag
 // Max number of slides that can be shown at once.
 const MAX_NUMBER_OF_SLIDES = 6;
 
+// Check if multi-branded site
+let IS_MULTIBRANDED_SITE;
+if (
+	typeof window === 'object' &&
+	window.newspack_blocks_data &&
+	window.newspack_blocks_data.multibranded_sites_enabled
+) {
+	IS_MULTIBRANDED_SITE = true;
+}
+
 class Edit extends Component {
 	constructor( props ) {
 		super( props );
@@ -150,6 +160,7 @@ class Edit extends Component {
 			authors,
 			autoplay,
 			categories,
+			brands,
 			delay,
 			hideControls,
 			imageFit,
@@ -232,6 +243,14 @@ class Edit extends Component {
 				),
 			},
 		];
+
+		const brandProps = IS_MULTIBRANDED_SITE
+			? {
+					brands,
+					onBrandsChange: value => setAttributes( { brands: value } ),
+			  }
+			: '';
+
 		return (
 			<Fragment>
 				<div className={ classes } ref={ this.carouselRef }>
@@ -359,6 +378,7 @@ class Edit extends Component {
 						</Fragment>
 					) }
 				</div>
+
 				<InspectorControls>
 					<PanelBody title={ __( 'Display Settings' ) } initialOpen={ true }>
 						{ postsToShow && (
@@ -373,6 +393,7 @@ class Edit extends Component {
 								onCategoriesChange={ value => setAttributes( { categories: value } ) }
 								tags={ tags }
 								onTagsChange={ value => setAttributes( { tags: value } ) }
+								{ ...brandProps }
 								specificMode={ specificMode }
 								onSpecificModeChange={ _specificMode =>
 									setAttributes( { specificMode: _specificMode } )

package/src/blocks/carousel/index.js

@@ -67,6 +67,9 @@ export const settings = {
 		tags: {
 			type: 'array',
 		},
+		brands: {
+			type: 'array',
+		},
 		showDate: {
 			type: 'boolean',
 			default: true,

package/src/blocks/carousel/view.php

@@ -410,6 +410,13 @@ function newspack_blocks_register_carousel() {
 							'type' => 'integer',
 						),
 					),
+					'brands'        => array(
+						'type'    => 'array',
+						'default' => array(),
+						'items'   => array(
+							'type' => 'integer',
+						),
+					),
 					'autoplay'      => array(
 						'type'    => 'boolean',
 						'default' => false,