Merge pull request #3210 from SillyTavern/sendtextarea-fieldsizing

Use CSS resizing for send textarea
This commit is contained in:
Cohee
2024-12-21 17:56:13 +02:00
committed by GitHub
3 changed files with 61 additions and 31 deletions

View File

@@ -849,11 +849,9 @@ export let is_send_press = false; //Send generation
let this_del_mes = -1; let this_del_mes = -1;
//message editing and chat scroll position persistence //message editing
var this_edit_mes_chname = ''; var this_edit_mes_chname = '';
var this_edit_mes_id; var this_edit_mes_id;
var scroll_holder = 0;
var is_use_scroll_holder = false;
//settings //settings
export let settings; export let settings;
@@ -9727,16 +9725,16 @@ jQuery(async function () {
chooseBogusFolder($(this), tagId); chooseBogusFolder($(this), tagId);
}); });
const cssAutofit = CSS.supports('field-sizing', 'content');
if (!cssAutofit) {
/** /**
* Sets the scroll height of the edit textarea to fit the content. * Sets the scroll height of the edit textarea to fit the content.
* @param {HTMLTextAreaElement} e Textarea element to auto-fit * @param {HTMLTextAreaElement} e Textarea element to auto-fit
*/ */
function autoFitEditTextArea(e) { function autoFitEditTextArea(e) {
scroll_holder = chatElement[0].scrollTop;
e.style.height = '0px'; e.style.height = '0px';
const newHeight = e.scrollHeight + 4; const newHeight = e.scrollHeight + 4;
e.style.height = `${newHeight}px`; e.style.height = `${newHeight}px`;
is_use_scroll_holder = true;
} }
const autoFitEditTextAreaDebounced = debounce(autoFitEditTextArea, debounce_timeout.short); const autoFitEditTextAreaDebounced = debounce(autoFitEditTextArea, debounce_timeout.short);
document.addEventListener('input', e => { document.addEventListener('input', e => {
@@ -9746,6 +9744,8 @@ jQuery(async function () {
immediately ? autoFitEditTextArea(e.target) : autoFitEditTextAreaDebounced(e.target); immediately ? autoFitEditTextArea(e.target) : autoFitEditTextAreaDebounced(e.target);
} }
}); });
}
const chatElementScroll = document.getElementById('chat'); const chatElementScroll = document.getElementById('chat');
const chatScrollHandler = function () { const chatScrollHandler = function () {
if (power_user.waifuMode) { if (power_user.waifuMode) {
@@ -9767,12 +9767,6 @@ jQuery(async function () {
}; };
chatElementScroll.addEventListener('wheel', chatScrollHandler, { passive: true }); chatElementScroll.addEventListener('wheel', chatScrollHandler, { passive: true });
chatElementScroll.addEventListener('touchmove', chatScrollHandler, { passive: true }); chatElementScroll.addEventListener('touchmove', chatScrollHandler, { passive: true });
chatElementScroll.addEventListener('scroll', function () {
if (is_use_scroll_holder) {
this.scrollTop = scroll_holder;
is_use_scroll_holder = false;
}
}, { passive: true });
$(document).on('click', '.mes', function () { $(document).on('click', '.mes', function () {
//when a 'delete message' parent div is clicked //when a 'delete message' parent div is clicked
@@ -10511,14 +10505,16 @@ jQuery(async function () {
.closest('.mes_block') .closest('.mes_block')
.find('.mes_text') .find('.mes_text')
.append( .append(
'<textarea id=\'curEditTextarea\' class=\'edit_textarea mdHotkeys\' style=\'max-width:auto;\'></textarea>', '<textarea id=\'curEditTextarea\' class=\'edit_textarea mdHotkeys\'></textarea>',
); );
$('#curEditTextarea').val(text); $('#curEditTextarea').val(text);
let edit_textarea = $(this) let edit_textarea = $(this)
.closest('.mes_block') .closest('.mes_block')
.find('.edit_textarea'); .find('.edit_textarea');
if (!cssAutofit) {
edit_textarea.height(0); edit_textarea.height(0);
edit_textarea.height(edit_textarea[0].scrollHeight); edit_textarea.height(edit_textarea[0].scrollHeight);
}
edit_textarea.focus(); edit_textarea.focus();
edit_textarea[0].setSelectionRange( //this sets the cursor at the end of the text edit_textarea[0].setSelectionRange( //this sets the cursor at the end of the text
String(edit_textarea.val()).length, String(edit_textarea.val()).length,

View File

@@ -887,7 +887,40 @@ export function initRossMods() {
saveSettingsDebounced(); saveSettingsDebounced();
}); });
const cssAutofit = CSS.supports('field-sizing', 'content');
if (cssAutofit) {
let lastHeight = chatBlock.offsetHeight;
const chatBlockResizeObserver = new ResizeObserver((entries) => {
for (const entry of entries) {
if (entry.target !== chatBlock) {
continue;
}
const threshold = 1;
const newHeight = chatBlock.offsetHeight;
const deltaHeight = newHeight - lastHeight;
const isScrollAtBottom = Math.abs(chatBlock.scrollHeight - chatBlock.scrollTop - newHeight) <= threshold;
if (!isScrollAtBottom && Math.abs(deltaHeight) > threshold) {
chatBlock.scrollTop -= deltaHeight;
}
lastHeight = newHeight;
}
});
chatBlockResizeObserver.observe(chatBlock);
}
sendTextArea.addEventListener('input', () => { sendTextArea.addEventListener('input', () => {
saveUserInputDebounced();
if (cssAutofit) {
// Unset modifications made with a manual resize
sendTextArea.style.height = 'auto';
return;
}
const hasContent = sendTextArea.value !== ''; const hasContent = sendTextArea.value !== '';
const fitsCurrentSize = sendTextArea.scrollHeight <= sendTextArea.offsetHeight; const fitsCurrentSize = sendTextArea.scrollHeight <= sendTextArea.offsetHeight;
const isScrollbarShown = sendTextArea.clientWidth < sendTextArea.offsetWidth; const isScrollbarShown = sendTextArea.clientWidth < sendTextArea.offsetWidth;
@@ -895,7 +928,6 @@ export function initRossMods() {
const needsDebounce = hasContent && (fitsCurrentSize || (isScrollbarShown && isHalfScreenHeight)); const needsDebounce = hasContent && (fitsCurrentSize || (isScrollbarShown && isHalfScreenHeight));
if (needsDebounce) autoFitSendTextAreaDebounced(); if (needsDebounce) autoFitSendTextAreaDebounced();
else autoFitSendTextArea(); else autoFitSendTextArea();
saveUserInputDebounced();
}); });
restoreUserInput(); restoreUserInput();

View File

@@ -1264,6 +1264,7 @@ button {
text-shadow: 0px 0px calc(var(--shadowWidth) * 1px) var(--SmartThemeShadowColor); text-shadow: 0px 0px calc(var(--shadowWidth) * 1px) var(--SmartThemeShadowColor);
flex: 1; flex: 1;
order: 3; order: 3;
field-sizing: content;
--progColor: rgb(146, 190, 252); --progColor: rgb(146, 190, 252);
--progFlashColor: rgb(215, 136, 114); --progFlashColor: rgb(215, 136, 114);
@@ -4111,6 +4112,7 @@ input[type="range"]::-webkit-slider-thumb {
line-height: calc(var(--mainFontSize) + .25rem); line-height: calc(var(--mainFontSize) + .25rem);
max-height: 75vh; max-height: 75vh;
max-height: 75dvh; max-height: 75dvh;
field-sizing: content;
} }
#anchor_order { #anchor_order {