Ensure edit_post_link works even when post is not queried

js/customize-posts.js

@@ -445,13 +445,16 @@
 		} );
 
 		/**
-		 * Focus on the section requested from the preview.
+		 * Ensure a post is added to the Customizer and focus on its section when an edit post link is clicked in preview.
 		 */
-		api.previewer.bind( 'focus-section', function( sectionId ) {
-			var section = api.section( sectionId );
-			if ( section ) {
-				section.focus();
-			}
+		api.previewer.bind( 'edit-post', function( postId ) {
+			var ensuredPromise = api.Posts.ensurePosts( [ postId ] );
+			ensuredPromise.done( function( postsData ) {
+				var postData = postsData[ postId ];
+				if ( postData ) {
+					postData.section.focus();
+				}
+			} );
 		} );
 
 		/**

js/customize-preview-posts.js

@@ -197,11 +197,11 @@
 			 * Focus on the post section in the Customizer pane when clicking an edit-post-link.
 			 */
 			$( document.body ).on( 'click', '.post-edit-link', function( e ) {
-				var link = $( this ), settingId;
-				settingId = link.data( 'customize-post-setting-id' );
+				var link = $( this ), postId;
+				postId = link.data( 'customize-post-id' );
 				e.preventDefault();
-				if ( settingId ) {
-					api.preview.send( 'focus-section', settingId );
+				if ( postId ) {
+					api.preview.send( 'edit-post', postId );
 				}
 			} );
 		} );

php/class-wp-customize-posts-preview.php

@@ -631,9 +631,7 @@ function filter_get_edit_post_link( $url, $post_id ) {
 	 * @return string Edit link.
 	 */
 	function filter_edit_post_link( $link, $post_id ) {
-		$edit_post = get_post( $post_id );
-		$setting_id = WP_Customize_Post_Setting::get_post_setting_id( $edit_post );
-		$data_attributes = sprintf( ' data-customize-post-setting-id="%s"', $setting_id );
+		$data_attributes = sprintf( ' data-customize-post-id="%d"', $post_id );
 		$link = preg_replace( '/(?<=<a\s)/', $data_attributes, $link );
 		return $link;
 	}

tests/php/test-class-wp-customize-posts-preview.php

@@ -693,7 +693,7 @@ public function test_filter_get_edit_post_link() {
 	public function test_filter_edit_post_link() {
 		$preview = new WP_Customize_Posts_Preview( $this->posts_component );
 		$link = '<a class="edit-me" href="' . esc_url( home_url( '?edit-me' ) ) . '">Edit</a>';
-		$contained = sprintf( ' data-customize-post-setting-id="%s"', WP_Customize_Post_Setting::get_post_setting_id( get_post( $this->post_id ) ) );
+		$contained = sprintf( ' data-customize-post-id="%d"', $this->post_id );
 		$this->assertContains( $contained, $preview->filter_edit_post_link( $link, $this->post_id ) );
 	}