=Timeline block fixes. Next up: adding article schema classes

Jake Vanderwerf

9 days ago 47e77f9fac1155c536b2b87fec552c7fcce66fa6

 inc/forms/TaxonomySelector.php

@@ -1,6 +1,7 @@
<?php
namespace JVBase\forms;

use JVBase\registrar\Registrar;
use WP_Term;

if (!defined('ABSPATH')) {
@@ -27,13 +28,19 @@
   protected string $base;
   protected string $title;
   protected array $config;
   protected Registrar $registrar;

   public function __construct(string $id, string $taxonomy, array $config = []) {
      $this->id = sanitize_key($id);
      $this->taxonomy = jvbCheckBase($taxonomy);
      $this->name = jvbNoBase($taxonomy);

      $this->title = JVB_TAXONOMY[$this->name]['plural'];
      $registrar = Registrar::getInstance($this->name);
      if ($registrar) {
         $this->registrar = $registrar;
      }

      $this->title = $registrar->getPlural();
      $this->base = $config['base']??'';
      $this->config = wp_parse_args($config, [
         'types'     => false, // for feed block implementation
@@ -50,8 +57,9 @@
         'update' => true,   // Whether to update on close
      ]);

      $this->plural = JVB_TAXONOMY[$taxonomy]['plural'];
      $this->singular = JVB_TAXONOMY[$taxonomy]['singular'];

      $this->plural = $registrar->getPlural();
      $this->singular = $registrar->getSingular();
   }


@@ -64,14 +72,14 @@
    */
   public static function getTermPath(WP_Term $term, bool $returnArray = false): string|array {
      if (!is_taxonomy_hierarchical($term->taxonomy)) {
         return $term->name;
         return html_entity_decode($term->name);
      }

      $path = [];
      $currentTerm = $term;

      while ($currentTerm) {
         array_unshift($path, $currentTerm->name);
         array_unshift($path, html_entity_decode($currentTerm->name));

         if ($currentTerm->parent) {
            $currentTerm = get_term($currentTerm->parent);
@@ -94,7 +102,7 @@
      ?>
      <dialog id="jvb-selector" aria-labelledby="modal-title" aria-modal="true">
         <div class="wrap col">
            <header class="modal-header">
            <header class="row">
               <h3 id="modal-title">Select Taxonomy</h3>
            </header>

@@ -104,8 +112,8 @@
            <div class="items-wrap">
               <!-- Common/Favorite terms section -->
               <details class="favourite-terms" hidden>
                  <summary class="title row btw">Your Go Tos:</summary>
                  <ul class="favourite-list row btw"></ul>
                  <summary class="title row x-btw">Your Go Tos:</summary>
                  <ul class="favourite-list row x-btw"></ul>
               </details>

               <!-- Pagination info -->
@@ -118,14 +126,15 @@
                  </button>
               </nav>

               <!-- Terms list -->
               <ul class="items-container col start" role="listbox" aria-label="Available terms">
                  <!-- Terms will be populated here -->
               </ul>

               <p class="message" hidden aria-live="polite">
                  { <span>loading items</span> }
               </p>
               <!-- Terms list -->
               <ul class="items-container col top" role="listbox" aria-label="Available terms">
                  <!-- Terms will be populated here -->
               </ul>

               <button class="submit-term" hidden data-ignore><strong>Create: </strong> "<span></span>"</button>

               <!-- Infinite scroll sentinel -->
@@ -135,13 +144,13 @@
            <!-- Search section -->
            <div class="search-wrapper">
               <div class="search-bar">
                  <?= jvbSearch('Search terms', 'search-terms') ?>
                  <?= str_replace('class="search-container', 'class="open search-container', jvbSearch('Search terms', 'search-terms')) ?>
               </div>
            </div>

            <!-- Create new term section -->
            <details class="create-term" hidden>
               <summary class="row btw">Add New Term</summary>
               <summary class="row x-btw">Add New Term</summary>
               <div class="create-new-term-section">
                  <form class="create-term" data-nocache data-form-id="create-term" data-save="terms">
                     <div class="form-group">
@@ -187,7 +196,7 @@
      <template class="selectedTerm">
         <div class="selected-item row">
            <span class="item-name"></span>
            <button type="button" class="remove-term row"><?=jvbIcon('x')?></button>
            <button type="button" class="remove-term"><?=jvbIcon('x')?></button>
         </div>
      </template>
      <template class="termBreadcrumb">
@@ -221,7 +230,7 @@
      ?>
      <div class="jvb-selector <?= esc_attr($this->name) ?>"
          id="<?= esc_attr($this->id) ?>"<?= $hidden ?>>
         <div class="field-group-header row btw">
         <div class="field-group-header row x-btw">
            <label for="<?= $this->base ?><?= esc_attr($this->config['name']) ?>-autocomplete">
               <?= ($this->config['icon']) ? jvbIcon($this->config['icon']) : '' ?>
               <span><?= $this->config['label'] ?></span>
@@ -239,12 +248,12 @@
            </button>
            <?php if ($hasAutocomplete !== '') { ?>
               <input type="text" id="<?= $this->base ?><?= esc_attr($this->config['name']) ?>-autocomplete" autocomplete="off" data-ignore data-autocomplete>
               <p class="message" hidden aria-live="polite">
                  { <span>loading items</span> }
               </p>
               <div class="auto-wrapper" hidden>
                  <ul class="search-results">
                  </ul>
                  <p class="message" hidden aria-live="polite">
                     { <span>loading items</span> }
                  </p>
                  <button class="submit-term" hidden data-ignore><strong>Create: </strong> "<span></span>"</button>
               </div>

@@ -260,7 +269,7 @@
            $selectedItems = ob_get_clean();
         endif;
         ?>
         <div class="selected-items row" role="region" aria-label="Selected <?= esc_attr($this->plural) ?>"><?=$selectedItems?></div>
         <div class="selected-items row left" role="region" aria-label="Selected <?= esc_attr($this->plural) ?>"><?=$selectedItems?></div>
         <?= $extra ?>
      </div>
      <?php
@@ -269,14 +278,16 @@

   protected function renderTaxonomyToggle(array $selected = [], string $extra = ''): string
   {

      return sprintf(
         '<button type="button" data-icon="%s" data-filter="taxonomy" data-taxonomy="%s" data-type="selector" data-single="%s" data-plural="%s" title="Filter by %s">%s<span class="label">%s</span></button>',
         JVB_TAXONOMY[$this->name]['icon'],
         '<button type="button" data-icon="%s" data-filter="taxonomy" data-taxonomy="%s" data-type="selector" data-single="%s" data-plural="%s" %stitle="Filter by %s">%s<span class="label">%s</span></button>',
         $this->registrar->getIcon(),
         $this->name,
         $this->singular,
         $this->plural,
         $this->buildDataAttributes([]),
         $this->singular,
         jvbIcon($this->config['icon']),
         jvbIcon($this->registrar->getIcon()),
         $this->singular
      );
   }
@@ -341,7 +352,7 @@
         <span><?= esc_html($termPath) ?></span>
         <button type="button"
               class="remove-term row"
               aria-label="Remove <?= esc_attr($term->name) ?>">
               aria-label="Remove <?= html_entity_decode($term->name) ?>">
            <?= jvbIcon('x') ?>
         </button>
      </div>