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 | 128 ++++++++++++++++++++++++++++--------------
1 files changed, 85 insertions(+), 43 deletions(-)
diff --git a/inc/meta/Form.php b/inc/meta/Form.php
index 048f62b..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
);
@@ -117,7 +117,7 @@
}
protected static function buildClasses(array $config): string
{
- $classes = ['field field-' . ($config['type'] ?? 'text')];
+ $classes = ['field '. (str_replace('_','-',sanitize_text_field($config['type'] ?? 'text')))];
if (!empty($config['required'])) {
$classes[] = 'required';
}
@@ -141,10 +141,10 @@
protected static function handleCustomDatasets($config):string
{
if (array_key_exists('data', $config) && !empty($config['data'])) {
- $datasets = array_map(function ($key) use ($config) {
+ $datasets = array_map(function ($value, $key) use ($config) {
$name = str_replace('_', '-', sanitize_title($key));
- return ' data-'.$name.'="'.$config['data'][$key].'"';
- }, $config['data']);
+ return ' data-'.$name.'="'.$value.'"';
+ }, array_values($config['data']), array_keys($config['data']));
return implode($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)
);
@@ -629,8 +633,22 @@
}
$config['data']['upload-field'] = '';
$config['data']['type'] = $config['multiple'] ? 'gallery' : 'single';
+ $plural = 'images';
+ $singular = 'image';
if (!empty($config['content'])) {
- $config['data']['content'] = $config['content'];
+ $content = $config['content'];
+
+ $config['data']['content'] = $content;
+ $plural =
+ JVB_CONTENT[$content]['plural']
+ ?? JVB_TAXONOMY[$content]['plural']
+ ?? JVB_USER[$content]['plural']
+ ?? str_replace('_', ' ', $content) . 's';
+
+ $singular = JVB_CONTENT[$content]['singular']
+ ?? JVB_TAXONOMY[$content]['singular']
+ ?? JVB_USER[$content]['singular']
+ ?? str_replace('_', ' ',$config['content']);
}
if ($config['limit'] > 0) {
$config['data']['limit'] = $config['limit'];
@@ -644,7 +662,8 @@
<input type="file"
%s
accept="%s"
- data-max-size="%s">
+ data-max-size="%s"
+ data-ignore>
<h2>%s</h2>
%s
<p class="file-upload-text">
@@ -660,8 +679,8 @@
esc_html(static::getAcceptedTypesLabel($config)),
esc_html(static::formatFileSize(static::getMaxFileSize($config)))
);
- $plural = (array_key_exists($config['content'], JVB_CONTENT)) ? JVB_CONTENT[$config['content']]['plural'] : (array_key_exists($config['content'], JVB_TAXONOMY) ? JVB_TAXONOMY[$config['content']]['plural'] : str_replace('_', ' ',$config['content']).'s');
- $singular = (array_key_exists($config['content'], JVB_CONTENT)) ? JVB_CONTENT[$config['content']]['singular'] : (array_key_exists($config['content'], JVB_TAXONOMY) ? JVB_TAXONOMY[$config['content']]['singular'] : str_replace('_', ' ',$config['content']));
+
+
if ($config['destination'] === 'post_group') {
$input .= sprintf(
'<p class="hint">You can group images to create separate %s.</p>
@@ -852,7 +871,7 @@
]
];
- $out .= static::render('image_data', $fields);
+ $out .= static::render('image_data', '', $fields);
$out .= static::renderUploadItemMetaEnd();
if ($additionalFields) {
@@ -920,7 +939,7 @@
]
];
- $out .= static::render('image_data', $fields);
+ $out .= static::render('image_data', '', $fields);
$out .= static::renderUploadItemMetaEnd();
if ($additionalFields) {
@@ -982,7 +1001,7 @@
]
];
- $out .= static::render('image_data', $fields);
+ $out .= static::render('image_data', '', $fields);
$out .= static::renderUploadItemMetaEnd();
if ($additionalFields) {
@@ -1426,59 +1445,83 @@
$input .= static::render($newName, '', $fieldConfig);
}
$input .= sprintf(
- '<button type="button" class="button add-tag-item">%s<span>%s</span></button></div>',
+ '<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
- $input .= '<div class="tag-items">'.static::renderTagItem($config['fields'], $value, $name, null, $tagFormat).'</div>';
+ $input .= '<div class="tag-items">'.static::renderTagItems($config['fields'], $value, $name, $tagFormat).'</div>';
//Template for tags
$input .= sprintf(
'<template class="%s">%s</template>',
uniqid('tagListItem'),
- static::renderTagItem($config['fields'], [], null, $name, $tagFormat)
+ static::renderTagItem($config['fields'], [], $name, null, $tagFormat)
);
+ $input .= '</div>';
+
+ unset($config['label']);
return static::fieldWrap($name, $input, $config);
}
+ protected static function renderTagItems(array $fields, mixed $value, string $name, string $tagFormat):string
+ {
+ if (!$value || $value === '') {
+ return '';
+ }
+ if (is_string($value)) {
+ $value = explode(',', $value);
+ }
+ if (empty($value)) {
+ return '';
+ }
+ $out = '';
+ foreach ($value as $index => $v) {
+ $out .= static::renderTagItem($fields, $v, $name, $index, $tagFormat);
+ }
+ return $out;
+
+ }
protected static function renderTagItem(array $fields, mixed $values, string $name, ?int $index, string $tagFormat):string
{
$tagText = static::getTagDisplayText($fields, $values, $tagFormat);
$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></div>',
- 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';
}
@@ -1487,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) {
@@ -1577,7 +1620,6 @@
protected static function renderGroup(string $name, mixed $value, array $config): string
{
$fields = $config['fields'] ?? [];
- error_log('Group fields: '.print_r($fields, true));
$values = is_array($value) ? $value : [];
$wrapper = (array_key_exists('wrap', $config)) ? 'details' : 'fieldset';
--
Gitblit v1.10.0