mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2024-12-12 09:26:33 +01:00
Make ST-style buttons keyboard selectable
- Make ST-style buttons keyboard selectable - Allow custom classes/selectors to be set as buttons too, with the same functionality (CSS selector-based) - Observer to automatically add functionality to any button added to the DOM - Allow buttons to not be selectable via 'disabled' or 'not_focusable'
This commit is contained in:
parent
9318f94f08
commit
5cc4242c6f
@ -236,6 +236,7 @@ import { ARGUMENT_TYPE, SlashCommandArgument } from './scripts/slash-commands/Sl
|
|||||||
import { SlashCommandBrowser } from './scripts/slash-commands/SlashCommandBrowser.js';
|
import { SlashCommandBrowser } from './scripts/slash-commands/SlashCommandBrowser.js';
|
||||||
import { initCustomSelectedSamplers, validateDisabledSamplers } from './scripts/samplerSelect.js';
|
import { initCustomSelectedSamplers, validateDisabledSamplers } from './scripts/samplerSelect.js';
|
||||||
import { DragAndDropHandler } from './scripts/dragdrop.js';
|
import { DragAndDropHandler } from './scripts/dragdrop.js';
|
||||||
|
import { initKeyboard } from './scripts/keyboard.js';
|
||||||
|
|
||||||
//exporting functions and vars for mods
|
//exporting functions and vars for mods
|
||||||
export {
|
export {
|
||||||
@ -887,6 +888,7 @@ async function firstLoadInit() {
|
|||||||
await getSystemMessages();
|
await getSystemMessages();
|
||||||
sendSystemMessage(system_message_types.WELCOME);
|
sendSystemMessage(system_message_types.WELCOME);
|
||||||
await getSettings();
|
await getSettings();
|
||||||
|
initKeyboard();
|
||||||
initTags();
|
initTags();
|
||||||
await getUserAvatars(true, user_avatar);
|
await getUserAvatars(true, user_avatar);
|
||||||
await getCharacters();
|
await getCharacters();
|
||||||
|
165
public/scripts/keyboard.js
Normal file
165
public/scripts/keyboard.js
Normal file
@ -0,0 +1,165 @@
|
|||||||
|
/* All selectors that should act as keyboard buttons by default */
|
||||||
|
const buttonSelectors = ['.menu_button', '.right_menu_button', '.clickable'];
|
||||||
|
|
||||||
|
const CUSTOM_CLICKABLE_BUTTON_CLASS = 'clickable';
|
||||||
|
|
||||||
|
const NOT_FOCUSABLE_CLASS = 'not_focusable';
|
||||||
|
const DISABLED_CLASS = 'disabled';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An observer that will check if any new buttons are added to the body
|
||||||
|
* @type {MutationObserver}
|
||||||
|
*/
|
||||||
|
const observer = new MutationObserver(mutations => {
|
||||||
|
mutations.forEach(mutation => {
|
||||||
|
if (mutation.type === 'childList') {
|
||||||
|
mutation.addedNodes.forEach(node => {
|
||||||
|
if (node.nodeType === Node.ELEMENT_NODE && node instanceof Element) {
|
||||||
|
// Check if the node itself is a button
|
||||||
|
if (isKeyboardButton(node)) {
|
||||||
|
enableKeyboardButton(node);
|
||||||
|
}
|
||||||
|
// Check for any descendants that might be buttons
|
||||||
|
const newButtons = getAllButtons(node);
|
||||||
|
enableKeyboardButton(...newButtons);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else if (mutation.type === 'attributes') {
|
||||||
|
const target = mutation.target;
|
||||||
|
if (mutation.attributeName === 'class' && target instanceof Element) {
|
||||||
|
if (isKeyboardButton(target)) {
|
||||||
|
enableKeyboardButton(target);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers a button class (for example for an exatension) and makes it keyboard-selectable.
|
||||||
|
* Optionally apply the 'not_focusable' and 'disabled' classes if needed.
|
||||||
|
*
|
||||||
|
* @param {string} buttonSelector - The CSS selector for the button (Supports class combinations, chained via dots like <c>tag.actionable</c>, and sub selectors)
|
||||||
|
* @param {object} [options={}] - Optional settings for the button class
|
||||||
|
* @param {boolean} [options.disabledByDefault=false] - Whether buttons of this class should be disabled by default
|
||||||
|
* @param {boolean} [options.notFocusableByDefault=false] - Whether buttons of this class should not be focusable by default
|
||||||
|
*/
|
||||||
|
export function registerKeyboardButtonClass(buttonSelector, { disabledByDefault = false, notFocusableByDefault = false } = {}) {
|
||||||
|
buttonSelectors.push(buttonSelector);
|
||||||
|
|
||||||
|
const buttons = document.querySelectorAll(buttonSelector);
|
||||||
|
|
||||||
|
if (disabledByDefault || notFocusableByDefault) {
|
||||||
|
buttons.forEach(button => {
|
||||||
|
if (disabledByDefault) button.classList.add(DISABLED_CLASS);
|
||||||
|
if (notFocusableByDefault) button.classList.add(NOT_FOCUSABLE_CLASS);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
enableKeyboardButton(...buttons);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the given button is a keyboard-enabled button.
|
||||||
|
*
|
||||||
|
* @param {Element} button - The button element to check
|
||||||
|
* @returns {boolean} Returns true if the button is a keyboard button, false otherwise
|
||||||
|
*/
|
||||||
|
export function isKeyboardButton(button) {
|
||||||
|
// Check if this button matches any of the selectors
|
||||||
|
return buttonSelectors.some(selector => button.matches(selector));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets a
|
||||||
|
* Adds the 'tabindex' attribute to buttons that are not marked as 'not_focusable' or 'disabled'
|
||||||
|
*
|
||||||
|
* @param {Element[]} buttons - The buttons to add the 'tabindex' attribute to
|
||||||
|
*/
|
||||||
|
export function enableKeyboardButton(...buttons) {
|
||||||
|
buttons.forEach(button => {
|
||||||
|
// If this button doesn't have any of the classes, lets say the caller knows this and wants this to be a custom-enabled keyboard button.
|
||||||
|
if (!isKeyboardButton(button)) {
|
||||||
|
button.classList.add(CUSTOM_CLICKABLE_BUTTON_CLASS);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set/remove the tabindex accordingly to the classes. Remembering if it had a custom value.
|
||||||
|
if (!button.classList.contains(NOT_FOCUSABLE_CLASS) && !button.classList.contains(DISABLED_CLASS)) {
|
||||||
|
if (!button.hasAttribute('tabindex')) {
|
||||||
|
const tabIndex = button.getAttribute('data-original-tabindex') ?? '0';
|
||||||
|
button.setAttribute('tabindex', tabIndex);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
button.setAttribute('data-original-tabindex', button.getAttribute('tabindex'));
|
||||||
|
button.removeAttribute('tabindex');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes the focusability of buttons on the given element or the document
|
||||||
|
*
|
||||||
|
* @param {Element|Document} [element=document] - The element on which to initialize the button focus. Defaults to the document
|
||||||
|
*/
|
||||||
|
function initializeButtonFocus(element = document) {
|
||||||
|
const buttons = getAllButtons(element);
|
||||||
|
enableKeyboardButton(...buttons);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Queries all buttons within the given element based on the button selectors and returns them as an array
|
||||||
|
*
|
||||||
|
* @param {Element|Document} element - The element within which to query the buttons
|
||||||
|
* @returns {HTMLElement[]} An array containing all the buttons that match the button selectors
|
||||||
|
*/
|
||||||
|
function getAllButtons(element) {
|
||||||
|
// Query each selecter individually and combine all to a big array to return
|
||||||
|
return [].concat(...buttonSelectors.map(selector => Array.from(element.querySelectorAll(`${selector}`))));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles keydown events on the document to trigger click on Enter key press for buttons
|
||||||
|
*
|
||||||
|
* @param {KeyboardEvent} event - The keyboard event
|
||||||
|
*/
|
||||||
|
function handleGlobalKeyDown(event) {
|
||||||
|
if (event.key === 'Enter') {
|
||||||
|
if (!(event.target instanceof HTMLElement))
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Only count enter on this button if no modifier key is pressed
|
||||||
|
if (event.altKey || event.ctrlKey || event.shiftKey)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Traverse up the DOM tree to find the actual button element
|
||||||
|
let target = event.target;
|
||||||
|
while (target && !isKeyboardButton(target)) {
|
||||||
|
target = target.parentElement;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Trigger click if a valid button is found and it's not disabled
|
||||||
|
if (target && !target.classList.contains(DISABLED_CLASS)) {
|
||||||
|
console.debug('Triggering click on keyboard-focused button via Enter', target);
|
||||||
|
target.click();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes severial keyboard functionalities for ST
|
||||||
|
*/
|
||||||
|
export function initKeyboard() {
|
||||||
|
// Start observing the body for added elements and attribute changes
|
||||||
|
observer.observe(document.body, {
|
||||||
|
childList: true,
|
||||||
|
subtree: true,
|
||||||
|
attributes: true,
|
||||||
|
attributeFilter: ['class']
|
||||||
|
});
|
||||||
|
|
||||||
|
// Initialize tabindex for existing buttons
|
||||||
|
initializeButtonFocus();
|
||||||
|
|
||||||
|
// Add a global keydown listener
|
||||||
|
document.addEventListener('keydown', handleGlobalKeyDown);
|
||||||
|
}
|
@ -189,8 +189,8 @@ export class Popup {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'Enter': {
|
case 'Enter': {
|
||||||
// Only count enter if no modifier key is pressed
|
// CTRL+Enter counts as a closing action, but all other modifiers (ALT, SHIFT) should not trigger this
|
||||||
if (evt.altKey || evt.ctrlKey || evt.shiftKey)
|
if (evt.altKey || evt.shiftKey)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Check if we are the currently active popup
|
// Check if we are the currently active popup
|
||||||
|
@ -22,6 +22,7 @@ import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '
|
|||||||
import { isMobile } from './RossAscends-mods.js';
|
import { isMobile } from './RossAscends-mods.js';
|
||||||
import { POPUP_RESULT, POPUP_TYPE, callGenericPopup } from './popup.js';
|
import { POPUP_RESULT, POPUP_TYPE, callGenericPopup } from './popup.js';
|
||||||
import { debounce_timeout } from './constants.js';
|
import { debounce_timeout } from './constants.js';
|
||||||
|
import { registerKeyboardButtonClass } from './keyboard.js';
|
||||||
|
|
||||||
export {
|
export {
|
||||||
TAG_FOLDER_TYPES,
|
TAG_FOLDER_TYPES,
|
||||||
@ -1909,6 +1910,8 @@ export function initTags() {
|
|||||||
eventSource.on(event_types.CHARACTER_DUPLICATED, copyTags);
|
eventSource.on(event_types.CHARACTER_DUPLICATED, copyTags);
|
||||||
eventSource.makeFirst(event_types.CHAT_CHANGED, () => selected_group ? applyTagsOnGroupSelect() : applyTagsOnCharacterSelect());
|
eventSource.makeFirst(event_types.CHAT_CHANGED, () => selected_group ? applyTagsOnGroupSelect() : applyTagsOnCharacterSelect());
|
||||||
|
|
||||||
|
registerKeyboardButtonClass('.tag.actionable');
|
||||||
|
|
||||||
$(document).on('input', '#tag_view_list input[name="auto_sort_tags"]', (evt) => {
|
$(document).on('input', '#tag_view_list input[name="auto_sort_tags"]', (evt) => {
|
||||||
const toggle = $(evt.target).is(':checked');
|
const toggle = $(evt.target).is(':checked');
|
||||||
toggleAutoSortTags(evt.originalEvent, toggle);
|
toggleAutoSortTags(evt.originalEvent, toggle);
|
||||||
|
Loading…
Reference in New Issue
Block a user