Skip to content

Query Loop: Fix 'block' scoped variations to get the query defaults #63477

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
ntsekouras merged 3 commits into from
Jul 15, 2024
Merged

Query Loop: Fix 'block' scoped variations to get the query defaults #63477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a856c6
Query Loop: Fix 'block' scoped variations to get the `query` defaults
ntsekouras Jul 12, 2024
8bee67c
only update innerBlocks in `block` scoped variations
ntsekouras Jul 12, 2024
ca12e6e
update e2e test
ntsekouras Jul 15, 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
22 changes: 1 addition & 21 deletions packages/block-library/src/query/edit/query-placeholder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export default function QueryPlaceholder( {
clientId,
name,
openPatternSelectionModal,
setAttributes,
} ) {
const [ isStartingBlank, setIsStartingBlank ] = useState( false );
const blockProps = useBlockProps();
Expand Down Expand Up @@ -64,7 +63,6 @@ export default function QueryPlaceholder( {
<QueryVariationPicker
clientId={ clientId }
attributes={ attributes }
setAttributes={ setAttributes }
icon={ icon }
label={ label }
/>
Expand Down Expand Up @@ -101,13 +99,7 @@ export default function QueryPlaceholder( {
);
}

function QueryVariationPicker( {
clientId,
attributes,
setAttributes,
icon,
label,
} ) {
function QueryVariationPicker( { clientId, attributes, icon, label } ) {
const scopeVariations = useScopedBlockVariations( attributes );
const { replaceInnerBlocks } = useDispatch( blockEditorStore );
const blockProps = useBlockProps();
Expand All @@ -118,18 +110,6 @@ function QueryVariationPicker( {
label={ label }
variations={ scopeVariations }
onSelect={ ( variation ) => {
if ( variation.attributes ) {
setAttributes( {
...variation.attributes,
query: {
...variation.attributes.query,
postType:
attributes.query.postType ||
variation.attributes.query.postType,
},
namespace: attributes.namespace,
} );
}
if ( variation.innerBlocks ) {
replaceInnerBlocks(
clientId,
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/specs/editor/various/is-typing.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ test.describe( 'isTyping', () => {
.getByRole( 'button', { name: 'Title & Date' } )
.click();

await editor.openDocumentSettingsSidebar();
await page.getByLabel( 'Inherit query from template' ).click();

// Moving the mouse shows the toolbar.
await editor.showBlockToolbar();
// Open the dropdown.
Expand Down