Merge branch 'fix/do-not-replace-blocks-on-save' of github.com:WordPr…

…ess/gutenberg into test/nav-screen-status
WordPress · May 29, 2020 · ead8ab2 · ead8ab2
2 parents cfcecf5 + cba04f8
commit ead8ab2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/block-editor/src/components/block-list/index.native.js b/packages/block-editor/src/components/block-list/index.native.js
@@ -53,6 +53,7 @@ export class BlockList extends Component {
 		this.extraData = {
 			parentWidth: this.props.parentWidth,
 			renderFooterAppender: this.props.renderFooterAppender,
+			onDeleteBlock: this.props.onDeleteBlock,
 		};
 		this.renderItem = this.renderItem.bind( this );
 		this.renderBlockListFooter = this.renderBlockListFooter.bind( this );
@@ -107,14 +108,16 @@ export class BlockList extends Component {
 	}
 
 	getExtraData() {
-		const { parentWidth, renderFooterAppender } = this.props;
+		const { parentWidth, renderFooterAppender, onDeleteBlock } = this.props;
 		if (
 			this.extraData.parentWidth !== parentWidth ||
-			this.extraData.renderFooterAppender !== renderFooterAppender
+			this.extraData.renderFooterAppender !== renderFooterAppender ||
+			this.extraData.onDeleteBlock !== onDeleteBlock
 		) {
 			this.extraData = {
 				parentWidth,
 				renderFooterAppender,
+				onDeleteBlock,
 			};
 		}
 		return this.extraData;

diff --git a/packages/edit-navigation/src/components/menus-editor/index.js b/packages/edit-navigation/src/components/menus-editor/index.js
@@ -21,9 +21,10 @@ import MenuEditor from '../menu-editor';
 export default function MenusEditor( { blockEditorSettings } ) {
 	const { menus, hasLoadedMenus } = useSelect( ( select ) => {
 		const { getMenus, hasFinishedResolution } = select( 'core' );
+		const query = { per_page: -1 };
 		return {
-			menus: getMenus(),
-			hasLoadedMenus: hasFinishedResolution( 'getMenus' ),
+			menus: getMenus( query ),
+			hasLoadedMenus: hasFinishedResolution( 'getMenus', [ query ] ),
 		};
 	}, [] );