rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent deselecting of pointer target character on menu close

This commit is contained in:
artisticMink 2023-11-09 15:18:59 +01:00
parent 2f7e34f66c
commit b56fb69eca
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
public/scripts/BulkEditOverlay.js
View File

@ -294,7 +294,14 @@ class BulkEditOverlay {
* *
* @type {boolean} * @type {boolean}
*/ */
#selectModeLock = false; #contextMenuOpen = false;
/**
* Whether the next character select should be skipped
*
* @type {boolean}
*/
#cancelNextToggle = false;
/** /**
* @type HTMLElement * @type HTMLElement
@ -383,7 +390,7 @@ class BulkEditOverlay {
switch (this.state) { switch (this.state) {
case BulkEditOverlayState.browse: case BulkEditOverlayState.browse:
this.container.classList.remove(BulkEditOverlay.selectModeClass); this.container.classList.remove(BulkEditOverlay.selectModeClass);
this.#selectModeLock = false; this.#contextMenuOpen = false;
this.#enableClickEventsForCharacters(); this.#enableClickEventsForCharacters();
this.#enableClickEventsForGroups(); this.#enableClickEventsForGroups();
this.clearSelectedCharacters(); this.clearSelectedCharacters();
@ -436,8 +443,9 @@ class BulkEditOverlay {
*/ */
handleHold = (event) => { handleHold = (event) => {
if (0 !== event.button && event.type !== 'touchstart') return; if (0 !== event.button && event.type !== 'touchstart') return;
if (this.#selectModeLock) { if (this.#contextMenuOpen) {
this.#selectModeLock = false; this.#contextMenuOpen = false;
this.#cancelNextToggle = true;
CharacterContextMenu.hide(); CharacterContextMenu.hide();
return; return;
} }
@ -455,7 +463,7 @@ class BulkEditOverlay {
if (this.state === BulkEditOverlayState.browse) { if (this.state === BulkEditOverlayState.browse) {
this.selectState(); this.selectState();
} else if (this.state === BulkEditOverlayState.select) { } else if (this.state === BulkEditOverlayState.select) {
this.#selectModeLock = true; this.#contextMenuOpen = true;
CharacterContextMenu.show(...this.#getContextMenuPosition(event)); CharacterContextMenu.show(...this.#getContextMenuPosition(event));
} }
} }
@ -468,12 +476,12 @@ class BulkEditOverlay {
handleLongPressEnd = () => { handleLongPressEnd = () => {
this.isLongPress = false; this.isLongPress = false;
if (this.#selectModeLock) event.stopPropagation(); if (this.#contextMenuOpen) event.stopPropagation();
} }
handleCancelClick = () => { handleCancelClick = () => {
if (false === this.#selectModeLock) this.state = BulkEditOverlayState.browse; if (false === this.#contextMenuOpen) this.state = BulkEditOverlayState.browse;
this.#selectModeLock = false; this.#contextMenuOpen = false;
} }
/** /**
@ -515,7 +523,8 @@ class BulkEditOverlay {
const legacyBulkEditCheckbox = character.querySelector('.' + BulkEditOverlay.legacySelectedClass); const legacyBulkEditCheckbox = character.querySelector('.' + BulkEditOverlay.legacySelectedClass);
if (!this.#selectModeLock) // Only toggle when context menu is closed and has not just been closed
if (!this.#contextMenuOpen && !this.#cancelNextToggle)
if (alreadySelected) { if (alreadySelected) {
character.classList.remove(BulkEditOverlay.selectedClass); character.classList.remove(BulkEditOverlay.selectedClass);
if (legacyBulkEditCheckbox) legacyBulkEditCheckbox.checked = false; if (legacyBulkEditCheckbox) legacyBulkEditCheckbox.checked = false;
@ -525,12 +534,14 @@ class BulkEditOverlay {
if (legacyBulkEditCheckbox) legacyBulkEditCheckbox.checked = true; if (legacyBulkEditCheckbox) legacyBulkEditCheckbox.checked = true;
this.selectCharacter(characterId); this.selectCharacter(characterId);
} }
this.#cancelNextToggle = false;
} }
handleContextMenuShow = (event) => { handleContextMenuShow = (event) => {
event.preventDefault(); event.preventDefault();
CharacterContextMenu.show(...this.#getContextMenuPosition(event)); CharacterContextMenu.show(...this.#getContextMenuPosition(event));
this.#selectModeLock = true; this.#contextMenuOpen = true;
} }
handleContextMenuHide = (event) => { handleContextMenuHide = (event) => {