-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
Add custom attributes sources block support #51375
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
<?php | ||
/** | ||
* Meta Custom Source | ||
* | ||
* @package gutenberg | ||
*/ | ||
|
||
return array( | ||
'name' => 'meta', | ||
'apply_source' => function ( $block_type, $block_content, $block_instance, $attribute_source, $attribute_config ) { | ||
$meta_field = $attribute_source['name']; | ||
$meta_value = get_post_meta( $block_instance->context['postId'], $meta_field, true ); | ||
$p = new WP_HTML_Tag_Processor( $block_content ); | ||
$found = $p->next_tag( | ||
array( | ||
// TODO: build the query from CSS selector. | ||
'tag_name' => $attribute_config['selector'], | ||
) | ||
); | ||
if ( ! $found ) { | ||
return $block_content; | ||
} | ||
$tag_name = $p->get_tag(); | ||
$markup = "<$tag_name>$meta_value</$tag_name>"; | ||
$p2 = new WP_HTML_Tag_Processor( $markup ); | ||
$p2->next_tag(); | ||
$names = $p->get_attribute_names_with_prefix( '' ); | ||
foreach ( $names as $name ) { | ||
$p2->set_attribute( $name, $p->get_attribute( $name ) ); | ||
} | ||
|
||
return $p2 . ''; | ||
}, | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
/** | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This file is an example of frontend definition of a custom source. |
||
* WordPress dependencies | ||
*/ | ||
import { getBlockType } from '@wordpress/blocks'; | ||
import { useEntityProp } from '@wordpress/core-data'; | ||
import { useMemo, useCallback } from '@wordpress/element'; | ||
|
||
export default { | ||
name: 'meta', | ||
|
||
useSource( { | ||
name, | ||
context: { postType, postId }, | ||
attributes, | ||
setAttributes, | ||
} ) { | ||
const [ meta, setMeta ] = useEntityProp( | ||
'postType', | ||
postType, | ||
'meta', | ||
postId | ||
); | ||
|
||
const blockType = getBlockType( name ); | ||
|
||
const attributesWithSourcedAttributes = useMemo( () => { | ||
if ( ! blockType.supports?.customSources ) { | ||
return attributes; | ||
} | ||
return { | ||
...attributes, | ||
...Object.fromEntries( | ||
Object.keys( blockType.supports.customSources ).map( | ||
( attributeName ) => { | ||
if ( | ||
attributes.source?.[ attributeName ]?.type === | ||
'meta' | ||
) { | ||
return [ | ||
attributeName, | ||
meta?.[ | ||
attributes.source?.[ attributeName ] | ||
?.name | ||
], | ||
]; | ||
} | ||
return [ | ||
attributeName, | ||
attributes[ attributeName ], | ||
]; | ||
} | ||
) | ||
), | ||
}; | ||
}, [ blockType.supports?.customSources, attributes, meta ] ); | ||
|
||
const updatedSetAttributes = useCallback( | ||
( nextAttributes ) => { | ||
const nextMeta = Object.fromEntries( | ||
Object.entries( nextAttributes ?? {} ) | ||
.filter( | ||
// Filter to intersection of keys between the updated | ||
// attributes and those with an associated meta key. | ||
( [ key ] ) => | ||
blockType.supports?.customSources && | ||
key in blockType.supports?.customSources && | ||
attributes.source?.[ key ]?.type === 'meta' | ||
) | ||
.map( ( [ attributeKey, value ] ) => [ | ||
// Rename the keys to the expected meta key name. | ||
attributes.source?.[ attributeKey ]?.name, | ||
value, | ||
] ) | ||
); | ||
|
||
const updatedAttributes = Object.entries( nextMeta ).length | ||
? Object.fromEntries( | ||
Object.entries( nextAttributes ).filter( | ||
( [ key ] ) => | ||
! ( | ||
blockType.supports?.customSources && | ||
key in | ||
blockType.supports?.customSources && | ||
attributes.source?.[ key ]?.type === | ||
'meta' | ||
) | ||
) | ||
) | ||
: nextAttributes; | ||
|
||
if ( Object.entries( nextMeta ).length ) { | ||
setMeta( nextMeta ); | ||
} | ||
|
||
setAttributes( updatedAttributes ); | ||
}, | ||
[ | ||
setAttributes, | ||
attributes.source, | ||
blockType.supports?.customSources, | ||
setMeta, | ||
] | ||
); | ||
|
||
return { | ||
setAttributes: updatedSetAttributes, | ||
attributes: attributesWithSourcedAttributes, | ||
}; | ||
}, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
/** | ||
* WordPress dependencies | ||
*/ | ||
import { hasBlockSupport } from '@wordpress/blocks'; | ||
import { useRegistry } from '@wordpress/data'; | ||
import { createHigherOrderComponent } from '@wordpress/compose'; | ||
import { addFilter } from '@wordpress/hooks'; | ||
|
||
/** | ||
* Internal dependencies | ||
*/ | ||
import meta from '../attributes-custom-sources/meta'; | ||
|
||
/** | ||
* Filters registered block settings, extending attributes to include `style` attribute. | ||
* | ||
* @param {Object} settings Original block settings. | ||
* | ||
* @return {Object} Filtered block settings. | ||
*/ | ||
function addAttribute( settings ) { | ||
if ( ! hasBlockSupport( settings, 'customSources' ) ) { | ||
return settings; | ||
} | ||
|
||
// Allow blocks to specify their own attribute definition with default values if needed. | ||
if ( ! settings.attributes.source ) { | ||
Object.assign( settings.attributes, { | ||
source: { | ||
type: 'object', | ||
}, | ||
} ); | ||
} | ||
|
||
return settings; | ||
} | ||
|
||
/** @typedef {import('@wordpress/compose').WPHigherOrderComponent} WPHigherOrderComponent */ | ||
/** @typedef {import('@wordpress/blocks').WPBlockSettings} WPBlockSettings */ | ||
|
||
/** | ||
* Given a mapping of attribute names (meta source attributes) to their | ||
* associated meta key, returns a higher order component that overrides its | ||
* `attributes` and `setAttributes` props to sync any changes with the edited | ||
* post's meta keys. | ||
* | ||
* @return {WPHigherOrderComponent} Higher-order component. | ||
*/ | ||
const createEditFunctionWithCustomSources = () => | ||
createHigherOrderComponent( | ||
( BlockEdit ) => | ||
( { name, attributes, setAttributes, context, ...props } ) => { | ||
const registry = useRegistry(); | ||
|
||
const { | ||
attributes: updatedAttributes, | ||
setAttributes: updatedSetAttributes, | ||
} = meta.useSource( { | ||
name, | ||
attributes, | ||
setAttributes, | ||
context, | ||
} ); | ||
|
||
return ( | ||
<BlockEdit | ||
attributes={ updatedAttributes } | ||
setAttributes={ ( newAttributes ) => | ||
registry.batch( () => | ||
updatedSetAttributes( newAttributes ) | ||
) | ||
} | ||
{ ...props } | ||
/> | ||
); | ||
}, | ||
'withCustomSources' | ||
); | ||
|
||
/** | ||
* Filters a registered block's settings to enhance a block's `edit` component | ||
* to upgrade meta-sourced attributes to use the post's meta entity property. | ||
* | ||
* @param {WPBlockSettings} settings Registered block settings. | ||
* | ||
* @return {WPBlockSettings} Filtered block settings. | ||
*/ | ||
function shimAttributeSource( settings ) { | ||
settings.edit = createEditFunctionWithCustomSources()( settings.edit ); | ||
|
||
return settings; | ||
} | ||
|
||
addFilter( | ||
'blocks.registerBlockType', | ||
'core/editor/custom-sources-backwards-compatibility/shim-attribute-source', | ||
shimAttributeSource | ||
); | ||
|
||
addFilter( | ||
'blocks.registerBlockType', | ||
'core/custom-sources-v2/addAttribute', | ||
addAttribute | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And this is the definition of a custom source in the backend.