From 59bca65c288673343012a0b21c93c5bb99540542 Mon Sep 17 00:00:00 2001 From: Geoff Dusome Date: Tue, 27 Jan 2026 12:41:39 -0500 Subject: [PATCH 01/11] [MOOSE-336]: icon card controller; image card controller --- .../src/Components/Icon_Card_Controller.php | 101 +++++++++++++++++ .../src/Components/Image_Card_Controller.php | 102 ++++++++++++++++++ .../core/blocks/tribe/icon-card/render.php | 45 +++----- .../core/blocks/tribe/image-card/render.php | 43 +++----- 4 files changed, 232 insertions(+), 59 deletions(-) create mode 100644 wp-content/plugins/core/src/Components/Icon_Card_Controller.php create mode 100644 wp-content/plugins/core/src/Components/Image_Card_Controller.php diff --git a/wp-content/plugins/core/src/Components/Icon_Card_Controller.php b/wp-content/plugins/core/src/Components/Icon_Card_Controller.php new file mode 100644 index 000000000..33ec08994 --- /dev/null +++ b/wp-content/plugins/core/src/Components/Icon_Card_Controller.php @@ -0,0 +1,101 @@ + + */ + private array $attributes; + private Block_Animation_Attributes $block_animation_attributes; + private string $animation_classes; + private string $animation_styles; + private Icon_Picker $icon_picker; + private string $icon_wrapper_styles; + private string $icon_svg; + private string $classes; + private string $title; + private string $description; + private string $link_url; + private bool $link_opens_in_new_tab; + private string $link_text; + private string $link_a11y_label; + + public function __construct( array $args = [] ) { + $this->attributes = $args['attributes'] ?? []; + $this->block_animation_attributes = new Block_Animation_Attributes( $this->attributes ); + $this->animation_classes = $this->block_animation_attributes->get_classes(); + $this->animation_styles = $this->block_animation_attributes->get_styles(); + $this->icon_picker = new Icon_Picker( $this->attributes ); + $this->icon_wrapper_styles = $this->icon_picker->get_icon_wrapper_styles(); + $this->icon_svg = $this->icon_picker->get_svg(); + $this->classes = 'b-icon-card'; + $this->title = $this->attributes['title'] ?? ''; + $this->description = $this->attributes['description'] ?? ''; + $this->link_url = $this->attributes['linkUrl'] ?? ''; + $this->link_opens_in_new_tab = $this->attributes['linkOpensInNewTab'] ?? false; + $this->link_text = $this->attributes['linkText'] ?? ''; + $this->link_a11y_label = $this->attributes['linkA11yLabel'] ?? ''; + } + + public function get_classes(): string { + if ( '' === $this->animation_classes ) { + $this->classes .= ' ' . $this->animation_classes; + } + + return $this->classes; + } + + public function get_styles(): string { + return $this->animation_styles; + } + + public function get_icon_wrapper_styles(): string { + return $this->icon_wrapper_styles; + } + + public function has_icon(): bool { + return ! empty( $this->icon_svg ); + } + + public function get_icon_svg(): string { + return $this->icon_svg; + } + + public function get_title(): string { + return $this->title; + } + + public function has_description(): bool { + return (bool) $this->description; + } + + public function get_description(): string { + return $this->description; + } + + public function has_link_url(): bool { + return (bool) $this->link_url; + } + + public function get_link_url(): string { + return $this->link_url; + } + + public function does_link_open_in_new_tab(): bool { + return $this->link_opens_in_new_tab; + } + + public function get_link_text(): string { + return $this->link_text; + } + + public function get_link_a11y_label(): string { + return $this->link_a11y_label; + } + +} diff --git a/wp-content/plugins/core/src/Components/Image_Card_Controller.php b/wp-content/plugins/core/src/Components/Image_Card_Controller.php new file mode 100644 index 000000000..f4241811f --- /dev/null +++ b/wp-content/plugins/core/src/Components/Image_Card_Controller.php @@ -0,0 +1,102 @@ + + */ + private array $attributes; + private Block_Animation_Attributes $block_animation_attributes; + private string $animation_classes; + private string $animation_styles; + private string $classes; + private int $media_id; + private string $media_url; + private string $title; + private string $description; + private string $link_url; + private bool $link_opens_in_new_tab; + private string $link_text; + private string $link_a11y_label; + + public function __construct( array $args = [] ) { + $this->attributes = $args['attributes'] ?? []; + $this->block_animation_attributes = new Block_Animation_Attributes( $this->attributes ); + $this->animation_classes = $this->block_animation_attributes->get_classes(); + $this->animation_styles = $this->block_animation_attributes->get_styles(); + $this->classes = 'b-image-card'; + $this->media_id = $this->attributes['mediaId'] ? (int) $this->attributes['mediaId'] : 0; + $this->media_url = $this->attributes['mediaUrl'] ?? ''; + $this->title = $this->attributes['title'] ?? ''; + $this->description = $this->attributes['description'] ?? ''; + $this->link_url = $this->attributes['linkUrl'] ?? ''; + $this->link_opens_in_new_tab = $this->attributes['linkOpensInNewTab'] ?? false; + $this->link_text = $this->attributes['linkText'] ?? ''; + $this->link_a11y_label = $this->attributes['linkA11yLabel'] ?? ''; + } + + public function get_classes(): string { + if ( '' === $this->animation_classes ) { + $this->classes .= ' ' . $this->animation_classes; + } + + return $this->classes; + } + + public function get_styles(): string { + return $this->animation_styles; + } + + public function has_media(): bool { + return 0 !== $this->media_id || '' !== $this->media_url; + } + + public function get_media(): string { + if ( 0 !== $this->media_id ) { + return wp_get_attachment_image( $this->media_id, 'large' ); + } + + if ( '' !== $this->media_url ) { + return '' . esc_attr__( 'Block placeholder image', 'tribe' ) . ''; + } + + return ''; + } + + public function get_title(): string { + return $this->title; + } + + public function has_description(): bool { + return '' !== $this->description; + } + + public function get_description(): string { + return $this->description; + } + + public function has_link_url(): bool { + return '' !== $this->link_url; + } + + public function get_link_url(): string { + return $this->link_url; + } + + public function does_link_open_in_new_tab(): bool { + return $this->link_opens_in_new_tab; + } + + public function get_link_text(): string { + return $this->link_text; + } + + public function get_link_a11y_label(): string { + return $this->link_a11y_label; + } + +} diff --git a/wp-content/themes/core/blocks/tribe/icon-card/render.php b/wp-content/themes/core/blocks/tribe/icon-card/render.php index f6ba80240..8abef54e9 100644 --- a/wp-content/themes/core/blocks/tribe/icon-card/render.php +++ b/wp-content/themes/core/blocks/tribe/icon-card/render.php @@ -1,58 +1,43 @@ get_styles(); -$animation_classes = $animation_attributes->get_classes(); -$icon_picker = new Icon_Picker( $attributes ); -$icon_wrapper_styles = $icon_picker->get_icon_wrapper_styles(); -$icon_svg = $icon_picker->get_svg(); -$classes = 'b-icon-card'; -$title = $attributes['title'] ?? ''; -$description = $attributes['description'] ?? ''; -$link_url = $attributes['linkUrl'] ?? ''; -$link_opens_in_new_tab = $attributes['linkOpensInNewTab'] ?? false; -$link_text = $attributes['linkText'] ?? ''; -$link_a11y_label = $attributes['linkA11yLabel'] ?? ''; - -if ( $animation_classes !== '' ) { - $classes .= ' ' . $animation_classes; -} +$c = new Icon_Card_Controller( [ + 'attributes' => $attributes, +] ); ?> -
esc_attr( $classes ), 'style' => $animation_styles ] ); ?>> + diff --git a/wp-content/themes/core/blocks/tribe/image-card/render.php b/wp-content/themes/core/blocks/tribe/image-card/render.php index efb24e397..267842f8d 100644 --- a/wp-content/themes/core/blocks/tribe/image-card/render.php +++ b/wp-content/themes/core/blocks/tribe/image-card/render.php @@ -1,56 +1,41 @@ get_classes() !== '' ) { - $classes .= ' ' . $animation_attributes->get_classes(); -} +$c = new Image_Card_Controller( [ + 'attributes' => $attributes, +] ); ?> -
esc_attr( $classes ), 'style' => $animation_attributes->get_styles() ] ); ?>> + From e6d70fefb6482db4d7d5cffadc549de986e5119e Mon Sep 17 00:00:00 2001 From: Geoff Dusome Date: Tue, 27 Jan 2026 13:15:56 -0500 Subject: [PATCH 02/11] [MOOSE-336]: add image overlay card controller --- .../src/Components/Icon_Card_Controller.php | 4 +- .../src/Components/Image_Card_Controller.php | 2 +- .../Image_Overlay_Card_Controller.php | 106 ++++++++++++++++++ .../tribe/image-overlay-card/render.php | 54 ++------- 4 files changed, 121 insertions(+), 45 deletions(-) create mode 100644 wp-content/plugins/core/src/Components/Image_Overlay_Card_Controller.php diff --git a/wp-content/plugins/core/src/Components/Icon_Card_Controller.php b/wp-content/plugins/core/src/Components/Icon_Card_Controller.php index 33ec08994..aa3d8d515 100644 --- a/wp-content/plugins/core/src/Components/Icon_Card_Controller.php +++ b/wp-content/plugins/core/src/Components/Icon_Card_Controller.php @@ -43,7 +43,7 @@ public function __construct( array $args = [] ) { } public function get_classes(): string { - if ( '' === $this->animation_classes ) { + if ( '' !== $this->animation_classes ) { $this->classes .= ' ' . $this->animation_classes; } @@ -97,5 +97,5 @@ public function get_link_text(): string { public function get_link_a11y_label(): string { return $this->link_a11y_label; } - + } diff --git a/wp-content/plugins/core/src/Components/Image_Card_Controller.php b/wp-content/plugins/core/src/Components/Image_Card_Controller.php index f4241811f..a384cb949 100644 --- a/wp-content/plugins/core/src/Components/Image_Card_Controller.php +++ b/wp-content/plugins/core/src/Components/Image_Card_Controller.php @@ -40,7 +40,7 @@ public function __construct( array $args = [] ) { } public function get_classes(): string { - if ( '' === $this->animation_classes ) { + if ( '' !== $this->animation_classes ) { $this->classes .= ' ' . $this->animation_classes; } diff --git a/wp-content/plugins/core/src/Components/Image_Overlay_Card_Controller.php b/wp-content/plugins/core/src/Components/Image_Overlay_Card_Controller.php new file mode 100644 index 000000000..5f5044f75 --- /dev/null +++ b/wp-content/plugins/core/src/Components/Image_Overlay_Card_Controller.php @@ -0,0 +1,106 @@ + + */ + private array $attributes; + private Block_Animation_Attributes $block_animation_attributes; + private string $animation_classes; + private string $animation_styles; + private string $classes; + private int $media_id; + private string $media_url; + private string $overlay_color; + private string $overlay_hover_color; + private bool $card_uses_dark_theme; + private string $title; + private string $link_url; + private bool $link_opens_in_new_tab; + private string $link_text; + private string $link_a11y_label; + + public function __construct( array $args = [] ) { + $this->attributes = $args['attributes'] ?? []; + $this->block_animation_attributes = new Block_Animation_Attributes( $this->attributes ); + $this->animation_classes = $this->block_animation_attributes->get_classes(); + $this->animation_styles = $this->block_animation_attributes->get_styles(); + $this->classes = 'b-image-overlay-card'; + $this->media_id = $this->attributes['mediaId'] ? (int) $this->attributes['mediaId'] : 0; + $this->media_url = $this->attributes['mediaUrl'] ?? ''; + $this->overlay_color = $this->attributes['overlayColor'] ?? '#0000001C'; + $this->overlay_hover_color = $this->attributes['overlayHoverColor'] ?? '#00000033'; + $this->card_uses_dark_theme = $this->attributes['cardUsesDarkTheme'] ?? false; + $this->title = $this->attributes['title'] ?? ''; + $this->link_url = $this->attributes['linkUrl'] ?? ''; + $this->link_opens_in_new_tab = $this->attributes['linkOpensInNewTab'] ?? false; + $this->link_text = $this->attributes['linkText'] ?? ''; + $this->link_a11y_label = $this->attributes['linkA11yLabel'] ?? ''; + } + + public function get_classes(): string { + if ( $this->card_uses_dark_theme ) { + $this->classes .= ' b-image-overlay-card--dark-theme'; + } + + if ( '' !== $this->animation_classes ) { + $this->classes .= ' ' . $this->animation_classes; + } + + return $this->classes; + } + + public function get_styles(): string { + $styles = $this->animation_styles; + $styles .= "--card-image-overlay-color: {$this->overlay_color};"; + $styles .= "--card-image-overlay-hover-color: {$this->overlay_hover_color};"; + + return $styles; + } + + public function has_media(): bool { + return 0 !== $this->media_id || '' !== $this->media_url; + } + + public function get_media(): string { + if ( 0 !== $this->media_id ) { + return wp_get_attachment_image( $this->media_id, 'large' ); + } + + if ( '' !== $this->media_url ) { + return '' . esc_attr__( 'Block placeholder image', 'tribe' ) . ''; + } + + return ''; + } + + public function get_title(): string { + return $this->title; + } + + public function has_link_url(): bool { + return '' !== $this->link_url; + } + + public function get_link_url(): string { + return $this->link_url; + } + + public function does_link_open_in_new_tab(): bool { + return $this->link_opens_in_new_tab; + } + + public function get_link_text(): string { + return $this->link_text; + } + + public function get_link_a11y_label(): string { + return $this->link_a11y_label; + } + +} diff --git a/wp-content/themes/core/blocks/tribe/image-overlay-card/render.php b/wp-content/themes/core/blocks/tribe/image-overlay-card/render.php index 18813ef61..5ff03c7ca 100644 --- a/wp-content/themes/core/blocks/tribe/image-overlay-card/render.php +++ b/wp-content/themes/core/blocks/tribe/image-overlay-card/render.php @@ -1,62 +1,32 @@ get_styles(); -$animation_classes = $animation_attributes->get_classes(); -$media_id = $attributes['mediaId'] ? (int) $attributes['mediaId'] : 0; // this returns a float by default so we need to cast it to int -$media_url = $attributes['mediaUrl'] ?? ''; -$overlay_color = $attributes['overlayColor'] ?? '#0000001C'; -$overlay_hover_color = $attributes['overlayHoverColor'] ?? '#00000033'; -$card_uses_dark_theme = $attributes['cardUsesDarkTheme']; -$title = $attributes['title'] ?? ''; -$link_url = $attributes['linkUrl'] ?? ''; -$link_opens_in_new_tab = $attributes['linkOpensInNewTab'] ?? false; -$link_text = $attributes['linkText'] ?? ''; -$link_a11y_label = $attributes['linkA11yLabel'] ?? ''; - -// add overlay color as CSS custom property -$styles = $animation_styles; -$styles .= "--card-image-overlay-color: {$overlay_color};"; -$styles .= "--card-image-overlay-hover-color: {$overlay_hover_color};"; - -// add dark theme class if applicable -if ( $card_uses_dark_theme ) { - $classes .= ' b-image-overlay-card--dark-theme'; -} - -// add animation attribute classes -if ( $animation_classes !== '' ) { - $classes .= ' ' . $animation_classes; -} +$c = new Image_Overlay_Card_Controller( [ + 'attributes' => $attributes, +] ); ?> -
esc_attr( $classes ), 'style' => esc_attr( $styles ) ] ); ?>> - -
- -
- + From 5e6445bb9db1fdbd075f700c6aeb5ec994cd2525 Mon Sep 17 00:00:00 2001 From: Geoff Dusome Date: Tue, 27 Jan 2026 13:33:12 -0500 Subject: [PATCH 03/11] [MOOSE-336]: add mashead search controller --- .../Components/Masthead_Search_Controller.php | 59 +++++++++++++++++++ .../blocks/tribe/masthead-search/render.php | 33 +++-------- 2 files changed, 68 insertions(+), 24 deletions(-) create mode 100644 wp-content/plugins/core/src/Components/Masthead_Search_Controller.php diff --git a/wp-content/plugins/core/src/Components/Masthead_Search_Controller.php b/wp-content/plugins/core/src/Components/Masthead_Search_Controller.php new file mode 100644 index 000000000..4e4acc46d --- /dev/null +++ b/wp-content/plugins/core/src/Components/Masthead_Search_Controller.php @@ -0,0 +1,59 @@ +search_icon = ''; + $this->search_icon_uri = trailingslashit( get_stylesheet_directory_uri() ) . '/assets/media/icons/search.svg'; + $this->search_icon_path = trailingslashit( get_stylesheet_directory() ) . '/assets/media/icons/search.svg'; + } + + public function get_search_icon(): string { + // If the file doesn't exist or we have already loaded it, return early + if ( ! file_exists( $this->search_icon_path ) || $this->search_icon !== '' ) { + return $this->search_icon; + } + + // Attempt to get the file contents from the file system + $this->search_icon = file_get_contents( $this->search_icon_path ); + + // Fallback to wp_remote_get if file_get_contents fails + if ( $this->search_icon === false ) { + $response = wp_remote_get( $this->search_icon_uri ); + + if ( ! is_wp_error( $response ) ) { + // wp_remote_retrieve_body returns an empty string on failure, so it's fine to end here + $this->search_icon = wp_remote_retrieve_body( $response ); + } + } + + return $this->search_icon; + } + + public function get_toggle_button_a11y_label(): string { + return __( 'Toggle Search Overlay', 'tribe' ); + } + + public function get_form_action(): string { + return home_url(); + } + + public function get_label_text(): string { + return __( 'Search', 'tribe' ); + } + + public function get_input_placeholder(): string { + return __( 'What are you looking for?', 'tribe' ); + } + + public function get_submit_button_text(): string { + return __( 'Search', 'tribe' ); + } + +} diff --git a/wp-content/themes/core/blocks/tribe/masthead-search/render.php b/wp-content/themes/core/blocks/tribe/masthead-search/render.php index 01e59f95b..ab2285318 100644 --- a/wp-content/themes/core/blocks/tribe/masthead-search/render.php +++ b/wp-content/themes/core/blocks/tribe/masthead-search/render.php @@ -1,34 +1,19 @@
- From cc029c2ce17db421969e75ca1053b2415c0248bf Mon Sep 17 00:00:00 2001 From: Geoff Dusome Date: Tue, 27 Jan 2026 15:38:37 -0500 Subject: [PATCH 04/11] [MOOSE-336]: post card controller; search card controller; style fixes --- .../src/Components/Post_Card_Controller.php | 107 ++++++++++++++++++ .../src/Components/Search_Card_Controller.php | 101 +++++++++++++++++ .../core/assets/pcss/cards/_mixins.pcss | 29 +++++ .../assets/pcss/cards/post-search-result.pcss | 26 +++-- .../themes/core/assets/pcss/cards/post.pcss | 36 +++--- .../core/assets/pcss/typography/_mixins.pcss | 4 +- .../themes/core/components/cards/post.php | 75 ++++++------ .../themes/core/components/cards/search.php | 64 +++++------ 8 files changed, 343 insertions(+), 99 deletions(-) create mode 100644 wp-content/plugins/core/src/Components/Post_Card_Controller.php create mode 100644 wp-content/plugins/core/src/Components/Search_Card_Controller.php create mode 100644 wp-content/themes/core/assets/pcss/cards/_mixins.pcss diff --git a/wp-content/plugins/core/src/Components/Post_Card_Controller.php b/wp-content/plugins/core/src/Components/Post_Card_Controller.php new file mode 100644 index 000000000..5d61e5655 --- /dev/null +++ b/wp-content/plugins/core/src/Components/Post_Card_Controller.php @@ -0,0 +1,107 @@ +post_id = $args['post_id'] ?? 0; + $this->animation_attributes = $args['animation_attributes']; + $this->animation_classes = $this->animation_attributes !== false ? $this->animation_attributes->get_classes() : ''; + $this->animation_styles = $this->animation_attributes !== false ? $this->animation_attributes->get_styles() : ''; + $this->layout = $args['layout']; + $this->classes = 'c-post-card'; + $this->image_id = get_post_thumbnail_id( $this->post_id ); + $this->primary_category = $this->get_primary_term( $this->post_id, Category::NAME ); + $this->title = get_the_title( $this->post_id ); + $this->author_id = (int) get_post_field( 'post_author', $this->post_id ); + $this->author = get_the_author_meta( 'display_name', $this->author_id ); + $this->date = get_the_date( 'M j, Y', $this->post_id ); + $this->excerpt = get_the_excerpt( $this->post_id ); + $this->permalink = get_the_permalink( $this->post_id ); + } + + public function get_classes(): string { + $this->classes .= " c-post-card--layout-$this->layout"; + + if ( '' !== $this->animation_classes ) { + $this->classes .= " $this->animation_classes"; + } + + return $this->classes; + } + + public function get_styles(): string { + return $this->animation_styles; + } + + public function has_media(): bool { + return false !== $this->image_id && 0 !== $this->image_id; + } + + public function get_media(): string { + return wp_get_attachment_image( $this->image_id, 'large' ); + } + + public function has_primary_category(): bool { + return null !== $this->primary_category; + } + + public function get_primary_category_name(): string { + return $this->primary_category->name; + } + + public function get_title(): string { + return $this->title; + } + + public function has_author(): bool { + return '' !== $this->author; + } + + public function get_author_name(): string { + return $this->author; + } + + public function has_date(): bool { + return '' !== $this->date; + } + + public function get_date(): string { + return $this->date; + } + + public function has_excerpt(): bool { + return '' !== $this->excerpt; + } + + public function get_excerpt(): string { + return $this->excerpt; + } + + public function get_permalink(): string { + return $this->permalink; + } + +} diff --git a/wp-content/plugins/core/src/Components/Search_Card_Controller.php b/wp-content/plugins/core/src/Components/Search_Card_Controller.php new file mode 100644 index 000000000..464c3ba57 --- /dev/null +++ b/wp-content/plugins/core/src/Components/Search_Card_Controller.php @@ -0,0 +1,101 @@ +post_id = $args['post_id'] ?? 0; + $this->animation_attributes = $args['animation_attributes']; + $this->animation_classes = $this->animation_attributes !== false ? $this->animation_attributes->get_classes() : ''; + $this->animation_styles = $this->animation_attributes !== false ? $this->animation_attributes->get_styles() : ''; + $this->classes = 'c-search-card'; + $this->post_type = get_post_type( $this->post_id ); + $this->post_type_object = get_post_type_object( $this->post_type ); + $this->image_id = get_post_thumbnail_id( $this->post_id ); + $this->title = get_the_title( $this->post_id ); + $this->author_id = (int) get_post_field( 'post_author', $this->post_id ); + $this->author = get_the_author_meta( 'display_name', $this->author_id ); + $this->date = get_the_date( 'M j, Y', $this->post_id ); + $this->excerpt = get_the_excerpt( $this->post_id ); + $this->permalink = get_the_permalink( $this->post_id ); + } + + public function get_classes(): string { + if ( '' !== $this->animation_classes ) { + $this->classes .= " $this->animation_classes"; + } + + return $this->classes; + } + + public function get_styles(): string { + return $this->animation_styles; + } + + public function has_media(): bool { + return false !== $this->image_id && 0 !== $this->image_id; + } + + public function get_media(): string { + return wp_get_attachment_image( $this->image_id, 'large' ); + } + + public function has_post_type(): bool { + return null !== $this->post_type_object; + } + + public function get_post_type_name(): string { + return $this->post_type_object->labels->singular_name; + } + + public function get_title(): string { + return $this->title; + } + + public function has_author(): bool { + return '' !== $this->author; + } + + public function get_author_name(): string { + return $this->author; + } + + public function has_date(): bool { + return '' !== $this->date; + } + + public function get_date(): string { + return $this->date; + } + + public function has_excerpt(): bool { + return '' !== $this->excerpt; + } + + public function get_excerpt(): string { + return $this->excerpt; + } + + public function get_permalink(): string { + return $this->permalink; + } + +} diff --git a/wp-content/themes/core/assets/pcss/cards/_mixins.pcss b/wp-content/themes/core/assets/pcss/cards/_mixins.pcss new file mode 100644 index 000000000..c9b8f39ef --- /dev/null +++ b/wp-content/themes/core/assets/pcss/cards/_mixins.pcss @@ -0,0 +1,29 @@ +/* ------------------------------------------------------------------------- + * + * Mixins: Cards + * + * ------------------------------------------------------------------------- */ + +@define-mixin post-card-hover-focus { + + .c-post-card__image img { + transform: scale(1.05); + } + + .c-post-card__title { + + @mixin t-animated-underline-hover; + } +} + +@define-mixin search-card-hover-focus { + + .c-search-card__image img { + transform: scale(1.05); + } + + .c-search-card__title { + + @mixin t-animated-underline-hover; + } +} diff --git a/wp-content/themes/core/assets/pcss/cards/post-search-result.pcss b/wp-content/themes/core/assets/pcss/cards/post-search-result.pcss index 015627418..531c73981 100644 --- a/wp-content/themes/core/assets/pcss/cards/post-search-result.pcss +++ b/wp-content/themes/core/assets/pcss/cards/post-search-result.pcss @@ -22,6 +22,12 @@ :--dark-themes & { border-top-color: var(--color-white); } + + &:hover, + &:focus-within { + + @mixin search-card-hover-focus; + } } /* ----------------------------------------------------------------------- @@ -36,11 +42,6 @@ & img { transition: var(--transition); - - .c-search-card:hover &, - .c-search-card:focus-within & { - transform: scale(1.05); - } } /* add some space below the image when the text could wrap */ @@ -63,19 +64,20 @@ margin-bottom: var(--spacer-10) !important; } +/* ----------------------------------------------------------------------- + * Search Result Post Card - Title Wrap + * ----------------------------------------------------------------------- */ + +.c-search-card__title-wrap { + margin-bottom: var(--spacer-10); +} + /* ----------------------------------------------------------------------- * Search Result Post Card - Title * ----------------------------------------------------------------------- */ .c-search-card__title { margin-top: 0 !important; - margin-bottom: var(--spacer-10) !important; - - .c-search-card:hover &, - .c-search-card:focus-within & { - - @mixin t-transparent-underline-hover; - } } /* ----------------------------------------------------------------------- diff --git a/wp-content/themes/core/assets/pcss/cards/post.pcss b/wp-content/themes/core/assets/pcss/cards/post.pcss index d8a708cc5..d5a02e781 100644 --- a/wp-content/themes/core/assets/pcss/cards/post.pcss +++ b/wp-content/themes/core/assets/pcss/cards/post.pcss @@ -8,7 +8,7 @@ position: relative; container: postcard / inline-size; - &.c-post-card__layout-horizontal { + &.c-post-card--layout-horizontal { border-top: 1px solid var(--color-border, #000); padding-top: var(--cards-query-interior-padding, 40px); @@ -46,6 +46,12 @@ } } } + + &:hover, + &:focus-within { + + @mixin post-card-hover-focus; + } } /* ----------------------------------------------------------------------- @@ -57,7 +63,7 @@ flex-direction: column; gap: var(--spacer-20); - .c-post-card__layout-horizontal & { + .c-post-card--layout-horizontal & { flex-direction: row-reverse; align-items: center; justify-content: flex-end; @@ -76,11 +82,6 @@ & img { transition: var(--transition); - - .c-post-card:hover &, - .c-post-card:focus-within & { - transform: scale(1.05); - } } } @@ -108,12 +109,6 @@ .c-post-card__title { margin-top: 0 !important; - - .c-post-card:hover &, - .c-post-card:focus-within & { - - @mixin t-transparent-underline-hover; - } } /* ----------------------------------------------------------------------- @@ -129,6 +124,21 @@ line-height: 1; } +/* ----------------------------------------------------------------------- + * Post Card - Excerpt + * + * Hides content after 3 lines + * + * ----------------------------------------------------------------------- */ + +.c-post-card__excerpt { + margin-top: 0 !important; + overflow: hidden; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; +} + /* ----------------------------------------------------------------------- * Post Card - Link Overlay * ----------------------------------------------------------------------- */ diff --git a/wp-content/themes/core/assets/pcss/typography/_mixins.pcss b/wp-content/themes/core/assets/pcss/typography/_mixins.pcss index 131fb8a50..41170de54 100644 --- a/wp-content/themes/core/assets/pcss/typography/_mixins.pcss +++ b/wp-content/themes/core/assets/pcss/typography/_mixins.pcss @@ -232,7 +232,7 @@ @define-mixin t-animated-underline { display: inline; background-image: linear-gradient(currentcolor, currentcolor); - background-size: 0 0.05em; + background-size: 0 0.06em; background-repeat: no-repeat; background-position: 0 100%; transition: background-size 0.3s; @@ -240,5 +240,5 @@ } @define-mixin t-animated-underline-hover { - background-size: 100% 0.05em; + background-size: 100% 0.06em; } diff --git a/wp-content/themes/core/components/cards/post.php b/wp-content/themes/core/components/cards/post.php index 8e76da989..68972700f 100644 --- a/wp-content/themes/core/components/cards/post.php +++ b/wp-content/themes/core/components/cards/post.php @@ -1,6 +1,6 @@ get_primary_term( $post_id, Category::NAME ); -$title = get_the_title( $post_id ); -$author_id = (int) get_post_field( 'post_author', $post_id ); -$author = get_the_author_meta( 'display_name', $author_id ); -$date = get_the_date( 'M j, Y' ); -$permalink = get_the_permalink( $post_id ); - -$classes = 'c-post-card c-post-card__layout-' . $layout; -$styles = ''; -if ( $animation_attributes ) { - $classes .= ' '; - $classes .= $animation_attributes->get_classes(); - $styles = ' style="' . $animation_attributes->get_styles() . '"'; -} +$c = new Post_Card_Controller( [ + 'post_id' => $post_id, + 'animation_attributes' => $animation_attributes, + 'layout' => $layout, +] ); ?> -
> +
get_styles() ) ? sprintf( 'style="%s"', $c->get_styles() ) : ''; ?>>
- + has_media() ) : ?>
- + get_media(); ?>
- -

name ); ?>

+ has_primary_category() ) : ?> +

get_primary_category_name() ); ?>

+ +
+ %2$s', + esc_html( $heading_level ), + esc_html( $c->get_title() ) + ); ?> +
+ has_author() || $c->has_date() ) : ?> +

+ has_author() ) : ?> + get_author_name() ); ?> + + has_author() && $c->has_date() ) : ?> + • + + has_date() ) : ?> + get_date() ); ?> + +

+ + has_excerpt() ) : ?> +

get_excerpt() ); ?>

- %2$s', - esc_html( $heading_level ), - esc_html( $title ) - ); ?> -

- - - - - • - - - - -

- +
diff --git a/wp-content/themes/core/components/cards/search.php b/wp-content/themes/core/components/cards/search.php index 78b3d32f6..60476e820 100644 --- a/wp-content/themes/core/components/cards/search.php +++ b/wp-content/themes/core/components/cards/search.php @@ -1,5 +1,7 @@ $post_id, + 'animation_attributes' => $animation_attributes, +] ); ?> -
+
get_styles() ) ? sprintf( 'style="%s"', $c->get_styles() ) : ''; ?>>
- + has_media() ) : ?>
- + get_media(); ?>
- -

labels->singular_name ); ?>

+ has_post_type() ) : ?> +

get_post_type_name() ); ?>

+ +
+

get_title() ); ?>

+
+ has_author() || $c->has_date() ) : ?> +

+ has_author() ) : ?> + get_author_name() ); ?> + + has_author() && $c->has_date() ) : ?> + • + + has_date() ) : ?> + get_date() ); ?> + +

-

-

- - - - - • - - - - -

- -

+ has_date() ) : ?> +

get_excerpt() ); ?>

-

+

get_permalink() ); ?>

- +
From d021f2df5c57dbe0f0f650f9a55011fbfba8559a Mon Sep 17 00:00:00 2001 From: Geoff Dusome Date: Tue, 27 Jan 2026 16:33:40 -0500 Subject: [PATCH 05/11] [MOOSE-336]: related posts controller; terms block controller --- .../Components/Related_Posts_Controller.php | 115 ++++++++++++++++++ .../Terms_Block_Controller.php} | 10 +- .../blocks/tribe/related-posts/render.php | 67 ++-------- .../themes/core/blocks/tribe/terms/render.php | 4 +- 4 files changed, 130 insertions(+), 66 deletions(-) create mode 100644 wp-content/plugins/core/src/Components/Related_Posts_Controller.php rename wp-content/plugins/core/src/{Blocks/Helpers/Terms_Block.php => Components/Terms_Block_Controller.php} (86%) diff --git a/wp-content/plugins/core/src/Components/Related_Posts_Controller.php b/wp-content/plugins/core/src/Components/Related_Posts_Controller.php new file mode 100644 index 000000000..bfb8062e7 --- /dev/null +++ b/wp-content/plugins/core/src/Components/Related_Posts_Controller.php @@ -0,0 +1,115 @@ + + */ + private array $attributes; + + /** + * @var array + */ + private array $query_args; + + /** + * @var array + */ + private array $chosen_posts; + private string $classes; + private Block_Animation_Attributes $animation_attributes; + private string $animation_classes; + private string $animation_styles; + private int|false $post_id; + private bool $has_automatic_selection; + private int $posts_to_show; + private string $block_layout; + private \WP_Query $query; + + public function __construct( array $args = [] ) { + $this->attributes = $args['attributes'] ?? []; + $this->post_id = get_the_ID(); + $this->classes = 'b-related-posts'; + $this->animation_attributes = new Block_Animation_Attributes( $this->attributes ); + $this->animation_classes = $this->animation_attributes->get_classes(); + $this->animation_styles = $this->animation_attributes->get_styles(); + $this->has_automatic_selection = $this->attributes['hasAutomaticSelection'] ?? true; + $this->chosen_posts = $this->attributes['chosenPosts'] ?? []; + $this->posts_to_show = $this->attributes['postsToShow'] ? intval( $this->attributes['postsToShow'] ) : 3; + $this->block_layout = $this->attributes['layout'] ?? 'grid'; + $this->query_args = []; + $this->query = new \WP_Query(); + + $this->set_query_args(); + $this->set_query(); + } + + public function should_bail_early(): bool { + return ! $this->has_automatic_selection && empty( $this->chosen_posts ); + } + + public function get_query(): \WP_Query { + return $this->query; + } + + public function get_classes(): string { + $this->classes .= " b-related-posts--layout-$this->block_layout"; + + if ( '' !== $this->animation_classes ) { + $this->classes .= " $this->animation_classes"; + } + + return $this->classes; + } + + public function get_styles(): string { + return $this->animation_styles; + } + + private function set_query_args(): void { + $this->query_args = [ + 'post_type' => Post::NAME, + 'post_status' => 'publish', + 'posts_per_page' => (int) $this->posts_to_show, + 'post__not_in' => [ $this->post_id ], + 'tax_query' => [], + ]; + + if ( ! $this->has_automatic_selection ) { + unset( + $this->query_args['tax_query'], + $this->query_args['post__not_in'], + $this->query_args['posts_per_page'] + ); + + $this->query_args['post__in'] = array_map( static fn( $post ): int => intval( $post['id'] ), $this->chosen_posts ); + $this->query_args['orderby'] = 'post__in'; + + return; + } + + $post_terms = get_the_terms( $this->post_id, 'category' ); + + if ( empty( $post_terms ) || is_wp_error( $post_terms ) ) { + return; + } + + $term_ids = wp_list_pluck( $post_terms, 'term_id' ); + + $this->query_args['tax_query'][] = [ + 'taxonomy' => 'category', + 'field' => 'term_id', + 'terms' => $term_ids, + ]; + } + + private function set_query(): void { + $this->query = new \WP_Query( $this->query_args ); + } + +} diff --git a/wp-content/plugins/core/src/Blocks/Helpers/Terms_Block.php b/wp-content/plugins/core/src/Components/Terms_Block_Controller.php similarity index 86% rename from wp-content/plugins/core/src/Blocks/Helpers/Terms_Block.php rename to wp-content/plugins/core/src/Components/Terms_Block_Controller.php index b172ec02e..cbf2d97bd 100644 --- a/wp-content/plugins/core/src/Blocks/Helpers/Terms_Block.php +++ b/wp-content/plugins/core/src/Components/Terms_Block_Controller.php @@ -1,16 +1,16 @@ $attributes, +] ); -// if the user doesn't want automatic selection and hasn't chosen any posts, bail early -if ( ! $has_automatic_selection && empty( $chosen_posts ) ) { - return; -} - -$query_args = [ - 'post_type' => Post::NAME, - 'post_status' => 'publish', - 'posts_per_page' => (int) $posts_to_show, - 'post__not_in' => [ $post_id ], - 'tax_query' => [], -]; - -if ( $has_automatic_selection ) { - // handle the case where the user wants automatic selection of related posts - $post_terms = get_the_terms( $post_id, Category::NAME ); - - if ( ! empty( $post_terms ) && ! is_wp_error( $post_terms ) ) { - $term_ids = wp_list_pluck( $post_terms, 'term_id' ); - - $query_args['tax_query'][] = [ - 'taxonomy' => Category::NAME, - 'field' => 'term_id', - 'terms' => $term_ids, - ]; - } -} else { - // handle the case where the user has selected specific posts to show - unset( - $query_args['tax_query'], - $query_args['post__not_in'], - $query_args['posts_per_page'] - ); - - /** - * because of the way FormTokenField's work, the $chosen_posts array contains a value and an ID - * so we need to map the array to get just the IDs when we pass it into post__in - * - * @see https://developer.wordpress.org/block-editor/reference-guides/components/form-token-field/ - */ - $query_args['post__in'] = array_map( static fn( $post ): int => intval( $post['id'] ), $chosen_posts ); - $query_args['orderby'] = 'post__in'; -} - -$query = new WP_Query( $query_args ); - -if ( ! $query->have_posts() ) { +if ( $c->should_bail_early() || ! $c->get_query()->have_posts() ) { return; } ?> -
'b-related-posts b-related-posts--layout-' . $block_layout . ' ' . $animation_attributes->get_classes(), 'style' => $animation_attributes->get_styles() ] ); ?>> - have_posts() ) : ?> - the_post(); ?> +
esc_attr( $c->get_classes() ), 'style' => $c->get_styles() ] ); ?>> + get_query()->have_posts() ) : ?> + get_query()->the_post(); ?> get_the_ID(), ] ); ?> diff --git a/wp-content/themes/core/blocks/tribe/terms/render.php b/wp-content/themes/core/blocks/tribe/terms/render.php index bf386f862..be514b0ca 100644 --- a/wp-content/themes/core/blocks/tribe/terms/render.php +++ b/wp-content/themes/core/blocks/tribe/terms/render.php @@ -1,7 +1,7 @@ get_the_terms(); $wrapper_attributes = get_block_wrapper_attributes([ 'class' => $animation_attributes->get_classes(), From c07f876a9904dc9ab77943e792aa56f256db27b5 Mon Sep 17 00:00:00 2001 From: Geoff Dusome Date: Tue, 27 Jan 2026 16:37:26 -0500 Subject: [PATCH 06/11] [MOOSE-336]: changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 768661103..044d07739 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ item (Added, Changed, Depreciated, Removed, Fixed, Security). ## [2026.01] - Added: Yoast Duplicate Post plugin v4.5 for easier content duplication in the editor. +- Updated: Dynamic blocks now pass data to PHP controller classes for processing, moving toward a more OOP/MVC approach. ## [2025.12] From 89a331a1363f49cb565bd91aaa36411eff414cb8 Mon Sep 17 00:00:00 2001 From: Geoff Dusome Date: Wed, 28 Jan 2026 09:24:54 -0500 Subject: [PATCH 07/11] [MOOSE-336]: fix author meta on post / search cards --- .../src/Components/Post_Card_Controller.php | 19 +++++++++++++++---- .../src/Components/Search_Card_Controller.php | 17 ++++++++++++++--- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/wp-content/plugins/core/src/Components/Post_Card_Controller.php b/wp-content/plugins/core/src/Components/Post_Card_Controller.php index 5d61e5655..ed1236603 100644 --- a/wp-content/plugins/core/src/Components/Post_Card_Controller.php +++ b/wp-content/plugins/core/src/Components/Post_Card_Controller.php @@ -19,7 +19,7 @@ class Post_Card_Controller extends Abstract_Controller { private int|false $image_id; private \WP_Term|null $primary_category; private string $title; - private int $author_id; + private string $author_id; private string $author; private string $date; private string $excerpt; @@ -35,11 +35,12 @@ public function __construct( array $args = [] ) { $this->image_id = get_post_thumbnail_id( $this->post_id ); $this->primary_category = $this->get_primary_term( $this->post_id, Category::NAME ); $this->title = get_the_title( $this->post_id ); - $this->author_id = (int) get_post_field( 'post_author', $this->post_id ); - $this->author = get_the_author_meta( 'display_name', $this->author_id ); + $this->author_id = get_post_field( 'post_author', $this->post_id ); $this->date = get_the_date( 'M j, Y', $this->post_id ); $this->excerpt = get_the_excerpt( $this->post_id ); $this->permalink = get_the_permalink( $this->post_id ); + + $this->set_post_author(); } public function get_classes(): string { @@ -69,7 +70,7 @@ public function has_primary_category(): bool { } public function get_primary_category_name(): string { - return $this->primary_category->name; + return $this->has_primary_category() ? $this->primary_category->name : ''; } public function get_title(): string { @@ -104,4 +105,14 @@ public function get_permalink(): string { return $this->permalink; } + private function set_post_author(): void { + if ( '' === $this->author_id ) { + $this->author = ''; + + return; + } + + $this->author = get_the_author_meta( 'display_name', (int) $this->author_id ); + } + } diff --git a/wp-content/plugins/core/src/Components/Search_Card_Controller.php b/wp-content/plugins/core/src/Components/Search_Card_Controller.php index 464c3ba57..132a634b3 100644 --- a/wp-content/plugins/core/src/Components/Search_Card_Controller.php +++ b/wp-content/plugins/core/src/Components/Search_Card_Controller.php @@ -15,7 +15,7 @@ class Search_Card_Controller extends Abstract_Controller { private \WP_Post_Type|null $post_type_object; private int|false $image_id; private string $title; - private int $author_id; + private string $author_id; private string $author; private string $date; private string $excerpt; @@ -31,11 +31,12 @@ public function __construct( array $args = [] ) { $this->post_type_object = get_post_type_object( $this->post_type ); $this->image_id = get_post_thumbnail_id( $this->post_id ); $this->title = get_the_title( $this->post_id ); - $this->author_id = (int) get_post_field( 'post_author', $this->post_id ); - $this->author = get_the_author_meta( 'display_name', $this->author_id ); + $this->author_id = get_post_field( 'post_author', $this->post_id ); $this->date = get_the_date( 'M j, Y', $this->post_id ); $this->excerpt = get_the_excerpt( $this->post_id ); $this->permalink = get_the_permalink( $this->post_id ); + + $this->set_post_author(); } public function get_classes(): string { @@ -98,4 +99,14 @@ public function get_permalink(): string { return $this->permalink; } + private function set_post_author(): void { + if ( '' === $this->author_id ) { + $this->author = ''; + + return; + } + + $this->author = get_the_author_meta( 'display_name', (int) $this->author_id ); + } + } From 27f5b557073a3188842ee434693bd5490ae0f77a Mon Sep 17 00:00:00 2001 From: Geoff Dusome Date: Wed, 28 Jan 2026 09:34:46 -0500 Subject: [PATCH 08/11] [MOOSE-336]: related posts logic; factory method --- .../Components/Related_Posts_Controller.php | 31 +++++++++---------- .../core/blocks/tribe/icon-card/render.php | 2 +- .../core/blocks/tribe/image-card/render.php | 2 +- .../tribe/image-overlay-card/render.php | 2 +- .../blocks/tribe/masthead-search/render.php | 2 +- .../blocks/tribe/related-posts/render.php | 2 +- .../themes/core/blocks/tribe/terms/render.php | 2 +- .../themes/core/components/cards/post.php | 2 +- .../themes/core/components/cards/search.php | 2 +- 9 files changed, 22 insertions(+), 25 deletions(-) diff --git a/wp-content/plugins/core/src/Components/Related_Posts_Controller.php b/wp-content/plugins/core/src/Components/Related_Posts_Controller.php index bfb8062e7..77910eda4 100644 --- a/wp-content/plugins/core/src/Components/Related_Posts_Controller.php +++ b/wp-content/plugins/core/src/Components/Related_Posts_Controller.php @@ -4,6 +4,7 @@ use Tribe\Plugin\Blocks\Helpers\Block_Animation_Attributes; use Tribe\Plugin\Post_Types\Post\Post; +use Tribe\Plugin\Taxonomies\Category\Category; class Related_Posts_Controller extends Abstract_Controller { @@ -42,8 +43,6 @@ public function __construct( array $args = [] ) { $this->chosen_posts = $this->attributes['chosenPosts'] ?? []; $this->posts_to_show = $this->attributes['postsToShow'] ? intval( $this->attributes['postsToShow'] ) : 3; $this->block_layout = $this->attributes['layout'] ?? 'grid'; - $this->query_args = []; - $this->query = new \WP_Query(); $this->set_query_args(); $this->set_query(); @@ -73,27 +72,25 @@ public function get_styles(): string { private function set_query_args(): void { $this->query_args = [ - 'post_type' => Post::NAME, - 'post_status' => 'publish', - 'posts_per_page' => (int) $this->posts_to_show, - 'post__not_in' => [ $this->post_id ], - 'tax_query' => [], + 'post_type' => Post::NAME, + 'post_status' => 'publish', ]; if ( ! $this->has_automatic_selection ) { - unset( - $this->query_args['tax_query'], - $this->query_args['post__not_in'], - $this->query_args['posts_per_page'] - ); - - $this->query_args['post__in'] = array_map( static fn( $post ): int => intval( $post['id'] ), $this->chosen_posts ); - $this->query_args['orderby'] = 'post__in'; + $this->query_args = array_merge( $this->query_args, [ + 'post__in' => array_map( static fn( $post ): int => intval( $post['id'] ), $this->chosen_posts ), + 'orderby' => 'post__in', + ] ); return; } - $post_terms = get_the_terms( $this->post_id, 'category' ); + $this->query_args = array_merge( $this->query_args, [ + 'posts_per_page' => $this->posts_to_show, + 'post__not_in' => [ $this->post_id ], + ] ); + + $post_terms = get_the_terms( $this->post_id, Category::NAME ); if ( empty( $post_terms ) || is_wp_error( $post_terms ) ) { return; @@ -102,7 +99,7 @@ private function set_query_args(): void { $term_ids = wp_list_pluck( $post_terms, 'term_id' ); $this->query_args['tax_query'][] = [ - 'taxonomy' => 'category', + 'taxonomy' => Category::NAME, 'field' => 'term_id', 'terms' => $term_ids, ]; diff --git a/wp-content/themes/core/blocks/tribe/icon-card/render.php b/wp-content/themes/core/blocks/tribe/icon-card/render.php index 8abef54e9..040787b61 100644 --- a/wp-content/themes/core/blocks/tribe/icon-card/render.php +++ b/wp-content/themes/core/blocks/tribe/icon-card/render.php @@ -6,7 +6,7 @@ * @var array $attributes */ -$c = new Icon_Card_Controller( [ +$c = Icon_Card_Controller::factory( [ 'attributes' => $attributes, ] ); ?> diff --git a/wp-content/themes/core/blocks/tribe/image-card/render.php b/wp-content/themes/core/blocks/tribe/image-card/render.php index 267842f8d..61167fe01 100644 --- a/wp-content/themes/core/blocks/tribe/image-card/render.php +++ b/wp-content/themes/core/blocks/tribe/image-card/render.php @@ -6,7 +6,7 @@ * @var array $attributes */ -$c = new Image_Card_Controller( [ +$c = Image_Card_Controller::factory( [ 'attributes' => $attributes, ] ); ?> diff --git a/wp-content/themes/core/blocks/tribe/image-overlay-card/render.php b/wp-content/themes/core/blocks/tribe/image-overlay-card/render.php index 5ff03c7ca..7e8d590cd 100644 --- a/wp-content/themes/core/blocks/tribe/image-overlay-card/render.php +++ b/wp-content/themes/core/blocks/tribe/image-overlay-card/render.php @@ -6,7 +6,7 @@ * @var array $attributes */ -$c = new Image_Overlay_Card_Controller( [ +$c = Image_Overlay_Card_Controller::factory( [ 'attributes' => $attributes, ] ); ?> diff --git a/wp-content/themes/core/blocks/tribe/masthead-search/render.php b/wp-content/themes/core/blocks/tribe/masthead-search/render.php index ab2285318..d6023d561 100644 --- a/wp-content/themes/core/blocks/tribe/masthead-search/render.php +++ b/wp-content/themes/core/blocks/tribe/masthead-search/render.php @@ -2,7 +2,7 @@ use Tribe\Plugin\Components\Masthead_Search_Controller; -$c = new Masthead_Search_Controller(); +$c = Masthead_Search_Controller::factory(); ?>
diff --git a/wp-content/themes/core/blocks/tribe/post-card/render.php b/wp-content/themes/core/blocks/tribe/post-card/render.php index 1f5bfa4a1..5fe8932be 100644 --- a/wp-content/themes/core/blocks/tribe/post-card/render.php +++ b/wp-content/themes/core/blocks/tribe/post-card/render.php @@ -1,15 +1,9 @@ $post_id, - 'animation_attributes' => $animation_attributes, - 'heading_level' => $heading_level, - 'layout' => $layout, + 'post_id' => $post_id, + 'attributes' => $attributes, ] ); diff --git a/wp-content/themes/core/blocks/tribe/related-posts/render.php b/wp-content/themes/core/blocks/tribe/related-posts/render.php index 8006c4cf3..3454dedb5 100644 --- a/wp-content/themes/core/blocks/tribe/related-posts/render.php +++ b/wp-content/themes/core/blocks/tribe/related-posts/render.php @@ -1,20 +1,21 @@ $attributes, + 'attributes' => $attributes, + 'block_classes' => 'b-related-posts', ] ); if ( $c->should_bail_early() || ! $c->get_query()->have_posts() ) { return; } ?> -
esc_attr( $c->get_classes() ), 'style' => $c->get_styles() ] ); ?>> +
esc_attr( $c->get_block_classes() ), 'style' => $c->get_block_styles() ] ); ?>> get_query()->have_posts() ) : ?> get_query()->the_post(); ?> $post_id, - 'animation_attributes' => $animation_attributes, + 'post_id' => $post_id, + 'attributes' => $attributes, ] ); diff --git a/wp-content/themes/core/blocks/tribe/terms/render.php b/wp-content/themes/core/blocks/tribe/terms/render.php index 57233d547..7c0250ebe 100644 --- a/wp-content/themes/core/blocks/tribe/terms/render.php +++ b/wp-content/themes/core/blocks/tribe/terms/render.php @@ -1,7 +1,6 @@ get_the_terms(); -$wrapper_attributes = get_block_wrapper_attributes([ - 'class' => $animation_attributes->get_classes(), - 'style' => $animation_attributes->get_styles(), +$c = Terms_Block_Controller::factory( [ + 'attributes' => $attributes, +] ); +$terms_block_terms = $c->get_the_terms(); +$wrapper_attributes = get_block_wrapper_attributes([ + 'class' => $c->get_block_classes(), + 'style' => $c->get_block_styles(), ]); // No terms and we're in the block editor if ( 0 === count( $terms_block_terms ) && ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) { echo ''; - printf( esc_html__( "No %s", 'tribe' ), $terms_block->get_taxonomy_name() ); + printf( esc_html__( "No %s", 'tribe' ), $c->get_taxonomy_name() ); echo ''; return; @@ -34,7 +34,7 @@ foreach ( $terms_block_terms as $term ) { echo '
  • '; - if ( $terms_block->display_as_links() ) { + if ( $c->display_as_links() ) { printf( '%s', esc_url( get_term_link( $term ) ?? '' ), diff --git a/wp-content/themes/core/components/cards/post.php b/wp-content/themes/core/components/cards/post.php index 9fdd2181f..b6a70e7af 100644 --- a/wp-content/themes/core/components/cards/post.php +++ b/wp-content/themes/core/components/cards/post.php @@ -1,6 +1,6 @@ $post_id, - 'animation_attributes' => $animation_attributes, - 'layout' => $layout, + 'post_id' => $post_id, + 'attributes' => $attributes, + 'block_classes' => 'c-post-card', ] ); ?> -
    get_styles() ) ? sprintf( 'style="%s"', $c->get_styles() ) : ''; ?>> +
    get_block_styles() ) ? sprintf( 'style="%s"', $c->get_block_styles() ) : ''; ?>>
    has_media() ) : ?>
    @@ -38,27 +36,27 @@
    %2$s', - esc_html( $heading_level ), - esc_html( $c->get_title() ) + esc_html( $c->get_heading_level() ), + esc_html( $c->get_post_title() ) ); ?>
    - has_author() || $c->has_date() ) : ?> + has_post_author() || $c->has_post_date() ) : ?>

    - has_author() ) : ?> - get_author_name() ); ?> + has_post_author() ) : ?> + get_post_author() ); ?> - has_author() && $c->has_date() ) : ?> + has_post_author() && $c->has_post_date() ) : ?> • - has_date() ) : ?> - get_date() ); ?> + has_post_date() ) : ?> + get_post_date() ); ?>

    - has_excerpt() ) : ?> -

    get_excerpt() ); ?>

    + has_post_excerpt() ) : ?> +

    get_post_excerpt() ); ?>

    - +
    diff --git a/wp-content/themes/core/components/cards/search.php b/wp-content/themes/core/components/cards/search.php index 51964c800..316d2e919 100644 --- a/wp-content/themes/core/components/cards/search.php +++ b/wp-content/themes/core/components/cards/search.php @@ -1,6 +1,6 @@ $post_id, - 'animation_attributes' => $animation_attributes, + 'post_id' => $post_id, + 'attributes' => $attributes, + 'block_classes' => 'c-search-card', ] ); ?> -
    get_styles() ) ? sprintf( 'style="%s"', $c->get_styles() ) : ''; ?>> +
    get_block_styles() ) ? sprintf( 'style="%s"', $c->get_block_styles() ) : ''; ?>>
    has_media() ) : ?>
    @@ -32,25 +33,25 @@

    get_post_type_name() ); ?>

    -

    get_title() ); ?>

    +

    get_post_title() ); ?>

    - has_author() || $c->has_date() ) : ?> + has_post_author() || $c->has_post_date() ) : ?>

    - has_author() ) : ?> - get_author_name() ); ?> + has_post_author() ) : ?> + get_post_author() ); ?> - has_author() && $c->has_date() ) : ?> + has_post_author() && $c->has_post_date() ) : ?> • - has_date() ) : ?> - get_date() ); ?> + has_post_date() ) : ?> + get_post_date() ); ?>

    - has_date() ) : ?> -

    get_excerpt() ); ?>

    + has_post_date() ) : ?> +

    get_post_excerpt() ); ?>

    -

    get_permalink() ); ?>

    +

    get_post_permalink() ); ?>

    - +