From d946c4cd50d2b5c978094ff0d8331b9fea9419f5 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Thu, 10 Dec 2020 09:27:48 +0100
Subject: [PATCH] Fix template mode

---
 .../editor/src/components/provider/index.js   |  2 +-
 .../provider/use-block-editor-settings.js     |  2 +-
 .../provider/use-post-content-editor.js       | 22 +++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
index d554c085a76a50..2f056ea3dbd727 100644
--- a/packages/editor/src/components/provider/index.js
+++ b/packages/editor/src/components/provider/index.js
@@ -104,7 +104,7 @@ function EditorProvider( {
 		if ( __unstableTemplate ) {
 			__unstableSetupTemplate( __unstableTemplate );
 		}
-	}, [ __unstableTemplate ] );
+	}, [ __unstableTemplate?.id ] );
 
 	if ( ! isReady ) {
 		return null;
diff --git a/packages/editor/src/components/provider/use-block-editor-settings.js b/packages/editor/src/components/provider/use-block-editor-settings.js
index e9625513514d45..9338189d1ecec0 100644
--- a/packages/editor/src/components/provider/use-block-editor-settings.js
+++ b/packages/editor/src/components/provider/use-block-editor-settings.js
@@ -139,7 +139,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 			// This selector is only defined on mobile.
 			isTitleSelected: isPostTitleSelected && isPostTitleSelected(),
 		};
-	} );
+	}, [] );
 
 	const { undo } = useDispatch( editorStore );
 
diff --git a/packages/editor/src/components/provider/use-post-content-editor.js b/packages/editor/src/components/provider/use-post-content-editor.js
index 1077d3e8fee580..d220803eb287e8 100644
--- a/packages/editor/src/components/provider/use-post-content-editor.js
+++ b/packages/editor/src/components/provider/use-post-content-editor.js
@@ -19,13 +19,10 @@ import serializeBlocks from '../../store/utils/serialize-blocks';
  * @return {Object} BlockEditorProvider props.
  */
 function usePostContentEditor( postType, postId ) {
-	const { blocks } = useSelect(
+	const blocks = useSelect(
 		( select ) => {
 			const { getEditedEntityRecord } = select( coreStore );
-			return {
-				blocks: getEditedEntityRecord( 'postType', postType, postId )
-					.blocks,
-			};
+			return getEditedEntityRecord( 'postType', postType, postId ).blocks;
 		},
 		[ postType, postId ]
 	);
@@ -64,12 +61,15 @@ function usePostContentEditor( postType, postId ) {
 		[ blocks, postId, postType ]
 	);
 
-	const onInput = useCallback( ( newBlocks, options ) => {
-		onChange( newBlocks, {
-			...options,
-			__unstableShouldCreateUndoLevel: false,
-		} );
-	}, onChange );
+	const onInput = useCallback(
+		( newBlocks, options ) => {
+			onChange( newBlocks, {
+				...options,
+				__unstableShouldCreateUndoLevel: false,
+			} );
+		},
+		[ onChange ]
+	);
 
 	return { value: blocks, onChange, onInput };
 }