From 56dabe84560927f59d64eb37a797ac1ae0a46b1b Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 12 May 2026 18:58:21 +0000
Subject: [PATCH] =added state schema.org class
---
inc/blocks/CustomBlocks.php | 239 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 114 insertions(+), 125 deletions(-)
diff --git a/inc/blocks/CustomBlocks.php b/inc/blocks/CustomBlocks.php
index 52b25d1..174e1a7 100644
--- a/inc/blocks/CustomBlocks.php
+++ b/inc/blocks/CustomBlocks.php
@@ -3,7 +3,8 @@
use DateTime;
use DOMDocument;
-use JVBase\managers\CacheManager;
+use JVBase\managers\Cache;
+use JVBase\managers\SEO\BreadcrumbManager;
use WP_Block;
use WP_Query;
@@ -13,12 +14,13 @@
class CustomBlocks
{
- protected CacheManager $cache;
+ protected Cache $cache;
public function __construct()
{
- $this->cache = CacheManager::for('blocks', WEEK_IN_SECONDS);
- add_filter('render_block', [$this, 'render'], 999, 3);
-
+ $this->cache = Cache::for('blocks', WEEK_IN_SECONDS);
+ $this->cache->connect('post')->connect('taxonomy');
+ $this->cache->flush();
+ add_filter('render_block', [$this, 'render'], 900, 2);
add_action('init', [$this, 'registerBlockStyles']);
}
@@ -64,7 +66,7 @@
);
}
- public function render(string $content, array $block, WP_Block $instance)
+ public function render(string $content, array $block)
{
$blockName = $this->sanitizeBlockName($block);
$method = 'render_'.$blockName;
@@ -73,16 +75,16 @@
if (function_exists($function)) {
return $function($block, $content);
// return $this->cache->remember(
-// $block,
+// get_the_ID(),
// function () use ($function, $block, $content) {
// return $function($block, $content);
// }
// );
} else if (method_exists($this, $method)) {
return $this->$method($block, $content);
-
+//
// return $this->cache->remember(
-// $block,
+// get_the_ID(),
// function () use ($method, $block, $content) {
// return $this->$method($block, $content);
// }
@@ -126,7 +128,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 +162,13 @@
);
}
- protected function render_core_buttons(array $block):string
+ public function render_core_buttons(array $block, string $content):string
{
return '<ul'.$this->getClassesAndStyles($block['attrs'], ['buttons','row']).'>'.
- $this->innerBlocks($block).'</ul>';
+ $this->inside($block, false, $content).'</ul>';
}
- protected function render_core_column(array $block):string
+ public function render_core_column(array $block, string $content):string
{
$styles = (array_key_exists('attrs', $block) &&
array_key_exists('width', $block['attrs'])) ?
@@ -174,36 +176,36 @@
: [];
return '<div'.
$this->getClassesAndStyles($block['attrs'], ['col'], $styles).'>'.
- $this->innerBlocks($block).'</div>';
+ $this->inside($block, false, $content).'</div>';
}
- protected function render_core_columns(array $block):string
+ public function render_core_columns(array $block, string $content):string
{
return '<section'.
$this->getClassesAndStyles($block['attrs'], ['columns']).'>'.
- $this->innerBlocks($block).'</section>';
+ $this->inside($block, false, $content).'</section>';
}
//core_comment_template
- protected function render_core_group(array $block):string
+ public function render_core_group(array $block, string $content):string
{
$tag = (array_key_exists('tagName', $block['attrs'])) ? $block['attrs']['tagName'] : 'div';
$classes = ($tag === 'main') ?
'' :
$this->getClassesAndStyles($block['attrs'], ['group']);
- return '<'.$tag.$classes.'>'.$this->innerBlocks($block).'</'.$tag.'>';
+ return '<'.$tag.$classes.'>'.$this->inside($block, false, $content).'</'.$tag.'>';
}
//core_home_link
//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,12 +221,12 @@
* Media Blocks
*/
//core_audio
- protected function render_core_cover(array $block):string
+ public function render_core_cover(array $block, string $content):string
{
// Extract block attributes
$attrs = $block['attrs'] ?? [];
- $innerContent = $this->innerBlocks($block);
+ $innerContent = $this->inside($block, false, $content);
$position = 'object-position: center;';
if (array_key_exists('focalPoint', $attrs)) {
@@ -254,7 +256,7 @@
// Build classes and styles
unset($attrs['url']);
- $classes = $this->getClassesAndStyles($attrs, ['cover']);
+ $classes = $this->getClassesAndStyles($attrs, ['cover row']);
return '<section' . $classes . '>' .
@@ -266,14 +268,14 @@
//core_file
- protected function render_core_gallery(array $block):string
+ public function render_core_gallery(array $block, string $content):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 +296,7 @@
$caption.'</figure>';
}
- protected function render_core_media_text(array $block):string
+ public function render_core_media_text(array $block, string $content):string
{
$ID = $this->imageID('', $block);
@@ -334,7 +336,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 +346,26 @@
'</h'.$level.'>';
}
- protected function render_core_list(array $block):string
+ public function render_core_list(array $block, string $content):string
{
$tag = (array_key_exists('ordered', $block['attrs'])) ? 'ol' : 'ul';
- return '<'.$tag.$this->getClassesAndStyles($block['attrs']).'>'.$this->innerBlocks($block).'</'.$tag.'>';
+ $output = '<'.$tag.$this->getClassesAndStyles($block['attrs']).'>'.$this->inside($block, false, $content).'</'.$tag.'>';
+ return $output;
}
-// 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 +386,7 @@
$citeHtml.
'</blockquote>';
}
- protected function render_core_pullquote(array $block): string
+ public function render_core_pullquote(array $block): string
{
$innerHTML = $block['innerHTML'];
@@ -398,7 +401,7 @@
if ($cite !== '') {
$content = $this->stripTagContents('cite', $content);
}
- $content = apply_filters('the_content', $content);
+ $content = jvb_filter_content( $content);
return '<blockquote'.$this->getClassesAndStyles($block['attrs'], ['pull']).'>'.
$content.
@@ -415,7 +418,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 +433,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 +475,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;
@@ -490,7 +493,7 @@
aria-expanded="false">'.
jvbIcon('list', ['title'=>'Toggle Menu']).
jvbIcon('x', ['title'=>'Toggle Menu']).
- '</button>';
+ '</button>';
$class = ($toggle === '') ?
$this->getClassesAndStyles($block['attrs'], ['mobile']) :
$this->getClassesAndStyles($block['attrs']);
@@ -498,6 +501,7 @@
'<nav><ul>'.jvbNotificationMenu().jvbHelpMenu().'</ul></nav>' :
'';
+
//Allows to add custom items to a menu, based on the menu name
$helpmenu = apply_filters('jvbMenuExtraAfter', $helpmenu, get_the_title($ID));
$main = trim(apply_filters('jvbMenuExtra', $this->innerBlocks($block), get_the_title($ID), $block));
@@ -513,7 +517,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 +539,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 $content):string
{
global $wp;
$url = (str_starts_with($block['attrs']['url'],'/')) ?
@@ -605,7 +609,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'])) ?
@@ -613,38 +617,45 @@
'main';
if ($content == '') {
- global $post;
- $block['innerBlocks'] = parse_blocks($post->post_content);
- return $this->innerBlocks($block);
+ if(is_singular()) {
+ global $post;
+
+ $block['innerBlocks'] = parse_blocks($post->post_content);
+ $result = $this->innerBlocks($block);
+ }else {
+ $result = '';
+ }
} else {
- return $this->inside($block, $tag, $content);
+ $result = $this->inside($block, false, $content);
}
+
+ return apply_filters('jvb_post_content_output', $result, $block);
}
//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);
$aOpen = $aClose = '';
- if(!is_single($ID)) {
+ if(!is_single($post->ID)) {
$aOpen = '<a href="'.get_the_permalink($post->ID).'">';
$aClose = '</a>';
}
- return $aOpen.'<figure'.$this->getClassesAndStyles($block['attrs']).'>'.
+ return '<figure'.$this->getClassesAndStyles($block['attrs']).'>'.$aOpen.
apply_filters('jvbCoreFeaturedImage', $this->image($ID), $post->post_type).
- '</figure>'.$aClose;
+ $aClose.'</figure>';
}
//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 = '';
@@ -654,7 +665,7 @@
$out .= '<li>'.$block['attrs']['prefix'].'</li>';
}
foreach($terms as $term) {
- $out .= '<li><a href="'.get_term_link($term).'" rel="tag">'.$term->name.'</a></li>';
+ $out .= '<li><a href="'.get_term_link($term).'" rel="tag">'.html_entity_decode($term->name).'</a></li>';
}
if (array_key_exists('suffix', $block['attrs'])) {
$out .= '<li>'.$block['attrs']['suffix'].'</li>';
@@ -664,7 +675,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 +700,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 +808,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 = (
@@ -812,6 +822,7 @@
if (($isHeaderTemplate || $isFooterTemplate)) {
+ $innerContent = $content;
$tag = $isHeaderTemplate ?: $isFooterTemplate ?: 'div';
@@ -820,42 +831,30 @@
$beforeHeader = apply_filters('jvbAboveHeader', $beforeHeader);
if ($beforeHeader !== '') {
- $beforeHeader = '<aside class="pre-header">'.$beforeHeader.'</aside>';
+ $beforeHeader = '<aside class="pre header row btw">'.$beforeHeader.'</aside>';
}
- $checked = (is_user_logged_in() && current_user_can('prefers_dark_theme', true)) ? ' checked' : '';
- $title = ($checked == '') ? 'Toggle Dark Mode' : 'Toggle Light Mode';
- $showThemeSwitch = (bool)apply_filters('jvb_show_theme_switch', true);
- $themeSwitch = ($showThemeSwitch) ? '<label title="'.$title.'" id="theme-switch" class="toggle-switch" for="theme-switcher">
- <input class="theme-switch row" id="theme-switcher" name="theme-switcher" type="checkbox"'.$checked.' data-setting="theme" data-theme role="switch" name="dark-mode" aria-label="Toggle dark mode"><span class="slider">'.
- jvbIcon('sun-dim', ['title'=> 'Light Mode']).
- jvbIcon('moon', ['title'=>'Dark Mode']).
- '</span></label>' : '';
- $breadcrumbs = jvbBuildBreadcrumbs();
+ $themeSwitch = jvbDarkModeToggle();
+ $breadcrumbs = BreadcrumbManager::getInstance()->renderNavigation();
$afterHeader = apply_filters('jvbBelowHeader', $afterHeader);
if ($afterHeader !== '') {
- $afterHeader = '<aside class="sub-header">'.$afterHeader.'</aside>';
+ $afterHeader = '<aside class="sub header row btw">'.$afterHeader.'</aside>';
}
$footerText = '<div class="scroll-progress"><div class="bar"></div>
</div>';
} elseif ($isFooterTemplate) {
$beforeHeader = apply_filters('jvbBeforeFooter', '');
if ($beforeHeader !== '') {
- $beforeHeader = '<section class="pre-footer">'.$beforeHeader.'</section>';
+ $beforeHeader = '<aside class="footer">'.$beforeHeader.'</aside>';
}
$footerText = jvbRandomFooterText();
}
-// jvbDump($beforeHeader,'beforeHeader');
-// jvbDump('<'.$tag.$this->getClassesAndStyles($block['attrs']).'>','tag');
-// jvbDump($themeSwitch,'themeSwitch');
-// jvbDump($this->inside($block, $tag, $content),'inside');
-// jvbDump($footerText,'footerText');
-// jvbDump($afterHeader, 'afterheader');
-// jvbDump($breadcrumbs, 'breadcrumbs');
- return $beforeHeader.'<'.$tag.$this->getClassesAndStyles($block['attrs']).'>'.
+ $content = $beforeHeader.'<'.$tag.$this->getClassesAndStyles($block['attrs']).'>'.
$themeSwitch .
- $this->inside($block, $tag, $content) .
+ $this->inside($block, false, $innerContent).
+// $this->innerBlocks($block).
+// $innerContent.
$footerText.'</'.$tag.'>'.$afterHeader.$breadcrumbs;
}
@@ -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,9 +887,9 @@
}
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>';
+ return '<ul class="socials">'.$this->inside($block, false, $content).'</ul>';
}
//core_tag_cloud
@@ -923,51 +922,46 @@
{
$content = '';
foreach ($block['innerBlocks'] as $b) {
- $method = 'render_'.$this->sanitizeBlockName($b);
- $function = BASE.$method;
-
- $content .= $before;
- if (function_exists($function)) {
- $content .= $function($b, '');
- } else if (method_exists($this, $method)) {
- $content .= $this->$method($b, '');
- } else {
- $content .= render_block($b);
- }
- $content .= $after;
+ $content .= $this->render('', $b);
}
return $content;
}
- public function inside(array $block, mixed $tag = false, mixed $o = false):string
- {
- if (!$o) {
- $o = trim($block['innerHTML']);
- }
- if (!$tag) {
- //check to see if there was one dynamically set first
- $tag = (array_key_exists('tagName', $block['attrs'])) ? $block['attrs']['tagName'] : '';
- $tag = ($tag == '') ? str_replace('<', '', strtok($o, '>')) : '';
- $tag = (str_contains($tag, ' class')) ? strtok($tag, ' class') : $tag;
- $tag = trim($tag);
- }
- if (!str_starts_with($o, '<'.$tag)) {
+ public function inside(array $block, mixed $tag = false, mixed $o = false): string
+ {
+ if (!$o) {
+ $o = trim($block['innerHTML']);
+ }
+
+ $dom = new \DOMDocument();
+
+ @$dom->loadHTML('<?xml encoding="utf-8"?>' . $o, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
+
+ // Find the real outermost element
+ $root = null;
+ foreach ($dom->childNodes as $node) {
+ if ($node->nodeType === XML_ELEMENT_NODE) {
+ $root = $node;
+ break;
+ }
+ }
+
+ if (!$root) {
return $o;
}
- $len = strlen('</'.$tag.'>');
+ // Only enforce tag match if explicitly provided
+ if ($tag && strtolower($root->nodeName) !== strtolower($tag)) {
+ return $o;
+ }
- return substr_replace(
- str_replace(
- strtok($o, '>').'>',
- ' ',
- $o
- ),
- '',
- -$len,
- $len
- );
- }
+ $inner = '';
+ foreach ($root->childNodes as $child) {
+ $inner .= $dom->saveHTML($child);
+ }
+
+ return trim($inner);
+ }
/**
* Extract content from a specific nested element
@@ -1166,11 +1160,9 @@
$classes[] = $class;
}
}
- $classes = array_filter($classes, function ($class) {
- return $class!=='' && !str_starts_with($class, 'wp');
- });
-
- return $classes;
+ return array_filter($classes, function ($class) {
+ return $class!=='' && !str_starts_with($class, 'wp');
+ });
}
protected function getClass(string $key, string|bool|array|int $value, array $attrs):string|array
{
@@ -1514,7 +1506,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 +1741,3 @@
}
}
-
-new CustomBlocks();
--
Gitblit v1.10.0