Merge pull request #1534 from tomusborne/bug/query-per-page

Improve post_per_page UX
tomusborne · Nov 28, 2024 · 17b3cec · 17b3cec
2 parents cb4b42b + 0d73df6
commit 17b3cec
Showing 1 changed file with 34 additions and 5 deletions.
diff --git a/src/blocks/query/components/ControlBuilder.jsx b/src/blocks/query/components/ControlBuilder.jsx
@@ -1,14 +1,14 @@
-import { ToggleControl, Button, Tooltip, ComboboxControl } from '@wordpress/components';
+import { ToggleControl, Button, Tooltip, ComboboxControl, TextControl } from '@wordpress/components';
 import { sprintf, __ } from '@wordpress/i18n';
 
 import { isArray, isObject } from 'lodash';
 
 import {
 	CategoriesSelect,
 	TagsSelect,
-	DebouncedTextControl,
 } from '@components';
 import { SelectPostType, SelectPost, MultiSelect, SelectUser } from '@edge22/components';
+import { Control } from '@edge22/styles-builder';
 
 import { TaxonomyParameterControl } from './TaxonomyParameterControl';
 import { DateQueryControl } from './DateQueryControl';
@@ -23,24 +23,53 @@ function ControlComponent( props ) {
 
 	switch ( props?.type ) {
 		case 'text':
+			return <Control { ...standardProps } as={ TextControl } />;
 		case 'number':
-			return <DebouncedTextControl { ...standardProps } />;
+			return (
+				<TextControl
+					{ ...standardProps }
+					value={ standardProps.value }
+					type="number"
+					min="-1"
+					onChange={ ( newValue ) => {
+						if ( parseInt( newValue, 10 ) < -1 ) {
+							standardProps.onChange( -1 );
+							return;
+						}
+
+						standardProps.onChange( newValue );
+					} }
+				/>
+			);
 		case 'postTypeSelect':
 			return <SelectPostType { ...standardProps } />;
 		case 'select':
 			return <ComboboxControl { ...standardProps } />;
 		case 'multiSelect':
 			return <MultiSelect { ...standardProps } />;
 		case 'authorsSelect':
-			return <SelectUser multiple={ true } currentLabel={ __( 'Current author', 'generateblocks' ) } { ...standardProps } />;
+			return (
+				<SelectUser
+					{ ...standardProps }
+					multiple={ true }
+					currentLabel={ __( 'Current author', 'generateblocks' ) }
+				/>
+			);
 		case 'categoriesSelect':
 			return <CategoriesSelect { ...standardProps } />;
 		case 'tagsSelect':
 			return <TagsSelect { ...standardProps } />;
 		case 'taxonomySelect':
 			return <TaxonomyParameterControl postType={ postType } { ...standardProps } />;
 		case 'includePosts':
-			return <SelectPost includeCurrent={ false } multiple={ true } postType={ postType } { ...standardProps } />;
+			return (
+				<SelectPost
+					{ ...standardProps }
+					includeCurrent={ false }
+					multiple={ true }
+					postType={ postType }
+				/>
+			);
 		case 'excludePosts':
 			return <SelectPost multiple={ true } postType={ postType } { ...standardProps } />;
 		case 'dateQuery':