Block top toolbar: fix mover direction (#19574)

WordPress · Jan 10, 2020 · 54aaba6 · 54aaba6
1 parent 684b4c2
commit 54aaba6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/packages/block-editor/src/components/block-list/block.js b/packages/block-editor/src/components/block-list/block.js
@@ -358,7 +358,6 @@ function BlockListBlock( {
 			focusOnMount={ isToolbarForced }
 			data-type={ name }
 			data-align={ wrapperProps ? wrapperProps[ 'data-align' ] : undefined }
-			moverDirection={ moverDirection }
 			hasMovers={ hasMovers }
 		/>
 	);

diff --git a/packages/block-editor/src/components/block-toolbar/index.js b/packages/block-editor/src/components/block-toolbar/index.js
@@ -22,25 +22,38 @@ import MultiBlocksSwitcher from '../block-switcher/multi-blocks-switcher';
 import BlockMover from '../block-mover';
 import Inserter from '../inserter';
 
-export default function BlockToolbar( { moverDirection, hasMovers = true } ) {
-	const { blockClientIds, isValid, mode, rootClientId } = useSelect( ( select ) => {
+export default function BlockToolbar( { hasMovers = true } ) {
+	const {
+		blockClientIds,
+		isValid,
+		mode,
+		rootClientId,
+		moverDirection,
+	} = useSelect( ( select ) => {
 		const {
 			getBlockMode,
 			getSelectedBlockClientIds,
 			isBlockValid,
 			getBlockRootClientId,
+			getBlockListSettings,
 		} = select( 'core/block-editor' );
 		const selectedBlockClientIds = getSelectedBlockClientIds();
+		const blockRootClientId = getBlockRootClientId( selectedBlockClientIds[ 0 ] );
+
+		const {
+			__experimentalMoverDirection,
+		} = getBlockListSettings( blockRootClientId ) || {};
 
 		return {
 			blockClientIds: selectedBlockClientIds,
-			rootClientId: getBlockRootClientId( selectedBlockClientIds[ 0 ] ),
+			rootClientId: blockRootClientId,
 			isValid: selectedBlockClientIds.length === 1 ?
 				isBlockValid( selectedBlockClientIds[ 0 ] ) :
 				null,
 			mode: selectedBlockClientIds.length === 1 ?
 				getBlockMode( selectedBlockClientIds[ 0 ] ) :
 				null,
+			moverDirection: __experimentalMoverDirection,
 		};
 	}, [] );
 	const [ isInserterShown, setIsInserterShown ] = useState( false );

diff --git a/packages/block-editor/src/components/inner-blocks/index.js b/packages/block-editor/src/components/inner-blocks/index.js
@@ -113,12 +113,14 @@ class InnerBlocks extends Component {
 			templateLock,
 			parentLock,
 			__experimentalCaptureToolbars,
+			__experimentalMoverDirection,
 		} = this.props;
 
 		const newSettings = {
 			allowedBlocks,
 			templateLock: templateLock === undefined ? parentLock : templateLock,
 			__experimentalCaptureToolbars: __experimentalCaptureToolbars || false,
+			__experimentalMoverDirection,
 		};
 
 		if ( ! isShallowEqual( blockListSettings, newSettings ) ) {