From 4dd7f7e258d382dbf73ff5beb1f43e03476b36cf Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 10 Feb 2026 21:08:23 +0000
Subject: [PATCH] =Taxonomy selector fixes in Form.php and TaxonomySelector.js
---
inc/meta/Form.php | 87 +++++++++++++++++++++++++++++++------------
1 files changed, 63 insertions(+), 24 deletions(-)
diff --git a/inc/meta/Form.php b/inc/meta/Form.php
index f6de609..7fc6690 100644
--- a/inc/meta/Form.php
+++ b/inc/meta/Form.php
@@ -87,7 +87,7 @@
// Helper Methods
// ─────────────────────────────────────────────────────────────
- protected static function fieldWrap(string $name, string $content, array $config): string
+ public static function fieldWrap(string $name, string $content, array $config): string
{
$classes = static::buildClasses($config);
$datasets = static::buildDatasets($config);
@@ -103,9 +103,12 @@
$datasets
);
+ $output .= static::buildCharacterLimit($config);
$output .= static::buildLabel($name, $config);
if (!array_key_exists('skipInput', $config)) {
$output .= static::buildInput($content);
+ } else {
+ $output .= $content;
}
$output .= static::buildHint($config);
@@ -179,6 +182,21 @@
);
}
+ protected static function buildCharacterLimit(array $config): string
+ {
+ $type = $config['type'] ?? 'text';
+ if (in_array($type, ['upload', 'gallery', 'selector'])) {
+ return '';
+ }
+ if (empty($config['maxlength'])) {
+ return '';
+ }
+ return sprintf(
+ '<span class="char-limit"><span class="current">0</span> / <span class="limit">%s</span></span>',
+ esc_html($config['maxlength'])
+ );
+ }
+
protected static function buildLabel(string $name, array $config):string
{
if (!empty($config['label'])) {
@@ -192,7 +210,7 @@
return '';
}
- protected static function buildInput(string $content):string
+ public static function buildInput(string $content):string
{
return sprintf(
'<div class="field-input-wrapper">
@@ -500,7 +518,7 @@
$optionsHtml .= sprintf(
'<option value="%s"%s>%s</option>',
esc_attr($optValue),
- selected($value, $optValue),
+ selected($value, $optValue, false),
esc_html($optLabel)
);
}
@@ -554,30 +572,47 @@
protected static function renderRadio(string $name, mixed $value, array $config): string
{
- $options = $config['options'] ?? [];
+ $options = $config['options'] ?? [];
+ $inputClass = !empty($config['inputClass']) ? ' class="' . esc_attr($config['inputClass']) . '"' : '';
+ $idPrefix = $config['idPrefix'] ?? '';
$radios = sprintf(
'<fieldset>
- <legend>%s%s</legend>',
+ <legend>%s%s</legend>',
array_key_exists('label', $config) ? esc_html($config['label']) : 'Select an option',
- array_key_exists('required', $config) && $config['required']===true ? '<span class="required" aria-label="required">*</span>' : ''
+ array_key_exists('required', $config) && $config['required'] === true
+ ? '<span class="required" aria-label="required">*</span>' : ''
);
- foreach ($options as $optValue => $optLabel) {
+ foreach ($options as $optValue => $optConfig) {
+ if (is_array($optConfig)) {
+ $optLabel = $optConfig['label'] ?? $optValue;
+ $optIcon = $optConfig['icon'] ?? null;
+ $optDisabled = !empty($optConfig['disabled']) ? ' disabled' : '';
+ } else {
+ $optLabel = $optConfig;
+ $optIcon = null;
+ $optDisabled = '';
+ }
+
+ $labelContent = $optIcon
+ ? jvbDashIcon($optIcon)
+ : '<span>' . esc_html($optLabel) . '</span>';
+
+ $optId = esc_attr($idPrefix . $name . '-' . $optValue);
+
$radios .= sprintf(
- '
- <input type="radio" name="%s" id="%s-%s" value="%s"%s />
- <label class="radio-option" for="%s-%s">
- <span>%s</span>
- </label>',
+ '<input type="radio" name="%s" id="%s" value="%s"%s%s%s />
+ <label class="radio-option" for="%s" title="%s">%s</label>',
esc_attr($name),
- esc_attr($name),
- $optValue,
+ $optId,
esc_attr($optValue),
- checked($value, $optValue),
- esc_attr($name),
- $optValue,
- esc_html($optLabel)
+ checked($value, $optValue, false),
+ $optDisabled,
+ $inputClass,
+ $optId,
+ esc_html($optLabel),
+ $labelContent
);
}
@@ -651,7 +686,7 @@
?? str_replace('_', ' ',$config['content']);
}
if ($config['limit'] > 0) {
- $config['data']['limit'] = $config['limit'];
+ $config['data']['max-files'] = $config['limit'];
}
$attachmentIds = static::parseIds($value);
@@ -697,7 +732,8 @@
$input .= '<div class="file-error"></div>';
$input .= jvbRenderProgressBar('', false, true, true);
- $input .= '</div>';
+
+ $input .= '</div>'; // closes .file-upload-wrapper
if ($config['destination'] === 'post_group') {
$input .= static::renderUploadGroupAreaStart($config, $plural, $singular);
@@ -708,6 +744,7 @@
$input .= static::renderUploadGroupAreaEnd($config, $plural, $singular);
}
+ $input .= '</div>'; // closes .file-upload-container
unset($config['description']);
unset($config['label']);
return static::fieldWrap($name, $input, $config);
@@ -1169,6 +1206,7 @@
$plural[1]??''
);
+ $config['type'] = 'selector';
unset($config['label']);
unset($config['description']);
unset($config['hint']);
@@ -1239,7 +1277,7 @@
$plural = $taxonomy->labels->name;
}
$attr = sprintf(
- ' data-taxonomy="%s" data-single="%s" data-plural="%s',
+ ' data-taxonomy="%s" data-single="%s" data-plural="%s"',
$config['taxonomy'],
$single,
$plural
@@ -1258,7 +1296,7 @@
$plural = $postType->labels->name;
}
$attr = sprintf(
- ' data-content="%s" data-single="%s" data-plural="%s',
+ ' data-content="%s" data-single="%s" data-plural="%s"',
$config['content'],
$single,
$plural
@@ -1278,7 +1316,7 @@
$plural = 'Users';
}
$attr = sprintf(
- ' data-user="%s" data-single="%s" data-plural="%s',
+ ' data-user="%s" data-single="%s" data-plural="%s"',
$config['user'],
$single,
$plural
@@ -1636,12 +1674,13 @@
foreach ($fields as $fieldName => $fieldConfig) {
$fieldValue = $values[$fieldName] ?? '';
- $fullName = "{$name}:{$fieldName}";
+ $fullName = array_key_exists('wrap', $config) ? $fieldName : "{$name}:{$fieldName}";
$output .= static::render($fullName, $fieldValue, $fieldConfig);
}
$output .= sprintf('</%s>', esc_attr($wrapper));
+ unset($config['label']);
return static::fieldWrap($name, $output, $config);
}
--
Gitblit v1.10.0