From 46d681c6b825d21b3f698d793c4e630c687d90ad Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Thu, 21 May 2026 21:41:53 +0000
Subject: [PATCH] =Major CustomBlocks.php overhaul, expanding block support and customization from the editor. theme.json should now be updated on new themes to set brand colours, etc. Also note: major change to .col vs .row alignment: simplifying it to .top .bottom vs the confusion of the differences for .col/.row .start and .a-start
---
inc/managers/IconsManager.php | 125 ++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 51 deletions(-)
diff --git a/inc/managers/IconsManager.php b/inc/managers/IconsManager.php
index d244340..f54120b 100644
--- a/inc/managers/IconsManager.php
+++ b/inc/managers/IconsManager.php
@@ -1,7 +1,8 @@
<?php
namespace JVBase\managers;
-use JVBase\utility\Features;
+use JVBase\registrar\Registrar;
+use JVBase\base\Site;
if (!defined('ABSPATH')) {
exit;
@@ -18,7 +19,7 @@
// Instance-specific properties
protected string $source;
protected array $icons = []; // Icons for THIS source [style => [names]]
- protected CacheManager $cache;
+ protected Cache $cache;
protected string $style = 'regular';
protected array $styles = ['regular', 'bold', 'duotone', 'fill', 'light', 'thin'];
protected array $customIcons = []; // Custom icons for THIS source
@@ -42,10 +43,8 @@
private function __construct(string $source)
{
$this->source = $source;
- $this->cache = CacheManager::for('icons_' . $source, WEEK_IN_SECONDS);
- $this->style = (array_key_exists('icons', JVB_SITE) && in_array(JVB_SITE['icons'], $this->styles))
- ? JVB_SITE['icons']
- : 'regular';
+ $this->cache = Cache::for('icons_' . $source, WEEK_IN_SECONDS);
+ $this->style = Site::icon();
$this->addMap();
@@ -145,6 +144,7 @@
'apple-logo',
'check-circle',
'close-circle',
+ 'faders-horizontal',
'cloud-slash',
'exclamation-mark',
'cloud-arrow-down',
@@ -195,15 +195,11 @@
// ]
];
+
// Add icons from content/taxonomy/user configs (like old behavior)
$configIcons = $this->getIconsFromConfigs();
if (!empty($configIcons)) {
- foreach ($configIcons as $source => $icons) {
- if (!isset($defaults[$source])) {
- $defaults[$source] = [];
- }
- $defaults[$source] = array_merge($defaults[$source], $icons);
- }
+ $defaults['icons'] = array_merge($defaults['icons'], $configIcons);
}
// Allow filtering per source (extensibility)
@@ -214,35 +210,27 @@
if (isset($allIcons[$this->source])) {
$icons = array_merge($icons, $allIcons[$this->source]);
}
-
if (!empty($icons)) {
$this->include($icons);
}
}
/**
- * Get icons from JVB_CONTENT, JVB_TAXONOMY, JVB_USER configs
+ * Get icons from Registrar instances
+ *
*/
protected function getIconsFromConfigs(): array
{
$icons = [];
- $check = [JVB_CONTENT, JVB_TAXONOMY, JVB_USER];
+ $registered = Registrar::getRegistered();
- foreach ($check as $constant) {
- foreach ($constant as $key => $value) {
- if (isset($value['icon'])) {
- // Determine source based on context (you could add 'icon_source' to configs)
- $source = $value['icon_source'] ?? 'icons';
-
- if (!isset($icons[$source])) {
- $icons[$source] = [];
- }
- $icons[$source][] = $value['icon'];
- }
- }
+ foreach ($registered as $type) {
+ $registrar = Registrar::getInstance($type);
+ $icons[] = $registrar->getIcon();
}
- return $icons;
+
+ return array_unique(array_filter($icons));
}
/**
@@ -362,16 +350,16 @@
$map = [
'seo' => 'robot'
];
- if (Features::forSite()->has('referrals')) {
+ if (Site::has('referrals')) {
$map['referrals'] = 'hand-heart';
}
- if (Features::forSite()->has('dashboard')) {
+ if (Site::has('dashboard')) {
$map['dash'] = 'door';
}
- if (Features::forSite()->has('magicLink')) {
+ if (Site::has('magicLink')) {
$map['magicLink'] = 'magic-wand';
}
- if (Features::hasAnyIntegration()) {
+ if (Site::hasAnyIntegration()) {
$map['integrations'] = 'plugs-connected';
}
update_option(BASE.'iconMap', $map);
@@ -385,7 +373,8 @@
*/
protected function registerGlobalHooks(): void
{
- add_action('init', [$this, 'checkCSS']);
+ add_action('wp_loaded', [self::class, 'checkCSS']);
+ add_action('shutdown', [self::class, 'checkCSS']);
}
/**
@@ -407,10 +396,13 @@
public function enqueueIconStyles():void
{
- wp_enqueue_style('jvb-icons-'.$this->source);
+// if (file_exists(JVB_CHILD_URL . "assets/css/{$this->source}.css")){
+ wp_enqueue_style('jvb-icons-'.$this->source);
+// }
+
}
- public function checkCSS(): void
+ public static function checkCSS(): void
{
$needsUpdate = get_option(BASE.'icons_needs_update', []);
if (!empty($needsUpdate)) {
@@ -420,7 +412,7 @@
}
}
- protected static function regenerateAllCSS(array $sourcesToUpdate = []): void
+ public static function regenerateAllCSS(array $sourcesToUpdate = []): void
{
error_log('[IconsManager]:regenerateCSS');
$css_dir = JVB_CHILD_DIR.'/assets/css/';
@@ -429,28 +421,41 @@
wp_mkdir_p($css_dir);
}
+ // Load all icons from database option
+ $allIcons = get_option(BASE.'usedIcons', []);
+
// If no specific sources provided, regenerate all
if (empty($sourcesToUpdate)) {
- $sourcesToUpdate = array_fill_keys(array_keys(self::$instances), true);
+ $sourcesToUpdate = array_fill_keys(array_keys($allIcons), true);
}
- // Generate CSS only for sources that need it
- foreach (self::$instances as $source => $instance) {
- if (!isset($sourcesToUpdate[$source])) {
+ // Generate CSS for each source that needs it
+ foreach ($sourcesToUpdate as $source => $needsUpdate) {
+ if (!$needsUpdate || !isset($allIcons[$source])) {
continue;
}
+ // Get or create instance for this source
+ $instance = self::for($source);
+
+ // Temporarily set icons from database
+ $originalIcons = $instance->icons;
+ $instance->icons = $allIcons[$source];
+
$css = $instance->generateIconCSS();
$css_path = $css_dir . $source . '.css';
$instance->archiveCurrentVersion($css);
if (file_put_contents($css_path, $css) !== false) {
- CacheManager::updateTimestamp('icons_' . $source);
+ Cache::touch('icons_' . $source);
error_log("[IconsManager] Updated {$source}.css");
} else {
error_log("[IconsManager] Could not write {$source}.css");
}
+
+ // Restore original icons
+ $instance->icons = $originalIcons;
}
}
@@ -481,7 +486,7 @@
$instance->archiveCurrentVersion($css);
if (file_put_contents($css_path, $css) !== false) {
- CacheManager::updateTimestamp('icons_' . $source);
+ Cache::touch('icons_' . $source);
error_log("[IconsManager] Updated {$source}.css");
} else {
error_log("[IconsManager] Could not write {$source}.css");
@@ -516,6 +521,10 @@
*/
public function get(string $name, array $options = []): string
{
+ if (empty($name)) {
+ //No icon requested
+ return '';
+ }
$style = $options['style'] ?? $this->style;
$name = $this->map[$name] ?? $name;
@@ -616,7 +625,7 @@
/**
* Get raw SVG content for CSS mask-image
*/
- protected function getRawSvg(string $name, ?string $style = null): ?string
+ public function getRawSvg(string $name, ?string $style = null): ?string
{
if (!$style) {
$style = $this->style;
@@ -635,14 +644,12 @@
// Clean up SVG for CSS usage
$svg = preg_replace("/([\n\t]+)/", ' ', $svg);
$svg = preg_replace('/>\s*</', '><', $svg);
- $svg = trim($svg);
-
- return $svg;
+ return trim($svg);
}
public function registerStyle(): void
{
- $timestamp = CacheManager::getTimestamp('icons_' . $this->source);
+ $timestamp = Cache::lastModified('icons_' . $this->source);
$handle = 'jvb-icons-' . $this->source;
wp_register_style(
@@ -665,6 +672,15 @@
foreach ($names as $icon) {
$svg = $this->getEncodedSVG($icon, $style);
if ($svg !== '') {
+ if ($icon === 'caret-down') {
+ $css .= 'details summary::after,';
+ } elseif ($icon === 'faders-horizontal') {
+ $css .= 'details.all-filters summary::after,';
+ } elseif ($icon === 'link') {
+ $css .= 'input[type=url],';
+ } elseif ($icon === apply_filters('jvbSeparatorLogo', 'logo')) {
+ $css .= 'hr.logo::before,';
+ }
$css .= ".icon-{$icon}{$styleClass}{";
$css .= "--icon:url('data:image/svg+xml;base64,{$svg}');";
$css .= "}";
@@ -692,6 +708,14 @@
if (!$style) {
$style = $this->style;
}
+
+ $icon = $this->map[$icon] ?? $icon;
+
+ // Validate icon exists
+ if (!$this->iconExists($icon, $style)) {
+ error_log('[IconsManager] Icon not found: ' . $icon);
+ return '';
+ }
$svg = $this->getEncodedSVG($icon, $style);
if ($svg !== '') {
return "data:image/svg+xml;base64,{$svg}";
@@ -725,8 +749,7 @@
// Clear cache for all sources
foreach (self::$instances as $source => $instance) {
- $instance->cache->delete('icon_styles_css');
- CacheManager::updateTimestamp('icons_' . $source);
+ $instance->cache->forget('icon_styles_css');
}
}
@@ -780,7 +803,7 @@
if (file_put_contents($css_path, $entry['css']) !== false) {
$this->icons = $entry['iconList'];
$this->saveIcons();
- CacheManager::updateTimestamp('icons_' . $this->source);
+ Cache::touch('icons_' . $this->source);
return true;
}
@@ -801,7 +824,7 @@
}
$needsUpdate[$this->source] = true;
update_option(BASE.'icons_needs_update', $needsUpdate);
- CacheManager::updateTimestamp('icons_' . $this->source);
+ Cache::touch('icons_' . $this->source);
}
public function mergeVersions(array $timestamps): bool
--
Gitblit v1.10.0