Prevent amp-story-page from being used anywhere other than root

ampproject · Jul 9, 2018 · 9cd428e · 9cd428e
1 parent e74b86a
commit 9cd428e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 35 deletions.
diff --git a/blocks/amp-story/amp-story-grid-layer.js b/blocks/amp-story/amp-story-grid-layer.js
@@ -10,6 +10,37 @@ const {
 	SelectControl
 } = wp.components;
 
+export const ALLOWED_BLOCKS = [
+	'core/button',
+	'core/code',
+	'core/embed',
+	'core/image',
+	'core/list',
+	'core/paragraph',
+	'core/preformatted',
+	'core/pullquote',
+	'core/quote',
+	'core/table',
+	'core/verse',
+	'core/video'
+];
+
+function setBlockParent( props ) {
+	if ( ALLOWED_BLOCKS.includes( props.name ) ) {
+		return {
+			...props,
+			...{ parent: [ 'amp/amp-story-grid-layer' ] }
+		};
+	}
+	return props;
+}
+
+wp.hooks.addFilter(
+	'blocks.registerBlockType',
+	'amp/set-block-parents',
+	setBlockParent
+);
+
 /**
  * Register block.
  */
@@ -70,7 +101,7 @@ export default registerBlockType(
 						/>
 					</InspectorControls>
 				),
-				<InnerBlocks key='contents' />
+				<InnerBlocks key='contents' allowedBlocks={ ALLOWED_BLOCKS } />
 			];
 		},
 

diff --git a/blocks/amp-story/amp-story-page.js b/blocks/amp-story/amp-story-page.js
@@ -62,7 +62,7 @@ export default registerBlockType(
 				! props.attributes.id && (
 					<Notice status="error" isDismissible={ false }>{ __( 'You must supply an ID for the page.', 'amp' ) }</Notice>
 				),
-				<InnerBlocks key='contents' />
+				<InnerBlocks key='contents' allowedBlocks={ [ 'amp/amp-story-grid-layer' ] } />
 			];
 		},
 

diff --git a/blocks/amp-story/index.js b/blocks/amp-story/index.js
@@ -1,42 +1,11 @@
 import './amp-story-page';
-import './amp-story-grid-layer';
 
-const blockParents = {
-	'core/button': 'amp/amp-story-grid-layer',
-	'core/code': 'amp/amp-story-grid-layer',
-	'core/embed': 'amp/amp-story-grid-layer',
-	'core/image': 'amp/amp-story-grid-layer',
-	'core/list': 'amp/amp-story-grid-layer',
-	'core/paragraph': 'amp/amp-story-grid-layer',
-	'core/preformatted': 'amp/amp-story-grid-layer',
-	'core/pullquote': 'amp/amp-story-grid-layer',
-	'core/quote': 'amp/amp-story-grid-layer',
-	'core/table': 'amp/amp-story-grid-layer',
-	'core/verse': 'amp/amp-story-grid-layer',
-	'core/video': 'amp/amp-story-grid-layer'
-};
-
-function setBlockParent( props ) {
-	if ( blockParents[ props.name ] ) {
-		return Object.assign(
-			{},
-			props,
-			{ parent: [ blockParents[ props.name ] ] }
-		);
-	}
-	return props;
-}
-
-wp.hooks.addFilter(
-	'blocks.registerBlockType',
-	'amp/set-block-parents',
-	setBlockParent
-);
+import { ALLOWED_BLOCKS as LAYER_ALLOWED_BLOCKS } from './amp-story-grid-layer';
 
 // Remove all blocks that are not known to be allowed in AMP Stories (ref. amp-story-cta-layer-allowed-descendants).
 window.addEventListener( 'load', () => { // @todo Should be better event.
 	wp.blocks.getBlockTypes().forEach( function( blockType ) {
-		if ( -1 === blockType.name.indexOf( 'amp/amp-story-' ) && ! blockParents[ blockType.name ] ) {
+		if ( -1 === blockType.name.indexOf( 'amp/amp-story-' ) && ! LAYER_ALLOWED_BLOCKS.includes( blockType.name ) ) {
 			wp.blocks.unregisterBlockType( blockType.name );
 		}
 	} );