From df6c00db050e188a6bd5707e72c4f1f331ced923 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 08 Feb 2026 20:46:43 +0000
Subject: [PATCH] =Port over to jakevan 2
---
inc/meta/Form.php | 64 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/inc/meta/Form.php b/inc/meta/Form.php
index 4a515bd..f6de609 100644
--- a/inc/meta/Form.php
+++ b/inc/meta/Form.php
@@ -99,7 +99,7 @@
'<div class="%s" data-field="%s" data-field-type="%s"%s>',
$classes,
$name,
- $config['type'],
+ str_replace('_', '-', $config['type']),
$datasets
);
@@ -276,7 +276,7 @@
protected static function renderText(string $name, mixed $value, array $config): string
{
- $value = ($value === '') ? ' value="'.esc_attr($value).'"' : '';
+ $value = ($value !== '') ? ' value="'.esc_attr($value).'"' : '';
$input = sprintf(
'<input type="%s"%s%s />',
$config['subtype']??'text',
@@ -312,7 +312,7 @@
{
$attrs = static::inputAttrs($name, $config);
- $value = ($value === '') ? ' value="'.esc_attr($value).'"' : '';
+ $value = ($value !== '') ? ' value="'.esc_attr($value).'"' : '';
$input = sprintf(
'<input type="number"%s%s />',
$value,
@@ -331,7 +331,7 @@
$attrs = static::inputAttrs($name, $config);
- $value = ($value === '') ? ' value="'.esc_attr($value).'"' : '';
+ $value = ($value !== '') ? ' value="'.esc_attr($value).'"' : '';
$input = sprintf(
'<div class="quantity">
<button type="button" class="decrease" title="%s" aria-label="Decrease %s">%s</button>
@@ -354,7 +354,7 @@
protected static function renderEmail(string $name, mixed $value, array $config): string
{
$config['validate'] = 'email';
- $value = ($value === '') ? ' value="'.esc_attr($value).'"' : '';
+ $value = ($value !== '') ? ' value="'.esc_attr($value).'"' : '';
$input = sprintf(
'<input type="email"%s%s />',
$value,
@@ -367,7 +367,7 @@
protected static function renderUrl(string $name, mixed $value, array $config): string
{
$config['validate'] = 'url';
- $value = ($value === '') ? ' value="'.esc_attr($value).'"' : '';
+ $value = ($value !== '') ? ' value="'.esc_attr($value).'"' : '';
$input = sprintf(
'<input type="url"%s%s />',
$value,
@@ -380,7 +380,7 @@
protected static function renderTel(string $name, mixed $value, array $config): string
{
$config['validate'] = 'phone';
- $value = ($value === '') ? ' value="'.esc_attr($value).'"' : '';
+ $value = ($value !== '') ? ' value="'.esc_attr($value).'"' : '';
$input = sprintf(
'<input type="tel"%s%s />',
$value,
@@ -401,7 +401,7 @@
}
}
- $value = ($value === '') ? ' value="'.esc_attr($value).'"' : '';
+ $value = ($value !== '') ? ' value="'.esc_attr($value).'"' : '';
$input = sprintf(
'<input type="date"%s%s />',
$value,
@@ -413,7 +413,7 @@
protected static function renderTime(string $name, mixed $value, array $config): string
{
- $value = ($value === '') ? ' value="'.esc_attr($value).'"' : '';
+ $value = ($value !== '') ? ' value="'.esc_attr($value).'"' : '';
$input = sprintf(
'<input type="time"%s%s />',
$value,
@@ -425,7 +425,7 @@
protected static function renderDatetime(string $name, mixed $value, array $config): string
{
- $value = ($value === '') ? ' value="'.esc_attr($value).'"' : '';
+ $value = ($value !== '') ? ' value="'.esc_attr($value).'"' : '';
$input = sprintf(
'<input type="datetime-local"%s%s />',
$value,
@@ -492,6 +492,8 @@
$optionsHtml = '';
if (empty($config['required'])) {
$optionsHtml .= '<option value="">— Select —</option>';
+ } else {
+ $optionsHtml .= '<option value="" disabled selected hidden>— Select —</option>';
}
foreach ($options as $optValue => $optLabel) {
@@ -538,7 +540,7 @@
$optValue,
esc_attr($optValue),
$checked,
- $name,
+ esc_attr($name),
$optValue,
esc_html($optLabel)
);
@@ -564,14 +566,16 @@
foreach ($options as $optValue => $optLabel) {
$radios .= sprintf(
'
- <input type="radio" name="%s" value="%s"%s />
+ <input type="radio" name="%s" id="%s-%s" value="%s"%s />
<label class="radio-option" for="%s-%s">
<span>%s</span>
</label>',
esc_attr($name),
+ esc_attr($name),
+ $optValue,
esc_attr($optValue),
checked($value, $optValue),
- $name,
+ esc_attr($name),
$optValue,
esc_html($optLabel)
);
@@ -1443,7 +1447,7 @@
$input .= sprintf(
'<button type="button" class="button add-tag">%s<span>%s</span></button></div>',
jvbIcon('plus'),
- $field['add_label']??'Add'
+ $config['add_label']??'Add'
);
//Tag Display
@@ -1463,7 +1467,7 @@
}
protected static function renderTagItems(array $fields, mixed $value, string $name, string $tagFormat):string
{
- if ($value === '') {
+ if (!$value || $value === '') {
return '';
}
if (is_string($value)) {
@@ -1485,37 +1489,39 @@
$out = sprintf(
'<div class="tag-item"%s><span class="tag-label">%s</span>',
- ($index) ? ' data-index="'.$index.'"' : '',
+ ($index !== null) ? ' data-index="'.$index.'"' : '',
$tagText
);
foreach ($fields as $fieldName => $fieldConfig) {
$value = $values[$fieldName]??'';
- $fullName = (!$index) ? $fieldName : sprintf('%s:%s:%s', $name, $index, $fieldName);
+ $fullName = ($index === null) ? $fieldName : sprintf('%s:%s:%s', $name, $index, $fieldName);
$out .= sprintf(
'<input type="hidden"
- name="%s"
- value="%s"
- data-field="%s"
- data-field-type="%s" />',
+ name="%s"
+ value="%s"
+ data-field="%s"
+ data-field-type="%s"
+ id="%s" />',
esc_attr($fullName),
esc_attr($value),
esc_attr($fieldName),
- esc_attr($fieldConfig['type'])
- );
-
- $out .= sprintf(
- '<button type="button" class="remove-tag" aria-label="Remove">%s</button>',
- jvbIcon('x')
+ esc_attr($fieldConfig['type']),
+ esc_attr($fullName)
);
}
+
+ $out .= sprintf(
+ '<button type="button" class="remove-tag" aria-label="Remove">%s</button>',
+ jvbIcon('x')
+ );
$out .='</div>';
return $out;
}
protected static function getTagDisplayText(array $fields, mixed $values, string $tagFormat):string
{
- if (empty($data)) {
+ if (empty($values)) {
return 'New Item';
}
@@ -1524,7 +1530,7 @@
$firstKey = array_key_first($fields);
return $values[$firstKey] ?? 'New Item';
case 'all_fields':
- $values = array_filter(array_values($data));
+ $values = array_filter(array_values($values));
return implode(', ', $values) ?: 'New Item';
default:
if (strpos($tagFormat, '{') !== false) {
--
Gitblit v1.10.0