Skip to content

Move Posts Per Page, Offset, and Pages controls from the block toolbar into Inspector Controls #58207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanwelcher merged 16 commits into from
Aug 6, 2024
Merged

Move Posts Per Page, Offset, and Pages controls from the block toolbar into Inspector Controls #58207

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b9daa7b
Add Per Page Controls to the Query Loop block.
ryanwelcher Jan 24, 2024
b75431f
Update changelog.
ryanwelcher Jan 24, 2024
9395aca
Update the max posts per page to match the toolbar control.
ryanwelcher Jan 24, 2024
728d3ed
Wrap per page, offset, and max pages controls to Inspector controls i…
ryanwelcher Jan 24, 2024
5b36598
Remove per page, offset and pages controls from block toolbar.
ryanwelcher Jan 24, 2024
402acb3
Rename ToolsPanel to "Display"
ryanwelcher Jan 24, 2024
b1eaf83
Fix leftover for incorrect dropdownMenuProps value.
afercia Jul 5, 2024
44c61da
Convert RangeControl value to number.
afercia Jul 5, 2024
fe9857e
Merge branch 'trunk' into feature/add-post-count-controls-to-query-lo…
ryanwelcher Jul 16, 2024
d6b5f8a
Add missing value checks for perPage, offset, and max pages controls.
ryanwelcher Jul 16, 2024
f5b43e2
Update e2e test
Mamaduka Jul 24, 2024
02c4579
Fix PHPCS
Mamaduka Jul 24, 2024
1dd54df
large and minor label tweak
richtabor Jul 31, 2024
af64535
"posts per page"
richtabor Jul 31, 2024
7b6e79c
Merge branch 'trunk' into feature/add-post-count-controls-to-query-lo…
ryanwelcher Aug 6, 2024
49ff394
Add __nextHasNoMarginBottom to the Per Page RangeControl component.
ryanwelcher Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove per page, offset and pages controls from block toolbar.
  • Loading branch information
@ryanwelcher @afercia
ryanwelcher authored and afercia committed Jul 5, 2024
commit 5b3659872fb18d0c3ac12520b39e8fcc89a694a2
91 changes: 1 addition & 90 deletions packages/block-library/src/query/edit/query-toolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
/**
* WordPress dependencies
*/
import {
ToolbarGroup,
Dropdown,
ToolbarButton,
__experimentalNumberControl as NumberControl,
} from '@wordpress/components';
import { ToolbarGroup, ToolbarButton } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { settings } from '@wordpress/icons';

/**
* Internal dependencies
*/
import { usePatterns } from '../utils';

export default function QueryToolbar( {
attributes: { query },
setQuery,
openPatternSelectionModal,
name,
clientId,
Expand All @@ -26,87 +18,6 @@ export default function QueryToolbar( {

return (
<>
{ ! query.inherit && (
<ToolbarGroup>
<Dropdown
contentClassName="block-library-query-toolbar__popover"
renderToggle={ ( { onToggle } ) => (
<ToolbarButton
icon={ settings }
label={ __( 'Display settings' ) }
onClick={ onToggle }
/>
) }
renderContent={ () => (
<>
<NumberControl
__unstableInputWidth="60px"
className="block-library-query-toolbar__popover-number-control"
label={ __( 'Items per Page' ) }
labelPosition="edge"
min={ 1 }
max={ 100 }
onChange={ ( value ) => {
if (
isNaN( value ) ||
value < 1 ||
value > 100
) {
return;
}
setQuery( {
perPage: value,
} );
} }
step="1"
value={ query.perPage }
isDragEnabled={ false }
/>
<NumberControl
__unstableInputWidth="60px"
className="block-library-query-toolbar__popover-number-control"
label={ __( 'Offset' ) }
labelPosition="edge"
min={ 0 }
max={ 100 }
onChange={ ( value ) => {
if (
isNaN( value ) ||
value < 0 ||
value > 100
) {
return;
}
setQuery( { offset: value } );
} }
step="1"
value={ query.offset }
isDragEnabled={ false }
/>
<NumberControl
__unstableInputWidth="60px"
className="block-library-query-toolbar__popover-number-control"
label={ __( 'Max pages to show' ) }
labelPosition="edge"
min={ 0 }
onChange={ ( value ) => {
if ( isNaN( value ) || value < 0 ) {
return;
}
setQuery( { pages: value } );
} }
step="1"
value={ query.pages }
isDragEnabled={ false }
help={ __(
'Limit the pages you want to show, even if the query has more results. To show all pages use 0 (zero).'
) }
/>
</>
) }
/>
</ToolbarGroup>
) }
{ hasPatterns && (
<ToolbarGroup className="wp-block-template-part__block-control-group">
<ToolbarButton onClick={ openPatternSelectionModal }>
Expand Down