Merge branch 'trunk' into fix/remove-onesignal-from-modal

Author: laurelfulford

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [4.5.6](https://github.com/Automattic/newspack-blocks/compare/v4.5.5...v4.5.6) (2025-01-23)
+
+
+### Bug Fixes
+
+* make sure fields after floated inputs clear floats in the modal checkout ([#2030](https://github.com/Automattic/newspack-blocks/issues/2030)) ([274b4d4](https://github.com/Automattic/newspack-blocks/commit/274b4d41aa63dc818a3da49a7fc8315dbdf08757))
+
 ## [4.5.5](https://github.com/Automattic/newspack-blocks/compare/v4.5.4...v4.5.5) (2025-01-20)
 
 

includes/class-newspack-blocks.php

@@ -688,6 +688,10 @@ public static function build_articles_query( $attributes, $block_name ) {
 							$term = $coauthors_plus->get_author_term( $co_author );
 							if ( $term ) {
 								$authors_term_ids[] = $term->term_id;
+							} else {
+								// If the author term does not exist, force a non-match, otherwise all posts will be returned.
+								// CAP's cli command to create author terms will only create terms for users that have authored posts.
+								$authors_term_ids[] = -1;
 							}
 
 							// If it's a guest author, also check the linked author.

newspack-blocks.php

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

package-lock.json

@@ -1,18 +1,18 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "4.5.5",
+	"version": "4.5.6",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.10.5",
 		"@testing-library/dom": "^10.4.0",
-		"@testing-library/user-event": "^14.6.0",
+		"@testing-library/user-event": "^14.6.1",
 		"@types/lodash": "^4.17.14",
 		"@wordpress/browserslist-config": "^6.16.0",
 		"eslint": "^8.57.0",
 		"fetch-mock-jest": "^1.5.1",
 		"html-entities": "^2.5.2",
 		"identity-obj-proxy": "^3.0.0",
-		"lint-staged": "^15.4.1",
+		"lint-staged": "^15.4.3",
 		"newspack-components": "^3.1.0",
 		"newspack-scripts": "^5.5.2",
 		"postcss-scss": "^4.0.9"

package.json

@@ -101,8 +101,16 @@
 			}
 		}
 
-		.woocommerce-billing-fields__field-wrapper ~ .form-row {
-			margin: var(--newspack-ui-spacer-5, 24px) 0 0;
+		.woocommerce-billing-fields__field-wrapper {
+			&::after {
+				clear: both;
+				content: "";
+				display: table;
+			}
+
+			& ~ .form-row {
+				margin: var(--newspack-ui-spacer-5, 24px) 0 0;
+			}
 		}
 
 		// Additional fields