@keenthemes/ktui 1.0.12 → 1.0.13

package/src/components/select/select.ts

@@ -37,7 +37,6 @@ export class KTSelect extends KTComponent {
 	private _displayElement: HTMLElement;
 	private _dropdownContentElement: HTMLElement;
 	private _searchInputElement: HTMLInputElement | null;
-	private _valueDisplayElement: HTMLElement;
 	private _options: NodeListOf<HTMLElement>;
 
 	// State
@@ -167,21 +166,23 @@ export class KTSelect extends KTComponent {
 		);
 		if (!optionsContainer) return;
 
+		// Clear previous messages
+		optionsContainer.innerHTML = '';
+
 		switch (type) {
 			case 'error':
-				optionsContainer.innerHTML = defaultTemplates.error({
+				optionsContainer.appendChild(defaultTemplates.error({
 					...this._config,
 					errorMessage: message,
-				});
+				}));
 				break;
 			case 'loading':
-				optionsContainer.innerHTML = defaultTemplates.loading(
+				optionsContainer.appendChild(defaultTemplates.loading(
 					this._config,
 					message || 'Loading...',
-				).outerHTML;
+				));
 				break;
 			case 'empty':
-				optionsContainer.innerHTML = '';
 				optionsContainer.appendChild(defaultTemplates.empty(this._config));
 				break;
 		}
@@ -397,6 +398,7 @@ export class KTSelect extends KTComponent {
 			this._displayElement,
 			this._dropdownContentElement,
 			this._config,
+			this, // Pass the KTSelect instance to KTSelectDropdown
 		);
 
 		// Update display and set ARIA attributes
@@ -408,13 +410,6 @@ export class KTSelect extends KTComponent {
 		this._attachEventListeners();
 	}
 
-	/**
-	 * Initialize options HTML from data
-	 */
-	// private _initializeOptionsHtml() {
-	// 	this._generateOptionsHtml(this._element);
-	// }
-
 	/**
 	 * Creates the HTML structure for the select component
 	 */
@@ -514,10 +509,6 @@ export class KTSelect extends KTComponent {
 			this._searchInputElement = this._displayElement as HTMLInputElement;
 		}
 
-		this._valueDisplayElement = this._wrapperElement.querySelector(
-			`[data-kt-select-value]`,
-		) as HTMLElement;
-
 		this._options = this._wrapperElement.querySelectorAll(
 			`[data-kt-select-option]`,
 		) as NodeListOf<HTMLElement>;
@@ -537,17 +528,10 @@ export class KTSelect extends KTComponent {
 			this._handleDropdownOptionClick.bind(this),
 		);
 
-		// Only attach click handler to display element
-		// this._eventManager.addListener(
-		// 	this._wrapperElement,
-		// 	'click',
-		// 	this._handleDropdownClick.bind(this),
-		// );
-
-		// Attach centralized keyboard handler
-		const keyboardTarget = this._searchInputElement || this._wrapperElement;
-		if (keyboardTarget) {
-			keyboardTarget.addEventListener('keydown', this._handleKeyboardEvent.bind(this));
+		// Attach centralized keyboard handler to the wrapper element.
+		// Events from focusable children like _displayElement or _searchInputElement (if present) will bubble up.
+		if (this._wrapperElement) {
+			this._wrapperElement.addEventListener('keydown', this._handleKeyboardEvent.bind(this));
 		}
 	}
 
@@ -729,28 +713,6 @@ export class KTSelect extends KTComponent {
 	 * ========================================================================
 	 */
 
-	/**
-	 * Toggle dropdown visibility
-	 * @deprecated
-	 */
-	public toggleDropdown() {
-		if (this._config.disabled) {
-			if (this._config.debug) console.log('toggleDropdown: select is disabled, not opening');
-			return;
-		}
-		if (this._config.debug) console.log('toggleDropdown called');
-		if (this._dropdownModule) {
-			// Always use the dropdown module's state to determine whether to open or close
-			if (this._dropdownModule.isOpen()) {
-				if (this._config.debug) console.log('Dropdown is open, closing...');
-				this.closeDropdown();
-			} else {
-				if (this._config.debug) console.log('Dropdown is closed, opening...');
-				this.openDropdown();
-			}
-		}
-	}
-
 	/**
 	 * Open the dropdown
 	 */
@@ -791,17 +753,6 @@ export class KTSelect extends KTComponent {
 		this._dispatchEvent('show');
 		this._fireEvent('show');
 
-		// Focus search input if configured and exists
-		if (
-			this._config.enableSearch &&
-			this._config.searchAutofocus &&
-			this._searchInputElement
-		) {
-			setTimeout(() => {
-				this._searchInputElement.focus();
-			}, 50);
-		}
-
 		// Update ARIA states
 		this._setAriaAttributes();
 
@@ -830,15 +781,15 @@ export class KTSelect extends KTComponent {
 		if (this._config.debug)
 			console.log('Closing dropdown via dropdownModule...');
 
-		// Clear search input and highlights if the dropdown is closing
+		// Clear search input if the dropdown is closing
 		if (this._searchModule && this._searchInputElement) {
 			// Clear search input if configured to do so
 			if (this._config.clearSearchOnClose) {
 				this._searchInputElement.value = '';
 			}
 
-			// Always clear the highlights when dropdown closes
-			this._searchModule.clearSearchHighlights();
+			// Clear search input when dropdown closes
+			this._searchModule.clearSearch();
 		}
 
 		// Set our internal flag to match what we're doing
@@ -878,11 +829,12 @@ export class KTSelect extends KTComponent {
 		const selectedOptions = this.getSelectedOptions();
 		if (selectedOptions.length === 0) return;
 
-		// Get the first selected option element
-		const firstSelectedValue = selectedOptions[0];
-
-		// Use the FocusManager to focus on the option
-		this._focusManager.focusOptionByValue(firstSelectedValue);
+		// Iterate through selected options and focus the first one that is visible
+		for (const value of selectedOptions) {
+			if (this._focusManager && this._focusManager.focusOptionByValue(value)) {
+				break; // Stop after focusing the first found selected and visible option
+			}
+		}
 	}
 
 	/**
@@ -954,38 +906,89 @@ export class KTSelect extends KTComponent {
 	 */
 	public updateSelectedOptionDisplay() {
 		const selectedOptions = this.getSelectedOptions();
+		const tagsEnabled = this._config.tags && this._tagsModule;
+		const valueDisplayEl = this.getValueDisplayElement();
 
-		// Tag mode: render tags if enabled
-		if (this._config.tags && this._tagsModule) {
+		if (tagsEnabled) {
+			// Tags module will render tags if selectedOptions > 0, or clear them if selectedOptions === 0.
 			this._tagsModule.updateTagsDisplay(selectedOptions);
-			return;
 		}
 
-		if (typeof this._config.renderSelected === 'function') {
-			// Use the custom renderSelected function if provided
-			this._valueDisplayElement.innerHTML = this._config.renderSelected(selectedOptions);
-		} else {
+		// Guard against valueDisplayEl being null due to template modifications
+		if (!valueDisplayEl) {
+			if (this._config.debug) {
+				console.warn('KTSelect: Value display element is null. Cannot update display or placeholder. Check template for [data-kt-select-value].');
+			}
+			return; // Nothing to display on if the element is missing
+		}
 
-			if (selectedOptions.length === 0) {
-				const placeholder = defaultTemplates.placeholder(this._config);
-				this._valueDisplayElement.replaceChildren(placeholder);
+		// 1. Custom render function takes highest precedence
+		if (typeof this._config.renderSelected === 'function') {
+			valueDisplayEl.innerHTML = this._config.renderSelected(selectedOptions);
+			return;
+		}
 
+		// 2. Custom displayTemplate string
+		// Check if a custom display template string is provided directly in config or via config.templates
+		const customDisplayTemplateString = this._config.displayTemplate || (this._config.templates && this._config.templates.display);
+		if (customDisplayTemplateString) {
+			// If tags are enabled and items are selected, the tags module handles display, so clear the main display area.
+			if (tagsEnabled && selectedOptions.length > 0) {
+				valueDisplayEl.innerHTML = '';
 			} else {
-				let content = '';
+				// Otherwise, render the custom display template.
+				// If no options are selected, renderDisplayTemplateForSelected should handle showing a placeholder if the template supports it,
+				// or we might need a separate placeholder rendering for custom templates if they don't handle empty selection.
+				// For now, assume renderDisplayTemplateForSelected handles it or shows selected text.
+				valueDisplayEl.innerHTML = this.renderDisplayTemplateForSelected(selectedOptions);
+			}
+			return;
+		}
 
-				if (this._config.displayTemplate) {
-					const selectedValues = this.getSelectedOptions();
-					content = this.renderDisplayTemplateForSelected(selectedValues);
-				} else {
-					// If no displayTemplate is provided, use the default comma-separated list of selected options
-					content = this.getSelectedOptionsText();
-				}
+		// 3. Default template behavior (no custom function or string template)
+		const textContainer = valueDisplayEl.querySelector('[data-kt-text-container="true"]') as HTMLElement;
 
-				this._valueDisplayElement.innerHTML = content;
+		if (tagsEnabled && selectedOptions.length > 0) {
+			// Tags are active and have content, clear the text container if it exists,
+			// or the whole display if it doesn't (though it should with default template).
+			if (textContainer) {
+				textContainer.innerHTML = '';
+			} else {
+				valueDisplayEl.innerHTML = ''; // Fallback: clear entire display area
+			}
+		} else if (selectedOptions.length === 0) {
+			// No options selected: display placeholder text in the text container.
+			const placeholderTemplate = defaultTemplates.placeholder(this._config);
+			const placeholderText = placeholderTemplate.textContent || ''; // Get text from placeholder element
+			if (textContainer) {
+				textContainer.innerHTML = placeholderText;
+			} else {
+				// Fallback: If no text container, replace children of valueDisplayEl with the placeholder element itself.
+				// This ensures the placeholder (which might have its own structure/classes) is displayed.
+				valueDisplayEl.replaceChildren(placeholderTemplate);
+			}
+		} else {
+			// Options are selected, and tags are not enabled (or no selected options for tags):
+			// Render normal selected text in the text container.
+			const content = this.getSelectedOptionsText();
+			if (textContainer) {
+				textContainer.innerHTML = content;
+			} else {
+				valueDisplayEl.innerHTML = content; // Fallback: set content on whole display area
 			}
 		}
 	}
 
+	/**
+	 * Check if an option was originally disabled in the HTML
+	 */
+	private _isOptionOriginallyDisabled(value: string): boolean {
+		const originalOption = Array.from(this._element.querySelectorAll('option')).find(
+			(opt) => opt.value === value
+		) as HTMLOptionElement;
+		return originalOption ? originalOption.disabled : false;
+	}
+
 	/**
 	 * Update CSS classes for selected options
 	 */
@@ -1007,17 +1010,23 @@ export class KTSelect extends KTComponent {
 		allOptions.forEach((option) => {
 			const optionValue = option.getAttribute('data-value');
 			if (!optionValue) return;
+
 			const isSelected = selectedValues.includes(optionValue);
+			const isOriginallyDisabled = this._isOptionOriginallyDisabled(optionValue);
+
 			if (isSelected) {
 				option.classList.add('selected');
 				option.setAttribute('aria-selected', 'true');
+				// Selected options should not be visually hidden or disabled by maxSelections logic
 				option.classList.remove('hidden');
 				option.classList.remove('disabled');
 				option.removeAttribute('aria-disabled');
 			} else {
 				option.classList.remove('selected');
 				option.setAttribute('aria-selected', 'false');
-				if (maxReached) {
+
+				// An option should be disabled if it was originally disabled OR if maxSelections is reached
+				if (isOriginallyDisabled || maxReached) {
 					option.classList.add('disabled');
 					option.setAttribute('aria-disabled', 'true');
 				} else {
@@ -1085,18 +1094,6 @@ export class KTSelect extends KTComponent {
 	 * ========================================================================
 	 */
 
-	/**
-	 * Handle display element click
-	 * @deprecated
-	 */
-	private _handleDropdownClick(event: Event) {
-		if (this._config.debug)
-			console.log('Display element clicked', event.target);
-		event.preventDefault();
-		event.stopPropagation(); // Prevent event bubbling
-		this.toggleDropdown();
-	}
-
 	/**
 	 * Handle click within the dropdown
 	 */
@@ -1145,6 +1142,13 @@ export class KTSelect extends KTComponent {
 
 		if (this._config.debug) console.log('Option clicked:', optionValue);
 
+		// If in single-select mode and the clicked option is already selected, just close the dropdown.
+		if (!this._config.multiple && this._state.isSelected(optionValue)) {
+			if (this._config.debug) console.log('Single select mode: clicked already selected option. Closing dropdown.');
+			this.closeDropdown();
+			return;
+		}
+
 		// Use toggleSelection instead of _selectOption to prevent re-rendering
 		this.toggleSelection(optionValue);
 	}
@@ -1221,7 +1225,14 @@ export class KTSelect extends KTComponent {
 	 * Get value display element
 	 */
 	public getValueDisplayElement() {
-		return this._valueDisplayElement;
+		return this._displayElement;
+	}
+
+	/**
+	 * Get wrapper element
+	 */
+	public getWrapperElement(): HTMLElement {
+		return this._wrapperElement;
 	}
 
 	/**
@@ -1253,7 +1264,7 @@ export class KTSelect extends KTComponent {
 						// Otherwise, remove just the display property
 						option.setAttribute(
 							'style',
-							styleAttr.replace(/display:\s*[^;]+;?/gi, '').trim(),
+							styleAttr?.replace(/display:\s*[^;]+;?/gi, '')?.trim(),
 						);
 					}
 				}
@@ -1265,7 +1276,7 @@ export class KTSelect extends KTComponent {
 			this._searchInputElement.value = '';
 			// If we have a search module, clear any search filtering
 			if (this._searchModule) {
-				this._searchModule.clearSearchHighlights();
+				this._searchModule.clearSearch();
 			}
 		}
 	}
@@ -1297,7 +1308,7 @@ export class KTSelect extends KTComponent {
 		// Get current selection state
 		const isSelected = this._state.isSelected(value);
 		if (this._config.debug)
-			console.log(`toggleSelection called for value: ${value}, isSelected: ${isSelected}, multiple: ${this._config.multiple}, closeOnSelect: ${this._config.closeOnSelect}`);
+			console.log(`toggleSelection called for value: ${value}, isSelected: ${isSelected}, multiple: ${this._config.multiple}`);
 
 		// If already selected in single select mode, do nothing (can't deselect in single select)
 		if (isSelected && !this._config.multiple) {
@@ -1309,9 +1320,9 @@ export class KTSelect extends KTComponent {
 		if (this._config.debug)
 			console.log(`Toggling selection for option: ${value}, currently selected: ${isSelected}`);
 
-		// Ensure any search highlights are cleared when selection changes
+		// Ensure any search input is cleared when selection changes
 		if (this._searchModule) {
-			this._searchModule.clearSearchHighlights();
+			this._searchModule.clearSearch();
 		}
 
 		// Toggle the selection in the state
@@ -1341,14 +1352,13 @@ export class KTSelect extends KTComponent {
 		this._updateSelectedOptionClass();
 
 		// For single select mode, always close the dropdown after selection
-		// For multiple select mode, only close if closeOnSelect is true
 		if (!this._config.multiple) {
 			if (this._config.debug)
 				console.log('About to call closeDropdown() for single select mode - always close after selection');
 			this.closeDropdown();
-		} else if (this._config.closeOnSelect) {
+		} else {
 			if (this._config.debug)
-				console.log('About to call closeDropdown() for multiple select with closeOnSelect:true');
+				console.log('About to call closeDropdown() for multiple select');
 			this.closeDropdown();
 		}
 
@@ -1476,9 +1486,9 @@ export class KTSelect extends KTComponent {
 							// Update options in the dropdown
 							this._updateSearchResults(items);
 
-							// Refresh the search module's option cache if search is enabled
-							if (this._searchModule && this._config.enableSearch) {
-								this._searchModule.refreshOptionCache();
+							// Refresh the search module to update focus and cache
+							if (this._searchModule) {
+								this._searchModule.refreshAfterSearch();
 							}
 						})
 						.catch((error) => {
@@ -1606,20 +1616,49 @@ export class KTSelect extends KTComponent {
 	 * Centralized keyboard event handler for all select modes
 	 */
 	private _handleKeyboardEvent(event: KeyboardEvent) {
+		// If the event target is the search input and the event was already handled (defaultPrevented),
+		// then return early to avoid duplicate processing by this broader handler.
+		if (event.target === this._searchInputElement && event.defaultPrevented) {
+			return;
+		}
+
 		const isOpen = this._dropdownIsOpen;
 		const config = this._config;
 		const focusManager = this._focusManager;
 		const buffer = this._typeToSearchBuffer;
 
-		// Ignore modifier keys
+		// If the event target is the search input, let it handle most typing keys naturally.
+		if (event.target === this._searchInputElement) {
+			// Allow navigation keys like ArrowDown, ArrowUp, Escape, Enter (for search/selection) to be handled by the logic below.
+			// For other keys (characters, space, backspace, delete), let the input field process them.
+			if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp' &&
+			    event.key !== 'Escape' && event.key !== 'Enter' && event.key !== 'Tab' &&
+			    event.key !== 'Home' && event.key !== 'End') {
+				// If it's a character key and we are NOT type-to-searching (because search has focus)
+				// then let the input field handle it for its own value.
+				// The search module's 'input' event will handle filtering based on the input's value.
+				buffer.clear(); // Clear type-to-search buffer when typing in search field
+				return;
+			}
+			// For Enter specifically in search input, we might want to select the focused option or submit search.
+			// This is handled later in the switch.
+		}
+
+		// Ignore modifier keys (except for specific combinations if added later)
 		if (event.altKey || event.ctrlKey || event.metaKey) return;
 
-		// Type-to-search: only for single char keys
-		if (event.key.length === 1 && !event.repeat && !event.key.match(/\s/)) {
+		// Type-to-search: only for single char keys, when search input does not have focus
+		if (event.key.length === 1 && !event.repeat && !event.key.match(/\s/) && document.activeElement !== this._searchInputElement) {
 			buffer.push(event.key);
 			const str = buffer.getBuffer();
+			if (isOpen) {
 			focusManager.focusByString(str);
-			return;
+			} else {
+				// If closed, type-to-search could potentially open and select.
+				// For now, let's assume it only works when open or opens it first.
+				// Or, we could find the matching option and set it directly without opening.
+			}
+			return; // Type-to-search handles the event
 		}
 
 		switch (event.key) {
@@ -1650,18 +1689,29 @@ export class KTSelect extends KTComponent {
 			case 'Enter':
 			case ' ': // Space
 				if (isOpen) {
-					const focused = focusManager.getFocusedOption();
-					if (focused) {
-						const value = focused.dataset.value;
-						if (value) {
-							this.toggleSelection(value);
-							if (!config.multiple && config.closeOnSelect) {
-								this.closeDropdown();
-							}
+					const focusedOptionEl = this._focusManager.getFocusedOption();
+					if (focusedOptionEl) {
+						const val = focusedOptionEl.dataset.value;
+						// If single select, and the item is already selected, just close.
+						if (val !== undefined && !this._config.multiple && this._state.isSelected(val)) {
+							if (this._config.debug) console.log('Enter on already selected item in single-select mode. Closing.');
+							this.closeDropdown();
+							event.preventDefault();
+							break;
 						}
 					}
-					// Prevent form submit
-					event.preventDefault();
+
+					// Proceed with selection if not handled above
+					this.selectFocusedOption();
+
+					// Close dropdown if configured to do so (for new selections)
+					if (!this._config.multiple) {
+						// This will also be true for the case handled above, but closeDropdown is idempotent.
+						// However, the break above prevents this from being reached for that specific case.
+						this.closeDropdown();
+					}
+					event.preventDefault(); // Prevent form submission or other default actions
+					break;
 				} else {
 					this.openDropdown();
 				}
@@ -1707,4 +1757,8 @@ export class KTSelect extends KTComponent {
 		));
 		return contentArray.join(displaySeparator);
 	}
+
+	public getDisplayElement(): HTMLElement {
+		return this._displayElement;
+	}
 }

package/src/components/select/tags.ts

@@ -6,7 +6,7 @@
 import { KTSelectConfigInterface } from './config';
 import { KTSelect } from './select';
 import { defaultTemplates } from './templates';
-import { EventManager, renderTemplateString } from './utils';
+import { EventManager } from './utils';
 
 /**
  * KTSelectTags - Handles tags-specific functionality for KTSelect
@@ -83,32 +83,6 @@ export class KTSelectTags {
 		});
 	}
 
-	/**
-	 * Get the label/text for an option by its value
-	 */
-	private _getOptionLabel(optionValue: string): string {
-		// First look for an option element in the dropdown with matching value
-		const optionElements = this._select.getOptionsElement();
-		for (const option of Array.from(optionElements)) {
-			if ((option as HTMLElement).dataset.value === optionValue) {
-				return (option as HTMLElement).textContent?.trim() || optionValue;
-			}
-		}
-
-		// If not found in dropdown, look in original select element
-		const originalOptions = this._select
-			.getElement()
-			.querySelectorAll('option');
-		for (const option of Array.from(originalOptions)) {
-			if ((option as HTMLOptionElement).value === optionValue) {
-				return (option as HTMLOptionElement).textContent?.trim() || optionValue;
-			}
-		}
-
-		// If still not found, return the value itself
-		return optionValue;
-	}
-
 	/**
 	 * Remove a tag and its selection
 	 */