From ac444cba221832c012c0435fdc8339fe9f37febb Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Mon, 11 May 2026 18:35:04 +0000
Subject: [PATCH] =Some changes to the CRUD.js editing, timeline post configuration
---
inc/blocks/CustomBlocks.php | 161 +++++++++++++++++++++++++----------------------------
1 files changed, 77 insertions(+), 84 deletions(-)
diff --git a/inc/blocks/CustomBlocks.php b/inc/blocks/CustomBlocks.php
index b22cb0a..6679038 100644
--- a/inc/blocks/CustomBlocks.php
+++ b/inc/blocks/CustomBlocks.php
@@ -4,6 +4,7 @@
use DateTime;
use DOMDocument;
use JVBase\managers\Cache;
+use JVBase\managers\SEO\BreadcrumbManager;
use WP_Block;
use WP_Query;
@@ -18,7 +19,7 @@
{
$this->cache = Cache::for('blocks', WEEK_IN_SECONDS);
$this->cache->connect('post')->connect('taxonomy');
- add_filter('render_block', [$this, 'render'], 999, 3);
+ add_filter('render_block', [$this, 'render'], 900, 2);
add_action('init', [$this, 'registerBlockStyles']);
}
@@ -64,7 +65,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;
@@ -160,13 +161,13 @@
);
}
- public 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>';
}
- public 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,25 +175,25 @@
: [];
return '<div'.
$this->getClassesAndStyles($block['attrs'], ['col'], $styles).'>'.
- $this->innerBlocks($block).'</div>';
+ $this->inside($block, false, $content).'</div>';
}
- public 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
- public 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
@@ -219,12 +220,12 @@
* Media Blocks
*/
//core_audio
- public 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)) {
@@ -266,7 +267,7 @@
//core_file
- public 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>').
@@ -294,7 +295,7 @@
$caption.'</figure>';
}
- public function render_core_media_text(array $block):string
+ public function render_core_media_text(array $block, string $content):string
{
$ID = $this->imageID('', $block);
@@ -344,10 +345,11 @@
'</h'.$level.'>';
}
- public 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;
}
// public function render_core_list_item(array $block):string
@@ -490,7 +492,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 +500,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));
@@ -535,7 +538,7 @@
return '<li'.$classes.'>'.$linkOpen.$block['attrs']['label'].'</a></li>';
}
- public 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'],'/')) ?
@@ -613,13 +616,19 @@
'main';
if ($content == '') {
- global $post;
+ if(is_singular()) {
+ global $post;
- $block['innerBlocks'] = parse_blocks($post->post_content);
- return $this->innerBlocks($block);
+ $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
public function render_core_post_date(array $block):string
@@ -633,14 +642,14 @@
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
@@ -812,6 +821,7 @@
if (($isHeaderTemplate || $isFooterTemplate)) {
+ $innerContent = $content;
$tag = $isHeaderTemplate ?: $isFooterTemplate ?: 'div';
@@ -820,42 +830,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;
}
@@ -890,7 +888,7 @@
}
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 +921,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
--
Gitblit v1.10.0