' + html + '
';
// Correctly balance InnerBlocks tags for jQuery's initial parse.
- html = html.replace( /{ innerBlockProps.children }
;
}
@@ -597,7 +670,11 @@ const md5 = require( 'md5' );
let value = nodeAttr.value;
// Allow overrides for third party libraries who might use specific attributes.
- let shortcut = acf.applyFilters( 'acf_blocks_parse_node_attr', false, nodeAttr );
+ let shortcut = acf.applyFilters(
+ 'acf_blocks_parse_node_attr',
+ false,
+ nodeAttr
+ );
if ( shortcut ) return shortcut;
@@ -698,10 +775,13 @@ const md5 = require( 'md5' );
Object.keys( upgrades ).forEach( ( key ) => {
if ( attributes[ key ] !== undefined ) {
attributes[ upgrades[ key ] ] = attributes[ key ];
- } else if ( attributes[ upgrades[ key ] ] === undefined ) {
+ } else if (
+ attributes[ upgrades[ key ] ] === undefined
+ ) {
//Check for a default
if ( blockType[ key ] !== undefined ) {
- attributes[ upgrades[ key ] ] = blockType[ key ];
+ attributes[ upgrades[ key ] ] =
+ blockType[ key ];
}
}
delete blockType[ key ];
@@ -710,7 +790,10 @@ const md5 = require( 'md5' );
// Set default attributes for those undefined.
for ( let attribute in blockType.attributes ) {
- if ( attributes[ attribute ] === undefined && blockType[ attribute ] !== undefined ) {
+ if (
+ attributes[ attribute ] === undefined &&
+ blockType[ attribute ] !== undefined
+ ) {
attributes[ attribute ] = blockType[ attribute ];
}
}
@@ -721,7 +804,11 @@ const md5 = require( 'md5' );
},
'withDefaultAttributes'
);
- wp.hooks.addFilter( 'editor.BlockListBlock', 'acf/with-default-attributes', withDefaultAttributes );
+ wp.hooks.addFilter(
+ 'editor.BlockListBlock',
+ 'acf/with-default-attributes',
+ withDefaultAttributes
+ );
/**
* The BlockSave functional component.
@@ -756,10 +843,7 @@ const md5 = require( 'md5' );
}
}
- if (
- isBlockInQueryLoop( clientId ) ||
- isSiteEditor()
- ) {
+ if ( isBlockInQueryLoop( clientId ) || isSiteEditor() ) {
restrictMode( [ 'preview' ] );
} else {
switch ( blockType.mode ) {
@@ -780,8 +864,7 @@ const md5 = require( 'md5' );
const { name, attributes, setAttributes, clientId } = this.props;
const blockType = getBlockType( name );
const forcePreview =
- isBlockInQueryLoop( clientId ) ||
- isSiteEditor();
+ isBlockInQueryLoop( clientId ) || isSiteEditor();
let { mode } = attributes;
if ( forcePreview ) {
@@ -795,8 +878,12 @@ const md5 = require( 'md5' );
}
// Configure toggle variables.
- const toggleText = mode === 'preview' ? acf.__( 'Switch to Edit' ) : acf.__( 'Switch to Preview' );
- const toggleIcon = mode === 'preview' ? 'edit' : 'welcome-view-site';
+ const toggleText =
+ mode === 'preview'
+ ? acf.__( 'Switch to Edit' )
+ : acf.__( 'Switch to Preview' );
+ const toggleIcon =
+ mode === 'preview' ? 'edit' : 'welcome-view-site';
function toggleMode() {
setAttributes( {
mode: mode === 'preview' ? 'edit' : 'preview',
@@ -843,8 +930,12 @@ const md5 = require( 'md5' );
const { mode } = attributes;
const index = useSelect( ( select ) => {
- const rootClientId = select( 'core/block-editor' ).getBlockRootClientId( clientId );
- return select( 'core/block-editor' ).getBlockIndex( clientId, rootClientId );
+ const rootClientId =
+ select( 'core/block-editor' ).getBlockRootClientId( clientId );
+ return select( 'core/block-editor' ).getBlockIndex(
+ clientId,
+ rootClientId
+ );
} );
let showForm = true;
@@ -865,7 +956,10 @@ const md5 = require( 'md5' );
acf.blockInstances[ clientId ].mode = mode;
if ( ! isSelected ) {
- if ( blockSupportsValidation( name ) && acf.blockInstances[ clientId ].validation_errors ) {
+ if (
+ blockSupportsValidation( name ) &&
+ acf.blockInstances[ clientId ].validation_errors
+ ) {
additionalClasses += ' acf-block-has-validation-error';
}
acf.blockInstances[ clientId ].has_been_deselected = true;
@@ -907,7 +1001,11 @@ const md5 = require( 'md5' );
*/
class Div extends Component {
render() {
- return ;
+ return (
+
+ );
}
}
@@ -1003,20 +1101,32 @@ const md5 = require( 'md5' );
}
// Set HTML to the preloaded version.
- preloadedBlocks[ blockId ].html = preloadedBlocks[ blockId ].html.replaceAll( blockId, clientId );
+ preloadedBlocks[ blockId ].html = preloadedBlocks[
+ blockId
+ ].html.replaceAll( blockId, clientId );
// Replace blockId in errors.
- if ( preloadedBlocks[ blockId ].validation && preloadedBlocks[ blockId ].validation.errors ) {
- preloadedBlocks[ blockId ].validation.errors = preloadedBlocks[ blockId ].validation.errors.map(
- ( error ) => {
- error.input = error.input.replaceAll( blockId, clientId );
- return error;
- }
- );
+ if (
+ preloadedBlocks[ blockId ].validation &&
+ preloadedBlocks[ blockId ].validation.errors
+ ) {
+ preloadedBlocks[ blockId ].validation.errors =
+ preloadedBlocks[ blockId ].validation.errors.map(
+ ( error ) => {
+ error.input = error.input.replaceAll(
+ blockId,
+ clientId
+ );
+ return error;
+ }
+ );
}
// Return preloaded object.
- acf.debug( 'Preload successful', preloadedBlocks[ blockId ] );
+ acf.debug(
+ 'Preload successful',
+ preloadedBlocks[ blockId ]
+ );
return preloadedBlocks[ blockId ];
}
}
@@ -1028,16 +1138,16 @@ const md5 = require( 'md5' );
const client = acf.blockInstances[ this.props.clientId ] || {};
this.state = client[ this.constructor.name ] || {};
}
-
setState( state ) {
- acf.blockInstances[ this.props.clientId ][ this.constructor.name ] = {
- ...this.state,
- ...state,
- };
+ acf.blockInstances[ this.props.clientId ][ this.constructor.name ] =
+ {
+ ...this.state,
+ ...state,
+ };
// Update component state if subscribed.
// - Allows AJAX callback to update store without modifying state of an unmounted component.
- if ( this.subscribed ) {
+ if ( this.subscribed || acf.get( 'StrictMode' ) ) {
super.setState( state );
}
@@ -1046,7 +1156,12 @@ const md5 = require( 'md5' );
Object.assign( {}, this ),
this.props.clientId,
this.constructor.name,
- Object.assign( {}, acf.blockInstances[ this.props.clientId ][ this.constructor.name ] )
+ Object.assign(
+ {},
+ acf.blockInstances[ this.props.clientId ][
+ this.constructor.name
+ ]
+ )
);
}
@@ -1064,7 +1179,10 @@ const md5 = require( 'md5' );
};
if ( this.renderMethod === 'jsx' ) {
- state.jsx = acf.parseJSX( html, getBlockVersion( this.props.name ) );
+ state.jsx = acf.parseJSX(
+ html,
+ getBlockVersion( this.props.name )
+ );
// Handle templates which don't contain any valid JSX parsable elements.
if ( ! state.jsx ) {
@@ -1072,12 +1190,17 @@ const md5 = require( 'md5' );
'Your ACF block template contains no valid HTML elements. Appending a empty div to prevent React JS errors.'
);
state.html += '';
- state.jsx = acf.parseJSX( state.html, getBlockVersion( this.props.name ) );
+ state.jsx = acf.parseJSX(
+ state.html,
+ getBlockVersion( this.props.name )
+ );
}
// If we've got an object (as an array) find the first valid React ref.
if ( Array.isArray( state.jsx ) ) {
- let refElement = state.jsx.find( ( element ) => React.isValidElement( element ) );
+ let refElement = state.jsx.find( ( element ) =>
+ React.isValidElement( element )
+ );
state.ref = refElement.ref;
} else {
state.ref = state.jsx.ref;
@@ -1138,7 +1261,10 @@ const md5 = require( 'md5' );
// This causes all instances to share the same state (cool), which unfortunately
// pulls $el back and forth between the last rendered reusable block.
// This simple fix leaves a "clone" behind :)
- if ( $prevParent.length && $prevParent[ 0 ] !== $thisParent[ 0 ] ) {
+ if (
+ $prevParent.length &&
+ $prevParent[ 0 ] !== $thisParent[ 0 ]
+ ) {
$prevParent.html( $el.clone() );
}
}
@@ -1186,9 +1312,12 @@ const md5 = require( 'md5' );
}
componentWillUnmount() {
- acf.doAction( 'unmount', this.state.$el );
+ // Only skip unmount action if in StrictMode AND component is not subscribed
+ if ( ! acf.get( 'StrictMode' ) || this.subscribed ) {
+ acf.doAction( 'unmount', this.state.$el );
+ }
- // Unsubscribe this component from state.
+ // Unsubscribe this component from state
this.subscribed = false;
}
@@ -1213,11 +1342,17 @@ const md5 = require( 'md5' );
}
isNotNewlyAdded() {
- return acf.blockInstances[ this.props.clientId ].has_been_deselected || false;
+ return (
+ acf.blockInstances[ this.props.clientId ].has_been_deselected ||
+ false
+ );
}
hasShownValidation() {
- return acf.blockInstances[ this.props.clientId ].shown_validation || false;
+ return (
+ acf.blockInstances[ this.props.clientId ].shown_validation ||
+ false
+ );
}
setShownValidation() {
@@ -1225,7 +1360,8 @@ const md5 = require( 'md5' );
}
setValidationErrors( errors ) {
- acf.blockInstances[ this.props.clientId ].validation_errors = errors;
+ acf.blockInstances[ this.props.clientId ].validation_errors =
+ errors;
}
getValidationErrors() {
@@ -1238,12 +1374,16 @@ const md5 = require( 'md5' );
lockBlockForSaving() {
if ( ! wp.data.dispatch( 'core/editor' ) ) return;
- wp.data.dispatch( 'core/editor' ).lockPostSaving( 'acf/block/' + this.props.clientId );
+ wp.data
+ .dispatch( 'core/editor' )
+ .lockPostSaving( 'acf/block/' + this.props.clientId );
}
unlockBlockForSaving() {
if ( ! wp.data.dispatch( 'core/editor' ) ) return;
- wp.data.dispatch( 'core/editor' ).unlockPostSaving( 'acf/block/' + this.props.clientId );
+ wp.data
+ .dispatch( 'core/editor' )
+ .unlockPostSaving( 'acf/block/' + this.props.clientId );
}
displayValidation( $formEl ) {
@@ -1257,7 +1397,12 @@ const md5 = require( 'md5' );
}
const errors = this.getValidationErrors();
- acf.debug( 'Starting handle validation', Object.assign( {}, this ), Object.assign( {}, $formEl ), errors );
+ acf.debug(
+ 'Starting handle validation',
+ Object.assign( {}, this ),
+ Object.assign( {}, $formEl ),
+ errors
+ );
this.setShownValidation();
@@ -1323,8 +1468,15 @@ const md5 = require( 'md5' );
const preloaded = this.maybePreload( hash, clientId, true );
if ( preloaded ) {
- this.setHtml( acf.applyFilters( 'blocks/form/render', preloaded.html, true ) );
- if ( preloaded.validation ) this.setValidationErrors( preloaded.validation.errors );
+ this.setHtml(
+ acf.applyFilters(
+ 'blocks/form/render',
+ preloaded.html,
+ true
+ )
+ );
+ if ( preloaded.validation )
+ this.setValidationErrors( preloaded.validation.errors );
return;
}
@@ -1342,20 +1494,31 @@ const md5 = require( 'md5' );
acf.debug( 'fetch block form promise' );
if ( ! data ) {
- this.setHtml( `${acf.__( 'Error loading block form' )}
` );
+ this.setHtml(
+ `${ acf.__(
+ 'Error loading block form'
+ ) }
`
+ );
return;
}
if ( data.form ) {
this.setHtml(
- acf.applyFilters( 'blocks/form/render', data.form.replaceAll( data.clientId, clientId ), false )
+ acf.applyFilters(
+ 'blocks/form/render',
+ data.form.replaceAll( data.clientId, clientId ),
+ false
+ )
);
}
- if ( data.validation ) this.setValidationErrors( data.validation.errors );
+ if ( data.validation )
+ this.setValidationErrors( data.validation.errors );
if ( this.isNotNewlyAdded() ) {
- acf.debug( "Block has already shown it's invalid. The form needs to show validation errors" );
+ acf.debug(
+ "Block has already shown it's invalid. The form needs to show validation errors"
+ );
this.validate();
}
} );
@@ -1366,7 +1529,10 @@ const md5 = require( 'md5' );
this.loadState();
}
- acf.debug( 'BlockForm calling validate with state', Object.assign( {}, this ) );
+ acf.debug(
+ 'BlockForm calling validate with state',
+ Object.assign( {}, this )
+ );
super.displayValidation( this.state.$el );
}
@@ -1398,8 +1564,13 @@ const md5 = require( 'md5' );
const { $el } = this.state;
- if ( blockSupportsValidation( this.props.name ) && this.isNotNewlyAdded() ) {
- acf.debug( "Block has already shown it's invalid. The form needs to show validation errors" );
+ if (
+ blockSupportsValidation( this.props.name ) &&
+ this.isNotNewlyAdded()
+ ) {
+ acf.debug(
+ "Block has already shown it's invalid. The form needs to show validation errors"
+ );
this.validate();
}
@@ -1431,8 +1602,14 @@ const md5 = require( 'md5' );
} );
}
- if ( blockSupportsValidation( name ) && ! silent && thisBlockForm.getMode() === 'edit' ) {
- acf.debug( 'No block preview currently available. Need to trigger a validation only fetch.' );
+ if (
+ blockSupportsValidation( name ) &&
+ ! silent &&
+ thisBlockForm.getMode() === 'edit'
+ ) {
+ acf.debug(
+ 'No block preview currently available. Need to trigger a validation only fetch.'
+ );
thisBlockForm.fetch( true, data );
}
}
@@ -1508,10 +1685,20 @@ const md5 = require( 'md5' );
if ( preloaded ) {
if ( getBlockVersion( name ) == 1 ) {
- preloaded.html = '' + preloaded.html + '
';
+ preloaded.html =
+ '' +
+ preloaded.html +
+ '
';
}
- this.setHtml( acf.applyFilters( 'blocks/preview/render', preloaded.html, true ) );
- if ( preloaded.validation ) this.setValidationErrors( preloaded.validation.errors );
+ this.setHtml(
+ acf.applyFilters(
+ 'blocks/preview/render',
+ preloaded.html,
+ true
+ )
+ );
+ if ( preloaded.validation )
+ this.setValidationErrors( preloaded.validation.errors );
return;
}
@@ -1530,16 +1717,32 @@ const md5 = require( 'md5' );
delay,
} ).done( ( { data } ) => {
if ( ! data ) {
- this.setHtml( `${acf.__( 'Error previewing block' )}
` );
+ this.setHtml(
+ `${ acf.__(
+ 'Error previewing block'
+ ) }
`
+ );
return;
}
- let replaceHtml = data.preview.replaceAll( data.clientId, clientId );
+ let replaceHtml = data.preview.replaceAll(
+ data.clientId,
+ clientId
+ );
if ( getBlockVersion( name ) == 1 ) {
- replaceHtml = '' + replaceHtml + '
';
+ replaceHtml =
+ '' +
+ replaceHtml +
+ '
';
}
acf.debug( 'fetch block render promise' );
- this.setHtml( acf.applyFilters( 'blocks/preview/render', replaceHtml, false ) );
+ this.setHtml(
+ acf.applyFilters(
+ 'blocks/preview/render',
+ replaceHtml,
+ false
+ )
+ );
if ( data.validation ) {
this.setValidationErrors( data.validation.errors );
}
@@ -1582,7 +1785,9 @@ const md5 = require( 'md5' );
delay = 300;
}
- acf.debug( 'Triggering fetch from block preview shouldComponentUpdate' );
+ acf.debug(
+ 'Triggering fetch from block preview shouldComponentUpdate'
+ );
this.fetch( {
attributes: nextAttributes,
@@ -1613,7 +1818,11 @@ const md5 = require( 'md5' );
// Do action.
acf.doAction( 'render_block_preview', blockElement, attributes );
- acf.doAction( `render_block_preview/type=${ type }`, blockElement, attributes );
+ acf.doAction(
+ `render_block_preview/type=${ type }`,
+ blockElement,
+ attributes
+ );
}
componentDidRemount() {
@@ -1629,10 +1838,15 @@ const md5 = require( 'md5' );
// Update preview if data has changed since last render (changing from "edit" to "preview").
if (
- ! compareObjects( this.state.prevAttributes, this.props.attributes ) ||
+ ! compareObjects(
+ this.state.prevAttributes,
+ this.props.attributes
+ ) ||
! compareObjects( this.state.prevContext, this.props.context )
) {
- acf.debug( 'Triggering block preview fetch from componentDidRemount' );
+ acf.debug(
+ 'Triggering block preview fetch from componentDidRemount'
+ );
this.fetch();
}
@@ -1656,7 +1870,12 @@ const md5 = require( 'md5' );
// Register block types.
const blockTypes = acf.get( 'blockTypes' );
if ( blockTypes ) {
- blockTypes.map( registerBlockType );
+ // Only register blocks with version < 3 (v3 blocks are registered separately).
+ blockTypes
+ .filter(
+ ( blockType ) => parseInt( blockType.acf_block_version ) < 3
+ )
+ .map( registerBlockType );
}
}
@@ -1709,7 +1928,9 @@ const md5 = require( 'md5' );
const DEFAULT = 'center center';
if ( align ) {
const [ y, x ] = align.split( ' ' );
- return `${ validateVerticalAlignment( y ) } ${ validateHorizontalAlignment( x ) }`;
+ return `${ validateVerticalAlignment(
+ y
+ ) } ${ validateHorizontalAlignment( x ) }`;
}
return DEFAULT;
}
@@ -1726,12 +1947,14 @@ const md5 = require( 'md5' );
*/
function withAlignContentComponent( OriginalBlockEdit, blockType ) {
// Determine alignment vars
- let type = blockType.supports.align_content || blockType.supports.alignContent;
+ let type =
+ blockType.supports.align_content || blockType.supports.alignContent;
let AlignmentComponent;
let validateAlignment;
switch ( type ) {
case 'matrix':
- AlignmentComponent = BlockAlignmentMatrixControl || BlockAlignmentMatrixToolbar;
+ AlignmentComponent =
+ BlockAlignmentMatrixControl || BlockAlignmentMatrixToolbar;
validateAlignment = validateMatrixAlignment;
break;
default:
@@ -1742,7 +1965,9 @@ const md5 = require( 'md5' );
// Ensure alignment component exists.
if ( AlignmentComponent === undefined ) {
- console.warn( `The "${ type }" alignment component was not found.` );
+ console.warn(
+ `The "${ type }" alignment component was not found.`
+ );
return OriginalBlockEdit;
}
@@ -1806,7 +2031,10 @@ const md5 = require( 'md5' );
return (
+
+
+ { children }
+
+);
diff --git a/assets/src/js/pro/blocks-v3/components/error-boundary.js b/assets/src/js/pro/blocks-v3/components/error-boundary.js
new file mode 100644
index 00000000..ecc35cb3
--- /dev/null
+++ b/assets/src/js/pro/blocks-v3/components/error-boundary.js
@@ -0,0 +1,141 @@
+import { Component, createContext } from '@wordpress/element';
+
+// Create context outside the class
+export const ErrorBoundaryContext = createContext( null );
+
+// Initial state constant
+const initialState = { didCatch: false, error: null };
+
+// Error Boundary Component
+export class ErrorBoundary extends Component {
+ constructor( props ) {
+ super( props );
+ this.resetErrorBoundary = this.resetErrorBoundary.bind( this );
+ this.state = initialState;
+ }
+
+ static getDerivedStateFromError( error ) {
+ return { didCatch: true, error: error };
+ }
+
+ resetErrorBoundary() {
+ const { error } = this.state;
+ if ( error !== null ) {
+ // Collect all arguments passed to reset
+ const args = Array.from( arguments );
+
+ // Call optional onReset callback with context
+ if ( this.props.onReset ) {
+ this.props.onReset( {
+ args: args,
+ reason: 'imperative-api',
+ } );
+ }
+
+ this.setState( initialState );
+ }
+ }
+
+ componentDidCatch( error, errorInfo ) {
+ // Call optional onError callback
+ if ( this.props.onError ) {
+ this.props.onError( error, errorInfo );
+ }
+ }
+
+ componentDidUpdate( prevProps, prevState ) {
+ const { didCatch } = this.state;
+ const { resetKeys } = this.props;
+
+ // Auto-reset if resetKeys prop changed
+ if (
+ didCatch &&
+ prevState.error !== null &&
+ hasResetKeysChanged( prevProps.resetKeys, resetKeys )
+ ) {
+ if ( this.props.onReset ) {
+ this.props.onReset( {
+ next: resetKeys,
+ prev: prevProps.resetKeys,
+ reason: 'keys',
+ } );
+ }
+ this.setState( initialState );
+ }
+ }
+
+ render() {
+ const { children, fallbackRender, FallbackComponent, fallback } =
+ this.props;
+ const { didCatch, error } = this.state;
+
+ let content = children;
+
+ if ( didCatch ) {
+ const errorProps = {
+ error: error,
+ resetErrorBoundary: this.resetErrorBoundary,
+ };
+
+ if ( typeof fallbackRender === 'function' ) {
+ content = fallbackRender( errorProps );
+ } else if ( FallbackComponent ) {
+ content = ' + htmlString + '
';
+
+ // Handle self-closing InnerBlocks tags (not valid HTML, but used in ACF)
+ htmlString = htmlString.replace(
+ / ); ?>){kind=spacer}
diff --git a/includes/admin/views/acf-field-group/location-rule.php b/includes/admin/views/acf-field-group/location-rule.php
index a0caae22..44413909 100644
--- a/includes/admin/views/acf-field-group/location-rule.php
+++ b/includes/admin/views/acf-field-group/location-rule.php
@@ -2,7 +2,6 @@
// vars
$prefix = 'acf_field_group[location][' . $rule['group'] . '][' . $rule['id'] . ']';
-
?>
diff --git a/includes/admin/views/acf-field-group/options.php b/includes/admin/views/acf-field-group/options.php
index 77c61360..a816c7ab 100644
--- a/includes/admin/views/acf-field-group/options.php
+++ b/includes/admin/views/acf-field-group/options.php
@@ -72,6 +72,8 @@
case 'location_rules':
echo '
';
echo '';
acf_get_view( 'acf-field-group/locations' );
+
+ do_action( 'acf/field_group/render_additional_location_settings', $field_group );
echo '
';
break;
case 'presentation':
@@ -164,6 +166,8 @@
'field'
);
+ do_action( 'acf/field_group/render_additional_presentation_settings', $field_group );
+
echo '';
@@ -221,8 +225,6 @@
'prefix' => 'acf_field_group',
'value' => $field_group['active'],
'ui' => 1,
- // 'ui_on_text' => __('Active', 'secure-custom-fields'),
- // 'ui_off_text' => __('Inactive', 'secure-custom-fields'),
)
);
@@ -237,8 +239,6 @@
'prefix' => 'acf_field_group',
'value' => $field_group['show_in_rest'],
'ui' => 1,
- // 'ui_on_text' => __('Active', 'secure-custom-fields'),
- // 'ui_off_text' => __('Inactive', 'secure-custom-fields'),
)
);
}
@@ -257,6 +257,21 @@
'field'
);
+ acf_render_field_wrap(
+ array(
+ 'label' => __( 'Display Title', 'secure-custom-fields' ),
+ 'instructions' => __( 'Title shown on the edit screen for the field group meta box to use instead of the field group title', 'secure-custom-fields' ),
+ 'type' => 'text',
+ 'name' => 'display_title',
+ 'prefix' => 'acf_field_group',
+ 'value' => $field_group['display_title'],
+ ),
+ 'div',
+ 'field'
+ );
+
+ do_action( 'acf/field_group/render_additional_group_settings', $field_group );
+
/* translators: 1: Post creation date 2: Post creation time */
$acf_created_on = sprintf( __( 'Created on %1$s at %2$s', 'secure-custom-fields' ), get_the_date(), get_the_time() );
?>
diff --git a/includes/admin/views/acf-post-type/list-empty.php b/includes/admin/views/acf-post-type/list-empty.php
index f12219fd..0bfc2cca 100644
--- a/includes/admin/views/acf-post-type/list-empty.php
+++ b/includes/admin/views/acf-post-type/list-empty.php
@@ -5,7 +5,8 @@
* @package wordpress/secure-custom-fields
*/
-?>
+?>
+
 ); ?>)
diff --git a/includes/admin/views/upgrade/network.php b/includes/admin/views/upgrade/network.php
index 49ab0457..643d4b1f 100644
--- a/includes/admin/views/upgrade/network.php
+++ b/includes/admin/views/upgrade/network.php
@@ -60,7 +60,7 @@
?>
class="alternate">
@@ -73,8 +73,16 @@ class="alternate">
-
-
+
+
+
diff --git a/includes/admin/views/upgrade/notice.php b/includes/admin/views/upgrade/notice.php
index bb14df96..603d8f2e 100644
--- a/includes/admin/views/upgrade/notice.php
+++ b/includes/admin/views/upgrade/notice.php
@@ -19,7 +19,7 @@
}
?>
-
diff --git a/includes/admin/views/upgrade/network.php b/includes/admin/views/upgrade/network.php
index 49ab0457..643d4b1f 100644
--- a/includes/admin/views/upgrade/network.php
+++ b/includes/admin/views/upgrade/network.php
@@ -60,7 +60,7 @@
?>
+
diff --git a/includes/ajax/class-acf-ajax-check-screen.php b/includes/ajax/class-acf-ajax-check-screen.php
index 6ee8cba8..0fe6ef7d 100644
--- a/includes/ajax/class-acf-ajax-check-screen.php
+++ b/includes/ajax/class-acf-ajax-check-screen.php
@@ -53,7 +53,7 @@ public function get_response( $request ) {
$item = array(
'id' => esc_attr( 'acf-' . $field_group['key'] ),
'key' => esc_attr( $field_group['key'] ),
- 'title' => esc_html( $field_group['title'] ),
+ 'title' => acf_esc_html( acf_get_field_group_title( $field_group ) ),
'position' => esc_attr( $field_group['position'] ),
'classes' => postbox_classes( 'acf-' . $field_group['key'], $args['screen'] ),
'style' => esc_attr( $field_group['style'] ),
diff --git a/includes/blocks.php b/includes/blocks.php
index c8765dd0..baea5c0d 100644
--- a/includes/blocks.php
+++ b/includes/blocks.php
@@ -51,6 +51,17 @@ function acf_handle_json_block_registration( $settings, $metadata ) {
return $settings;
}
+ /**
+ * Filters the default ACF block version for blocks registered via block.json.
+ *
+ * @since 6.6.0
+ *
+ * @param integer $default_acf_block_version The default ACF block version.
+ * @param array $settings An array of block settings.
+ * @return integer
+ */
+ $default_acf_block_version = apply_filters( 'acf/blocks/default_block_version', 2, $settings );
+
// Setup SCF defaults.
$settings = wp_parse_args(
$settings,
@@ -64,8 +75,7 @@ function acf_handle_json_block_registration( $settings, $metadata ) {
'uses_context' => array(),
'supports' => array(),
'attributes' => array(),
- 'acf_block_version' => 2,
- 'api_version' => 2,
+ 'acf_block_version' => $default_acf_block_version,
'validate' => true,
'validate_on_load' => true,
'use_post_meta' => false,
@@ -105,14 +115,15 @@ function acf_handle_json_block_registration( $settings, $metadata ) {
// Map custom SCF properties from the SCF key, with localization.
$property_mappings = array(
- 'renderCallback' => 'render_callback',
- 'renderTemplate' => 'render_template',
- 'mode' => 'mode',
- 'blockVersion' => 'acf_block_version',
- 'postTypes' => 'post_types',
- 'validate' => 'validate',
- 'validateOnLoad' => 'validate_on_load',
- 'usePostMeta' => 'use_post_meta',
+ 'renderCallback' => 'render_callback',
+ 'renderTemplate' => 'render_template',
+ 'mode' => 'mode',
+ 'blockVersion' => 'acf_block_version',
+ 'postTypes' => 'post_types',
+ 'validate' => 'validate',
+ 'validateOnLoad' => 'validate_on_load',
+ 'usePostMeta' => 'use_post_meta',
+ 'hideFieldsInSidebar' => 'hide_fields_in_sidebar',
);
$textdomain = ! empty( $metadata['textdomain'] ) ? $metadata['textdomain'] : 'secure-custom-fields';
$i18n_schema = get_block_metadata_i18n_schema();
@@ -127,6 +138,17 @@ function acf_handle_json_block_registration( $settings, $metadata ) {
}
}
+ if ( isset( $metadata['apiVersion'] ) ) {
+ // Use the apiVersion defined in block.json if it exists.
+ $settings['api_version'] = $metadata['apiVersion'];
+ } elseif ( $settings['acf_block_version'] >= 3 && version_compare( get_bloginfo( 'version' ), '6.3', '>=' ) ) {
+ // Otherwise, if we're on WP 6.3+ and the block is ACF block version 3 or greater, use apiVersion 3.
+ $settings['api_version'] = 3;
+ } else {
+ // Otherwise, default to apiVersion 2.
+ $settings['api_version'] = 2;
+ }
+
// Add the block name and registration path to settings.
$settings['name'] = $metadata['name'];
$settings['path'] = dirname( $metadata['file'] );
@@ -198,11 +220,28 @@ function acf_register_block_type( $block ) {
// Set ACF required attributes.
$block['attributes'] = acf_get_block_type_default_attributes( $block );
- if ( ! isset( $block['api_version'] ) ) {
- $block['api_version'] = 2;
- }
+
+ /**
+ * Filters the default ACF block version for blocks registered via acf_register_block_type().
+ *
+ * @since 6.6.0
+ *
+ * @param integer $default_acf_block_version The default ACF block version.
+ * @param array $block An array of block settings.
+ * @return integer
+ */
+ $default_acf_block_version = apply_filters( 'acf/blocks/default_block_version', 1, $block );
+
if ( ! isset( $block['acf_block_version'] ) ) {
- $block['acf_block_version'] = 1;
+ $block['acf_block_version'] = $default_acf_block_version;
+ }
+
+ if ( ! isset( $block['api_version'] ) ) {
+ if ( $block['acf_block_version'] >= 3 && version_compare( get_bloginfo( 'version' ), '6.3', '>=' ) ) {
+ $block['api_version'] = 3;
+ } else {
+ $block['api_version'] = 2;
+ }
}
// Add to storage.
@@ -559,8 +598,16 @@ function acf_render_block_callback( $attributes, $content = '', $wp_block = null
* @return string The block HTML.
*/
function acf_rendered_block( $attributes, $content = '', $is_preview = false, $post_id = 0, $wp_block = null, $context = false, $is_ajax_render = false ) {
- $mode = isset( $attributes['mode'] ) ? $attributes['mode'] : 'auto';
- $form = ( 'edit' === $mode && $is_preview );
+ $registry = WP_Block_Type_Registry::get_instance();
+ $wp_block_type = $registry->get_registered( $attributes['name'] );
+
+ if ( isset( $wp_block_type->acf_block_version ) && $wp_block_type->acf_block_version >= 3 ) {
+ $mode = 'preview';
+ $form = false;
+ } else {
+ $mode = isset( $attributes['mode'] ) ? $attributes['mode'] : 'auto';
+ $form = ( 'edit' === $mode && $is_preview );
+ }
// If context is available from the WP_Block class object and we have no context of our own, use that.
if ( empty( $context ) && ! empty( $wp_block->context ) ) {
@@ -754,12 +801,16 @@ function acf_block_render_template( $block, $content, $is_preview, $post_id, $wp
$path = locate_template( $block['render_template'] );
}
+ do_action( 'acf/blocks/pre_block_template_render', $block, $content, $is_preview, $post_id, $wp_block, $context );
+
// Include template.
if ( file_exists( $path ) ) {
include $path;
} elseif ( $is_preview ) {
echo acf_esc_html( apply_filters( 'acf/blocks/template_not_found_message', '
 ); ?>){kind=logo}
@@ -33,7 +33,7 @@
' . __( 'The render template for this ACF Block was not found', 'secure-custom-fields' ) . '
' ) ); } + + do_action( 'acf/blocks/post_block_template_render', $block, $content, $is_preview, $post_id, $wp_block, $context ); } /** @@ -808,14 +859,17 @@ function acf_enqueue_block_assets() { // Localize text. acf_localize_text( array( - 'Switch to Edit' => __( 'Switch to Edit', 'secure-custom-fields' ), - 'Switch to Preview' => __( 'Switch to Preview', 'secure-custom-fields' ), - 'Change content alignment' => __( 'Change content alignment', 'secure-custom-fields' ), - 'Error previewing block' => __( 'An error occurred when loading the preview for this block.', 'secure-custom-fields' ), - 'Error loading block form' => __( 'An error occurred when loading the block in edit mode.', 'secure-custom-fields' ), - + 'Switch to Edit' => __( 'Switch to Edit', 'secure-custom-fields' ), + 'Switch to Preview' => __( 'Switch to Preview', 'secure-custom-fields' ), + 'Change content alignment' => __( 'Change content alignment', 'secure-custom-fields' ), + 'Error previewing block' => __( 'An error occurred when loading the preview for this block.', 'secure-custom-fields' ), + 'Error loading block form' => __( 'An error occurred when loading the block in edit mode.', 'secure-custom-fields' ), + 'Edit Block' => __( 'Edit Block', 'secure-custom-fields' ), + 'Open Expanded Editor' => __( 'Open Expanded Editor', 'secure-custom-fields' ), + 'Error previewing block v3' => __( 'The preview for this block couldn’t be loaded. Review its content or settings for issues.', 'secure-custom-fields' ), + 'ACF Block' => __( 'ACF Block', 'secure-custom-fields' ), /* translators: %s: Block type title */ - '%s settings' => __( '%s settings', 'secure-custom-fields' ), + '%s settings' => __( '%s settings', 'secure-custom-fields' ), ) ); diff --git a/includes/class-acf-internal-post-type.php b/includes/class-acf-internal-post-type.php index 8808511d..67925f8c 100644 --- a/includes/class-acf-internal-post-type.php +++ b/includes/class-acf-internal-post-type.php @@ -166,7 +166,7 @@ public function get_raw_post( $id = 0 ) { * @since ACF 6.1 * * @param integer|string $id The post ID, key, or name. - * @return WP_Post|bool The post object, or false on failure. + * @return WP_Post|boolean The post object, or false on failure. */ public function get_post_object( $id = 0 ) { if ( is_numeric( $id ) ) { diff --git a/includes/fields/class-acf-field-button-group.php b/includes/fields/class-acf-field-button-group.php index d1000551..36e480fc 100644 --- a/includes/fields/class-acf-field-button-group.php +++ b/includes/fields/class-acf-field-button-group.php @@ -67,10 +67,11 @@ public function render_field( $field ) { // append $buttons[] = array( - 'name' => $field['name'], - 'value' => $_value, - 'label' => $_label, - 'checked' => $checked, + 'name' => $field['name'], + 'value' => $_value, + 'label' => $_label, + 'checked' => $checked, + 'button_group' => true, ); } @@ -79,16 +80,29 @@ public function render_field( $field ) { $buttons[0]['checked'] = true; } + // Ensure roving tabindex when allow_null is enabled and no selection yet. + if ( $field['allow_null'] && null === $selected && ! empty( $buttons ) ) { + $buttons[0]['tabindex'] = '0'; + } + // div - $div = array( 'class' => 'acf-button-group' ); + $div = array( + 'class' => 'acf-button-group', + 'role' => 'radiogroup', + ); + + // Add aria-labelledby if field has an ID for proper screen reader announcement + if ( ! empty( $field['id'] ) ) { + $div['aria-labelledby'] = $field['id'] . '-label'; + } - if ( 'vertical' === acf_maybe_get( $field, 'layout' ) ) { + if ( 'vertical' === $field['layout'] ) { $div['class'] .= ' -vertical'; } - if ( acf_maybe_get( $field, 'class' ) ) { - $div['class'] .= ' ' . acf_maybe_get( $field, 'class' ); + if ( $field['class'] ) { + $div['class'] .= ' ' . $field['class']; } - if ( acf_maybe_get( $field, 'allow_null' ) ) { + if ( $field['allow_null'] ) { $div['data-allow_null'] = 1; } diff --git a/includes/fields/class-acf-field-checkbox.php b/includes/fields/class-acf-field-checkbox.php index 582672be..5935a041 100644 --- a/includes/fields/class-acf-field-checkbox.php +++ b/includes/fields/class-acf-field-checkbox.php @@ -80,8 +80,14 @@ function render_field( $field ) { $li = ''; $ul = array( 'class' => 'acf-checkbox-list', + 'role' => 'group', ); + // Add aria-labelledby if field has an ID for proper screen reader announcement + if ( ! empty( $field['id'] ) ) { + $ul['aria-labelledby'] = $field['id'] . '-label'; + } + // append to class $ul['class'] .= ' ' . ( 'horizontal' === acf_maybe_get( $field, 'layout' ) ? 'acf-hl' : 'acf-bl' ); $ul['class'] .= ' ' . acf_maybe_get( $field, 'class', '' ); diff --git a/includes/fields/class-acf-field-color_picker.php b/includes/fields/class-acf-field-color_picker.php index 98fd1e0f..fd3d6ed9 100644 --- a/includes/fields/class-acf-field-color_picker.php +++ b/includes/fields/class-acf-field-color_picker.php @@ -26,9 +26,12 @@ function initialize() { $this->doc_url = 'https://developer.wordpress.org/secure-custom-fields/features/fields/color-picker/'; $this->tutorial_url = 'https://developer.wordpress.org/secure-custom-fields/features/fields/color-picker/color-picker-tutorial/'; $this->defaults = array( - 'default_value' => '', - 'enable_opacity' => false, - 'return_format' => 'string', // 'string'|'array' + 'default_value' => '', + 'enable_opacity' => false, + 'custom_palette_source' => '', + 'palette_colors' => '', + 'show_color_wheel' => true, + 'return_format' => 'string', // Possible values: 'string' or 'array'. ); } @@ -106,7 +109,7 @@ function input_admin_enqueue_scripts() { * @since ACF 3.6 * @date 23/01/13 */ - function render_field( $field ) { + public function render_field( $field ) { $text_input = acf_get_sub_array( $field, array( 'id', 'class', 'name', 'value' ) ); $hidden_input = acf_get_sub_array( $field, array( 'name', 'value' ) ); $text_input['data-alpha-skip-debounce'] = true; @@ -116,9 +119,55 @@ function render_field( $field ) { $text_input['data-alpha-enabled'] = true; } + // Handle color palette when the theme supports theme.json. + if ( wp_theme_has_theme_json() ) { + // If the field was set to use themejson. + if ( 'themejson' === $field['custom_palette_source'] ) { + $text_input['data-acf-palette-type'] = 'custom'; + + // Get the palette (theme + custom). + $global_settings = wp_get_global_settings(); + $palette = $global_settings['color']['palette']['theme'] ?? array(); + + // Extract only the color values. + $color_values = array_map( + fn( $c ) => $c['color'] ?? null, + $palette + ); + + // Remove nulls (in case any entries are missing 'color') + $color_values = array_filter( $color_values ); + + $hex_string = implode( ',', $color_values ); + + $text_input['data-acf-palette-colors'] = $hex_string; + } elseif ( 'custom' === $field['custom_palette_source'] && ! empty( $field['palette_colors'] ) ) { + // If the field was set to use a custom palette. + $text_input['data-acf-palette-type'] = 'custom'; + $text_input['data-acf-palette-colors'] = $field['palette_colors']; + } elseif ( '' === $field['custom_palette_source'] && ! empty( $field['palette_colors'] ) ) { + // This state can happen if they switched from a classic theme to a themejson theme without resaving the field. + $text_input['data-acf-palette-type'] = 'custom'; + $text_input['data-acf-palette-colors'] = $field['palette_colors']; + } else { + // Fallback to use the default color palette for the iris color picker. + $text_input['data-acf-palette-type'] = 'default'; + } + // phpcs:disable Universal.ControlStructures.DisallowLonelyIf.Found + } else { + // Handle color palette for themes that do not support themejson. + if ( ! empty( $field['palette_colors'] ) ) { + $text_input['data-acf-palette-type'] = 'custom'; + $text_input['data-acf-palette-colors'] = $field['palette_colors']; + } else { + // Fallback to use the default color palette for the iris color picker. + $text_input['data-acf-palette-type'] = 'default'; + } + } + // html ?> -
+
@@ -179,6 +228,86 @@ function render_field_settings( $field ) {
);
}
+
+ /**
+ * Renders the field settings used in the "Presentation" tab.
+ *
+ * @since 6.0
+ *
+ * @param array $field The field settings array.
+ * @return void
+ */
+ public function render_field_presentation_settings( $field ) {
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Show Custom Palette', 'secure-custom-fields' ),
+ 'instructions' => '',
+ 'type' => 'true_false',
+ 'name' => 'show_custom_palette',
+ 'ui' => 1,
+ )
+ );
+
+ $custom_palette_conditions = array(
+ 'field' => 'show_custom_palette',
+ 'operator' => '==',
+ 'value' => 1,
+ );
+
+ if ( wp_theme_has_theme_json() ) {
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Custom Palette Source', 'secure-custom-fields' ),
+ 'instructions' => '',
+ 'type' => 'radio',
+ 'name' => 'custom_palette_source',
+ 'layout' => 'vertical',
+ 'choices' => array(
+ 'custom' => __( 'Specify custom colors', 'secure-custom-fields' ),
+ 'themejson' => __( 'Use colors from theme.json', 'secure-custom-fields' ),
+ ),
+ 'conditions' => array(
+ 'field' => 'show_custom_palette',
+ 'operator' => '==',
+ 'value' => 1,
+ ),
+ )
+ );
+
+ $custom_palette_conditions = array(
+ 'field' => 'custom_palette_source',
+ 'operator' => '==',
+ 'value' => 'custom',
+ );
+ }
+
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Custom Palette', 'secure-custom-fields' ),
+ 'instructions' => __( 'Use a custom color palette by entering comma separated hex or rgba values', 'secure-custom-fields' ),
+ 'type' => 'text',
+ 'name' => 'palette_colors',
+ 'conditions' => $custom_palette_conditions,
+ )
+ );
+
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Show Color Wheel', 'secure-custom-fields' ),
+ 'instructions' => '',
+ 'type' => 'true_false',
+ 'name' => 'show_color_wheel',
+ 'default_value' => 1,
+ 'ui' => 1,
+ )
+ );
+ }
+
+
/**
* Format the value for use in templates. At this stage, the value has been loaded from the
* database and is being returned by an API function such as get_field(), the_field(), etc.
diff --git a/includes/fields/class-acf-field-file.php b/includes/fields/class-acf-field-file.php
index 37fe0dad..59c40187 100644
--- a/includes/fields/class-acf-field-file.php
+++ b/includes/fields/class-acf-field-file.php
@@ -130,7 +130,7 @@ function render_field( $field ) {
)
);
?>
-