'; + print_r( $block_config ); + echo ''; + + return; + } + + $this->load_template( $path, (array) apply_filters( 'tribe/project/block/view/data', [ + 'c' => $controller, + 'block' => $block_config, + 'is_preview' => $model->is_preview(), + 'post_id' => 0, + ], $block_config, $model, $controller ) ); + } + + /** + * A better version of load_template. + * + * @param string $path The path to the view to load. + * @param array $data The data to pass to the view. + * + * @see \load_template() + * + * @return void + */ + protected function load_template( string $path, array $data = [] ): void { + global $posts, $post, $wp_did_header, $wp_query, $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID; + + extract( $data, EXTR_SKIP ); + + if ( is_array( $wp_query->query_vars ) ) { + /* + * This use of extract() cannot be removed. There are many possible ways that + * templates could depend on variables that it creates existing, and no way to + * detect and deprecate it. + * + * Passing the EXTR_SKIP flag is the safest option, ensuring globals and + * function variables cannot be overwritten. + */ + // phpcs:ignore WordPress.PHP.DontExtract.extract_extract + extract( $wp_query->query_vars, EXTR_SKIP ); + } + + if ( isset( $s ) ) { + $s = esc_attr( $s ); + } + + include $path; + } + +} diff --git a/wp-content/plugins/core/src/Blocks/Block_View_Factory.php b/wp-content/plugins/core/src/Blocks/Block_View_Factory.php new file mode 100644 index 000000000..0f733162f --- /dev/null +++ b/wp-content/plugins/core/src/Blocks/Block_View_Factory.php @@ -0,0 +1,111 @@ +container = $container; + $this->block_path = $block_path; + } + + /** + * Build the block model, controller and render the block view. + * + * @filter tribe/project/block/render + * + * @param array $block + * @param string $content + * @param bool $is_preview + * @param int $post_id + * @param \WP_Block|null $WP_block + * @param array $context + * + * @throws \DI\DependencyException + * @throws \DI\NotFoundException + */ + public function render_template( array $block, string $content, bool $is_preview, int $post_id, ?WP_Block $WP_block, array $context = [] ): void { + $fields = $WP_block ? ( $WP_block->parsed_block['attrs'] ?? [] ) : []; + $fields = array_merge( $fields, (array) get_fields() ); + + $model = $this->container->make( $block['model'], [ + 'fields' => $fields, + ] ); + + $controller = $this->container->make( $block['controller'], [ + 'model' => $model, + ] ); + + $file_path = sprintf( $this->block_path, $block['view'] ); + $path = locate_template( $file_path . '.php' ); + + if ( ! file_exists( $path ) ) { + if ( ! WP_DEBUG ) { + return; + } + echo '
'; + print_r( $block ); + print_r( $content ); + print_r( $is_preview ); + print_r( $post_id ); + echo ''; + + return; + } + + $this->load_template( $path, (array) apply_filters( 'tribe/project/block/view/data', [ + 'c' => $controller, + 'block' => $block, + 'is_preview' => $is_preview, + 'post_id' => $post_id, + 'context' => $context, + ], $block, $model, $controller ) ); + } + + /** + * A better version of load_template. + * + * @param string $path The path to the view to load. + * @param array $data The data to pass to the view. + * + * @see \load_template() + * + * @return void + */ + protected function load_template( string $path, array $data = [] ): void { + global $posts, $post, $wp_did_header, $wp_query, $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID; + + extract( $data, EXTR_SKIP ); + + if ( is_array( $wp_query->query_vars ) ) { + /* + * This use of extract() cannot be removed. There are many possible ways that + * templates could depend on variables that it creates existing, and no way to + * detect and deprecate it. + * + * Passing the EXTR_SKIP flag is the safest option, ensuring globals and + * function variables cannot be overwritten. + */ + // phpcs:ignore WordPress.PHP.DontExtract.extract_extract + extract( $wp_query->query_vars, EXTR_SKIP ); + } + + if ( isset( $s ) ) { + $s = esc_attr( $s ); + } + + include $path; + } + +} diff --git a/wp-content/plugins/core/src/Blocks/Blocks_Definer.php b/wp-content/plugins/core/src/Blocks/Blocks_Definer.php index c27906616..975b252ae 100644 --- a/wp-content/plugins/core/src/Blocks/Blocks_Definer.php +++ b/wp-content/plugins/core/src/Blocks/Blocks_Definer.php @@ -11,8 +11,6 @@ use Tribe\Project\Blocks\Types\Content_Loop\Content_Loop; use Tribe\Project\Blocks\Types\Gallery_Grid\Gallery_Grid; use Tribe\Project\Blocks\Types\Gallery_Slider\Gallery_Slider; -use Tribe\Project\Blocks\Types\Hero\Hero; -use Tribe\Project\Blocks\Types\Icon_Grid\Icon_Grid; use Tribe\Project\Blocks\Types\Interstitial\Interstitial; use Tribe\Project\Blocks\Types\Lead_Form\Lead_Form; use Tribe\Project\Blocks\Types\Links\Links; @@ -23,16 +21,20 @@ use Tribe\Project\Blocks\Types\Spacer\Spacer; use Tribe\Project\Blocks\Types\Stats\Stats; use Tribe\Project\Blocks\Types\Tabs\Tabs; +use Tribe\Project\Templates\Components\blocks\hero\src\Hero; +use Tribe\Project\Templates\Components\blocks\icon_grid\src\Icon_Grid; class Blocks_Definer implements Definer_Interface { - public const DENY_LIST = 'blocks.deny_list'; - public const STYLES = 'blocks.style_overrides'; - public const TYPES = 'blocks.types'; + public const DENY_LIST = 'blocks.deny_list'; + public const STYLES = 'blocks.style_overrides'; + public const TYPES = 'blocks.types'; + public const BLOCK_PATH = 'blocks.block_path'; public function define(): array { return [ - self::TYPES => DI\add( [ + // TODO: probably move this part of the definition to the theme. + self::TYPES => DI\add( [ DI\get( Accordion::class ), DI\get( Buttons::class ), DI\get( Card_Grid::class ), @@ -60,7 +62,7 @@ public function define(): array { * * @see: https://developer.wordpress.org/block-editor/reference-guides/filters/block-filters/#using-a-deny-list */ - self::DENY_LIST => [ + self::DENY_LIST => [ 'core/archives', 'core/button', 'core/buttons', @@ -90,7 +92,7 @@ public function define(): array { * * TODO: Create a proper thumbnail of the style for the block editor: http://p.tri.be/dmsAwK */ - self::STYLES => DI\add( [ + self::STYLES => DI\add( [ DI\factory( static function () { return new Block_Style_Override( [ 'core/paragraph' ], [ [ @@ -113,7 +115,12 @@ public function define(): array { } ), ] ), - Block_Deny_List::class => DI\autowire()->constructor( DI\get( self::DENY_LIST ) ), + Block_Deny_List::class => DI\autowire()->constructor( DI\get( self::DENY_LIST ) ), + + // TODO: likely to update this path out of components, since a block isn't technically a component + self::BLOCK_PATH => DI\string( 'components/blocks/%1$s/%1$s' ), + Block_View_Factory::class => DI\autowire()->constructorParameter( 'block_path', DI\get( self::BLOCK_PATH ) ), + Block_Component::class => DI\autowire()->constructorParameter( 'block_path', DI\get( self::BLOCK_PATH ) ), ]; } diff --git a/wp-content/plugins/core/src/Blocks/Blocks_Subscriber.php b/wp-content/plugins/core/src/Blocks/Blocks_Subscriber.php index 1428dff02..1467eb3b8 100644 --- a/wp-content/plugins/core/src/Blocks/Blocks_Subscriber.php +++ b/wp-content/plugins/core/src/Blocks/Blocks_Subscriber.php @@ -3,7 +3,6 @@ namespace Tribe\Project\Blocks; use Tribe\Libs\ACF\Block_Registrar; -use Tribe\Libs\ACF\Block_Renderer; use Tribe\Libs\Container\Abstract_Subscriber; class Blocks_Subscriber extends Abstract_Subscriber { @@ -16,8 +15,8 @@ public function register(): void { }, 10, 1 ); add_action( 'tribe/project/block/render', function ( ...$args ): void { - $this->container->get( Block_Renderer::class )->render_template( ...$args ); - }, 10, 4 ); + $this->container->get( Block_View_Factory::class )->render_template( ...$args ); + }, 10, 6 ); /** * Adds the deny list to the JS_Config class. diff --git a/wp-content/plugins/core/src/Blocks/Contracts/Block_Controller.php b/wp-content/plugins/core/src/Blocks/Contracts/Block_Controller.php new file mode 100644 index 000000000..41bad8583 --- /dev/null +++ b/wp-content/plugins/core/src/Blocks/Contracts/Block_Controller.php @@ -0,0 +1,10 @@ +classes ); + } + + /** + * Get any block attributes from the block editor. + * + * @return array|string[] + */ + public function get_attrs(): array { + $attrs = []; + + // "HTML Anchor" attribute + if ( ! empty( $this->anchor ) ) { + $attrs['id'] = $this->anchor; + } + + return $attrs; + } + + public function is_preview(): bool { + return $this->mode === 'preview'; + } + +} diff --git a/wp-content/plugins/core/src/Blocks/Types/Base_Model.php b/wp-content/plugins/core/src/Blocks/Types/Base_Model.php index 9778a0181..22b76ea37 100644 --- a/wp-content/plugins/core/src/Blocks/Types/Base_Model.php +++ b/wp-content/plugins/core/src/Blocks/Types/Base_Model.php @@ -2,6 +2,9 @@ namespace Tribe\Project\Blocks\Types; +/** + * @TODO this would no longer be needed + */ abstract class Base_Model { /** diff --git a/wp-content/plugins/core/src/Blocks/Types/Hero/Hero_Model.php b/wp-content/plugins/core/src/Blocks/Types/Hero/Hero_Model.php deleted file mode 100644 index 6496889e7..000000000 --- a/wp-content/plugins/core/src/Blocks/Types/Hero/Hero_Model.php +++ /dev/null @@ -1,26 +0,0 @@ - $this->get_attrs(), - Hero_Block_Controller::CLASSES => $this->get_classes(), - Hero_Block_Controller::LAYOUT => $this->get( Hero::LAYOUT, Hero::LAYOUT_LEFT ), - Hero_Block_Controller::MEDIA => new Image( $this->get( Hero::IMAGE, [] ) ), - Hero_Block_Controller::TITLE => $this->get( Hero::TITLE, '' ), - Hero_Block_Controller::LEADIN => $this->get( Hero::LEAD_IN, '' ), - Hero_Block_Controller::DESCRIPTION => $this->get( Hero::DESCRIPTION, '' ), - Hero_Block_Controller::CTA => new Cta( $this->get( Cta_Field::GROUP_CTA, [] ) ), - ]; - } - -} diff --git a/wp-content/plugins/core/src/Blocks/Types/Icon_Grid/Icon_Grid_Model.php b/wp-content/plugins/core/src/Blocks/Types/Icon_Grid/Icon_Grid_Model.php deleted file mode 100644 index ade2b26f7..000000000 --- a/wp-content/plugins/core/src/Blocks/Types/Icon_Grid/Icon_Grid_Model.php +++ /dev/null @@ -1,32 +0,0 @@ - $this->get_attrs(), - Icon_Grid_Controller::CLASSES => $this->get_classes(), - Icon_Grid_Controller::LAYOUT => $this->get( Icon_Grid::LAYOUT, [] ), - Icon_Grid_Controller::TITLE => $this->get( Icon_Grid::TITLE, '' ), - Icon_Grid_Controller::LEADIN => $this->get( Icon_Grid::LEADIN, '' ), - Icon_Grid_Controller::DESCRIPTION => $this->get( Icon_Grid::DESCRIPTION, '' ), - Icon_Grid_Controller::CTA => new Cta( $this->get( Cta_Field::GROUP_CTA, [] ) ), - Icon_Grid_Controller::ICONS => Icon_Collection::create( $this->get( Icon_Grid::ICONS, [] ) ), - ]; - } - -} diff --git a/wp-content/themes/core/blocks/hero/hero.php b/wp-content/themes/core/blocks/hero/hero.php deleted file mode 100644 index 42ba3d445..000000000 --- a/wp-content/themes/core/blocks/hero/hero.php +++ /dev/null @@ -1,14 +0,0 @@ -container()->make( Hero_Model::class, $args ); - -get_template_part( - 'components/blocks/hero/hero', - '', - $model->get_data() -); diff --git a/wp-content/themes/core/blocks/icongrid/icongrid.php b/wp-content/themes/core/blocks/icongrid/icongrid.php deleted file mode 100644 index 95c0df432..000000000 --- a/wp-content/themes/core/blocks/icongrid/icongrid.php +++ /dev/null @@ -1,14 +0,0 @@ -container()->make( Icon_Grid_Model::class, $args ); - -get_template_part( - 'components/blocks/icon_grid/icon_grid', - '', - $model->get_data() -); diff --git a/wp-content/themes/core/components/blocks/hero/Hero_Block_Controller.php b/wp-content/themes/core/components/blocks/hero/Hero_Block_Controller.php deleted file mode 100644 index 2bde4df08..000000000 --- a/wp-content/themes/core/components/blocks/hero/Hero_Block_Controller.php +++ /dev/null @@ -1,222 +0,0 @@ -parse_args( $args ); - - $this->attrs = (array) $args[ self::ATTRS ]; - $this->classes = (array) $args[ self::CLASSES ]; - $this->container_classes = (array) $args[ self::CONTAINER_CLASSES ]; - $this->content_classes = (array) $args[ self::CONTENT_CLASSES ]; - $this->cta = $args[ self::CTA ]; - $this->description = (string) $args[ self::DESCRIPTION ]; - $this->layout = (string) $args[ self::LAYOUT ]; - $this->leadin = (string) $args[ self::LEADIN ]; - $this->media = $args[ self::MEDIA ]; - $this->media_classes = (array) $args[ self::MEDIA_CLASSES ]; - $this->title = (string) $args[ self::TITLE ]; - } - - public function get_classes(): string { - $this->classes[] = 'c-block--layout-' . $this->layout; - - return Markup_Utils::class_attribute( $this->classes ); - } - - public function get_attrs(): string { - return Markup_Utils::concat_attrs( $this->attrs ); - } - - public function get_container_classes(): string { - return Markup_Utils::class_attribute( $this->container_classes ); - } - - public function get_media_classes(): string { - return Markup_Utils::class_attribute( $this->media_classes ); - } - - public function get_content_classes(): string { - return Markup_Utils::class_attribute( $this->content_classes ); - } - - public function get_content_args(): array { - if ( empty( $this->title ) && empty( $this->description ) ) { - return []; - } - - return [ - Content_Block_Controller::TAG => 'header', - Content_Block_Controller::LEADIN => $this->get_leadin(), - Content_Block_Controller::TITLE => $this->get_title(), - Content_Block_Controller::CONTENT => $this->get_content(), - Content_Block_Controller::CTA => $this->get_cta(), - Content_Block_Controller::LAYOUT => $this->layout, - Content_Block_Controller::CLASSES => [ - 'c-block__content-block', - 'c-block__header', - 'b-hero__content-container', - 't-theme--light', - ], - ]; - } - - public function get_image_args(): array { - if ( ! $this->media->id ) { - return []; - } - - return [ - Image_Controller::IMG_ID => $this->media->id, - Image_Controller::AS_BG => true, - Image_Controller::AUTO_SHIM => false, - Image_Controller::USE_LAZYLOAD => true, - Image_Controller::WRAPPER_TAG => 'div', - Image_Controller::CLASSES => [ 'b-hero__figure', 'c-image--bg', 'c-image--overlay' ], - Image_Controller::IMG_CLASSES => [ 'b-hero__img' ], - Image_Controller::SRC_SIZE => Image_Sizes::CORE_FULL, - Image_Controller::SRCSET_SIZES => [ - Image_Sizes::CORE_FULL, - Image_Sizes::CORE_MOBILE, - ], - ]; - } - - protected function defaults(): array { - return [ - self::ATTRS => [], - self::CLASSES => [ 'c-block--full-bleed' ], - self::CONTAINER_CLASSES => [], - self::CONTENT_CLASSES => [], - self::CTA => new Cta(), - self::DESCRIPTION => '', - self::LAYOUT => Hero_Block::LAYOUT_LEFT, - self::LEADIN => '', - self::MEDIA => new Image(), - self::MEDIA_CLASSES => [], - self::TITLE => '', - ]; - } - - protected function required(): array { - return [ - self::CLASSES => [ 'c-block', 'b-hero' ], - self::CONTAINER_CLASSES => [ 'b-hero__container', 'l-container' ], - self::CONTENT_CLASSES => [ 'b-hero__content' ], - self::MEDIA_CLASSES => [ 'b-hero__media' ], - ]; - } - - private function get_leadin(): Deferred_Component { - return defer_template_part( 'components/text/text', null, [ - Text_Controller::CLASSES => [ - 'c-block__leadin', - 'b-hero__leadin', - 'h6', - ], - Text_Controller::CONTENT => $this->leadin, - ] ); - } - - private function get_title(): Deferred_Component { - return defer_template_part( 'components/text/text', null, [ - Text_Controller::TAG => 'h2', - Text_Controller::CLASSES => [ - 'c-block__title', - 'b-hero__title', - 'h3', - ], - Text_Controller::CONTENT => $this->title, - ] ); - } - - private function get_content(): Deferred_Component { - return defer_template_part( 'components/container/container', null, [ - Container_Controller::CLASSES => [ - 'c-block__description', - 'b-hero__description', - 't-sink', - 's-sink', - ], - Container_Controller::CONTENT => $this->description, - ] ); - } - - private function get_cta(): Deferred_Component { - return defer_template_part( 'components/link/link', null, [ - Link_Controller::URL => $this->cta->link->url, - Link_Controller::CONTENT => $this->cta->link->title ?: $this->cta->link->url, - Link_Controller::TARGET => $this->cta->link->target, - Link_Controller::ADD_ARIA_LABEL => $this->cta->add_aria_label, - Link_Controller::ARIA_LABEL => $this->cta->aria_label, - Link_Controller::CLASSES => [ - 'c-block__cta-link', - 'a-btn', - 'a-btn--has-icon-after', - 'icon-arrow-right', - ], - ] ); - } - -} diff --git a/wp-content/themes/core/components/blocks/hero/hero.php b/wp-content/themes/core/components/blocks/hero/hero.php index b41f2c0a8..6f3a28751 100644 --- a/wp-content/themes/core/components/blocks/hero/hero.php +++ b/wp-content/themes/core/components/blocks/hero/hero.php @@ -1,11 +1,8 @@