placeholders and bypass queryloop errors

WordPress · Jul 20, 2020 · bea53c7 · bea53c7
1 parent 461f759
commit bea53c7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/packages/block-library/src/post-content/edit.js b/packages/block-library/src/post-content/edit.js
@@ -9,7 +9,7 @@ import { __ } from '@wordpress/i18n';
 import PostContentInnerBlocks from './inner-blocks';
 
 export default function PostContentEdit( { context: { postId, postType } } ) {
-	if ( postId && postType ) {
+	if ( postId && postType && postType !== 'wp_template' ) {
 		return (
 			<PostContentInnerBlocks postType={ postType } postId={ postId } />
 		);

diff --git a/packages/block-library/src/post-title/edit.js b/packages/block-library/src/post-title/edit.js
@@ -20,11 +20,7 @@ import { __ } from '@wordpress/i18n';
  */
 import HeadingLevelDropdown from '../heading/heading-level-dropdown';
 
-export default function PostTitleEdit( {
-	attributes,
-	setAttributes,
-	context,
-} ) {
+function PostTitleEditor( { attributes, setAttributes, context } ) {
 	const { level, align } = attributes;
 	const { postType, postId } = context;
 	const tagName = 0 === level ? 'p' : 'h' + level;
@@ -72,3 +68,20 @@ export default function PostTitleEdit( {
 		</>
 	);
 }
+
+export default function PostTitleEdit( {
+	attributes,
+	setAttributes,
+	context,
+} ) {
+	if ( ! context.postType || context.postType === 'wp_template' ) {
+		return <p>{ __( 'This is a placeholder for post title.' ) }</p>;
+	}
+	return (
+		<PostTitleEditor
+			attributes={ attributes }
+			setAttributes={ setAttributes }
+			context={ context }
+		/>
+	);
+}
diff --git a/packages/block-library/src/query-loop/edit.js b/packages/block-library/src/query-loop/edit.js
@@ -17,12 +17,12 @@ import { useQueryContext } from '../query';
 const TEMPLATE = [ [ 'core/post-title' ], [ 'core/post-content' ] ];
 export default function QueryLoopEdit( {
 	clientId,
-	context: {
-		query: { perPage, offset, categoryIds },
-		queryContext,
-	},
+	context: { query: _query, queryContext },
 } ) {
-	const [ { page } ] = useQueryContext() || queryContext;
+	const perPage = _query?.perPage;
+	const offset = _query?.offset;
+	const categoryIds = _query?.categoryIds;
+	const [ { page } ] = useQueryContext() || queryContext || [ {} ];
 	const [ activeBlockContext, setActiveBlockContext ] = useState();
 
 	const { posts, blocks } = useSelect(