From 42fa8304ddb811b0f725f245130f70c0f5e86a6c Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 04 Nov 2025 06:12:02 +0000
Subject: [PATCH] =Refactored LoginManager to be more extensible and configurable, as well as an AjaxRateLimiter
---
inc/blocks/CustomBlocks.php | 817 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 700 insertions(+), 117 deletions(-)
diff --git a/inc/blocks/CustomBlocks.php b/inc/blocks/CustomBlocks.php
index 721c706..8e175b8 100644
--- a/inc/blocks/CustomBlocks.php
+++ b/inc/blocks/CustomBlocks.php
@@ -1,8 +1,11 @@
<?php
namespace JVBase\blocks;
+use DateTime;
+use DOMDocument;
use JVBase\managers\CacheManager;
use WP_Block;
+use WP_Query;
if (!defined('ABSPATH')) {
exit; // Exit if accessed directly
@@ -14,8 +17,8 @@
protected CacheManager $imgCache;
public function __construct()
{
- $this->cache = new CacheManager('blocks', DAY_IN_SECONDS);
- $this->imgCache = new CacheManager('images', DAY_IN_SECONDS);
+ $this->cache = CacheManager::for('blocks', WEEK_IN_SECONDS);
+ $this->imgCache = CacheManager::for('images', WEEK_IN_SECONDS);
add_action('render_block', [$this, 'render'], 10, 3);
add_action('init', [$this, 'registerBlockStyles']);
@@ -23,6 +26,7 @@
public function registerBlockStyles():void
{
+ do_action('jvbBlockStyles');
//Register extra block styles
register_block_style(
'core/navigation',
@@ -45,12 +49,36 @@
'label' => __('Fixed', 'jvb')
]
);
+ register_block_style(
+ 'core/group',
+ [
+ 'name' =>'callout',
+ 'label' => __('Callout', 'jvb')
+ ]
+ );
+ register_block_style(
+ 'core/group',
+ [
+ 'name' =>'callalt',
+ 'label' => __('Callout Alt', 'jvb')
+ ]
+ );
}
public function render(string $content, array $block, WP_Block $instance)
{
$method = 'render_'.$this->sanitizeBlockName($block);
- if (method_exists($this, $method)) {
+ $function = BASE.$method;
+ if (function_exists($function)) {
+// return $this->cache->remember(
+// $block,
+// function () use ($function, $block, $content) {
+// return $function($block, $content);
+// }
+// );
+ return $function($block, $content);
+ }
+ if (method_exists($this, $method)) {
return $this->$method($block, $content);
//TODO: Recache it
// return $this->cache->remember(
@@ -59,7 +87,18 @@
// return $this->$method($block, $content);
// }
// );
- }
+ } else if (!empty($block['blockName'])){
+ //TESTING
+ $ignore = [
+ 'core/null',
+ 'core/post-title',
+ 'core/list-item',
+ 'core/site-title',
+ ];
+ if (!in_array($block['blockName'], $ignore)) {
+ jvbDump('No method found for '.print_r($block['blockName'], true));
+ }
+ }
if ($block['blockName'] === 'jvb/feed') {
// Enqueue the feed block script (it will automatically load dependencies)
$this->localize_feedblock();
@@ -73,6 +112,7 @@
/**
* Common Blocks
*/
+ //For Reference:
//core_form
//core_form_input
//core_form_submission_notification
@@ -82,25 +122,46 @@
*/
- protected function render_core_button($block):string
+ protected function render_core_button(array $block):string
{
- $link = explode('href="', $block['innerHTML']);
- $url = explode('">', $link[1]);
- $label = explode('</a>', $url[1])[0];
- $url = $url[0];
+ preg_match('/href="([^"]*)"/', $block['innerHTML'], $url);
+ preg_match('/>([^<]*)<\/a>/', $block['innerHTML'], $label);
- return '<li'.$this->getClassesAndStyles($block['attrs'],['row']).'>
- <a href="'.$url.'">'.$label.'</a>
- </li>';
+ if (empty($url[1]) || empty($label[1])) {
+ return '';
+ }
+ $icon = '';
+ if (str_contains($url[1], 'google.com/maps')) {
+ $icon = 'google-logo';
+ }
+ if (str_contains($url[1], 'maps.apple.com')) {
+ $icon = 'apple-logo';
+ }
+ if ($icon !== '') {
+ return sprintf(
+ '<li%s><a href="%s" title="Find Us On %s">%s Maps</a></li>',
+ $this->getClassesAndStyles($block['attrs']),
+ esc_url($url[1]),
+ esc_html($label[1]),
+ jvbIcon($icon)
+ );
+ }
+
+ return sprintf(
+ '<li%s><a href="%s">%s</a></li>',
+ $this->getClassesAndStyles($block['attrs']),
+ esc_url($url[1]),
+ esc_html($label[1])
+ );
}
- protected function render_core_buttons($block):string
+ protected function render_core_buttons(array $block):string
{
- return '<ul'.$this->getClassesAndStyles($block['attrs'], ['buttons row']).'">'.
+ return '<ul'.$this->getClassesAndStyles($block['attrs'], ['buttons','row']).'>'.
$this->innerBlocks($block).'</ul>';
}
- protected function render_core_column($block):string
+ protected function render_core_column(array $block):string
{
$styles = (array_key_exists('attrs', $block) &&
array_key_exists('width', $block['attrs'])) ?
@@ -111,7 +172,7 @@
$this->innerBlocks($block).'</div>';
}
- protected function render_core_columns($block):string
+ protected function render_core_columns(array $block):string
{
return '<section'.
$this->getClassesAndStyles($block['attrs'], ['columns']).'>'.
@@ -119,24 +180,24 @@
}
//core_comment_template
- protected function render_core_group($block):string
+ protected function render_core_group(array $block):string
{
$tag = (array_key_exists('tagName', $block['attrs'])) ? $block['attrs']['tagName'] : 'div';
$classes = ($tag === 'main') ?
$this->getClassesAndStyles($block['attrs']) :
- $this->getClassesAndStyles($block['attrs'], ['group row']);
+ $this->getClassesAndStyles($block['attrs'], ['group']);
return '<'.$tag.$classes.'>'.$this->innerBlocks($block).'</'.$tag.'>';
}
//core_home_link
//core_more
//core_nextpage
- protected function render_core_separator($block):string
+ protected function render_core_separator(array $block):string
{
return '<hr'.$this->getClassesAndStyles($block['attrs']).'>';
}
- protected function render_core_spacer($block):string
+ protected function render_core_spacer(array $block):string
{
return '<div'.$this->getClassesAndStyles($block['attrs'], ['spacer'], ['height:2rem']).
' aria-hidden="true"></div>';
@@ -152,49 +213,52 @@
* Media Blocks
*/
//core_audio
- protected function render_core_cover($block):string
+ protected function render_core_cover(array $block):string
{
+
// Extract block attributes
$attrs = $block['attrs'] ?? [];
$innerContent = $this->innerBlocks($block);
- // Handle overlay opacity
- $dimRatio = $attrs['dimRatio'] ?? 50;
- $overlayClass = 'overlay-' . (ceil($dimRatio / 25) * 25);
-
- // Build classes and styles
- $classes = $this->getClassesAndStyles($attrs, ['cover', $overlayClass]);
+ if (array_key_exists('focalPoint', $attrs)) {
+ $x = (array_key_exists('x', $attrs['focalPoint'])) ? ($attrs['focalPoint']['x'] * 100).'%' : 'center';
+ $y = (array_key_exists('y', $attrs['focalPoint'])) ? ($attrs['focalPoint']['y'] * 100).'%' : 'center';
+ $position = 'object-position:'.$x.' '.$y.';';
+ unset($attrs['focalPoint']);
+ }
// Check for background type
$backgroundType = $attrs['backgroundType'] ?? 'image';
$background = '';
- if ($backgroundType === 'image' && isset($attrs['url'])) {
- // Image background
- $background = '<div class="cover-bg" aria-hidden="true"></div>';
+ if ($backgroundType === 'image' && isset($attrs['id'])) {
+ $background .= str_replace('<img', '<img style="'.$position.'"', $this->image($attrs['id']));
} elseif ($backgroundType === 'video' && isset($attrs['url'])) {
- // Video background
- $background = '<div class="cover-bg" aria-hidden="true"></div>';
- $background .= '<video autoplay muted loop playsinline src="' . esc_url($attrs['url']) . '"></video>';
+ $background .= '<video style="'.$position.'"autoplay muted loop playsinline src="' . esc_url($attrs['url']) . '"></video>';
}
- return '<div' . $classes . '>' .
+ // Build classes and styles
+ unset($attrs['url']);
+ $classes = $this->getClassesAndStyles($attrs, ['cover']);
+
+
+ return '<section' . $classes . '>' .
$background .
'<div class="content">' .
$innerContent .
- '</div></div>';
+ '</div></section>';
}
//core_file
- protected function render_core_gallery($block):string
+ protected 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($block):string
+ protected function render_core_image(array $block):string
{
$ID = $this->imageID('', $block);
if (!$ID) {
@@ -215,15 +279,20 @@
$caption.'</figure>';
}
- protected function render_core_media_text($block):string
+ protected function render_core_media_text(array $block):string
{
+
$ID = $this->imageID('', $block);
- $img = ($ID) ? $this->image($ID, $block) : '';
$imgLink = ($ID) ? $this->imageLink(true, $ID) : '';
$inner = $this->innerBlocks($block);
- $content = '<div'.$this->getClassesAndStyles($block['attrs'], ['media-text']).'>';
+
+ $classes = ['media-text', 'row'];
+ if (array_key_exists('isStackedOnMobile', $block['attrs'])) {
+ $classes[] = 'nowrap';
+ }
+ $content = '<div'.$this->getClassesAndStyles($block['attrs'], $classes).'>';
$content .= (array_key_exists(
'mediaPosition',
$block['attrs']
@@ -251,22 +320,74 @@
protected function render_core_heading(array $block):string
{
$level = (array_key_exists('level', $block['attrs'])) ? $block['attrs']['level'] : '2';
- $id = sanitize_title(wp_strip_all_tags($block['innerHTML']));
+ $content = $this->inside($block);
+ $id = sanitize_title(wp_strip_all_tags($this->stripTagContents('small', $content)));
return '<h'.$level.' id="'.$id.'"'.$this->getClassesAndStyles($block['attrs']).'>'.
- $this->inside($block).
+ $content.
'</h'.$level.'>';
}
- //render_core_list
- //render_core_list_item
+
+ protected 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
+// {
+// return '<li'.$this->getClassesAndStyles($block['attrs']).'>'.$this->inside($block).'</li>';
+// }
//render_core_missing
protected function render_core_paragraph(array $block):string
{
- return '<p'.$this->getClassesAndStyles($block['attrs'], ['paragraph']).'>'.
+ return '<p'.$this->getClassesAndStyles($block['attrs']).'>'.
$this->inside($block, 'p').
'</p>';
}
- //render_core_quote
+ protected function render_core_quote(array $block): string
+ {
+ $innerHTML = $block['innerHTML'];
+
+ // Extract cite content first
+ $cite = $this->extractElement($innerHTML, 'cite');
+ $citeHtml = ($cite === '') ? '' : '<cite>— '.$cite.'</cite>';
+
+ // Get the blockquote content
+ $content = $this->inside($block, 'blockquote');
+
+ // Remove the cite element from content if it exists
+ if ($cite !== '') {
+ $content = $this->stripTagContents('cite', $content);
+ }
+
+ return '<blockquote'.$this->getClassesAndStyles($block['attrs']).'>
+ <div class="content">'.$content.'</div>'.
+ $citeHtml.
+ '</blockquote>';
+ }
+ protected function render_core_pullquote(array $block): string
+ {
+ $innerHTML = $block['innerHTML'];
+
+ // Extract cite content first
+ $cite = $this->extractElement($innerHTML, 'cite');
+ $citeHtml = ($cite === '') ? '' : '<cite>— '.$cite.'</cite>';
+
+ // Get the blockquote content
+ $content = $this->extractElement($innerHTML, 'blockquote');
+
+ // Remove the cite element from content if it exists
+ if ($cite !== '') {
+ $content = $this->stripTagContents('cite', $content);
+ }
+ $content = apply_filters('the_content', $content);
+
+ return '<blockquote'.$this->getClassesAndStyles($block['attrs'], ['pull']).'>'.
+ $content.
+ $citeHtml.
+ '</blockquote>';
+ }
//render_core_table
//render_core_verse
@@ -280,12 +401,13 @@
protected function render_core_site_logo(array $block, string $content):string
{
$open = $close = '';
- if ($block['attrs']['isLink']) {
+
+ if (!is_home() && !is_front_page()) {
$open = '<a href="'.get_home_url().'" rel="home">';
$close = '</a>';
}
$img = get_theme_mod('custom_logo');
- $img = $this->image($img);
+ $img = $this->image($img, 'tiny', 'thumbnail');
$img = str_replace('<img', '<img'.$this->getClassesAndStyles($block['attrs']), $img);
return $open.$img.$close;
}
@@ -308,10 +430,7 @@
return '<'.$tag.$class.'>'.
$open.
- jvbIcon('logo-basic').
- '<span class="screen-reader-text">'.
get_bloginfo('name').
- '</span>'.
$close.
'</'.$tag.'>';
}
@@ -338,9 +457,9 @@
*/
protected function render_core_navigation(array $block, string $content):string
{
- $ID = $block['attrs']['ref'];
+ $ID = (array_key_exists('ref', $block['attrs'])) ? $block['attrs']['ref'] : false;
- if (empty($block['innerBlocks']) && get_post($ID)) {
+ if (empty($block['innerBlocks']) && $ID && get_post($ID)) {
$block['innerBlocks'] = parse_blocks(get_post($ID)->post_content);
}
@@ -364,17 +483,20 @@
//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));
+
+ $main = str_starts_with($main, '<ul') ? $main : '<ul>'.$main.'</ul>';
+
return '<nav'.$class.' id="navigation-' . $ID . '"aria-label="Navigation">
<span class="screen-reader-text">
<a href="#content">Skip to Content</a>
</span>' .
$toggle .
- '<ul>'.
- apply_filters('jvbMenuExtra', $this->innerBlocks($block), get_the_title($ID)).
- '</ul></nav>'.$helpmenu;
+ $main.
+ '</nav>'.$helpmenu;
}
- protected function render_core_navigation_link($block):string
+ protected function render_core_navigation_link(array $block):string
{
global $wp;
$url = (str_starts_with($block['attrs']['url'],'/')) ?
@@ -431,7 +553,7 @@
home_url($attrs['url']) :
$attrs['url'];
- $type = $id = $label = $desc = $rel = $title = $kind = '';
+ $target = $type = $id = $label = $desc = $rel = $title = $kind = '';
foreach ($attrs as $k => $v) {
switch ($k) {
case 'description':
@@ -449,9 +571,12 @@
case 'type':
$type = $v;
break;
+ case 'opensInNewTab':
+ $target = ' target="'.$v.'"';
+ break;
}
}
- return '<a href="'.$url.'"'.$aria.$rel.$title.'>';
+ return '<a href="'.$url.'"'.$aria.$rel.$target.$title.'>';
}
/**
@@ -465,7 +590,7 @@
$tag = (array_key_exists('tagName', $block['attrs'])) ?
$block['attrs']['tagName'] :
- 'div';
+ 'main';
if ($content == '') {
return do_blocks(get_the_content(get_the_ID()));
@@ -474,6 +599,11 @@
}
}
//core_post_date
+ protected 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
{
@@ -484,6 +614,25 @@
//core_post_navigation_link
//core_post_template
//core_post_terms
+ protected function render_core_post_terms(array $block):string
+ {
+ $terms = get_the_terms(get_the_ID(), $block['attrs']['term']);
+ $out = '';
+ if ($terms && !is_wp_error($terms)) {
+ $out = '<ul class="term-list">';
+ if (array_key_exists('prefix', $block['attrs'])) {
+ $out .= '<li>'.$block['attrs']['prefix'].'</li>';
+ }
+ foreach($terms as $term) {
+ $out .= '<li><a href="'.get_term_link($term).'" rel="tag">'.$term->name.'</a></li>';
+ }
+ if (array_key_exists('suffix', $block['attrs'])) {
+ $out .= '<li>'.$block['attrs']['suffix'].'</li>';
+ }
+ $out .= '</ul>';
+ }
+ return $out;
+ }
//core_post_time_to_read
protected function render_core_post_title(array $block):string
{
@@ -509,7 +658,103 @@
$open.get_the_title().$close.
'</h'.$level.'>';
}
- //core_query
+
+ protected function render_core_query(array $block, string $content):string
+ {
+// jvbDump($block);
+// $queryID = $block['attrs']['queryId'];
+// $args = [];
+// $inherit = $block['attrs']['inherit']??false;
+// if ($inherit) {
+// global $wp_query;
+// $loop = $wp_query;
+// } else {
+// foreach ($block['attrs']['query'] as $key => $value) {
+// if (empty($value)) {
+// continue;
+// }
+// switch ($key) {
+// case 'postType':
+// $args['post_type'] = $value;
+// break;
+// case 'perPage':
+// $args['posts_per_page'] = $value;
+// break;
+// case 'orderBy':
+// $args['orderby'] = $value;
+// break;
+// case 'taxQuery':
+// $taxQuery = [];
+// foreach ($value as $tax => $terms) {
+// $taxQuery[] = [
+// 'taxonomy' => $tax,
+// 'terms' => $terms
+// ];
+// }
+// if (!empty($taxQuery)) {
+// $args['tax_query'] = $taxQuery;
+// if (count($taxQuery) > 1) {
+// $args['tax_query']['relation'] = 'OR';
+// }
+// }
+// break;
+// case 'sticky':
+// if ($value === 'ignore') {
+// $args['ignore_sticky_posts'] = true;
+// } else if ($value === 'exclude'){
+// $args['post__not_in'] = get_option('sticky_posts');
+// } else if ($value === 'only') {
+// $args['include'] = get_option('sticky_posts');
+// }
+// break;
+// case 'search':
+// $args['s'] = $value;
+// break;
+// default:
+// $args[$key] = $value;
+// break;
+//
+// }
+// }
+// //Add in any args from the query string
+// $search = 'query-'.$queryID;
+// foreach ($_GET as $key => $value) {
+// if (str_contains($key, $search)) {
+// $key = str_replace($search, '', $key);
+// if ($key === 'page') {
+// $args['paged'] = (int)$value;
+// }
+// }
+// }
+// $loop = new WP_Query($args);
+// }
+
+// $inner = $this->innerBlocks($block);
+// foreach ($block['innerBlocks'] as $innerBlock) {
+// switch ($innerBlock['blockName']) {
+// case 'core/post-template':
+// $inner .= '<ul class="item-grid">';
+// if ($loop->have_posts()) {
+// while($loop->have_posts()) {
+// $loop->the_post();
+// $inner .= $this->doBlocks
+// }
+// }
+// $inner .= '</ul>';
+// break;
+// }
+// }
+
+
+
+ $tagName = (array_key_exists('tagName', $block['attrs'])) ? $block['attrs']['tagName'] : 'div';
+ $out = '<'.$tagName.' class="loop">'.$this->innerBlocks($block).'</'.$tagName.'>';
+// if ($inherit) {
+// wp_reset_postdata();
+// }
+ return $out;
+ }
+
//core_query_no_results
//core_query_pagination
//core_query_pagination_next
@@ -519,25 +764,48 @@
//core_read_more
protected function render_core_template_part(array $block, string $content):string
{
- if (array_key_exists('attrs', $block) && array_key_exists('slug', $block['attrs']) &&
- in_array($block['attrs']['slug'], array('header', 'footer'))) {
- $tag = (array_key_exists('slug', $block['attrs'])) ? $block['attrs']['slug'] : 'div';
- $breadcrumbs = $themeSwitch = $afterHeader = $footerText= '';
- if ($block['attrs']['slug'] == 'header') {
+ $check = ['header', 'footer'];
+ $isHeaderTemplate = (
+ (array_key_exists('slug', $block['attrs']) && str_contains($block['attrs']['slug'], 'header')) ||
+ (array_key_exists('tagName', $block['attrs']) && str_contains($block['attrs']['tagName'], 'header'))
+ ) ? 'header' : false;
+ $isFooterTemplate = (
+ (array_key_exists('slug', $block['attrs']) && str_contains($block['attrs']['slug'], 'footer')) ||
+ (array_key_exists('tagName', $block['attrs']) && str_contains($block['attrs']['tagName'], 'footer'))
+ ) ? 'footer' : false;
+
+
+ if ($isHeaderTemplate || $isFooterTemplate) {
+ $tag = $isHeaderTemplate ?: $isFooterTemplate ?: 'div';
+
+ $breadcrumbs = $themeSwitch = $afterHeader = $beforeHeader = $footerText= '';
+ if ($isHeaderTemplate) {
+
+ $beforeHeader = apply_filters('jvbAboveHeader', $beforeHeader);
+ if ($beforeHeader !== '') {
+ $beforeHeader = '<aside class="pre-header">'.$beforeHeader.'</aside>';
+ }
$checked = (is_user_logged_in() && current_user_can('prefers_dark_theme', true)) ? ' checked' : '';
$title = ($checked == '') ? 'Toggle Dark Mode' : 'Toggle Light Mode';
$themeSwitch = '<label title="'.$title.'" id="theme-switch" class="toggle-switch" for="theme-switcher">
- <input class="theme-switch row" id="theme-switcher" type="checkbox"'.$checked.' role="switch" name="dark-mode"><span class="slider">'.
+ <input class="theme-switch row" id="theme-switcher" type="checkbox"'.$checked.' data-setting="theme" data-theme role="switch" name="dark-mode"><span class="slider">'.
jvbIcon('light', ['title'=> 'Light Mode']).
jvbIcon('dark', ['title'=>'Dark Mode']).
'</span></label>';
$breadcrumbs = jvbBuildBreadcrumbs();
$afterHeader = apply_filters('jvbBelowHeader', $afterHeader);
- } elseif ($block['attrs']['slug'] == 'footer') {
- $footerText = jvbRandomFooterText();
+ if ($afterHeader !== '') {
+ $afterHeader = '<aside class="sub-header">'.$afterHeader.'</aside>';
+ }
+ } elseif ($isFooterTemplate) {
+ $beforeHeader = apply_filters('jvbBeforeFooter', '');
+ if ($beforeHeader !== '') {
+ $beforeHeader = '<section class="pre-footer">'.$beforeHeader.'</section>';
+ }
+ $footerText = jvbRandomFooterText();
}
- return '<'.$tag.$this->getClassesAndStyles($block['attrs']).'>'.
+ return $beforeHeader.'<'.$tag.$this->getClassesAndStyles($block['attrs']).'>'.
$themeSwitch .
$this->inside($block, $tag, $content).
$footerText.'</'.$tag.'>'.$afterHeader.$breadcrumbs;
@@ -560,10 +828,24 @@
//core_rss
//core_search
//core_shortcode
- //core_social_link
- //core_social_links
+ protected function render_core_social_link(array $block, string $content):string
+ {
+ $url = $block['attrs']['url'];
+ $service = $block['attrs']['service'];
+ $iconName = ($service === 'bluesky') ? 'butterfly' : $service.'-logo';
+ $icon = jvbIcon($iconName);
+ if (!$icon) {
+ $icon = jvbIcon('link');
+ }
+ 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
+ {
+ return '<ul class="socials">'.$this->innerBlocks($block).'</ul>';
+ }
//core_tag_cloud
+
/**
* Extra feed block localization
*/
@@ -585,6 +867,13 @@
/***********************************
* Helpers
**********************************/
+ public function stripTagContents(string $tag, string $content):string
+ {
+ $clean = preg_replace('/<'.$tag.'\b[^>]*>.*?<\/'.$tag.'>/is', '', $content);
+ $clean = preg_replace('/\s+/', ' ', $clean);
+ return trim($clean);
+ }
+
public function innerBlocks(array $block, string $before = '', string $after = ''):string
{
$content = '';
@@ -629,8 +918,35 @@
);
}
+ /**
+ * Extract content from a specific nested element
+ * @param string $html The HTML to parse
+ * @param string $tag The tag name to extract
+ * @return string The content of the first matching element, or empty string
+ */
+ protected function extractElement(string $html, string $tag): string
+ {
+ if (empty($html)) {
+ return '';
+ }
+
+ $dom = new DOMDocument();
+ // Suppress errors for malformed HTML
+ libxml_use_internal_errors(true);
+ $dom->loadHTML('<?xml encoding="utf-8" ?>' . $html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
+ libxml_clear_errors();
+
+ $elements = $dom->getElementsByTagName($tag);
+ if ($elements->length === 0) {
+ return '';
+ }
+
+ return trim($elements->item(0)->textContent);
+ }
+
public function imageID(int|string $ID, array $block = []):int|false
{
+
if ($ID === '' && !empty($block)) {
if (($block['blockName'] === 'core/post-featured-image' ||
(!array_key_exists('attrs', $block) && !array_key_exists('id', $block['attrs'])))) {
@@ -643,7 +959,7 @@
}
}
}
- if ($ID == '' || is_null(get_post($ID))) {
+ if (!is_int($ID)) {
return false;
}
return $ID;
@@ -674,7 +990,7 @@
}
return $img;
}
- public function image($ID = '', $start = 'tiny', $replace = 'large'):string
+ public function image(string $ID = '', string $start = 'tiny', string $replace = 'large'):string
{
if ($ID == '') {
$ID = $this->imageID($ID);
@@ -684,7 +1000,10 @@
if ($ID === 0 || $ID === false) {
return '';
}
- $img = wp_get_attachment_image_src($ID, $start)[0];
+
+ $img = wp_get_attachment_image_src($ID, $start);
+ if (!$img) return '';
+ $img = $img[0];
$data = $this->gallerySizes($ID, $replace);
@@ -815,13 +1134,13 @@
protected function getPresetSpacing(string $spacing):string
{
return match ($spacing) {
- 'var:preset|spacing|20' => '0.5rem', // 1
- 'var:preset|spacing|30' => '1rem', // 2
- 'var:preset|spacing|40' => '1.5rem', // 3
- 'var:preset|spacing|50' => '3rem', // 4
- 'var:preset|spacing|60' => '4rem', // 5
- 'var:preset|spacing|70' => '5rem', // 6
- 'var:preset|spacing|80' => '6rem', // 7
+ 'var:preset|spacing|20' => 1,
+ 'var:preset|spacing|30' => 2,
+ 'var:preset|spacing|40' => 3,
+ 'var:preset|spacing|50' => 4,
+ 'var:preset|spacing|60' => 5,
+ 'var:preset|spacing|70' => 6,
+ 'var:preset|spacing|80' => 7,
default => $spacing,
};
}
@@ -833,7 +1152,7 @@
}
$classes = [];
foreach ($attrs as $key => $value) {
- $class = $this->getClass($key, $value);
+ $class = $this->getClass($key, $value, $attrs);
if (is_array($class)) {
$classes = array_merge($classes, $class);
} else {
@@ -846,38 +1165,87 @@
return $classes;
}
- protected function getClass(string $key, string|bool|array|int $value):string|array
+ protected function getClass(string $key, string|bool|array|int $value, array $attrs):string|array
{
+
switch ($key) {
//Any additional classes the user adds
case 'className':
return match ($value) {
'is-style-floating' => 'always mobile fixed',
'is-style-fixed' => 'fixed bottom',
- default => $value,
+ default => str_replace('is-style-', '', $value),
};
+ case 'contentPosition':
+ $classes = [];
+ $pos = explode(' ', $value);
+ foreach($pos as $p) {
+ switch ($p) {
+ case 'top':
+ $classes[] = 'a-start';
+ break;
+ case 'right':
+ $classes[] = 'end';
+ break;
+ case 'bottom':
+ $classes[] = 'a-end';
+ break;
+ case 'left':
+ $classes[] = 'start';
+ break;
+ }
+ }
+ return implode(' ', $classes);
//Layout attributes
case 'layout':
$classes = [];
+ $type = 'row';
if (array_key_exists('type', $value)) {
+ $type = 'col';
if ($value['type'] === 'constrained') {
- $classes[] = 'container';
+ $classes[] = 'container col';
}
}
- if (array_key_exists('justifyContent', $value)) {
- if (in_array($value['justifyContent'], ['left', 'right','space-between'])) {
- $classes[] = 'j-'.$value['justifyContent'];
- }
- }
- if (array_key_exists('orientation', $value)) {
+ if (array_key_exists('orientation', $value)) {
+ $type = 'col';
if ($value['orientation'] === 'vertical') {
- $classes[] = 'col';
+ $classes[] = 'col';
if (in_array('row', $classes)) {
$index = array_search('row', $classes);
unset($classes[$index]);
}
- }
- }
+ }
+ }else if (array_key_exists('type', $value) && $value['type'] === 'flex') {
+ $classes[] = 'row';
+ if (in_array('col', $classes)) {
+ $index = array_search('col', $classes);
+ unset($classes[$index]);
+ }
+ }
+//jvbDump($type);
+//jvbDump($value);
+// $check = [$value, $attrs];
+// foreach ($check as $ch) {
+//
+// }
+ if (!array_key_exists('justifyContent', $value) && !array_key_exists('contentPosition', $attrs)) {
+ $classes[] = 'start';
+ }
+ if (array_key_exists('justifyContent', $value) && !array_key_exists('contentPosition', $attrs)) {
+ if (in_array($value['justifyContent'], ['left', 'right','space-between'])) {
+// jvbDump($type);
+ switch ($value['justifyContent']) {
+ case 'right':
+ $classes[] = 'end';
+ break;
+ case 'space-between':
+ $classes[] = 'btw';
+ break;
+ }
+ }
+ }
+
+
if (array_key_exists('flexWrap', $value)) {
if ($value['flexWrap'] === 'nowrap') {
$classes[] = 'nowrap';
@@ -898,11 +1266,11 @@
case 'dimRatio':
if (is_numeric($value)) {
$width = match (true) {
- $value < 25 => 'one-fourth',
- $value < 33 => 'one-third',
- $value < 50 => 'half',
- $value < 66 => 'two-third',
- $value < 75 => 'three-fourth',
+ $value < 25 => '25',
+ $value < 33 => '33',
+ $value <= 50 => '50',
+ $value < 66 => '66',
+ $value < 75 => '75',
default => 'full',
};
switch ($key) {
@@ -930,22 +1298,84 @@
case 'style':
$classes = [];
//Margin and Padding
- if (array_key_exists('spacing', $value)) {
- foreach (['margin' => 'm', 'padding'=>'p'] as $search => $c) {
- if (array_key_exists($search, $value['spacing'])) {
- foreach ($value['spacing'][$search] as $direction => $size) {
- $size = $this->getPresetSpacing($size);
- if ($size) {
- $classes[] = $c.'-'.$direction.'-'.$size;
- }
- }
- }
- }
- }
+ if (array_key_exists('spacing', $value)) {
+ foreach (['margin' => 'm', 'padding'=>'p'] as $search => $c) {
+ if (array_key_exists($search, $value['spacing'])) {
+ $directions = [];
+
+ // Collect ONLY preset spacing values for classes
+ foreach ($value['spacing'][$search] as $direction => $size) {
+ $presetSize = $this->getPresetSpacing($size);
+ if ($presetSize) {
+ $directions[$direction] = $presetSize;
+ }
+ // Non-preset values are skipped here and handled by inline styles below
+ }
+
+ if (empty($directions)) {
+ continue;
+ }
+
+ // Check what directions we have
+ $hasTop = isset($directions['top']);
+ $hasBottom = isset($directions['bottom']);
+ $hasLeft = isset($directions['left']);
+ $hasRight = isset($directions['right']);
+
+ // Check if axes match
+ $xMatch = $hasLeft && $hasRight && $directions['left'] === $directions['right'];
+ $yMatch = $hasTop && $hasBottom && $directions['top'] === $directions['bottom'];
+
+ // All 4 directions exist and match → p-3
+ if ($hasTop && $hasBottom && $hasLeft && $hasRight &&
+ count(array_unique($directions)) === 1) {
+ $classes[] = $c . '-' . reset($directions);
+ }
+ // Both axes match → px-3 py-2
+ elseif ($xMatch && $yMatch) {
+ $classes[] = $c . 'x-' . $directions['left'];
+ $classes[] = $c . 'y-' . $directions['top'];
+ }
+ // Only X axis matches → px-3 (+ individual for top/bottom)
+ elseif ($xMatch) {
+ $classes[] = $c . 'x-' . $directions['left'];
+ if ($hasTop) {
+ $classes[] = $c . 't-' . $directions['top'];
+ }
+ if ($hasBottom) {
+ $classes[] = $c . 'b-' . $directions['bottom'];
+ }
+ }
+ // Only Y axis matches → py-3 (+ individual for left/right)
+ elseif ($yMatch) {
+ $classes[] = $c . 'y-' . $directions['top'];
+ if ($hasLeft) {
+ $classes[] = $c . 'l-' . $directions['left'];
+ }
+ if ($hasRight) {
+ $classes[] = $c . 'r-' . $directions['right'];
+ }
+ }
+ // No matches - individual directions
+ else {
+ foreach ($directions as $direction => $size) {
+ $dir = match($direction) {
+ 'top' => 't',
+ 'bottom' => 'b',
+ 'left' => 'l',
+ 'right' => 'r',
+ default => $direction
+ };
+ $classes[] = $c . $dir . '-' . $size;
+ }
+ }
+ }
+ }
+ }
if (array_key_exists('fontSize', $value)) {
if (in_array($value['fontSize'], ['small', 'large', 'extra-large', 'huge'])) {
- $classes[] = 'text-'.$value['fontSize'];
+ $classes[] = 'font-'.$value['fontSize'];
}
if (in_array('fontWeight', $value)) {
$classes[] = 'text-'.$value['fontWeight'];
@@ -957,8 +1387,76 @@
}
}
return implode(' ', $classes);
-
+ case 'fontSize':
+ $classes[] = 'font-'.$value;
+ return implode(' ', $classes);
+ case 'isStackedOnMobile':
+ return ($value === true) ? 'stack-small' : '';
+ case 'width':
+ if (is_numeric($value)) {
+ $width = match (true) {
+ $value < 25 => '25',
+ $value < 33 => '33',
+ $value <= 50 => '50',
+ $value < 66 => '66',
+ $value < 75 => '75',
+ default => 'full',
+ };
+ switch ($key) {
+ case 'width':
+ return 'width-'.$width;
+ case 'dimRatio':
+ return 'overlay-'.$width;
+ }
+ }
+ return '';
default:
+ $ignore = [
+ 'opacity',
+ 'borderColor',
+ 'backgroundColor',
+ 'textColor',
+ 'minHeight',
+ 'minHeightUnit',
+ 'isDark',
+ 'sizeSlug',
+ 'isUserOverlayColor',
+ 'customOverlayColor',
+ 'dimRatio',
+ 'placeholder',
+ 'alt',
+ 'imageFill',
+ 'mediaSizeSlug',
+ 'isLink',
+ 'kind',
+ 'label',
+ 'type',
+ 'id',
+ 'url',
+ 'label',
+ 'shouldSyncIcon',
+ 'rel',
+ 'opensInNewTab',
+ 'title',
+ 'ref',
+ 'overlayMenu',
+ 'slug',
+ 'theme',
+ 'tagName',
+ 'level',
+ 'ordered',
+ 'area',
+ 'mediaId',
+ 'mediaLink',
+ 'mediaType',
+ 'height', //maybe still need?
+ ];
+ if (!is_admin() &&!in_array($key, $ignore)) {
+// TESTING
+ jvbDump($key, 'getClass');
+ jvbDump($attrs);
+ }
+
return '';
}
}
@@ -1015,9 +1513,10 @@
// Focal point for background images
case 'focalPoint':
- if (isset($value['x']) && isset($value['y'])) {
- $styles[] = 'background-position: '.($value['x'] * 100).'% '.($value['y'] * 100).'%';
- }
+ $x = (array_key_exists('x', $attrs['focalPoint'])) ? $attrs['focalPoint']['x'] * 100 : 'center';
+ $y = (array_key_exists('y', $attrs['focalPoint'])) ? $attrs['focalPoint']['y'] * 100 : 'center';
+ $styles[] = 'background-position:'.$x.' '.$y.';';
+
break;
// Complex style object
@@ -1127,6 +1626,25 @@
}
}
break;
+ case 'dimRatio':
+ $ratio = (ceil($value /25) *25);
+ $s = 'background-color: rgba(var(--base-rgb), ';
+ switch ($ratio) {
+ case 0:
+ $s .= 'var(--rgb-subtle-hover));';
+ break;
+ case 25:
+ $s .= 'var(--rgb-light));';
+ break;
+ case 50:
+ $s .= 'var(--rgb-medium));';
+ break;
+ default:
+ $s .= 'var(--rgb-heavy));';
+ break;
+ }
+ $styles[] = $s;
+ break;
// Custom styles (any other attributes that need inline styling)
case 'backgroundType':
@@ -1137,8 +1655,72 @@
}
break;
+ case 'backgroundColor':
+ case 'borderColor':
+ case 'textColor':
+ $type = ($key === 'backgroundColor') ? 'background-color:' : (($key === 'borderColor') ? 'border-color:' : 'color:');
+ $defaults = apply_filters('jvbColours', ['base', 'contrast', 'action', 'secondary']);
+ $continue = true;
+ foreach ($defaults as $default) {
+ if (str_starts_with($value, $default)) {
+ $continue = false;
+ $styles[] = $type.'var(--'.$value.')';
+ }
+ }
+ if ($continue) {
+ $styles[] = $type.$value;
+ }
+ break;
// Any other attributes that need direct styling
default:
+ $ignore = [
+ 'opacity',
+ 'textAlign',
+ 'minHeightUnit',
+ 'isDark',
+ 'isUserOverlayColor',
+ 'contentPosition',
+ 'sizeSlug',
+ 'customOverlayColor',
+ 'alt',
+ 'placeholder',
+ 'imageFill',
+ 'mediaSizeSlug',
+ 'isLink',
+ 'kind',
+ 'label',
+ 'type',
+ 'id',
+ 'url',
+ 'label',
+ 'shouldSyncIcon',
+ 'rel',
+ 'opensInNewTab',
+ 'title',
+ 'ref',
+ 'overlayMenu',
+ 'slug',
+ 'theme',
+ 'tagName',
+ 'level',
+ 'ordered',
+ 'area',
+ 'className',
+ 'fontSize',
+ 'layout',
+ 'align',
+ 'mediaId',
+ 'mediaLink',
+ 'mediaType',
+ 'isStackedOnMobile',
+ 'width',
+ 'height', // maybe still need?
+ ];
+ if (!is_admin() && !in_array($key, $ignore)) {
+ //TESTING
+ jvbDump($key, 'getStyle');
+ jvbDump($attrs);
+ }
// No default inline styles
break;
}
@@ -1202,6 +1784,7 @@
}
);
}
+
}
new CustomBlocks();
--
Gitblit v1.10.0