Refactor AMP modes

amp.php

@@ -343,6 +343,7 @@ function amp_init() {
 	add_action( 'admin_init', 'AMP_Options_Manager::register_settings' );
 	add_action( 'wp_loaded', 'amp_add_options_menu' );
 	add_action( 'wp_loaded', 'amp_admin_pointer' );
+	add_action( 'wp_loaded', 'amp_post_meta_box' ); // Used in both Website and Stories experiences.
 
 	if ( AMP_Options_Manager::is_website_experience_enabled() ) {
 		add_rewrite_endpoint( amp_get_slug(), EP_PERMALINK );
@@ -351,7 +352,6 @@ function amp_init() {
 		add_action( 'parse_query', 'amp_correct_query_when_is_front_page' );
 		add_action( 'admin_bar_menu', 'amp_add_admin_bar_view_link', 100 );
 		add_action( 'wp_loaded', 'amp_editor_core_blocks' );
-		add_action( 'wp_loaded', 'amp_post_meta_box' );
 		add_filter( 'request', 'amp_force_query_var_value' );
 
 		// Add actions for reader mode templates.

assets/src/block-editor/index.js

@@ -16,20 +16,23 @@ import './store';
 
 const { ampLatestStoriesBlockData } = window;
 
-addFilter( 'blocks.registerBlockType', 'ampEditorBlocks/addAttributes', addAMPAttributes );
-addFilter( 'blocks.getSaveElement', 'ampEditorBlocks/filterSave', filterBlocksSave );
-addFilter( 'editor.BlockEdit', 'ampEditorBlocks/filterEdit', filterBlocksEdit, 20 );
-addFilter( 'blocks.getSaveContent.extraProps', 'ampEditorBlocks/addExtraAttributes', addAMPExtraProps );
-addFilter( 'editor.PostFeaturedImage', 'ampEditorBlocks/withFeaturedImageNotice', withFeaturedImageNotice );
-addFilter( 'editor.MediaUpload', 'ampEditorBlocks/addCroppedFeaturedImage', ( InitialMediaUpload ) => withCroppedFeaturedImage( InitialMediaUpload, getMinimumFeaturedImageDimensions() ) );
+// Add filters if AMP for Website experience is enabled.
+if ( select( 'amp/block-editor' ).isWebsiteEnabled() ) {
+	addFilter( 'blocks.registerBlockType', 'ampEditorBlocks/addAttributes', addAMPAttributes );
+	addFilter( 'blocks.getSaveElement', 'ampEditorBlocks/filterSave', filterBlocksSave );
+	addFilter( 'editor.BlockEdit', 'ampEditorBlocks/filterEdit', filterBlocksEdit, 20 );
+	addFilter( 'blocks.getSaveContent.extraProps', 'ampEditorBlocks/addExtraAttributes', addAMPExtraProps );
+	addFilter( 'editor.PostFeaturedImage', 'ampEditorBlocks/withFeaturedImageNotice', withFeaturedImageNotice );
+	addFilter( 'editor.MediaUpload', 'ampEditorBlocks/addCroppedFeaturedImage', ( InitialMediaUpload ) => withCroppedFeaturedImage( InitialMediaUpload, getMinimumFeaturedImageDimensions() ) );
 
-const plugins = require.context( './plugins', true, /.*\.js$/ );
+	const plugins = require.context( './plugins', true, /.*\.js$/ );
 
-plugins.keys().forEach( ( modulePath ) => {
-	const { name, render, icon } = plugins( modulePath );
+	plugins.keys().forEach( ( modulePath ) => {
+		const { name, render, icon } = plugins( modulePath );
 
-	registerPlugin( name, { icon, render } );
-} );
+		registerPlugin( name, { icon, render } );
+	} );
+}
 
 /*
  * If there's no theme support, unregister blocks that are only meant for AMP.
@@ -52,14 +55,24 @@ const blocks = require.context( './blocks', true, /(?<!test\/)index\.js$/ );
 blocks.keys().forEach( ( modulePath ) => {
 	const { name, settings } = blocks( modulePath );
 
-	// Prevent registering latest-stories block if not enabled.
-	if ( 'amp/amp-latest-stories' === name && typeof ampLatestStoriesBlockData === 'undefined' ) {
-		return;
-	}
+	const isLatestStoriesBlock = 'amp/amp-latest-stories' === name;
 
-	const blockRequiresAmp = AMP_DEPENDENT_BLOCKS.includes( name );
+	const shouldRegister = (
+		(
+			select( 'amp/block-editor' ).isWebsiteEnabled() &&
+			(
+				( ! isLatestStoriesBlock && select( 'amp/block-editor' ).isStandardMode() && AMP_DEPENDENT_BLOCKS.includes( name ) ) ||
+				( isLatestStoriesBlock && select( 'amp/block-editor' ).isStoriesEnabled() )
+			)
+		) ||
+		(
+			select( 'amp/block-editor' ).isStoriesEnabled() &&
+			isLatestStoriesBlock &&
+			typeof ampLatestStoriesBlockData !== 'undefined'
+		)
+	);
 
-	if ( ! blockRequiresAmp || select( 'amp/block-editor' ).isNativeAMP() ) {
+	if ( shouldRegister ) {
 		registerBlockType( name, settings );
 	}
 } );

assets/src/block-editor/store/selectors.js

@@ -22,16 +22,36 @@ export function hasThemeSupport( state ) {
 }
 
 /**
- * Returns whether the current site uses AMP first (as opposed to paired).
- *
- * @todo Rename to isStandardAMP or isAMPFirst?
+ * Returns whether the current site is in Standard mode (AMP first) as opposed to Transitional (paired).
  *
  * @param {Object} state Editor state.
  *
  * @return {boolean} Whether the current site uses AMP first.
  */
-export function isNativeAMP( state ) {
-	return Boolean( state.isNativeAMP );
+export function isStandardMode( state ) {
+	return Boolean( state.isStandardMode );
+}
+
+/**
+ * Returns whether the website experience is enabled.
+ *
+ * @param {Object} state Editor state.
+ *
+ * @return {boolean} Whether website experienced enabled.
+ */
+export function isWebsiteEnabled( state ) {
+	return Boolean( state.isWebsiteEnabled );
+}
+
+/**
+ * Returns whether the stories experience is enabled.
+ *
+ * @param {Object} state Editor state.
+ *
+ * @return {boolean} Whether stories experienced enabled.
+ */
+export function isStoriesEnabled( state ) {
+	return Boolean( state.isStoriesEnabled );
 }
 
 export function getDefaultStatus( state ) {

includes/admin/class-amp-post-meta-box.php

@@ -230,8 +230,10 @@ public function enqueue_block_assets() {
 			'possibleStatuses' => array( self::ENABLED_STATUS, self::DISABLED_STATUS ),
 			'defaultStatus'    => $enabled_status,
 			'errorMessages'    => $error_messages,
+			'isWebsiteEnabled' => AMP_Options_Manager::is_website_experience_enabled(),
+			'isStoriesEnabled' => AMP_Options_Manager::is_stories_experience_enabled(),
 			'hasThemeSupport'  => current_theme_supports( AMP_Theme_Support::SLUG ),
-			'isNativeAMP'      => amp_is_canonical(),
+			'isStandardMode'   => amp_is_canonical(),
 		);
 
 		wp_localize_script(