Skip to content
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

Jump to bottom

Block Bindings: Remove key fallback in bindings get values and rely on source label #65517

Merged
merged 2 commits into from
Sep 20, 2024
+3 −28
Merged

Block Bindings: Remove key fallback in bindings get values and rely on source label #65517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb4bbea
Always fall back to source label
SantosGuillamot Sep 20, 2024
8894768
Adapt e2e tests
SantosGuillamot Sep 20, 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
5 changes: 2 additions & 3 deletions packages/block-editor/src/hooks/use-bindings-attributes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,8 @@ export const withBlockBindingSupport = createHigherOrderComponent(
let values = {};
if ( ! source.getValues ) {
Object.keys( bindings ).forEach( ( attr ) => {
// Default to the `key` or the source label when `getValues` doesn't exist
values[ attr ] =
bindings[ attr ].args?.key || source.label;
// Default to the the source label when `getValues` doesn't exist.
values[ attr ] = source.label;
} );
} else {
values = source.getValues( {
Expand Down
26 changes: 1 addition & 25 deletions test/e2e/specs/editor/various/block-bindings.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ test.describe( 'Block bindings', () => {
);
} );

test( 'should show the key of the custom field in server sources with key', async ( {
test( 'should always show the source label in server-only sources', async ( {
editor,
} ) => {
await editor.insertBlock( {
Expand All @@ -86,30 +86,6 @@ test.describe( 'Block bindings', () => {
const paragraphBlock = editor.canvas.getByRole( 'document', {
name: 'Block: Paragraph',
} );
await expect( paragraphBlock ).toHaveText(
'text_custom_field'
);
} );

test( 'should show the source label in server sources without key', async ( {
editor,
} ) => {
await editor.insertBlock( {
name: 'core/paragraph',
attributes: {
content: 'paragraph default content',
metadata: {
bindings: {
content: {
source: 'core/server-source',
},
},
},
},
} );
const paragraphBlock = editor.canvas.getByRole( 'document', {
name: 'Block: Paragraph',
} );
await expect( paragraphBlock ).toHaveText( 'Server Source' );
} );

Expand Down
Loading