Merge pull request #4 from colorful-tones/feature/block-wrapper-attrs

Various enhancements

Author: colorful-tones

blocks/phone-number/block.json

@@ -12,7 +12,11 @@
     "supports": {
         "align": false,
         "anchor": true,
-        "mode": false
+        "mode": false,
+        "color": {
+            "text": true,
+            "background": true
+        }
     },
     "example": {
         "attributes": {

blocks/phone-number/template.php

@@ -17,27 +17,15 @@
 	$block_id = esc_attr( $block['anchor'] );
 }
 
-// Create class attribute allowing for custom "className" and "align" values.
-$class_name = 'demo-acf-phone-number';
-if ( ! empty( $block['className'] ) ) {
-	$class_name .= ' ' . $block['className'];
-}
-
 $phone_number = get_field( 'demo_acf_phone_number', 'options' );
-
 ?>
-<div
-	<?php
-	echo wp_kses_data(
-		get_block_wrapper_attributes(
-			array(
-				'id'    => $block_id,
-				'class' => esc_attr( $class_name ),
-			)
-		)
-	);
-	?>
->
+
+<?php if ( ! $is_preview ) : ?>
+	<div
+		id="<?php echo esc_attr( $block_id ); ?>"
+		<?php echo wp_kses_data( get_block_wrapper_attributes() ); ?>
+	>
+<?php endif; ?>
 
 	<div style="display:flex;align-items:center;gap:5px;">
 		<svg fill="currentColor" height="18" width="18" viewBox="0 0 16 16">
@@ -47,4 +35,6 @@
 		<?php echo esc_html( $phone_number ); ?>
 	</div>
 
-</div>
+<?php if ( ! $is_preview ) : ?>
+	</div>
+<?php endif; ?>

demo-acf-plugin.php

@@ -15,7 +15,7 @@
 
 // Define our handy constants.
 define( 'DEMO_ACF_VERSION', '0.1.2' );
-define( 'DEMO_ACF_PLUGIN_DIR', dirname( __FILE__ ) );
+define( 'DEMO_ACF_PLUGIN_DIR', __DIR__ );
 define( 'DEMO_ACF_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'DEMO_ACF_PLUGIN_BLOCKS', DEMO_ACF_PLUGIN_DIR . '/blocks/' );
 

includes/acf-json.php

@@ -95,13 +95,12 @@ function demo_acf_json_save_path_for_option_pages() {
  *
  * @param string $filename  The default filename.
  * @param array  $post      The main post array for the item being saved.
- * @param string $load_path The path that the item was loaded from.
  *
  * @return string $filename
  *
  * @since  0.1.1
  */
-function demo_acf_json_filename( $filename, $post, $load_path ) {
+function demo_acf_json_filename( $filename, $post ) {
 	$filename = str_replace(
 		array(
 			' ',

includes/acf-restrict-access.php

@@ -7,20 +7,24 @@
 /**
  * @link https://www.advancedcustomfields.com/resources/how-to-hide-acf-menu-from-clients/
  */
-add_filter( 'acf/settings/show_admin', 'demo_acf_show_admin' );
+add_filter( 'acf/settings/show_admin', 'demo_acf_show_acf_admin' );
+/**
+ * Filters the settings to pass to the block editor for all editor type.
+ * @link https://developer.wordpress.org/reference/hooks/block_editor_settings_all/
+ */
+add_filter( 'block_editor_settings_all', 'demo_acf_restrict_locking_ui', 10, 2 );
 
 /**
  * Allow access to ACF screens by WP user role
  * AND a list of allowed email domains.
  *
  * @link https://developer.wordpress.org/reference/functions/current_user_can/
  *
- * @param boolean $show Whether to show the ACF admin.
  * @return boolean $show Whether to show the ACF admin.
  *
  * @since 0.1.2
  */
-function demo_acf_show_admin( $show ) {
+function demo_acf_show_admin() {
 	// If our user can manage site options.
 	if ( current_user_can( 'manage_options' ) ) {
 		$user = wp_get_current_user();
@@ -34,7 +38,9 @@ function demo_acf_show_admin( $show ) {
 		// Make sure we have a WP_User object and email address.
 		if ( $user && isset( $user->user_email ) ) {
 			// Trim user email to domain only.
-			$email_domain = strtolower( array_pop( explode( '@', trim( $user->user_email ) ) ) );
+			$email_domain = trim( $user->user_email );
+			$email_domain = explode( '@', $email_domain );
+			$email_domain = strtolower( array_pop( $email_domain ) );
 
 			// Compare current logged in user's email with our allow list.
 			if ( in_array( $email_domain, $allowed_email_domains, true ) ) {
@@ -43,3 +49,16 @@ function demo_acf_show_admin( $show ) {
 		}
 	}
 }
+
+/**
+ * Restrict access to the locking UI to designated email domains.
+ *
+ * @param array $settings Default editor settings.
+ *
+ * @since 0.1.3
+ */
+function example_theme_restrict_locking_ui( $settings ) {
+	$settings['canLockBlocks'] = demo_acf_show_admin();
+
+	return $settings;
+}

includes/acf-settings-page.php

@@ -7,7 +7,7 @@
 
 add_action(
 	'acf/init',
-	function() {
+	function () {
 		// Add the top-level page.
 		acf_add_options_page(
 			array(