Nested locking basis.

WordPress · May 29, 2018 · 816f43c · 816f43c
1 parent bfafd1b
commit 816f43c
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 21 deletions.
diff --git a/editor/components/inner-blocks/index.js b/editor/components/inner-blocks/index.js
@@ -3,8 +3,8 @@
  */
 import { withContext } from '@wordpress/components';
 
-function InnerBlocks( { BlockList, layouts, allowedBlocks, template } ) {
-	return <BlockList { ...{ layouts, allowedBlocks, template } } />;
+function InnerBlocks( { BlockList, layouts, allowedBlocks, locking, template } ) {
+	return <BlockList { ...{ layouts, allowedBlocks, locking, template } } />;
 }
 
 InnerBlocks = withContext( 'BlockList' )()( InnerBlocks );

diff --git a/editor/store/selectors.js b/editor/store/selectors.js
@@ -1243,7 +1243,7 @@ export const canInsertBlockType = createSelector(
 		}
 
 		const parentBlockListSettings = getBlockListSettings( state, parentUID );
-		const parentAllowedBlocks = get( parentBlockListSettings, [ 'supportedBlocks' ] );
+		const parentAllowedBlocks = get( parentBlockListSettings, [ 'allowedBlocks' ] );
 		const hasParentAllowedBlock = checkAllowList( parentAllowedBlocks, blockName );
 
 		const blockAllowedParentBlocks = blockType.parent;
@@ -1744,3 +1744,22 @@ export function getSupportedBlocks( state, uid, globallyEnabledBlockTypes ) {
 export function getEditorSettings( state ) {
 	return state.settings;
 }
+
+/*
+ * Returns the locking in the context of a given root block.
+ *
+ * @param {Object}  state   Editor state.
+ * @param {?string} rootUID Block UID.
+ *
+ * @return {?string} Locking in the context of a given block.
+ */
+export function getLocking( state, rootUID ) {
+	if ( ! rootUID ) {
+		return getTemplateLock( state );
+	}
+	const blockListSettings = getBlockListSettings( state, rootUID );
+	if ( ! blockListSettings ) {
+		return null;
+	}
+	return blockListSettings.locking;
+}
diff --git a/editor/store/test/selectors.js b/editor/store/test/selectors.js
@@ -2756,7 +2756,7 @@ describe( 'selectors', () => {
 				},
 				blockListSettings: {
 					block1: {
-						supportedBlocks: [ 'core/test-block-c' ],
+						allowedBlocks: [ 'core/test-block-c' ],
 					},
 				},
 				settings: {},
@@ -2775,7 +2775,7 @@ describe( 'selectors', () => {
 				},
 				blockListSettings: {
 					block1: {
-						supportedBlocks: [ 'core/test-block-b' ],
+						allowedBlocks: [ 'core/test-block-b' ],
 					},
 				},
 				settings: {},
@@ -2794,7 +2794,7 @@ describe( 'selectors', () => {
 				},
 				blockListSettings: {
 					block1: {
-						supportedBlocks: [],
+						allowedBlocks: [],
 					},
 				},
 				settings: {},

diff --git a/editor/utils/block-list.js b/editor/utils/block-list.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { isEqual, noop, omit } from 'lodash';
+import { noop, omit } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -11,6 +11,7 @@ import {
 	synchronizeBlocksWithTemplate,
 } from '@wordpress/blocks';
 import { withSelect, withDispatch } from '@wordpress/data';
+import isShallowEqual from '@wordpress/is-shallow-equal';
 
 /**
  * Internal dependencies
@@ -24,6 +25,24 @@ import BlockList from '../components/block-list';
  */
 const INNER_BLOCK_LIST_CACHE = {};
 
+const LOCKING_HIERARCHY = {
+	insert: 1,
+	all: 2,
+};
+
+const getHighestLocking = ( locking1, locking2 ) => {
+	if ( ! locking1 ) {
+		return locking2;
+	}
+	if ( ! locking2 ) {
+		return locking1;
+	}
+	if ( LOCKING_HIERARCHY[ locking1 ] > LOCKING_HIERARCHY[ locking2 ] ) {
+		return locking1;
+	}
+	return locking2;
+};
+
 /**
  * Returns a BlockList component which is already pre-bound to render with a
  * given UID as its rootUID prop. It is necessary to cache these components
@@ -40,10 +59,19 @@ const INNER_BLOCK_LIST_CACHE = {};
 export function createInnerBlockList( uid, renderBlockMenu = noop ) {
 	if ( ! INNER_BLOCK_LIST_CACHE[ uid ] ) {
 		const InnerBlockListComponent = class extends Component {
-			componentWillReceiveProps( nextProps ) {
-				this.updateNestedSettings( {
-					supportedBlocks: nextProps.allowedBlocks,
-				} );
+			constructor( props ) {
+				super( props );
+				this.state = {};
+			}
+
+			static getDerivedStateFromProps( props ) {
+				const newSettings = {
+					allowedBlocks: props.allowedBlocks,
+					locking: getHighestLocking( props.locking, props.parentLocking ),
+				};
+				if ( ! isShallowEqual( props.blockListSettings, newSettings ) ) {
+					props.updateNestedSettings( newSettings );
+				}
 			}
 
 			componentWillUnmount() {
@@ -56,9 +84,6 @@ export function createInnerBlockList( uid, renderBlockMenu = noop ) {
 
 			componentDidMount() {
 				INNER_BLOCK_LIST_CACHE[ uid ][ 1 ]++;
-				this.updateNestedSettings( {
-					supportedBlocks: this.props.allowedBlocks,
-				} );
 				this.insertTemplateBlocks( this.props.template );
 			}
 
@@ -71,12 +96,6 @@ export function createInnerBlockList( uid, renderBlockMenu = noop ) {
 				}
 			}
 
-			updateNestedSettings( newSettings ) {
-				if ( ! isEqual( this.props.blockListSettings, newSettings ) ) {
-					this.props.updateNestedSettings( newSettings );
-				}
-			}
-
 			render() {
 				return (
 					<BlockList
@@ -98,10 +117,11 @@ export function createInnerBlockList( uid, renderBlockMenu = noop ) {
 
 		const InnerBlockListComponentContainer = compose(
 			withSelect( ( select ) => {
-				const { getBlock, getBlockListSettings } = select( 'core/editor' );
+				const { getBlock, getBlockListSettings, getBlockRootUID, getLocking } = select( 'core/editor' );
 				return {
 					block: getBlock( uid ),
 					blockListSettings: getBlockListSettings( uid ),
+					parentLocking: getLocking( getBlockRootUID( uid ) ),
 				};
 			} ),
 			withDispatch( ( dispatch ) => {