From 56a9a1ccf764ff7a6af8f8a2292cb07443cb4aa7 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Thu, 28 May 2026 18:19:57 +0000
Subject: [PATCH] =New Gitbit setpu
---
assets/js/concise/TaxonomySelector.js | 974 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 675 insertions(+), 299 deletions(-)
diff --git a/assets/js/concise/TaxonomySelector.js b/assets/js/concise/TaxonomySelector.js
index fcd9364..90f6076 100644
--- a/assets/js/concise/TaxonomySelector.js
+++ b/assets/js/concise/TaxonomySelector.js
@@ -1,3 +1,4 @@
+
class TaxonomySelector {
constructor() {
this.container = document.querySelector('dialog#jvb-selector');
@@ -9,17 +10,19 @@
this.subscribers = new Set();
this.fields = new Map();
this.selectedTerms = new Map(); // a map of fieldId => Set of selected term Ids
- this.loadedTaxonomies = new Set(); // a set of taxonomies, to know whether we should preload a newly registered field
this.batchFetch = new Set();
this.activeField = null;
this.isInitializing = true;
+ this.lazyInit = false;
+ this.messageText = {}
this.init();
}
init() {
this.initStore();
this.initElements();
+ this.defineTemplates();
this.initModal();
this.scanExistingFields();
this.initListeners();
@@ -41,7 +44,7 @@
indexes: [
{name: 'taxonomy', keyPath: 'taxonomy'},
{name: 'parent', keyPath: 'parent'},
- {name: 'slug', keyPath: 'slug', unique: true},
+ {name: 'slug', keyPath: 'slug'},
{name: 'count', keyPath: 'count'},
],
endpoint: 'terms',
@@ -61,16 +64,102 @@
this.store.subscribe(this.handleStoreEvent.bind(this));
}
+ defineTemplates() {
+ const T = window.jvbTemplates;
+ const terms = this;
+
+ T.define('emptyState');
+ T.define('selectedTerm', {
+ refs: {
+ name: '.item-name',
+ btn: 'button',
+ },
+ setup({el, refs, manyRefs, data}) {
+ el.dataset.id = data.id;
+ el.dataset.taxonomy = data.taxonomy;
+ if (refs.name) refs.name.textContent = data.path;
+ if (refs.button) refs.button.title = `Remove ${data.name}`;
+ }
+ });
+ T.define('termListItem', {
+ refs: {
+ checkbox: 'input',
+ label: 'label',
+ name: 'span, .term-name'
+ },
+ setup({el, refs, manyRefs, data}) {
+ el.dataset.id = data.id;
+
+ let field = terms.currentField();
+ let isSelected = terms.selectedTerms.get(terms.activeField).has(data.id);
+ let limitReached = field.limit > 0 && terms.selectedTerms.get(terms.activeField).size >= field.limit;
+
+ if (refs.checkbox) {
+ refs.checkbox.dataset.id = data.id;
+ refs.checkbox.id = `${field.id}-${data.id}`;
+ refs.checkbox.name = `${field.id}-${field.taxonomy}-select`;
+ refs.checkbox.value = data.id;
+ refs.checkbox.disabled = !isSelected && limitReached;
+ refs.checkbox.checked = isSelected;
+ }
+ if (refs.label) {
+ refs.label.htmlFor = `${field.id}-${data.id}`;
+ refs.label.title = data.path??data.name;
+ refs.label.dataset.path = data.path;
+ }
+ if (refs.name) {
+ refs.name.textContent = data.show ? data.path : data.name;
+ }
+
+ if (data.hasChildren) {
+ let temp = {
+ plural: field.plural,
+ name: data.name
+ };
+ const toggle = window.jvbTemplates.create('termChildrenToggle', temp);
+ el.append(toggle);
+ }
+ }
+ });
+
+ T.define('termChildrenToggle', {
+ setup({el, refs, manyRefs, data}) {
+ el.ariaLabel = `View ${data.plural} nested under ${data.name}`;
+ }
+ });
+
+ T.define('termBreadcrumb', {
+ setup({el, refs, manyRefs, data}) {
+ el.dataset.id = data.id;
+ el.textContent = data.name;
+ el.title = data.name;
+ }
+ });
+
+ T.define('autocompleteItem', {
+ setup({el, refs, manyRefs, data}) {
+ el.dataset.id = data.id;
+ el.textContent = data.path||data.name;
+ el.title = `Select ${data.name}`;
+ }
+ });
+
+
+ }
/******************************************************************
ELEMENTS
******************************************************************/
initElements() {
this.selectors = {
search: {
- input: '[type=search]',
+ input: '[type="search"]',
clear: '.clear-search',
container: '.search-wrapper',
- results: '.search-results'
+ results: '.search-results',
+ },
+ create: {
+ button: 'button.submit-term',
+ span: '.submit-term span',
},
terms: {
list: '.items-container',
@@ -83,9 +172,9 @@
child: '.toggle-children',
pathLevel: '.path-level',
},
- loading: {
- loading: '.loading',
- text: '.loading span',
+ message: {
+ message: 'p.message',
+ text: 'p.message span',
},
selected: '.selected-items',
modal: {
@@ -95,15 +184,26 @@
},
favourites: '.favourite-terms',
field: {
- toggle: 'button.taxonomy-toggle',
+ toggle: 'button.selector-toggle, [data-filter="taxonomy"]',
value: 'input[type="hidden"]',
selected: '.selected-items',
- dropdown: '.search-results',
- search: '[data-autocomplete]',
+ dropdown: {
+ list: '.search-results',
+ wrapper: '.auto-wrapper',
+ },
+ create: {
+ button: '.auto-wrapper .submit-term',
+ span: '.auto-wrapper button span',
+ },
+ search: 'input[data-autocomplete]',
+ message: {
+ message: 'p.message',
+ text: 'p.message span',
+ },
}
}
- this.ui = window.uiFromSelectors(this.selectors);
+ this.ui = window.uiFromSelectors(this.selectors, this.container);
}
initListeners() {
@@ -132,41 +232,52 @@
}
handleClick(e) {
- const fieldId = this.getFieldId(e.target);
+ if (!this.container.contains(e.target) && !e.target.closest('[data-type="selector"], [data-field-type="selector"]')) {
+ return;
+ }
+ const fieldId = this.getFieldId(e.target) || this.activeField;
const field = this.fields.get(fieldId);
if (!fieldId || !field) return;
- const autoComplete = window.targetCheck(e, '[data-autocomplete-select]');
- if (autoComplete) {
- let termId = parseInt(autoComplete.dataset.id);
- this.addSelected(termId, fieldId);
- if (field.ui.dropdown) {
- field.ui.dropdown.hidden = true;
- }
-
- if (field.ui.search) {
- field.ui.search.value = '';
+ if (this.creator) {
+ let button = window.targetCheck(e, this.selectors.create.button);
+ if (button) {
+ this.maybeCreateTerm(e).then(()=>{});
}
}
- const toggleButton = window.targetCheck(e, field.ui.toggle);
+ const removeButton = window.targetCheck(e, '.remove-term');
+ if (removeButton) {
+ const termId = removeButton.closest('[data-id]').dataset.id??false;
+ if (fieldId && termId) {
+ this.removeSelected(parseInt(termId), fieldId);
+ }
+ return;
+ }
+
+ const autocomplete = window.targetCheck(e, '.item.autocomplete');
+
+ if (autocomplete) {
+ let termId = parseInt(autocomplete.dataset.id);
+ this.addSelected(termId, fieldId);
+ this.scheduleHideDropdown(fieldId, 6000);
+ if (field.ui.search) {
+ field.ui.search.value = '';
+ }
+ return;
+ }
+
+ const toggleButton = window.targetCheck(e, this.selectors.field.toggle);
+
if (toggleButton) {
e.preventDefault();
this.openModal(fieldId);
return;
}
- const removeButton = window.targetCheck(e, 'button.remove-item');
- if (removeButton) {
- const fieldId = this.getFieldId(removeButton);
- const termId = removeButton.closest('.selected-item').dataset.id??false;
- if (fieldId && termId) {
- this.removeSelected(termId, fieldId);
- }
- return;
- }
if (e.target.matches('.modal-close')) {
+ this.updateFieldValue(fieldId);
this.modal?.handleClose();
return;
}
@@ -192,9 +303,10 @@
if (pathLevel) {
const termId = parseInt(pathLevel.dataset.id)??0;
this.navigateTo(termId);
+ return;
}
- const dropdown = window.targetCheck(e, field.selectors.dropdown);
+ const dropdown = window.targetCheck(e, this.selectors.field.dropdown);
if (dropdown) {
// reset the timer for hiding the dropdown
this.scheduleHideDropdown(fieldId);
@@ -216,13 +328,12 @@
this.ui.search.input.value = '';
}
}
-
}
handleChange(e) {
- if (!this.container.contains(e.target)) {
+ if (!this.container.contains(e.target) && !e.target.closest('[data-type="selector"], [data-field-type="selector"]')) {
return;
}
- if (e.target.type !== 'checkbox') return;
+ if (!['checkbox', 'button'].includes(e.target.type)) return;
e.preventDefault();
e.stopPropagation();
@@ -236,68 +347,115 @@
}
//For search in modal or field autocomplete
handleInput(e) {
+ if (!this.container.contains(e.target) && !e.target.closest('[data-type="selector"], [data-field-type="selector"]')) {
+ return;
+ }
let fieldId = this.getFieldId(e.target)??this.activeField;
if (!fieldId) return;
const field = this.fields.get(fieldId);
if (!field) return;
+ if (['checkbox', 'button'].includes(e.target.type)) return;
+ e.preventDefault();
+ e.stopPropagation();
+
+ //If it's the autocomplete field, we need to set the active field
if (!this.container.open) {
- this.activeField = fieldId;
+ this.setField(fieldId);
}
- const query = e.target.value.trim();
+ let query = e.target.value.trim();
+ this.setMessage(field,true, `Searching for "${query}" in ${field.plural??'items'}`);
window.debouncer.schedule(
`${fieldId}-search`,
async () => {
+ if (this.container.open) {
+ window.removeChildren(this.ui.terms.list);
+ }
await this.store.setFilters({
taxonomy: field.taxonomy,
search: query,
page: 1,
parent: query ? 0 : (this.store.filters.parent || 0)
});
- if (this.container.open) {
- window.removeChildren(this.ui.terms.list);
- }
},
100
);
}
- handleFocus(e) {
- const fieldId = this.getFieldId(e.target);
+ setField(fieldId) {
const field = this.fields.get(fieldId);
- if (!fieldId || !field) return;
+ if (!field) {
+ console.error('No field found...');
+ return;
+ }
+ this.activeField = fieldId;
+ this.setMessage(field,true, `Loading ${field.plural}...`);
+ this.resetFilters({taxonomy: field.taxonomy});
+ }
+
+ resetFilters(filters) {
+ if (!Object.hasOwn(filters, 'taxonomy')) {
+ return;
+ }
+ filters = {
+ page: 1,
+ search: '',
+ parent: 0,
+ ... filters
+ };
+ this.store.setFilters(filters);
+ }
+
+ handleFocus(e) {
+ if (!this.container.contains(e.target) && !e.target.closest('[data-type="selector"], [data-field-type="selector"]')) {
+ return;
+ }
+ const fieldId = this.getFieldId(e.target);
+ if (!fieldId) return;
+ const field = this.fields.get(fieldId);
+ if (!field) return;
if (!field.hasAutocomplete && !field.hasSearch) return;
window.debouncer.cancel(`${fieldId}-search-results`);
if (!this.container.open){
- this.activeField = fieldId;
- this.preloadTaxonomy(field.taxonomy);
+ this.setField(fieldId);
}
}
//Hide autocomplete dropdown on blur
handleBlur(e) {
+ if (!this.container.contains(e.target) && !e.target.closest('[data-type="selector"], [data-field-type="selector"]')) {
+ return;
+ }
const fieldId = this.getFieldId(e.target);
+ if (!fieldId) return;
const field = this.fields.get(fieldId);
- if (!fieldId || ! field) return;
- if (!field.hasAutocomplete) return;
+ if (!field) return;
+ if (!field.hasAutocomplete || this.container.open) return;
+ if (e.target.closest('.remove-item')) return;
+
+ if (e.relatedTarget && field.ui.dropdown.wrapper?.contains(e.relatedTarget)) return;
this.scheduleHideDropdown(fieldId);
}
- scheduleHideDropdown(fieldId){
+ scheduleHideDropdown(fieldId, delay = 1500){
const field = this.fields.get(fieldId);
if (!field) return;
window.debouncer.schedule(
`${fieldId}-search-results`,
() => {
- this.activeField = null;
- field.ui.dropdown.hidden = true;
+ if (!this.container.open) {
+ this.activeField = null;
+ }
+ if (field.ui.dropdown.wrapper) {
+ field.ui.dropdown.wrapper.hidden = true;
+ }
},
- 1500
+ delay
);
}
@@ -312,13 +470,14 @@
this.container,
{
handleForm: false,
- save: null,
open: null
}
);
this.modal.subscribe((event, data) => {
switch (event) {
-
+ case 'modal-close':
+ this.closeModal()
+ break;
}
});
}
@@ -338,51 +497,95 @@
const field = this.fields.get(fieldId);
if (!field) return;
- this.activeField = fieldId;
- this.ui.modal.title.textContent = `Select ${field.plural}`;
+ this.setField(fieldId);
+ this.ui.modal.title.textContent = (field.isFilter) ?`Filter by ${field.singular}` : `Select ${field.plural}`;
if (this.ui.search.container) {
this.ui.search.container.hidden = !field.canSearch;
}
- if (this.ui.create.details) {
- this.ui.create.details.hidden = !field.canCreate;
-
- if (this.ui.create.summary) {
- this.ui.create.summary.textContent = `Add new ${field.singular}`;
- }
- if (this.ui.create.label.name) {
- this.ui.create.label.name.textContent = `Name this ${field.singular}`;
- }
- if (this.ui.create.label.parent) {
- this.ui.create.label.parent.textContent = `Nest it under`;
- }
+ if (this.creator) {
+ this.creator.handleOpen(field);
}
let message = `Opened ${field.singular} selection. Choose from checkboxes, or search to filter results.`;
+ window.removeChildren(this.ui.selected);
window.removeChildren(this.ui.terms.list);
this.modal.handleOpen();
- this.setLoading();
-
- this.store.setFilters({
- taxonomy: field.taxonomy,
- page: 1,
- search: '',
- parent: 0,
- });
this.a11y.announce(message);
}
+ openEmpty(taxonomy, singular, plural, onComplete) {
+ // Store the callback for when modal closes
+ this.emptyCallback = onComplete;
+
+ // Create a temporary "field" for bulk operations
+ const bulkFieldId = `empty-${taxonomy}-${Date.now()}`;
+
+ if (!this.fields.has(bulkFieldId)) {
+ this.fields.set(bulkFieldId, {
+ id: bulkFieldId,
+ taxonomy: taxonomy,
+ singular: singular,
+ plural: plural,
+ canSearch: true,
+ canCreate: false,
+ hasAutocomplete: false,
+ isFilter: false,
+ isEmpty: true,
+ limit: 0,
+ ui: {},
+ element: null,
+ value: null,
+ toggle: null,
+ checked: true
+ });
+ this.selectedTerms.set(bulkFieldId, new Set());
+ }
+
+ this.setField(bulkFieldId);
+ this.ui.modal.title.textContent = `Add to ${plural}`;
+
+ if (this.ui.search?.container) {
+ this.ui.search.container.hidden = false;
+ }
+
+ window.removeChildren(this.ui.selected);
+ window.removeChildren(this.ui.terms.list);
+
+ this.modal.handleOpen();
+ }
+
closeModal() {
- this.modal.handleClose();
const field = this.fields.get(this.activeField);
if (!field) return;
+
+
+ this.updateFieldValue(this.activeField);
+
this.observer.unobserve(this.ui.terms.sentinel);
window.removeChildren(this.ui.terms.list);
- this.notify('selected-terms', {
- terms: this.selectedTerms.get(this.activeField),
- taxonomy: field.taxonomy
- });
+ if (field.isEmpty && this.emptyCallback) {
+ const selectedTermIds = Array.from(this.selectedTerms.get(this.activeField) || []);
+ const selectedTerms = selectedTermIds.map(id => this.store.get(id)).filter(Boolean);
+
+ this.emptyCallback({
+ taxonomy: field.taxonomy,
+ termIds: selectedTermIds,
+ terms: selectedTerms
+ });
+
+ // Cleanup temporary bulk field
+ this.fields.delete(this.activeField);
+ this.selectedTerms.delete(this.activeField);
+ this.emptyCallback = null;
+ this.bulkAssignmentTaxonomy = null;
+ } else {
+ this.notify('selected-terms', {
+ terms: this.selectedTerms.get(this.activeField),
+ taxonomy: field.taxonomy
+ });
+ }
this.activeField = null;
@@ -394,7 +597,10 @@
const current = this.store.filters.parent;
if (current === 0) return;
let term = this.store.get(parseInt(current));
- if (!term) return;
+ if (!term) {
+ this.navigateTo(0);
+ return;
+ }
let parent = term.parent;
this.navigateTo(parseInt(parent));
}
@@ -419,22 +625,30 @@
addTermToModal(termId) {
const term = this.store.get(termId);
if (!term) return;
+ const field = this.currentField();
+ if (!field) return;
+ if (this.ui.selected.querySelector(`[data-id="${termId}"]`)) return;
- const item = window.getTemplate('selectedTerm');
- item.dataset.id = termId;
- item.querySelector('span').textContent = term.path;
- item.querySelector('button').title = `Remove ${name}`;
+ this.ui.selected.append(this.getSelectedTermUI(term));
+ }
- this.ui.selected.append(item);
+ getSelectedTermUI(term, showPath = true) {
+ return window.jvbTemplates.create('selectedTerm', term);
}
/******************************************************************
FIELDS
******************************************************************/
scanExistingFields(container = document.body) {
- container.querySelectorAll('[data-type="selector"]').forEach(
+ container.querySelectorAll('[data-type="selector"], [data-field-type="selector"]').forEach(
selector => {
try {
- this.registerField(selector);
+ if (selector.dataset.lazy) {
+ this.lazyInit = true;
+ } else {
+ // Register field if not already registered
+ // registerField will check if already registered and return early if so
+ this.registerField(selector);
+ }
} catch (error) {
this.error.log(error, {
component: 'TaxonomySelector',
@@ -444,12 +658,41 @@
}
}
);
+ if (this.lazyInit) {
+ this.initObserver(container);
+ }
+ }
+
+ unregisterFields(container) {
+ container.querySelectorAll('[data-type="selector"],[data-field-type="selector"]').forEach(
+ selector=> {
+ this.fields.delete(selector.dataset.fieldId);
+ }
+ );
+ }
+ initObserver(container){
+ this.lazyObserver = new IntersectionObserver((entries) => {
+ entries.forEach(entry => {
+ if (entry.isIntersecting && entry.target.dataset.lazy) {
+ delete entry.target.dataset.lazy;
+ this.registerField(entry.target);
+ this.lazyObserver.unobserve(entry.target);
+ }
+ });
+ }, {rootMargin: '50px'});
+
+ container.querySelectorAll('[data-type="selector"][data-lazy], [data-field-type="selector"][data-lazy]').forEach(field => {
+ this.lazyObserver.observe(field);
+ });
}
registerField(element, options = {}) {
+ if (element.dataset.fieldId && this.fields.has(element.dataset.fieldId)) {
+ return element.dataset.fieldId; // Already registered
+ }
+
let input = element.querySelector('input[type="hidden"]');
- if (!input) {
- console.warn('TaxonomySelector: No hidden input found for field', element);
+ if (!input && !Object.hasOwn(element.dataset, 'filter')) {
return;
}
@@ -460,11 +703,19 @@
let selectors = this.selectors.field;
- let button = element.querySelector('button.taxonomy-toggle');
- if (options.size === 0){
+ const isFilter = Object.hasOwn(element.dataset,'filter') && element.dataset.filter === 'taxonomy';
+ let button = (isFilter) ? element : element.querySelector('button.selector-toggle');
+
+ if (Object.keys(options).length === 0){
if (!button) return;
- options = button.dataset;
- if (options.size === 0) return;
+ options = {
+ taxonomy: button.dataset.taxonomy,
+ single: button.dataset.single,
+ plural: button.dataset.plural,
+ search: Object.hasOwn(button.dataset, 'search'),
+ autocomplete: Object.hasOwn(button.dataset, 'autocomplete'),
+ creatable: Object.hasOwn(button.dataset, 'creatable')
+ };
} else if (Object.hasOwn(options, 'toggle')) {
button = document.querySelector(options.toggle);
selectors.toggle = options.toggle;
@@ -478,38 +729,73 @@
singular: options.single??'',
plural: options.plural??'',
name: element.dataset.field,
- canSearch: Object.hasOwn(options, 'search'),
+ canSearch: options.search??false,
limit: options.limit??0,
- hasAutocomplete: Object.hasOwn(options, 'autocomplete'),
- canCreate: Object.hasOwn(options, 'creatable'),
- isRequired: Object.hasOwn(options, 'required'),
+ hasAutocomplete: options.autocomplete??false,
+ canCreate: options.creatable??false,
+ isRequired: options.required??false,
+ isFilter: isFilter,
toggle: button,
+ create: {
+ button: null,
+ span: null
+ },
selectors: selectors,
ui: window.uiFromSelectors(selectors, element),
checked: false,
};
- if (!config.taxonomy) return;
+
+ if (isFilter && !config.ui.toggle) {
+ config.ui.toggle = element;
+ }
+ if (!config.taxonomy) {
+ console.error('TaxonomySelector: Field missing taxonomy', element);
+ return;
+ }
+ if (!config.singular || !config.plural) {
+ console.warn('TaxonomySelector: Field missing singular/plural labels', element);
+ config.singular = config.taxonomy.replace('jvb_', '');
+ config.plural = config.singular + 's';
+ }
this.fields.set(fieldId, config);
//Check for stored selected terms in hidden input
- this.setSelectedFromValue(input);
+ this.setSelectedFromValue(fieldId, input);
if (this.isInitializing) {
this.batchFetch.add(config.taxonomy);
}
- this.updateFieldUI(fieldId);
+
+ if (element.offsetParent !== null) {
+ this.updateFieldUI(fieldId);
+ } else {
+ // Defer until visible
+ requestIdleCallback(() => {
+ if (element.offsetParent !== null) {
+ this.updateFieldUI(fieldId);
+ }
+ }, {timeout: 2000});
+
+ }
return fieldId;
}
setSelectedFromValue(fieldId, input) {
+ if (!fieldId) return;
+ let field = this.fields.get(fieldId);
+ if (!field) return;
+ if (!input && !field.isFilter) return;
+
let selected = new Set();
- input.value.value.trim()
- .split(',')
- .map(id => parseInt(id.trim()))
- .filter(id => !isNaN(id))
- .forEach(id => selected.add(id));
+ if (input) {
+ input.value.trim()
+ .split(',')
+ .map(id => parseInt(id.trim()))
+ .filter(id => !isNaN(id))
+ .forEach(id => selected.add(id));
+ }
this.selectedTerms.set(fieldId, selected);
}
@@ -524,8 +810,10 @@
if (field.limit !== 0 && selected.size >= field.limit) return;
selected.add(parseInt(termId));
+ if (!this.container.open && !field.isFilter) {
+ this.updateFieldValue(fieldId);
+ }
this.addTermToDisplay(termId, fieldId);
- this.updateFieldValue(fieldId);
this.checkLimits(fieldId);
}
removeSelected(termId, fieldId = null) {
@@ -535,34 +823,45 @@
if (!field || !term) return;
this.selectedTerms.get(fieldId).delete(parseInt(termId));
- const selectedItem = field.ui.selected.querySelector(`[data-i"${termId}"]`);
+ const selectedItem = (field.ui.selected) ? field.ui.selected.querySelector(`[data-id="${termId}"]`) : false;
if (selectedItem) selectedItem.remove();
if (this.container.open) {
- let item = this.ui.selected.querySelector(`[data-id="${termId}"]`);
+ let item = (this.ui.selected) ? this.ui.selected.querySelector(`[data-id="${termId}"]`) : false;
if (item) item.remove();
+ let checkbox = this.ui.terms.list.querySelector(`[type=checkbox][data-id="${termId}"]`);
+ if (checkbox) {
+ checkbox.checked = false;
+ }
}
- this.updateFieldValue(fieldId);
+ if (!this.container.open && !field.isFilter) {
+ this.updateFieldValue(fieldId);
+ }
+
this.checkLimits(fieldId);
}
updateFieldValue(fieldId) {
const field = this.fields.get(fieldId);
if (!field) return;
let selected = Array.from(this.selectedTerms.get(fieldId));
- field.ui.value = selected.join(',');
+ if (field.ui.value) {
+ field.ui.value.value = selected.join(',')??'';
+ field.ui.value.dispatchEvent(new Event('change', { bubbles: true }));
+ }
}
checkLimits(fieldId) {
if (!this.container.open) return;
const field = this.fields.get(fieldId);
- if (!field || field.limit === 0) return;
+ if (!field || !field.isFilter || field.limit === 0) return;
const disabled = this.selectedTerms.get(fieldId).size >= field.limit;
this.setCheckboxes(disabled);
}
updateFieldFromInput(input) {
const fieldId = this.getFieldId(input);
+ if (!fieldId) return;
const field = this.fields.get(fieldId);
- if (!fieldId || !field) return;
+ if(!field) return;
this.setSelectedFromValue(fieldId, input);
this.updateFieldUI(fieldId);
@@ -570,8 +869,8 @@
updateFieldUI(fieldId) {
const field = this.fields.get(fieldId);
- let selected = this.selectedTerms.get(fieldId);
- if (!field || selected.size === 0) return;
+ let selected = this.selectedTerms.get(fieldId)??new Set();
+ if (!field || field.isFilter || selected.size === 0) return;
Array.from(selected).forEach(termId => {
this.addTermToDisplay(termId, fieldId);
@@ -580,13 +879,14 @@
updateFieldsForTaxonomy(taxonomy) {
let fields = Array.from(this.fields.values())
- .filter(field => !field.checked && field.taxonomy === taxonomy);
+ .filter(field => field.taxonomy === taxonomy);
const hasItems = Array.from(this.store.data.values())
- .some(term=>term.taxonomy === taxonomy);
+ .some(term => term && term.taxonomy === taxonomy);
fields.forEach(field => {
- field.ui.toggle.disabled = !hasItems && !field.canCreate;
- field.ui.toggle.title = !hasItems
+ if (!field.toggle) return;
+ field.toggle.disabled = !hasItems && !field.canCreate;
+ field.toggle.title = !hasItems
? `No ${field.singular} available`
: `Select ${field.plural}`;
@@ -594,117 +894,79 @@
});
}
- showModalTerms(append = true, showPath = false) {
+ showModalTerms(showPath = false) {
+ const field = this.currentField();
const terms = this.store.getFiltered();
- if (terms.size === 0) return;
- if (!append) {
- window.removeChildren(this.ui.terms.list);
+ if (terms.length === 0) {
+ if (this.store.filters.page??1 === 1) {
+ window.removeChildren(this.ui.terms.list);
+ }
+ this.setMessage(field,true, this.store.filters.search === ''
+ ? `No matching ${field.plural}.`
+ : `No ${field.plural} found.`,
+ false);
+ if (this.ui.terms.sentinel) {
+ this.observer.unobserve(this.ui.terms.sentinel);
+ }
+ return;
+ }
+
+ this.setCreateButton(field,true);
+
+ if (this.ui.terms.sentinel) {
+ if (this.store.lastResponse?.has_more) {
+ this.observer.observe(this.ui.terms.sentinel);
+ } else {
+ this.observer.unobserve(this.ui.terms.sentinel);
+ }
}
const currentParent = this.store.filters.parent??0;
this.ui.nav.back.hidden = currentParent === 0;
- const fragment = document.createDocumentFragment();
- terms.forEach(term => {
- const element = this.createTermElement({
- show: showPath,
- ... term
- });
- if (element) {
- fragment.appendChild(element);
- }
- });
+ window.chunkIt(
+ terms,
+ (term) => this.createTermElement({show:showPath, ... term}),
+ (fragment) => this.ui.terms.list.append(fragment),
+ 10
+ ).then(()=>{});
- this.ui.terms.list.append(fragment);
+ if (terms.length > 0) {
+ this.setMessage(field,false);
+ }
}
createTermElement(term) {
if (!term || !term.name) return null;
-
- const item = window.getTemplate('termListItem');
- item.dataset.id = term.id;
-
- const isSelected = this.selectedTerms.get(this.activeField).has(term.id);
- let [
- checkbox,
- label,
- nameSpan
- ] = [
- item.querySelector('input'),
- item.querySelector('label'),
- item.querySelector('span, .term-name')
- ];
-
- let field = this.currentField();
- let limitReached = field.limit > 0 && this.selectedTerms.get(this.activeField).size >= field.limit;
- if (checkbox && label && nameSpan) {
- [
- checkbox.id,
- checkbox.name,
- checkbox.value,
- checkbox.disabled,
- checkbox.checked,
- label.htmlFor,
- label.title,
- label.dataset.path,
- nameSpan.textContent
- ] = [
- `${field.element.id}-${term.id}`,
- `${field.container.id}-${field.taxonomy}-select`,
- term.id,
- !isSelected && limitReached,
- isSelected,
- `${field.element.id}-${term.id}`,
- term.path??term.name,
- term.path,
- term.show ? term.path : term.name
- ];
- if (term.hasChildren) {
- const toggle = window.getTemplate('termChildrenToggle');
- if (toggle) {
- toggle.ariaLabel = `View ${field.plural} nested under ${term.name}`;
- item.append(toggle);
- }
- }
- }
-
- return item;
+ return window.jvbTemplates.create('termListItem', term);
}
showAutocompleteTerms() {
const field = this.currentField();
+ if (!field || !field.hasAutocomplete || !field.ui.dropdown?.list) return;
+ const dropdown = field.ui.dropdown.list;
const terms = this.currentTerms();
- if (!field || terms.size ===0) return;
- const dropdown = field.ui.dropdown;
window.removeChildren(dropdown);
if (terms.length === 0) {
- this.showEmptyState(`No ${field.plural} found.`, dropdown);
+ this.setMessage(field,true, `No ${field.plural} found.`, false);
} else {
- terms.forEach(term => {
- const item = this.createAutocompleteTerm(term);
- if (item) {
- dropdown.append(item);
- }
- })
- }
+ window.chunkIt(
+ terms,
+ (term) => this.createAutocompleteTerm(term),
+ (fragment) => dropdown.append(fragment)
+ ).then(()=>{});
- const query = field.ui.search?.value;
- if (field.canCreate && query.length >= 2 && this.creator) {
- const createButton = this.createTermButton(query);
- if (createButton) {
- dropdown.append(createButton);
- }
+ this.setMessage(field,false);
}
+ this.setCreateButton(field,true);
- dropdown.hidden = false;
+ if (field.ui.dropdown.wrapper) {
+ field.ui.dropdown.wrapper.hidden = false;
+ }
}
- createAutocompleteTerm(term) {
- const item = window.getTemplate('autocompleteItem');
- if (!item) return;
- item.dataset.id = term.id;
- item.textContent = term.path || term.name;
- return item;
+ createAutocompleteTerm(term) {
+ return window.jvbTemplates.create('autocompleteItem', term);
}
/******************************************************************
UI
@@ -713,18 +975,16 @@
const term = this.store.get(termId);
const field = this.fields.get(fieldId);
if (!term || !field) return;
+
//if the term already exists in the selected items, bail early
- if (field.ui.selected.querySelector(`[data-id="${termId}"]`)) return;
+ if (field.ui.selected && field.ui.selected.querySelector(`[data-id="${termId}"]`)) return;
- const item = window.getTemplate('selectedTerm');
- if (!item) return;
- item.dataset.id = termId;
- item.dataset.taxonomy = field.taxonomy;
- item.querySelector('.item-name').textContent = term.path;
- item.querySelector('button').title = `Remove ${term.name}`;
+ let item = this.getSelectedTermUI(term);
- field.ui.selected.append(item);
+ if (field.ui.selected) {
+ field.ui.selected.append(item);
+ }
if (this.container.open) {
this.addTermToModal(termId);
@@ -732,15 +992,6 @@
if (checkbox) checkbox.checked = true;
}
}
- createTermButton(query) {
- const button = window.getTemplate('autocompleteButton');
- if(!button) return;
-
- let queryEl = button.querySelector('span');
- queryEl.textContent = `"${query}"`;
-
- return button;
- }
updateBreadcrumbs(termId) {
const nav = this.ui.nav.nav;
@@ -760,13 +1011,7 @@
// Add new breadcrumb
const term = this.store.get(termId);
if (!term) return;
-
- const crumb = window.getTemplate('termBreadcrumb');
- if (!crumb) return;
-
- crumb.dataset.id = termId;
- crumb.textContent = term.name;
- crumb.title = term.name;
+ const crumb = window.jvbTemplates.create('termBreadcrumb', term);
nav.append(crumb);
}
@@ -789,6 +1034,13 @@
/******************************************************************
UTILITY
******************************************************************/
+ checkRendered(collection, term) {
+ if (!collection) return;
+ if (!Object.hasOwn(collection, term.taxonomy)) {
+ collection[term.taxonomy] = new Map();
+ }
+ return collection[term.taxonomy].has(term.id);
+ }
currentField() {
return this.fields.get(this.activeField)??false;
}
@@ -826,15 +1078,20 @@
handleStoreEvent(event, data) {
const handlers = {
'data-loaded': () => this.handleDataLoaded(),
- 'filters-changed': () => this.handleFiltersChanged(),
+ 'filters-changed': () => this.handleFiltersChanged(data),
'fetch-error': () => this.handleFetchError()
};
- handlers[event]?.();
+ try {
+ handlers[event]?.(data);
+ } catch (error) {
+ console.error(`Error handling store event "${event}":`, error);
+ }
}
handleDataLoaded() {
const taxonomy = this.store.filters.taxonomy;
- if (taxonomy?.includes(',')) {
+
+ if (taxonomy) {
const taxonomies = taxonomy.split(',').map(t => t.trim());
taxonomies.forEach(tax => this.updateFieldsForTaxonomy(tax));
}
@@ -845,63 +1102,71 @@
}
if (this.activeField) {
this.showResults(true);
+ return;
}
}
showResults(isAutoComplete = false) {
- this.setLoading(false);
const terms = this.store.getFiltered();
const filters = this.store.filters;
- const response = this.store.lastResponse?.page || {};
const isSearch = filters.search && filters.search.length > 0;
- const append = filters.page > 1;
- const field = this.currentField();
this.notify('terms-loaded', {
terms,
filters
});
- if (terms.length === 0) {
- if (!append) {
- this.showEmptyState(isSearch ? `No matching ${field.plural}.` : `No ${field.plural} available.`);
- }
- this.observer.unobserve(this.ui.terms.sentinel);
+ if (!this.activeField && isAutoComplete) {
+ return;
+ }
+ this.setMessage(this.currentField(), false);
+ if (isAutoComplete) {
+ this.showAutocompleteTerms();
} else {
- if (!isAutoComplete) {
- this.showModalTerms(append, isSearch);
-
- if (response.has_more) {
- this.observer.observe(this.ui.terms.sentinel);
- } else {
- this.observer.unobserve(this.ui.terms.sentinel);
- }
- } else {
- this.showAutocompleteTerms()
- }
+ this.showModalTerms(isSearch);
}
- this.a11y.announce(terms.length, append);
+
+ this.a11y.announce(terms.length);
}
- handleFiltersChanged() {
- // if (this.modal?.open) {
- // this.setLoading();
- // }
+ handleFiltersChanged(data) {
+ //maybe do something?
}
handleFetchError(error) {
- this.setLoading(false);
+ const field = this.currentField();
+ this.setMessage(field, true, 'Something went wrong.', false);
+
+ const conf = this.container.open || field?.isFilter ? this.ui : field?.ui;
+ const p = conf?.message?.message;
+
+ if (p && !p.querySelector('.clear-cache-btn')) {
+ const btn = document.createElement('button');
+ btn.className = 'clear-cache-btn';
+ btn.type = 'button';
+ btn.textContent = 'Clear cache and try again';
+ btn.addEventListener('click', async () => {
+ btn.remove();
+ this.store.clearCache();
+ if (this.activeField && field) {
+ await this.store.setFilters({
+ taxonomy: field.taxonomy,
+ page: 1,
+ search: '',
+ parent: 0
+ });
+ }
+ });
+ p.appendChild(btn);
+ }
+
+ console.error('Store fetch error:', error);
}
async batchFetchTaxonomies() {
if (this.batchFetch.size === 0) return;
-
const taxonomies = Array.from(this.batchFetch);
- taxonomies.forEach(tax => this.loadedTaxonomies.add(tax));
this.batchFetch.clear();
-
try {
- taxonomies.forEach(tax => this.loadedTaxonomies.add(tax));
-
await this.store.setFilters({
taxonomy: taxonomies.join(','),
page: 1,
@@ -914,55 +1179,132 @@
}
preloadTaxonomy(taxonomy) {
- if (this.loadedTaxonomies.has(taxonomy)) return;
-
this.store.setFilters( {
taxonomy: taxonomy,
page: 1,
search: '',
parent: 0
});
-
- this.loadedTaxonomies.add(taxonomy);
}
/**************************************************
LOADING
**************************************************/
- setLoading(on = true) {
- this.ui.loading.loading.hidden = on;
- this.modal.classList.toggle('loading', on);
+ setCreateButton(field, show = true) {
+ if (!field.canCreate || !this.creator) return;
- if (on) {
- let searchQuery = this.store.filters.search || '';
- searchQuery = searchQuery === '' ? false : searchQuery;
- const currentParent = this.store.filters.parent || 0;
- const message = searchQuery
- ? `Searching for "${searchQuery} items` :
- currentParent === 0
- ? 'loading items'
- : 'loading child items';
+ const conf = (this.container.open) ? this.ui : field.ui;
+ if (!conf.create?.button || !conf.create?.span) return;
- if (window.typeLoop && this.ui.loading.text) {
- this.stopTyping = window.typeLoop(this.ui.loading.text, message);
- } else {
- this.ui.loading.text.textContenet = message;
- }
+ const createButton = conf.create.button;
+ createButton.hidden = !show;
+ const buttonSpan = conf.create.span;
+ const input = (this.container.open) ? conf.search.input : conf.search;
+ if (!input) return;
+
+ let results = this.currentTerms()??[];
+ let matches = results.map(t => t.name);
+
+ let query = input.value;
+ const willShow = show && query.length >= 2 && !matches.includes(query);
+ createButton.hidden = !willShow;
+ if (willShow) {
+ buttonSpan.textContent = input.value??'';
+ }
+ }
+ async maybeCreateTerm(e) {
+ const field = this.currentField();
+ if (!field) return;
+
+ window.debouncer.cancel(`${field.id}-search-results`);
+
+ let data = {
+ taxonomy: field.taxonomy,
+ parent: this.store.filters.parent??0
+ }
+
+ if (!this.container.open || this.ui.search.input.value !== '') {
+ data.name = (this.container.open) ? this.ui.search.input.value : field.ui.search.value;
} else {
- if (this.stopTyping) {
- this.stopTyping();
- this.stopTyping = null;
+ data.parent = this.creator.ui.parent.value??data.parent;
+ data.name = this.creator.ui.name.value??false;
+ }
+
+ if (data.parent !== undefined && data.name) {
+ this.setMessage(field,true, `Creating "${data.name}"...`);
+ this.setCreateButton(field,false);
+
+ if (this.container.open) {
+ window.removeChildren(this.ui.terms.list);
+ } else {
+ field.ui.search.disabled = true;
+ if (field.ui.dropdown.wrapper) {
+ field.ui.dropdown.wrapper.hidden = false;
+ }
+ }
+
+ let term = await this.creator.handleTermCreation(data);
+
+ if (term) {
+ // Stop any typeLoop animation and show success message WITHOUT typeLoop
+ this.setMessage(field,true, `"${term.name}" created!`, false);
+
+ this.addSelected(term.id, field.id);
+ this.updateFieldValue(field.id);
+ // For autocomplete, show the newly created term in dropdown
+ if (!this.container.open && field.ui.dropdown.list) {
+ window.removeChildren(field.ui.dropdown.list);
+ const termElement = this.createAutocompleteTerm(term);
+ if (termElement) {
+ termElement.classList.add('newly-created');
+ field.ui.dropdown.list.append(termElement);
+ }
+ }
+ this.scheduleHideDropdown(field.id, 300);
+ this.setMessage(field,false);
+ } else {
+ // Creation failed - hide immediately
+ this.setMessage(field,false);
+ if (!this.container.open && field.ui.dropdown.wrapper) {
+ field.ui.dropdown.wrapper.hidden = true;
+ }
+ }
+
+ if (!this.container.open) {
+ field.ui.search.disabled = false;
+ field.ui.search.value = '';
}
}
}
- showEmptyState(message = 'No items found.', container = null) {
- if (!container) container = this.ui.terms.list;
- const emptyElement = window.getTemplate('noTermResults');
- const span = emptyElement.querySelector('span');
- if (message && span) {
- span.textContent = message;
+ setMessage(field, show = true, message = '', type = true) {
+ const conf = this.container.open||field.isFilter ? this.ui : (field.isFilter ? null : field.ui);
+ if (!conf?.message?.message) return;
+
+ message = (message === '') ? `No ${field.plural??'items'} found.` : message;
+
+ const p = conf.message.message;
+ const pText = conf.message.text;
+
+ p.hidden = !show;
+ if (show) {
+ if (message && pText) {
+ if (type && window.typeLoop && pText) {
+ if (this.messageText[field.id]) {
+ this.messageText[field.id]();
+ delete this.messageText[field.id];
+ }
+ this.messageText[field.id] = window.typeLoop(pText, message);
+ } else {
+ pText.textContent = message;
+ }
+
+ }
+ } else {
+ if (this.messageText[field.id]) {
+ this.messageText[field.id]();
+ delete this.messageText[field.id];
+ }
}
- container.append(emptyElement);
}
/**************************************************
SUBSCRIBERS
@@ -984,16 +1326,50 @@
CLEANUP
******************************************************/
destroy() {
+ // Cancel all debounced operations for this instance
+ this.fields.forEach((field, fieldId) => {
+ window.debouncer.cancel(`${fieldId}-search`);
+ window.debouncer.cancel(`${fieldId}-search-results`);
+ });
+
+ // Stop any typeLoop animations
+ Object.keys(this.messageText).forEach(key => {
+ if (this.messageText[key]) {
+ this.messageText[key]();
+ }
+ });
+ this.messageText = {};
+
+ // Disconnect observer
+ if (this.ui.terms?.sentinel) {
+ this.observer?.unobserve(this.ui.terms.sentinel);
+ }
+ this.observer?.disconnect();
+ this.lazyObserver?.disconnect();
+
+ // Remove event listeners
document.removeEventListener('click', this.clickHandler);
document.removeEventListener('change', this.changeHandler);
document.removeEventListener('input', this.inputHandler);
- document.removeEventListener('focus', this.focusHandler);
- document.removeEventListener('blur', this.blurHandler);
+ document.removeEventListener('focus', this.focusHandler, true);
+ document.removeEventListener('blur', this.blurHandler, true);
- this.observer?.disconnect();
+ // Clear data structures
this.subscribers.clear();
this.fields.clear();
this.selectedTerms.clear();
+ this.batchFetch.clear();
+
+ // Cleanup creator if exists
+ if (this.creator) {
+ this.creator.destroy();
+ this.creator = null;
+ }
+
+ // Unsubscribe from store
+ if (this.store) {
+ this.store = null;
+ }
}
}
--
Gitblit v1.10.0