From adabea225a04df880f0b6e120ee8dcad82c3445d Mon Sep 17 00:00:00 2001
From: Adam Borowski <aborowski24@gmail.com>
Date: Thu, 28 Sep 2023 16:06:37 +0200
Subject: [PATCH 1/4] feat: remove is_non_interactive method

This feature has been deprecated.
---
 includes/class-newspack-popups-settings.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/includes/class-newspack-popups-settings.php b/includes/class-newspack-popups-settings.php
index 2dbe1dd0..279efd37 100644
--- a/includes/class-newspack-popups-settings.php
+++ b/includes/class-newspack-popups-settings.php
@@ -349,17 +349,6 @@ function ( $carry, $item ) {
 		return $settings_list;
 	}
 
-	/**
-	 * Is the non-interactive setting on?
-	 *
-	 * Deprecated: There is no longer a non interactive mode
-	 *
-	 * @deprecated
-	 */
-	public static function is_non_interactive() {
-		return false;
-	}
-
 	/**
 	 * Donor landing page.
 	 */

From fa30d54811f48e0c076051f6d478d5a06d72eb8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 16:05:36 +0000
Subject: [PATCH 2/4] chore(deps-dev): bump postcss-scss from 4.0.8 to 4.0.9

Bumps [postcss-scss](https://github.com/postcss/postcss-scss) from 4.0.8 to 4.0.9.
- [Changelog](https://github.com/postcss/postcss-scss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss-scss/compare/4.0.8...4.0.9)

---
updated-dependencies:
- dependency-name: postcss-scss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 052b987b..ef39336e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "eslint": "^7.32.0",
         "lint-staged": "^13.2.3",
         "newspack-scripts": "^5.1.0",
-        "postcss-scss": "^4.0.8",
+        "postcss-scss": "^4.0.9",
         "prettier": "npm:wp-prettier@^2.2.1-beta-1",
         "stylelint": "^15.10.3"
       }
@@ -26098,9 +26098,9 @@
       }
     },
     "node_modules/postcss-scss": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.8.tgz",
-      "integrity": "sha512-Cr0X8Eu7xMhE96PJck6ses/uVVXDtE5ghUTKNUYgm8ozgP2TkgV3LWs3WgLV1xaSSLq8ZFiXaUrj0LVgG1fGEA==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz",
+      "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==",
       "dev": true,
       "funding": [
         {
@@ -51884,9 +51884,9 @@
       "requires": {}
     },
     "postcss-scss": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.8.tgz",
-      "integrity": "sha512-Cr0X8Eu7xMhE96PJck6ses/uVVXDtE5ghUTKNUYgm8ozgP2TkgV3LWs3WgLV1xaSSLq8ZFiXaUrj0LVgG1fGEA==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz",
+      "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==",
       "dev": true,
       "requires": {}
     },
diff --git a/package.json b/package.json
index e4f4b064..f2eb0e66 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "eslint": "^7.32.0",
     "lint-staged": "^13.2.3",
     "newspack-scripts": "^5.1.0",
-    "postcss-scss": "^4.0.8",
+    "postcss-scss": "^4.0.9",
     "prettier": "npm:wp-prettier@^2.2.1-beta-1",
     "stylelint": "^15.10.3"
   }

From d7dbabbb23bcc475ed610279bfcf314a65fccf5d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 16:07:45 +0000
Subject: [PATCH 3/4] chore(deps-dev): bump @rushstack/eslint-patch from 1.4.0
 to 1.5.1

Bumps [@rushstack/eslint-patch](https://github.com/microsoft/rushstack/tree/HEAD/eslint/eslint-patch) from 1.4.0 to 1.5.1.
- [Changelog](https://github.com/microsoft/rushstack/blob/main/eslint/eslint-patch/CHANGELOG.md)
- [Commits](https://github.com/microsoft/rushstack/commits/@rushstack/eslint-patch_v1.5.1/eslint/eslint-patch)

---
updated-dependencies:
- dependency-name: "@rushstack/eslint-patch"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ef39336e..6bd892eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "qs": "^6.11.2"
       },
       "devDependencies": {
-        "@rushstack/eslint-patch": "^1.4.0",
+        "@rushstack/eslint-patch": "^1.5.1",
         "eslint": "^7.32.0",
         "lint-staged": "^13.2.3",
         "newspack-scripts": "^5.1.0",
@@ -4390,9 +4390,9 @@
       }
     },
     "node_modules/@rushstack/eslint-patch": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.4.0.tgz",
-      "integrity": "sha512-cEjvTPU32OM9lUFegJagO0mRnIn+rbqrG89vV8/xLnLFX0DoR0r1oy5IlTga71Q7uT3Qus7qm7wgeiMT/+Irlg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.5.1.tgz",
+      "integrity": "sha512-6i/8UoL0P5y4leBIGzvkZdS85RDMG9y1ihZzmTZQ5LdHUYmZ7pKFoj8X0236s3lusPs1Fa5HTQUpwI+UfTcmeA==",
       "dev": true
     },
     "node_modules/@semantic-release/changelog": {
@@ -35286,9 +35286,9 @@
       }
     },
     "@rushstack/eslint-patch": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.4.0.tgz",
-      "integrity": "sha512-cEjvTPU32OM9lUFegJagO0mRnIn+rbqrG89vV8/xLnLFX0DoR0r1oy5IlTga71Q7uT3Qus7qm7wgeiMT/+Irlg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.5.1.tgz",
+      "integrity": "sha512-6i/8UoL0P5y4leBIGzvkZdS85RDMG9y1ihZzmTZQ5LdHUYmZ7pKFoj8X0236s3lusPs1Fa5HTQUpwI+UfTcmeA==",
       "dev": true
     },
     "@semantic-release/changelog": {
diff --git a/package.json b/package.json
index f2eb0e66..cb0455f3 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "qs": "^6.11.2"
   },
   "devDependencies": {
-    "@rushstack/eslint-patch": "^1.4.0",
+    "@rushstack/eslint-patch": "^1.5.1",
     "eslint": "^7.32.0",
     "lint-staged": "^13.2.3",
     "newspack-scripts": "^5.1.0",

From bbb952d0f696bb72850607579574a2a0d19d82a3 Mon Sep 17 00:00:00 2001
From: Miguel Peixe <miguel.peixe@automattic.com>
Date: Wed, 4 Oct 2023 18:09:00 -0300
Subject: [PATCH 4/4] fix: deduplication strategy for Homepage Posts block
 (#1228)

---
 includes/class-newspack-popups-model.php | 29 ++++++++++++++++--------
 includes/class-newspack-popups.php       | 17 ++++++++++++++
 src/editor/index.js                      | 19 +++++++++++++++-
 3 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/includes/class-newspack-popups-model.php b/includes/class-newspack-popups-model.php
index 77ea051a..87e66aba 100644
--- a/includes/class-newspack-popups-model.php
+++ b/includes/class-newspack-popups-model.php
@@ -43,6 +43,13 @@ final class Newspack_Popups_Model {
 	 */
 	protected static $form_hooks_popup_id;
 
+	/**
+	 * The current popup.
+	 *
+	 * @var array|null
+	 */
+	protected static $current_popup = null;
+
 	/**
 	 * Retrieve all Popups (first 100).
 	 *
@@ -976,9 +983,19 @@ class="<?php echo esc_attr( implode( ' ', $classes ) ); ?>"
 				<?php echo do_shortcode( $body ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 			</div>
 		<?php
+		self::$current_popup = null;
 		return ob_get_clean();
 	}
 
+	/**
+	 * Return the current popup.
+	 *
+	 * @return array|null The current popup or null if it's not set.
+	 */
+	public static function get_current_popup() {
+		return self::$current_popup;
+	}
+
 	/**
 	 * Generate markup and styles for an overlay popup.
 	 *
@@ -997,10 +1014,7 @@ public static function generate_popup( $popup ) {
 			$popup = Newspack_Popups_Presets::retrieve_preset_popup( Newspack_Popups::preset_popup_id() );
 		}
 
-		if ( self::is_overlay( $popup ) && self::is_overlay( $popup ) && has_block( 'newspack-blocks/homepage-articles', $popup['content'] ) ) {
-			add_filter( 'newspack_blocks_homepage_enable_duplication', '__return_true' );
-			add_filter( 'newspack_blocks_homepage_shown_rendered_posts', '__return_true' );
-		}
+		self::$current_popup = $popup;
 
 		if ( ! self::is_overlay( $popup ) ) {
 			return self::generate_inline_popup( $popup );
@@ -1084,12 +1098,7 @@ class="<?php echo esc_attr( implode( ' ', $classes ) ); ?>"
 			<div id="page-position-marker_<?php echo esc_attr( $element_id ); ?>" class="page-position-marker" style="position: absolute; top: <?php echo esc_attr( $popup['options']['trigger_scroll_progress'] ); ?>%"></div>
 		<?php endif; ?>
 		<?php
-		if ( self::is_overlay( $popup ) && has_block( 'newspack-blocks/homepage-articles', $popup['content'] ) ) {
-			add_filter( 'newspack_blocks_homepage_enable_duplication', '__return_false' );
-			add_filter( 'newspack_blocks_homepage_shown_rendered_posts', '__return_false' );
-		}
-		?>
-		<?php
+		self::$current_popup = null;
 		return ob_get_clean();
 	}
 
diff --git a/includes/class-newspack-popups.php b/includes/class-newspack-popups.php
index 227d05f2..a7ad7483 100644
--- a/includes/class-newspack-popups.php
+++ b/includes/class-newspack-popups.php
@@ -93,6 +93,7 @@ public function __construct() {
 		add_action( 'transition_post_status', [ __CLASS__, 'prevent_default_category_on_publish' ], 10, 3 );
 		add_action( 'pre_delete_term', [ __CLASS__, 'prevent_default_category_on_term_delete' ], 10, 2 );
 		add_filter( 'show_admin_bar', [ __CLASS__, 'show_admin_bar' ], 10, 2 ); // phpcs:ignore WordPressVIPMinimum.UserExperience.AdminBarRemoval.RemovalDetected
+		add_filter( 'newspack_blocks_should_deduplicate', [ __CLASS__, 'newspack_blocks_should_deduplicate' ], 10, 2 );
 
 		include_once dirname( __FILE__ ) . '/class-newspack-popups-model.php';
 		include_once dirname( __FILE__ ) . '/class-newspack-segments-migration.php';
@@ -108,6 +109,22 @@ public function __construct() {
 		include_once dirname( __FILE__ ) . '/class-newspack-popups-criteria.php';
 	}
 
+	/**
+	 * Handle deduplication of "Homepage Posts" block from Newspack Blocks.
+	 *
+	 * @param boolean $deduplicate Whether to deduplicate.
+	 * @param array   $attributes  Block attributes.
+	 *
+	 * @return boolean
+	 */
+	public static function newspack_blocks_should_deduplicate( $deduplicate, $attributes ) {
+		$current_popup = Newspack_Popups_Model::get_current_popup();
+		if ( $current_popup && Newspack_Popups_Model::is_overlay( $current_popup ) ) {
+			$deduplicate = false;
+		}
+		return $deduplicate;
+	}
+
 	/**
 	 * Register CLI commands.
 	 *
diff --git a/src/editor/index.js b/src/editor/index.js
index 558eb86a..01d35be8 100644
--- a/src/editor/index.js
+++ b/src/editor/index.js
@@ -20,7 +20,7 @@ import { useEffect } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { optionsFieldsSelector } from './utils';
+import { optionsFieldsSelector, isOverlayPlacement } from './utils';
 import Sidebar from './Sidebar';
 import StylesSidebar from './StylesSidebar';
 import FrequencySidebar from './FrequencySidebar';
@@ -145,6 +145,23 @@ registerPlugin( 'newspack-popups-editor', {
 	icon: null,
 } );
 
+// Hide Newspack's Homepage Posts block deduplication toggle when the popup is an overlay.
+registerPlugin( 'newspack-popups-disable-newspack-blocks-deduplication', {
+	render: function HideDeduplicationToggle() {
+		const { placement } = useSelect( select => {
+			const { getEditedPostAttribute } = select( 'core/editor' );
+			return {
+				placement: getEditedPostAttribute( 'meta' )?.placement,
+			};
+		} );
+		if ( ! isOverlayPlacement( placement ) ) {
+			return null;
+		}
+		return <style>{ '.newspack-blocks-deduplication-toggle {display: none;}' }</style>;
+	},
+	icon: null,
+} );
+
 // Add a button in post status section
 const PluginPostStatusInfoTest = () => (
 	<PluginPostStatusInfo className="newspack-popups__status-options">