AMP infinite scroll add hidden (#17778)

Author: pereirinha

modules/infinite-scroll/class-jetpack-amp-infinite-scroll-sanitizer.php

@@ -15,6 +15,7 @@ final class Jetpack_AMP_Infinite_Scroll_Sanitizer extends AMP_Base_Sanitizer {
 	 * @var array {
 	 *     @type string   $footer_xpaths
 	 *     @type string[] $next_page_hide_xpaths
+	 *     @type string[] $hidden_xpaths
 	 * }
 	 */
 	protected $args;
@@ -67,6 +68,7 @@ public function sanitize() {
 		}
 
 		$this->hide_next_page_elements();
+		$this->hide_hidden_elements();
 	}
 
 	/**
@@ -83,7 +85,25 @@ private function hide_next_page_elements() {
 		foreach ( $xpaths as $next_page_hide_xpath ) {
 			/** @var DOMElement $element */
 			foreach ( $this->xpath->query( $next_page_hide_xpath ) as $element ) {
-				$element->setAttribute( 'next-page-hide', '' ); // @todo Also hidden?
+				$element->setAttribute( 'next-page-hide', '' );
+			}
+		}
+	}
+
+	/**
+	 * Hide elements on initial load.
+	 */
+	private function hide_hidden_elements() {
+		if ( isset( $this->args['hidden_xpaths'] ) && is_array( $this->args['hidden_xpaths'] ) ) {
+			$xpaths = $this->args['hidden_xpaths'];
+		} else {
+			$xpaths = array();
+		}
+
+		foreach ( $xpaths as $hidden_xpath ) {
+			/** @var DOMElement $element */
+			foreach ( $this->xpath->query( $hidden_xpath ) as $element ) {
+				$element->setAttribute( 'hidden', '' );
 			}
 		}
 	}

modules/theme-tools/compat/twentynineteen.php

@@ -156,6 +156,9 @@ function twentynineteen_filter_amp_infinite_scroll_sanitizers( $sanitizers ) {
 				'//*[ @id = "masthead" ]',
 				'//*[ contains( @class, "navigation pagination" ) ]',
 			),
+			'hidden_xpaths'         => array(
+				'//*[ contains( @class, "navigation pagination" ) ]',
+			),
 		)
 	);
 

modules/theme-tools/compat/twentytwenty.php

@@ -185,7 +185,7 @@ function twentytwenty_filter_amp_infinite_scroll_sanitizers( $sanitizers ) {
 	$sanitizers['Jetpack_AMP_Infinite_Scroll_Sanitizer'] = array_merge(
 		$sanitizers['Jetpack_AMP_Infinite_Scroll_Sanitizer'],
 		array(
-			// Formerly twentynineteen_amp_infinite_footers.
+			// Formerly twentytwenty_amp_infinite_footers.
 			'footer_xpaths'         => array(
 				'//div[ contains( @class, "footer-nav-widgets-wrapper" ) ]',
 				'//footer[ @id = "site-footer" ]',
@@ -194,6 +194,9 @@ function twentytwenty_filter_amp_infinite_scroll_sanitizers( $sanitizers ) {
 				'//*[ @id = "site-header" ]',
 				'//*[ contains( @class, "pagination-wrapper" ) ]',
 			),
+			'hidden_xpaths'         => array(
+				'//*[ contains( @class, "pagination-wrapper" ) ]',
+			),
 		)
 	);