From a58a2e7ca4700d3e23341fde767060a4c2c704a3 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 30 Aug 2026 21:04:37 +0000
Subject: [PATCH] =Minor tweaks to MenuBlock.php
---
inc/blocks/CustomBlocks.php | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/inc/blocks/CustomBlocks.php b/inc/blocks/CustomBlocks.php
index bfd4e69..2443f94 100644
--- a/inc/blocks/CustomBlocks.php
+++ b/inc/blocks/CustomBlocks.php
@@ -1,14 +1,12 @@
<?php
namespace JVBase\blocks;
-use DateTime;
use DOMDocument;
+use JVBase\Instance;
use JVBase\managers\Cache;
-use JVBase\managers\LoginManager;
+use JVBase\managers\Login;
use JVBase\managers\SEO\BreadcrumbManager;
-use JVBase\managers\SEO\render\Thing\CreativeWork\MediaObject\VideoObject;
use JVBase\utility\Image;
-use JVBase\utility\Video;
use WP_Block;
use WP_Query;
@@ -18,6 +16,7 @@
class CustomBlocks
{
+ use Instance;
protected Cache $cache;
protected static ?WP_Query $currentLoop = null;
@@ -31,11 +30,10 @@
protected static array $pendingClass = [];
protected static bool $renderGallery = false;
- public function __construct()
+ private function __construct()
{
- $this->cache = Cache::for('blocks', WEEK_IN_SECONDS);
- $this->cache->connect('post')->connect('taxonomy');
- $this->cache->flush();
+// $this->cache = Cache::for('blocks', null,WEEK_IN_SECONDS);
+
add_filter('pre_render_block', [$this, 'prerender'], 10, 3);
add_filter('render_block', [$this, 'render'], 10, 2);
@@ -113,6 +111,9 @@
protected function checkMethods(?string $content, array $block, ?WP_Block $parent = null, bool $isPrerender = false):?string
{
$blockName = $this->sanitizeBlockName($block);
+ if (str_starts_with($blockName, 'woocommerce')) {
+ return $content;
+ }
$base = ($isPrerender) ? 'prerender_' : 'render_';
$method = $base.$blockName;
@@ -124,7 +125,7 @@
$content = $this->$method($block, $content, $parent);
return $isPrerender ? $this->maybeOutputCustomStyles().$content : $content;
} elseif (JVB_TESTING && !empty($blockName)) {
- if (!in_array($block['blockName'], $this->getIgnore($isPrerender))) {
+ if (!str_starts_with($block['blockName'],'jvb/') && !in_array($block['blockName'], $this->getIgnore($isPrerender))) {
jvbDump('No method found for '.print_r($block['blockName'], true));
}
}
@@ -135,6 +136,7 @@
//Ignore for both
$base = [
'core/null',
+ 'core/pattern',
'core/list-item',
'core/post-content',
'jvb/drawer-menu',
@@ -144,6 +146,8 @@
'jvb/gmbreviews',
'jvb/timeline',
'jvb/video',
+ 'jvb/faq',
+ 'jvb/glossary'
];
if ($isPrerender) {
$base = array_merge($base, [
@@ -164,8 +168,7 @@
}
public function prerender(?string $content, array $block, ?WP_Block $parent = null):?string
{
- $result = $this->checkMethods($content, $block, $parent, true);
- return $result;
+ return $this->checkMethods($content, $block, $parent, true);
}
public function render(string $content, array $block):string
@@ -178,13 +181,12 @@
wp_enqueue_style('jvb-form');
break;
case 'jvb/timeline':
+ case 'jvb/menu':
wp_enqueue_script('jvb-gallery');
add_action('wp_footer', 'jvbRenderGallery');
break;
}
-
-
return $this->checkMethods($content, $block);
}
@@ -550,7 +552,7 @@
}
if (array_key_exists('focalPoint', $attrs)) {
$attrs['isObjectPosition'] = true;
- $style = $this->getFocalPointStyle($attrs['focalPoint'], $attrs);
+ $style = implode(';',$this->getFocalPointStyle($attrs['focalPoint'], $attrs));
$style .= ';object-fit:none;';
$imgLink = str_replace('<img', sprintf(
'<img style="%s"',
@@ -818,8 +820,8 @@
}
if (array_key_exists('displayLoginAsForm', $attrs) && $attrs['displayLoginAsForm']) {
- LoginManager::getInstance()->setAction($action);
- return LoginManager::getInstance()->renderLoginForm($action, $redirect, '<h2>Login</h2>');
+ Login::getInstance()->setAction($action);
+ return Login::getInstance()->renderLoginForm($action, $redirect, '<h2>Login</h2>');
}
@@ -1401,9 +1403,6 @@
if (!static::$currentLoop) {
- if (JVB_TESTING) {
- jvbDump('No loop stored');
- }
return $content;
}
if (static::$currentLoop->have_posts()) {
@@ -1939,9 +1938,7 @@
);
}
- if (JVB_TESTING) {
- jvbDump('Could not create template part block for '.$block['blockName']);
- }
+
return $content;
// $isHeaderTemplate = (
@@ -2788,6 +2785,9 @@
);
}
return $classes;
+ case 'anchor':
+ //TODO: What's this doing?
+ return '';
default:
if (JVB_TESTING && !is_admin() &&!in_array($key, $this->ignore)) {
// TESTING
@@ -3150,7 +3150,9 @@
break;
}
return $this->getColorStyle($value, $type);
-
+ case 'anchor':
+ //TODO: What should we do here?
+ break;
// Any other attributes that need direct styling
default:
if (JVB_TESTING && !is_admin() && !in_array($key, $this->ignore)) {
@@ -3180,7 +3182,7 @@
break;
default:
if (JVB_TESTING) {
- jvbDump($value, 'No preset found for size: '.print_r($value, true));
+ error_log('No preset found for size: '.print_r($value, true));
}
}
}
--
Gitblit v1.10.0