Merge branch 'WordPress:trunk' into trunk

Author: sabernhardt

package-lock.json

@@ -116,7 +116,8 @@
 		"@wordpress/notices": "3.6.1",
 		"@wordpress/nux": "5.4.5",
 		"@wordpress/plugins": "4.4.3",
-		"@wordpress/preferences": "1.2.5",
+		"@wordpress/preferences": "2.8.0",
+		"@wordpress/preferences-persistence": "1.8.0",
 		"@wordpress/primitives": "3.4.1",
 		"@wordpress/priority-queue": "2.6.1",
 		"@wordpress/redux-routine": "4.6.1",

package.json

@@ -617,7 +617,7 @@ window.screenMeta = {
 		 * @return {void}
 		 */
 		panel.slideDown( 'fast', function() {
-			panel.trigger( 'focus' );
+			panel.removeClass( 'hidden' ).trigger( 'focus' );
 			button.addClass( 'screen-meta-active' ).attr( 'aria-expanded', true );
 		});
 
@@ -646,6 +646,7 @@ window.screenMeta = {
 			button.removeClass( 'screen-meta-active' ).attr( 'aria-expanded', false );
 			$('.screen-meta-toggle').css('visibility', '');
 			panel.parent().hide();
+			panel.addClass( 'hidden' );
 		});
 
 		$document.trigger( 'screen:options:close' );

src/js/_enqueues/admin/common.js

@@ -776,6 +776,12 @@ ul#add-to-blog-users {
 
 .form-table p.timezone-info {
 	margin: 1em 0;
+	display: flex;
+	flex-direction: column;
+}
+
+#local-time {
+	margin-top: 0.5em;
 }
 
 .form-table td fieldset label {
@@ -1636,13 +1642,6 @@ table.form-table td .updated p {
 		display: block;
 	}
 
-	#utc-time,
-	#local-time {
-		display: block;
-		float: none;
-		margin-top: 0.5em;
-	}
-
 	.form-field #domain {
 		max-width: none;
 	}

src/wp-admin/css/forms.css

@@ -214,12 +214,20 @@
 	);
 }
 
+if ( ! wp_is_block_theme() && current_theme_supports( 'block-template-parts' ) ) {
+	$submenu['themes.php'][6] = array(
+		__( 'Template Parts' ),
+		'edit_theme_options',
+		'site-editor.php?postType=wp_template_part',
+	);
+}
+
 $customize_url = add_query_arg( 'return', urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ), 'customize.php' );
 
 // Hide Customize link on block themes unless a plugin or theme
 // is using 'customize_register' to add a setting.
 if ( ! wp_is_block_theme() || has_action( 'customize_register' ) ) {
-	$position = wp_is_block_theme() ? 7 : 6;
+	$position = ( wp_is_block_theme() || current_theme_supports( 'block-template-parts' ) ) ? 7 : 6;
 
 	$submenu['themes.php'][ $position ] = array( __( 'Customize' ), 'customize', esc_url( $customize_url ), '', 'hide-if-no-customize' );
 }

src/wp-admin/menu.php

@@ -19,10 +19,15 @@
 	);
 }
 
-if ( ! wp_is_block_theme() ) {
+if ( ! ( current_theme_supports( 'block-template-parts' ) || wp_is_block_theme() ) ) {
 	wp_die( __( 'The theme you are currently using is not compatible with Full Site Editing.' ) );
 }
 
+$is_template_part_editor = isset( $_GET['postType'] ) && 'wp_template_part' === sanitize_key( $_GET['postType'] );
+if ( ! wp_is_block_theme() && ! $is_template_part_editor ) {
+	wp_die( __( 'The theme you are currently using is not compatible with the Site Editor.' ) );
+}
+
 /**
  * Do a server-side redirection if missing `postType` and `postId`
  * query args when visiting Site Editor.
@@ -64,14 +69,24 @@ static function( $classes ) {
 
 $block_editor_context = new WP_Block_Editor_Context( array( 'name' => 'core/edit-site' ) );
 $custom_settings      = array(
-	'siteUrl'                  => site_url(),
-	'postsPerPage'             => get_option( 'posts_per_page' ),
-	'styles'                   => get_block_editor_theme_styles(),
-	'defaultTemplateTypes'     => $indexed_template_types,
-	'defaultTemplatePartAreas' => get_allowed_block_template_part_areas(),
-	'__unstableHomeTemplate'   => $home_template,
+	'siteUrl'                   => site_url(),
+	'postsPerPage'              => get_option( 'posts_per_page' ),
+	'styles'                    => get_block_editor_theme_styles(),
+	'defaultTemplateTypes'      => $indexed_template_types,
+	'defaultTemplatePartAreas'  => get_allowed_block_template_part_areas(),
+	'supportsLayout'            => WP_Theme_JSON_Resolver::theme_has_support(),
+	'supportsTemplatePartsMode' => ! wp_is_block_theme() && current_theme_supports( 'block-template-parts' ),
+	'__unstableHomeTemplate'    => $home_template,
 );
 
+/**
+ * Home template resolution is not needed when block template parts are supported.
+ * Set the value to `true` to satisfy the editor initialization guard clause.
+ */
+if ( $custom_settings['supportsTemplatePartsMode'] ) {
+	$custom_settings['__unstableHomeTemplate'] = true;
+}
+
 // Add additional back-compat patterns registered by `current_screen` et al.
 $custom_settings['__experimentalAdditionalBlockPatterns']          = WP_Block_Patterns_Registry::get_instance()->get_all_registered( true );
 $custom_settings['__experimentalAdditionalBlockPatternCategories'] = WP_Block_Pattern_Categories_Registry::get_instance()->get_all_registered( true );

src/wp-admin/site-editor.php

@@ -40,6 +40,7 @@ a:focus {
 	outline: thin;
 	outline-style: dotted;
 	text-decoration: underline;
+	text-decoration-thickness: 2px;
 }
 
 h1,

src/wp-content/themes/twentynineteen/sass/elements/_elements.scss

@@ -17,5 +17,6 @@ a {
 	&:focus {
 		outline: thin dotted;
 		text-decoration: underline;
+		text-decoration-thickness: 2px;
 	}
 }

src/wp-content/themes/twentynineteen/sass/navigation/_links.scss

@@ -323,6 +323,7 @@
 
 		a {
 			text-decoration: underline;
+			text-decoration-thickness: 2px;
 
 			&:hover {
 				text-decoration: none;

src/wp-content/themes/twentynineteen/sass/site/primary/_comments.scss

@@ -212,6 +212,7 @@
 
 		a {
 			text-decoration: underline;
+			text-decoration-thickness: 2px;
 
 			&.button,
 			&:hover {