diff --git a/composer.lock b/composer.lock index e65e18fb..6da67b32 100644 --- a/composer.lock +++ b/composer.lock @@ -448,30 +448,30 @@ }, { "name": "doctrine/instantiator", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^0.16 || ^1", "phpstan/phpstan": "^1.4", "phpstan/phpstan-phpunit": "^1", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -498,7 +498,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.1" + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" }, "funding": [ { @@ -514,7 +514,7 @@ "type": "tidelift" } ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "myclabs/deep-copy", @@ -917,16 +917,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.19", + "version": "9.2.23", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559" + "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559", - "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", + "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", "shasum": "" }, "require": { @@ -982,7 +982,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23" }, "funding": [ { @@ -990,7 +990,7 @@ "type": "github" } ], - "time": "2022-11-18T07:47:47+00:00" + "time": "2022-12-28T12:41:10+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1235,20 +1235,20 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.27", + "version": "9.5.28", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38" + "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e", + "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -1317,7 +1317,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28" }, "funding": [ { @@ -1333,7 +1333,7 @@ "type": "tidelift" } ], - "time": "2022-12-09T07:31:23+00:00" + "time": "2023-01-14T12:32:24+00:00" }, { "name": "psr/container", diff --git a/includes/class-newspack-popups-model.php b/includes/class-newspack-popups-model.php index 4c5d91cc..b02d4b17 100644 --- 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 index 2f662689..28ff4636 100644 --- 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 index 8a11cb97..3d2bdfc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,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" @@ -17827,9 +17827,9 @@ } }, "node_modules/newspack-scripts": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/newspack-scripts/-/newspack-scripts-4.5.0.tgz", - "integrity": "sha512-Y/fezljGzQQt28GTdkPdqBDLaJ2dbSdbFaDhP4v7mD4kkjSi1sgD9+WBhHEQyI4cUAyWq2If4FuqOjJ6ZLnirg==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/newspack-scripts/-/newspack-scripts-4.6.0.tgz", + "integrity": "sha512-Ci5zOTYcJRfqLSBK9oAFLU55uMCUzzbynjuZpUmcdl1nlwyp8E1jBXXcbq+LwEoyqxUbED/B+F/a3YGQiPLeIg==", "dev": true, "dependencies": { "@automattic/calypso-build": "^10.0.0", @@ -45017,9 +45017,9 @@ } }, "newspack-scripts": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/newspack-scripts/-/newspack-scripts-4.5.0.tgz", - "integrity": "sha512-Y/fezljGzQQt28GTdkPdqBDLaJ2dbSdbFaDhP4v7mD4kkjSi1sgD9+WBhHEQyI4cUAyWq2If4FuqOjJ6ZLnirg==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/newspack-scripts/-/newspack-scripts-4.6.0.tgz", + "integrity": "sha512-Ci5zOTYcJRfqLSBK9oAFLU55uMCUzzbynjuZpUmcdl1nlwyp8E1jBXXcbq+LwEoyqxUbED/B+F/a3YGQiPLeIg==", "dev": true, "requires": { "@automattic/calypso-build": "^10.0.0", diff --git a/package.json b/package.json index a503e5b3..14127bc9 100644 --- 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 index 1a30ae63..5266af30 100644 --- 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,