From b5abd615697146beeca6dba4acd057d049554a30 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 02 Jan 2026 00:16:00 +0000
Subject: [PATCH] Merge branch 'main' of https://github.com/jakevdwerf/jvb
---
inc/blocks/CustomBlocks.php | 70 ++++++++++++++++------------------
1 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/inc/blocks/CustomBlocks.php b/inc/blocks/CustomBlocks.php
index 52b25d1..f83b57d 100644
--- a/inc/blocks/CustomBlocks.php
+++ b/inc/blocks/CustomBlocks.php
@@ -19,7 +19,6 @@
$this->cache = CacheManager::for('blocks', WEEK_IN_SECONDS);
add_filter('render_block', [$this, 'render'], 999, 3);
-
add_action('init', [$this, 'registerBlockStyles']);
}
@@ -126,7 +125,7 @@
*/
- protected function render_core_button(array $block):string
+ public function render_core_button(array $block):string
{
preg_match('/href="([^"]*)"/', $block['innerHTML'], $url);
preg_match('/>([^<]*)<\/a>/', $block['innerHTML'], $label);
@@ -160,13 +159,13 @@
);
}
- protected function render_core_buttons(array $block):string
+ public function render_core_buttons(array $block):string
{
return '<ul'.$this->getClassesAndStyles($block['attrs'], ['buttons','row']).'>'.
$this->innerBlocks($block).'</ul>';
}
- protected function render_core_column(array $block):string
+ public function render_core_column(array $block):string
{
$styles = (array_key_exists('attrs', $block) &&
array_key_exists('width', $block['attrs'])) ?
@@ -177,7 +176,7 @@
$this->innerBlocks($block).'</div>';
}
- protected function render_core_columns(array $block):string
+ public function render_core_columns(array $block):string
{
return '<section'.
$this->getClassesAndStyles($block['attrs'], ['columns']).'>'.
@@ -185,7 +184,7 @@
}
//core_comment_template
- protected function render_core_group(array $block):string
+ public function render_core_group(array $block):string
{
$tag = (array_key_exists('tagName', $block['attrs'])) ? $block['attrs']['tagName'] : 'div';
@@ -198,12 +197,12 @@
//core_more
//core_nextpage
- protected function render_core_separator(array $block):string
+ public function render_core_separator(array $block):string
{
return '<hr'.$this->getClassesAndStyles($block['attrs']).'>';
}
- protected function render_core_spacer(array $block):string
+ public function render_core_spacer(array $block):string
{
return '<div'.$this->getClassesAndStyles($block['attrs'], ['spacer'], ['height:2rem']).
' aria-hidden="true"></div>';
@@ -219,7 +218,7 @@
* Media Blocks
*/
//core_audio
- protected function render_core_cover(array $block):string
+ public function render_core_cover(array $block):string
{
// Extract block attributes
@@ -254,7 +253,7 @@
// Build classes and styles
unset($attrs['url']);
- $classes = $this->getClassesAndStyles($attrs, ['cover']);
+ $classes = $this->getClassesAndStyles($attrs, ['cover row']);
return '<section' . $classes . '>' .
@@ -266,14 +265,14 @@
//core_file
- protected function render_core_gallery(array $block):string
+ public function render_core_gallery(array $block):string
{
return '<ul'.$this->getClassesAndStyles($block['attrs'], ['gallery']).'>'.
$this->innerBlocks($block,'<li>', '</li>').
'</ul>';
}
- protected function render_core_image(array $block):string
+ public function render_core_image(array $block):string
{
$ID = $this->imageID('', $block);
if (!$ID) {
@@ -294,7 +293,7 @@
$caption.'</figure>';
}
- protected function render_core_media_text(array $block):string
+ public function render_core_media_text(array $block):string
{
$ID = $this->imageID('', $block);
@@ -334,7 +333,7 @@
//render_core_details
//render_core_footnotes
//render_core_classic
- protected function render_core_heading(array $block):string
+ public function render_core_heading(array $block):string
{
$level = (array_key_exists('level', $block['attrs'])) ? $block['attrs']['level'] : '2';
$content = $this->inside($block);
@@ -344,25 +343,25 @@
'</h'.$level.'>';
}
- protected function render_core_list(array $block):string
+ public function render_core_list(array $block):string
{
$tag = (array_key_exists('ordered', $block['attrs'])) ? 'ol' : 'ul';
return '<'.$tag.$this->getClassesAndStyles($block['attrs']).'>'.$this->innerBlocks($block).'</'.$tag.'>';
}
-// protected function render_core_list_item(array $block):string
+// public function render_core_list_item(array $block):string
// {
// return '<li'.$this->getClassesAndStyles($block['attrs']).'>'.$this->inside($block).'</li>';
// }
//render_core_missing
- protected function render_core_paragraph(array $block):string
+ public function render_core_paragraph(array $block):string
{
return '<p'.$this->getClassesAndStyles($block['attrs']).'>'.
$this->inside($block, 'p').
'</p>';
}
- protected function render_core_quote(array $block): string
+ public function render_core_quote(array $block): string
{
$innerHTML = $block['innerHTML'];
@@ -383,7 +382,7 @@
$citeHtml.
'</blockquote>';
}
- protected function render_core_pullquote(array $block): string
+ public function render_core_pullquote(array $block): string
{
$innerHTML = $block['innerHTML'];
@@ -415,7 +414,7 @@
//core_loginout
//core_pattern
- protected function render_core_site_logo(array $block, string $content):string
+ public function render_core_site_logo(array $block, string $content):string
{
$open = $close = '';
@@ -430,7 +429,7 @@
}
//core_site_title_tagline
- protected function render_core_site_title(array $block, string $content):string
+ public function render_core_site_title(array $block, string $content):string
{
$tag = (array_key_exists('level', $block['attrs'])) ? $block['attrs']['level'] : 1;
$tag = ($tag == 0) ? 'p' : 'h'.$tag;
@@ -472,7 +471,7 @@
/**
* Theme Navigation Blocks
*/
- protected function render_core_navigation(array $block, string $content):string
+ public function render_core_navigation(array $block, string $content):string
{
$ID = (array_key_exists('ref', $block['attrs'])) ? $block['attrs']['ref'] : false;
@@ -513,7 +512,7 @@
'</nav>'.$helpmenu;
}
- protected function render_core_navigation_link(array $block):string
+ public function render_core_navigation_link(array $block):string
{
global $wp;
$url = (str_starts_with($block['attrs']['url'],'/')) ?
@@ -535,7 +534,7 @@
return '<li'.$classes.'>'.$linkOpen.$block['attrs']['label'].'</a></li>';
}
- protected function render_core_navigation_submenu(array $block):string
+ public function render_core_navigation_submenu(array $block):string
{
global $wp;
$url = (str_starts_with($block['attrs']['url'],'/')) ?
@@ -605,7 +604,7 @@
//core_post_author
//core_post_author_biography
//core_post_author_name
- protected function render_core_post_content(array $block, string $content = ''):string
+ public function render_core_post_content(array $block, string $content = ''):string
{
$tag = (array_key_exists('tagName', $block['attrs'])) ?
@@ -614,6 +613,7 @@
if ($content == '') {
global $post;
+
$block['innerBlocks'] = parse_blocks($post->post_content);
return $this->innerBlocks($block);
} else {
@@ -621,13 +621,13 @@
}
}
//core_post_date
- protected function render_core_post_date(array $block):string
+ public function render_core_post_date(array $block):string
{
$postDate = get_the_date('c');
return '<time datetime="'.$postDate.'" itemprop="datePublished"'.$this->getClassesAndStyles($block['attrs']).'>'.get_the_date().'</time>';
}
//core_post_excerpt
- protected function render_core_post_featured_image(array $block):string
+ public function render_core_post_featured_image(array $block):string
{
global $post;
$ID = get_post_thumbnail_id($post->ID);
@@ -644,7 +644,7 @@
//core_post_navigation_link
//core_post_template
//core_post_terms
- protected function render_core_post_terms(array $block):string
+ public function render_core_post_terms(array $block):string
{
$terms = get_the_terms(get_the_ID(), $block['attrs']['term']);
$out = '';
@@ -664,7 +664,7 @@
return $out;
}
//core_post_time_to_read
- protected function render_core_post_title(array $block):string
+ public function render_core_post_title(array $block):string
{
$open = $close = '';
if (array_key_exists('isLink', $block['attrs'])) {
@@ -689,9 +689,8 @@
'</h'.$level.'>';
}
- protected function render_core_query(array $block, string $content):string
+ public function render_core_query(array $block, string $content):string
{
-
$queryID = $block['attrs']['queryId'];
$args = [];
$inherit = $block['attrs']['inherit']??false;
@@ -798,7 +797,7 @@
//core_query_pagination_previous
//core_query_title
//core_read_more
- protected function render_core_template_part(array $block, string $content):string
+ public function render_core_template_part(array $block, string $content):string
{
$isHeaderTemplate = (
@@ -877,7 +876,7 @@
//core_rss
//core_search
//core_shortcode
- protected function render_core_social_link(array $block, string $content):string
+ public function render_core_social_link(array $block, string $content):string
{
$url = $block['attrs']['url'];
$service = $block['attrs']['service'];
@@ -888,7 +887,7 @@
}
return '<li><a href="'.$url.'" target="_blank" rel="nofollow" title="Find us on '.ucfirst($service).'">'.$icon.'<span class="screen-reader-text">Find us on '.ucfirst($service).'</span></a></li>';
}
- protected function render_core_social_links(array $block, string $content):string
+ public function render_core_social_links(array $block, string $content):string
{
return '<ul class="socials">'.$this->innerBlocks($block).'</ul>';
}
@@ -1514,7 +1513,6 @@
// Background URL (for cover, media blocks)
case 'url':
- jvbDump($value);
if (!empty($value) && str_starts_with($value, 'http')) {
$styles[] = 'background-image: url('.$value.')';
}
@@ -1750,5 +1748,3 @@
}
}
-
-new CustomBlocks();
--
Gitblit v1.10.0