Merge pull request #1047 from Automattic/master

Alpha release Jan 26
Automattic · Jan 26, 2023 · cba9197 · cba9197
2 parents 9b50d99 + 25570e0
commit cba9197
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 33 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/includes/class-newspack-popups-model.php b/includes/class-newspack-popups-model.php
@@ -1160,7 +1160,7 @@ public static function generate_popup( $popup ) {
 		$large_border          = $popup['options']['large_border'];
 		$overlay_opacity       = absint( $popup['options']['overlay_opacity'] ) / 100;
 		$overlay_color         = $popup['options']['overlay_color'];
-		$overlay_size          = $popup['options']['overlay_size'];
+		$overlay_size          = 'full' === $popup['options']['overlay_size'] ? 'full-width' : $popup['options']['overlay_size'];
 		$no_overlay_background = $popup['options']['no_overlay_background'];
 		$hidden_fields         = self::get_hidden_fields( $popup );
 		$is_newsletter_prompt  = self::has_newsletter_prompt( $popup );

diff --git a/includes/class-newspack-popups.php b/includes/class-newspack-popups.php
@@ -804,11 +804,11 @@ public static function popup_default_fields( $post_id, $post, $update ) {
 				break;
 			case 'overlay-top':
 				$placement    = 'top';
-				$overlay_size = 'full';
+				$overlay_size = 'full-width';
 				break;
 			case 'overlay-bottom':
 				$placement    = 'bottom';
-				$overlay_size = 'full';
+				$overlay_size = 'full-width';
 				break;
 			case 'archives':
 				$placement = 'archives';

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "@rushstack/eslint-patch": "^1.2.0",
     "eslint": "^7.32.0",
     "lint-staged": "^13.1.0",
-    "newspack-scripts": "^4.5.0",
+    "newspack-scripts": "^4.6.0",
     "postcss-scss": "^4.0.6",
     "prettier": "npm:wp-prettier@^2.2.1-beta-1",
     "stylelint": "^14.9.1"

diff --git a/src/editor/utils.js b/src/editor/utils.js
@@ -52,7 +52,7 @@ export const optionsFieldsSelector = select => {
 		frequency_reset,
 		overlay_color,
 		overlay_opacity,
-		overlay_size,
+		overlay_size: 'full' === overlay_size ? 'full-width' : overlay_size,
 		no_overlay_background,
 		placement,
 		trigger_type,