@automattic/newspack-blocks 3.0.3 → 3.0.4-alpha.1

package/includes/class-modal-checkout.php

@@ -51,6 +51,8 @@ final class Modal_Checkout {
 		add_filter( 'wcs_place_subscription_order_text', [ __CLASS__, 'order_button_text' ], 1 );
 		add_filter( 'woocommerce_order_button_text', [ __CLASS__, 'order_button_text' ] );
 		add_filter( 'option_woocommerce_subscriptions_order_button_text', [ __CLASS__, 'order_button_text' ] );
+		add_action( 'option_woocommerce_default_customer_address', [ __CLASS__, 'ensure_base_default_customer_address' ] );
+		add_action( 'default_option_woocommerce_default_customer_address', [ __CLASS__, 'ensure_base_default_customer_address' ] );
 
 		/** Custom handling for registered users. */
 		add_filter( 'woocommerce_checkout_customer_id', [ __CLASS__, 'associate_existing_user' ] );
@@ -996,6 +998,46 @@ final class Modal_Checkout {
 		return $text;
 	}
 
+	/**
+	 * Force option for base country for new customers if unset and billing country optional while state is required
+	 * unless the NEWSPACK_PREVENT_FORCE_BASE_DEFAULT_CUSTOMER_ADDRESS constant is set.
+	 *
+	 * If this option is empty AND billing state is set as a required field AND billing country is not,
+	 * validation of the state value will fail during modal checkout.
+	 *
+	 * See Default Customer Location in: https://woo.com/document/configuring-woocommerce-settings/#general-options
+	 *
+	 * @param string $option_value The value of the default customer address option.
+	 *
+	 * @return string Option value.
+	 */
+	public static function ensure_base_default_customer_address( $option_value ) {
+		// If the option is set, we're good.
+		if ( ! empty( $option_value ) ) {
+			return $option_value;
+		}
+
+		// Only in modal checkout.
+		if ( ! self::is_modal_checkout() ) {
+			return $option_value;
+		}
+
+		// Escape hatch in case we want the standard behavior even in modal checkout.
+		if ( defined( 'NEWSPACK_PREVENT_FORCE_BASE_DEFAULT_CUSTOMER_ADDRESS' ) && NEWSPACK_PREVENT_FORCE_BASE_DEFAULT_CUSTOMER_ADDRESS ) {
+			return $option_value;
+		}
+
+		// If billing state is required but billing country is not, we need to ensure a default location is set.
+		if ( defined( '\Newspack\Donations::DONATION_BILLING_FIELDS_OPTION' ) ) {
+			$billing_fields = get_option( \Newspack\Donations::DONATION_BILLING_FIELDS_OPTION, [] );
+			if ( ! in_array( 'billing_country', $billing_fields, true ) && in_array( 'billing_state', $billing_fields, true ) ) {
+				return 'base';
+			}
+		}
+
+		return $option_value;
+	}
+
 	/**
 	 * If a reader tries to make a purchase with an email address that
 	 * has been previously registered, automatically associate the transaction

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         3.0.3
+ * Version:         3.0.4-alpha.1
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 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', '3.0.3' );
+define( 'NEWSPACK_BLOCKS__VERSION', '3.0.4-alpha.1' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "3.0.3",
+	"version": "3.0.4-alpha.1",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.7.2",
@@ -10,7 +10,7 @@
 		"@types/lodash.debounce": "^4.0.9",
 		"eslint": "^7.32.0",
 		"fetch-mock-jest": "^1.5.1",
-		"html-entities": "^2.4.0",
+		"html-entities": "^2.5.2",
 		"identity-obj-proxy": "^3.0.0",
 		"lint-staged": "^15.2.2",
 		"newspack-scripts": "^5.3.0",

package/src/blocks/carousel/edit.js

@@ -250,8 +250,8 @@ class Edit extends Component {
 						<Fragment>
 							{ autoplay && (
 								<Fragment>
-									<button ref={ this.btnPauseRef } />
-									<button ref={ this.btnPlayRef } />
+									<button className="swiper-button swiper-button-pause" ref={ this.btnPauseRef } />
+									<button className="swiper-button swiper-button-play" ref={ this.btnPlayRef } />
 								</Fragment>
 							) }
 							<div className="swiper-wrapper">
@@ -339,8 +339,8 @@ class Edit extends Component {
 							</div>
 							{ ! hasNoPosts && ! hasOnePost && (
 								<>
-									<button className="swiper-button-prev" ref={ this.btnPrevRef } />
-									<button className="swiper-button-next" ref={ this.btnNextRef } />
+									<button className="swiper-button-prev swiper-button" ref={ this.btnPrevRef } />
+									<button className="swiper-button-next swiper-button" ref={ this.btnNextRef } />
 									<div
 										className="swiper-pagination swiper-pagination-bullets"
 										ref={ this.paginationRef }

package/vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit90b7aab6d3fee0e0d25f57e0e59b1d50::getLoader();
+return ComposerAutoloaderInita79acdd5c7d41d18c52fcb779f35c2e9::getLoader();

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit90b7aab6d3fee0e0d25f57e0e59b1d50
+class ComposerAutoloaderInita79acdd5c7d41d18c52fcb779f35c2e9
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInit90b7aab6d3fee0e0d25f57e0e59b1d50
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit90b7aab6d3fee0e0d25f57e0e59b1d50', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInita79acdd5c7d41d18c52fcb779f35c2e9', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit90b7aab6d3fee0e0d25f57e0e59b1d50', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInita79acdd5c7d41d18c52fcb779f35c2e9', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit90b7aab6d3fee0e0d25f57e0e59b1d50::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInita79acdd5c7d41d18c52fcb779f35c2e9::getInitializer($loader));
 
         $loader->register(true);
 

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit90b7aab6d3fee0e0d25f57e0e59b1d50
+class ComposerStaticInita79acdd5c7d41d18c52fcb779f35c2e9
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInit90b7aab6d3fee0e0d25f57e0e59b1d50
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInit90b7aab6d3fee0e0d25f57e0e59b1d50::$classMap;
+            $loader->classMap = ComposerStaticInita79acdd5c7d41d18c52fcb779f35c2e9::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-trunk',
         'version' => 'dev-trunk',
-        'reference' => 'd3fa078a30c1abed3ffdc4387ead1ec55798bc23',
+        'reference' => '55968234f9b5a61f8d5bd0a494f3c45eaa12bc5b',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-trunk',
             'version' => 'dev-trunk',
-            'reference' => 'd3fa078a30c1abed3ffdc4387ead1ec55798bc23',
+            'reference' => '55968234f9b5a61f8d5bd0a494f3c45eaa12bc5b',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),