generator-chisel 2.0.0-alpha.8 → 2.0.0

package/lib/commands/create/creators/app/chisel-starter-theme/{classes → inc/WP}/AcfBlocks.php

@@ -1,31 +1,56 @@
 <?php
 
-namespace Chisel;
+namespace Chisel\WP;
 
 use Timber\Timber;
-use Chisel\ChiselCache;
+use Chisel\Interfaces\InstanceInterface;
+use Chisel\Interfaces\HooksInterface;
+use Chisel\Traits\Singleton;
+use Chisel\Factory\RegisterBlocks;
+use Chisel\Traits\PageBlocks;
+use Chisel\Helper\BlocksHelpers;
+use Chisel\Helper\AssetsHelpers;
 
 /**
  * ACF blocks related functionalities.
  *
  * @package Chisel
  */
-class AcfBlocks extends RegisterBlocks implements Instance {
+class AcfBlocks implements InstanceInterface, HooksInterface {
+
+	use Singleton;
+	use PageBlocks;
+
+	/**
+	 * Register blocks factory.
+	 *
+	 * @var RegisterBlocks
+	 */
+	private $register_blocks_factory;
+
+	/**
+	 * Blocks.
+	 *
+	 * @var array
+	 */
+	private $blocks = array();
 
 	/**
 	 * Blocks twig file base path.
 	 *
 	 * @var string
 	 */
-	protected $blocks_twig_base_path;
+	public $blocks_twig_base_path;
 
 	/**
 	 * Class constructor.
 	 */
 	private function __construct() {
-		$this->set_properties();
+		$this->register_blocks_factory = new RegisterBlocks( 'acf' );
+		$this->blocks                  = $this->register_blocks_factory->get_blocks();
 
-		parent::__construct( 'acf' );
+		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
+		add_action( 'wp_print_styles', array( $this, 'dequeue_blocks_styles' ), 999 );
 
 		$this->action_hooks();
 		$this->filter_hooks();
@@ -58,7 +83,7 @@ class AcfBlocks extends RegisterBlocks implements Instance {
 	 * Register ACF blocks and their assets.
 	 */
 	public function register_blocks() {
-		$this->register_custom_blocks();
+		$this->register_blocks_factory->register_custom_blocks();
 	}
 
 	/**
@@ -73,7 +98,7 @@ class AcfBlocks extends RegisterBlocks implements Instance {
 		}
 
 		foreach ( $this->blocks as $block ) {
-			$locations[] = array( $this->blocks_path_src . '/' . $block . '/' );
+			$locations[] = array( $this->register_blocks_factory->get_blocks_path_src() . '/' . $block . '/' );
 		}
 
 		return $locations;
@@ -87,11 +112,11 @@ class AcfBlocks extends RegisterBlocks implements Instance {
 	 */
 	public function load_acf_field_group( $paths ) {
 		if ( ! is_array( $this->blocks ) || ! $this->blocks ) {
-			return;
+			return $paths;
 		}
 
 		foreach ( $this->blocks as $block ) {
-			$paths[] = $this->blocks_path_src . '/' . $block . '/acf-json';
+			$paths[] = $this->register_blocks_factory->get_blocks_path_src() . '/' . $block . '/acf-json';
 		}
 
 		return $paths;
@@ -120,7 +145,7 @@ class AcfBlocks extends RegisterBlocks implements Instance {
 							return $path;
 						}
 
-						return $this->blocks_path_src . '/' . $block_name . '/acf-json';
+						return $this->register_blocks_factory->get_blocks_path_src() . '/' . $block_name . '/acf-json';
 					}
 				}
 			}
@@ -130,61 +155,37 @@ class AcfBlocks extends RegisterBlocks implements Instance {
 	}
 
 	/**
-	 * Render ACF block.
-	 *
-	 * @param array  $block The block.
-	 * @param string $content The content.
-	 * @param bool   $is_preview Is preview.
-	 * @param int    $post_id The post ID.
+	 * Dequeue blocks styles that are not used on current page and add inline critical css for blocks.
 	 *
 	 * @return void
 	 */
-	public static function acf_block_render( $block, $content = '', $is_preview = false, $post_id = 0 ) {
-		$context = Timber::context();
-
-		$block_slug = str_replace( 'chisel/', '', $block['name'] );
-
-		$slug                  = 'b-' . $block_slug;
-		$context['block']      = $block;
-		$context['post_id']    = $post_id;
-		$context['slug']       = $slug;
-		$context['is_preview'] = $is_preview;
-		$context['fields']     = get_fields();
-		$classes               = array_merge(
-			array( $slug ),
-			isset( $block['className'] ) ? array( $block['className'] ) : array(),
-			$is_preview ? array( 'is-preview' ) : array(),
-			$block['supports']['align'] ? array( 'align' . $context['block']['align'] ) : array(),
-		);
-
-		$context['block']['class_names'] = $classes;
-		$context['block']['block_id']    = isset( $block['anchor'] ) ? $block['anchor'] : $block['id'];
-
-		// allow to use filters to manipulate the output.
-		$context = apply_filters( 'chisel_timber_acf_blocks_data', $context );
-		$context = apply_filters( 'chisel_timber_acf_blocks_data_' . $block_slug, $context );
-		$context = apply_filters( 'chisel_timber_acf_blocks_data_' . $block['id'], $context );
-
-		$context['wrapper_attributes'] = get_block_wrapper_attributes(
-			array(
-				'id'    => $context['block']['block_id'],
-				'class' => implode( ' ', $context['block']['class_names'] ),
-			)
-		);
-
-		Timber::render( self::get_instance()->blocks_twig_base_path . $block_slug . '/' . $block_slug . '.twig', $context, ChiselCache::expiry() );
-	}
+	public function dequeue_blocks_styles() {
+		if ( is_admin() ) {
+			return;
+		}
 
-	/**
-	 * Get the instance of the class.
-	 */
-	public static function get_instance() {
-		static $instance = null;
+		$blocks_used_on_page = $this->get_content_blocks_names();
+		$blocks              = $this->blocks;
 
-		if ( null === $instance ) {
-			$instance = new self();
-		}
+		if ( $blocks ) {
+			$blocks_path = $this->register_blocks_factory->get_blocks_path();
+			$blocks_url  = $this->register_blocks_factory->get_blocks_url();
+
+			foreach ( $blocks as $block_name ) {
+				if ( ! in_array( $block_name, $blocks_used_on_page, true ) ) {
+					wp_dequeue_style( 'block-acf-' . $block_name . '-style' );
+				} else {
+					$block_critical_css = $blocks_path . '/' . $block_name . '/script.css';
 
-		return $instance;
+					if ( is_file( $block_critical_css ) ) {
+						$css = BlocksHelpers::get_block_inline_css( $blocks_url, $block_name );
+
+						if ( $css ) {
+							$add = wp_add_inline_style( AssetsHelpers::get_final_handle( 'main' ), $css );
+						}
+					}
+				}
+			}
+		}
 	}
 }

package/lib/commands/create/creators/app/chisel-starter-theme/{classes → inc/WP}/AjaxEnpoints.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Chisel;
+namespace Chisel\WP;
 
 use Timber\Timber;
-use Chisel\ChiselCache;
+use Chisel\Helper\CacheHelpers;
 
 /**
  * Custom Ajax enpoints callbacks
@@ -48,7 +48,7 @@ class AjaxEnpoints {
 
 		if ( $posts ) {
 			foreach ( $posts as $post ) {
-				$response .= Timber::compile( $templates, array( 'post' => $post ), ChiselCache::expiry() );
+				$response .= Timber::compile( $templates, array( 'post' => $post ), CacheHelpers::expiry() );
 			}
 		}
 
@@ -62,7 +62,7 @@ class AjaxEnpoints {
 	 *
 	 * @return array
 	 */
-	protected function get_data( $request ) {
+	private function get_data( $request ) {
 		return $request->get_body_params();
 	}
 
@@ -73,7 +73,7 @@ class AjaxEnpoints {
 	 *
 	 * @return \WP_REST_Response
 	 */
-	protected function success( $data = array() ) {
+	private function success( $data = array() ) {
 		return new \WP_REST_Response(
 			array(
 				'error'   => 0,
@@ -91,7 +91,7 @@ class AjaxEnpoints {
 	 *
 	 * @return \WP_REST_Response
 	 */
-	protected function error( $message ) {
+	private function error( $message ) {
 		return new \WP_REST_Response(
 			array(
 				'error'   => 1,