Merge branch 'trunk' into feature/derive-pagination

Author: ryanwelcher

index.php

@@ -3,7 +3,7 @@
  * Plugin Name:       Advanced Query Loop
  * Description:       Query loop block variations to create custom queries.
  * Plugin URI:        https://github.com/ryanwelcher/advanced-query-loop/
- * Version:           4.0.0
+ * Version:           4.0.2
  * Requires at least: 6.2
  * Requires PHP:      7.4
  * Author:            Ryan Welcher

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "advanced-query-loop",
-	"version": "4.0.0",
+	"version": "4.0.2",
 	"description": "Query loop block variations to create custom queries.",
 	"main": "index.js",
 	"scripts": {

readme.md

@@ -20,10 +20,6 @@ Built complicated taxonomy queries!
 
 Select additional post types for your query!
 
-#### Post Count
-
-Set the number of items you want to display (up to 50).
-
 #### Include Posts
 
 Choose the posts you want to display manually or only the children of the current content.
@@ -34,11 +30,7 @@ Remove the current post from the query.
 
 #### Exclude posts by category
 
-Choose to exclude posts from a list of categories
-
-#### Offset
-
-Choose whether you want to start at the first or 100th!
+Choose to exclude posts from a list of categories.
 
 #### Post Meta Query
 
@@ -67,7 +59,7 @@ Sort in ascending or descending order by:
 
 #### Disable Pagination
 
-Improve the performance of the query by disabling pagination
+Improve the performance of the query by disabling pagination.
 
 ## Extending AQL
 

readme.txt

@@ -3,7 +3,7 @@ Contributors: welcher
 Tags: Query Loop, Custom Queries
 Requires at least: 6.2
 Tested up to: 6.7.1
-Stable tag: 4.0.0
+Stable tag: 4.0.2
 Requires PHP: 7.4
 License: GPL v2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -26,10 +26,6 @@ Built complicated taxonomy queries!
 
 Select additional post types for your query!
 
-==== Post Count ====
-
-Set the number of items you want to display (up to 50).
-
 ==== Include Posts ====
 
 Choose the posts you want to display manually or only the children of the current content.
@@ -40,11 +36,7 @@ Remove the current post from the query.
 
 ==== Exclude posts by category ====
 
-Choose to exclude posts from a list of categories
-
-==== Offset ====
-
-Choose whether you want to start at the first or 100th!
+Choose to exclude posts from a list of categories.
 
 ==== Post Meta Query ====
 
@@ -73,7 +65,7 @@ Sort in ascending or descending order by:
 
 ==== Disable Pagination ====
 
-Improve the performance of the query by disabling pagination
+Improve the performance of the query by disabling pagination.
 
 == Screenshots ==
 
@@ -82,6 +74,13 @@ Improve the performance of the query by disabling pagination
 3. Query posts before a date, after a date or between two dates.
 
 == Changelog ==
+
+= 4.0.2=
+* Bug fixes
+
+= 4.0.1 =
+* A few small bug fixes courtesy of @gvgvgvijayan
+
 = 4.0.0 =
 * Introducing the new Taxonomy Builder!
 * Show children of current item only.

src/components/post-include-controls.js

@@ -88,6 +88,11 @@ export const PostIncludeControls = ( { attributes, setAttributes } ) => {
 		return <div>{ __( 'Loading…', 'advanced-query-loop' ) }</div>;
 	}
 
+	// If the first post in the posts array does not have a title, don't render the component.
+	if ( posts.length > 0 && ! posts[ 0 ].title ) {
+		return null;
+	}
+
 	return (
 		<>
 			<h2> { __( 'Include Posts', 'advanced-query-loop' ) }</h2>
@@ -101,7 +106,9 @@ export const PostIncludeControls = ( { attributes, setAttributes } ) => {
 				<FormTokenField
 					label={ __( 'Posts', 'advanced-query-loop' ) }
 					value={ includePosts.map( ( item ) => item.title ) }
-					suggestions={ posts.map( ( post ) => post.title.rendered ) }
+					suggestions={ posts.map(
+						( post ) => post?.title?.rendered
+					) } // Need to fix this here. Posts might not have title.rendered
 					onInputChange={ ( searchPost ) =>
 						setSearchArg( searchPost )
 					}

src/components/post-order-controls.js

@@ -90,7 +90,6 @@ export const PostOrderControls = ( { attributes, setAttributes } ) => {
 				__nextHasNoMarginBottom
 			/>
 			<ToggleControl
-				__nextHasNoMarginBottom
 				label={ __( 'Ascending Order', 'advanced-query-loop' ) }
 				checked={ order === 'asc' }
 				onChange={ () => {

src/variations/controls.js

@@ -46,9 +46,9 @@ const isAdvancedQueryLoop = ( props ) => {
 const withAdvancedQueryControls = ( BlockEdit ) => ( props ) => {
 	// If the is the correct variation, add the custom controls.
 	if ( isAdvancedQueryLoop( props ) ) {
-		// If the inherit prop is false, add all the controls.
+		// If the inherit prop is false or undefined,  add all the controls.
 		const { attributes } = props;
-		if ( attributes.query.inherit === false ) {
+		if ( ! attributes.query.inherit ) {
 			return (
 				<>
 					<BlockEdit { ...props } />