Merge pull request #3210 from SillyTavern/sendtextarea-fieldsizing Use CSS resizing for send textarea

f794b7621fe21d57ef51c11da56265d03fbb528a

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed
3 files changed, +61 -31Ignore whitespace
public/script.js+26 -30
@@ -849,11 +849,9 @@ export let is_send_press = false; //Send generation
849849
850850let this_del_mes = -1;
851851
852852//message editing and chat scroll position persistence
853853var this_edit_mes_chname = '';
854854var this_edit_mes_id;
855-var scroll_holder = 0;
856-var is_use_scroll_holder = false;
857855
858856//settings
859857export let settings;
@@ -9727,25 +9725,27 @@ jQuery(async function () {
97279725 chooseBogusFolder($(this), tagId);
97289726 });
97299727
9730- /**
9728+ const cssAutofit = CSS.supports('field-sizing', 'content');
9731- * Sets the scroll height of the edit textarea to fit the content.
9729+ if (!cssAutofit) {
9732- * @param {HTMLTextAreaElement} e Textarea element to auto-fit
9730+ /**
9733- */
9731+ * Sets the scroll height of the edit textarea to fit the content.
9734- function autoFitEditTextArea(e) {
9732+ * @param {HTMLTextAreaElement} e Textarea element to auto-fit
9735- scroll_holder = chatElement[0].scrollTop;
9733+ */
9736- e.style.height = '0px';
9734+ function autoFitEditTextArea(e) {
9737- const newHeight = e.scrollHeight + 4;
9735+ e.style.height = '0px';
9738- e.style.height = `${newHeight}px`;
9736+ const newHeight = e.scrollHeight + 4;
9739- is_use_scroll_holder = true;
9737+ e.style.height = `${newHeight}px`;
9738+ }
9739+ const autoFitEditTextAreaDebounced = debounce(autoFitEditTextArea, debounce_timeout.short);
9740+ document.addEventListener('input', e => {
9741+ if (e.target instanceof HTMLTextAreaElement && e.target.classList.contains('edit_textarea')) {
9742+ const scrollbarShown = e.target.clientWidth < e.target.offsetWidth && e.target.offsetHeight >= window.innerHeight * 0.75;
9743+ const immediately = (e.target.scrollHeight > e.target.offsetHeight && !scrollbarShown) || e.target.value === '';
9744+ immediately ? autoFitEditTextArea(e.target) : autoFitEditTextAreaDebounced(e.target);
9745+ }
9746+ });
97409747 }
9741- const autoFitEditTextAreaDebounced = debounce(autoFitEditTextArea, debounce_timeout.short);
9748+
9742- document.addEventListener('input', e => {
9743- if (e.target instanceof HTMLTextAreaElement && e.target.classList.contains('edit_textarea')) {
9744- const scrollbarShown = e.target.clientWidth < e.target.offsetWidth && e.target.offsetHeight >= window.innerHeight * 0.75;
9745- const immediately = (e.target.scrollHeight > e.target.offsetHeight && !scrollbarShown) || e.target.value === '';
9746- immediately ? autoFitEditTextArea(e.target) : autoFitEditTextAreaDebounced(e.target);
9747- }
9748- });
97499749 const chatElementScroll = document.getElementById('chat');
97509750 const chatScrollHandler = function () {
97519751 if (power_user.waifuMode) {
@@ -9767,12 +9767,6 @@ jQuery(async function () {
97679767 };
97689768 chatElementScroll.addEventListener('wheel', chatScrollHandler, { passive: true });
97699769 chatElementScroll.addEventListener('touchmove', chatScrollHandler, { passive: true });
9770- chatElementScroll.addEventListener('scroll', function () {
9771- if (is_use_scroll_holder) {
9772- this.scrollTop = scroll_holder;
9773- is_use_scroll_holder = false;
9774- }
9775- }, { passive: true });
97769770
97779771 $(document).on('click', '.mes', function () {
97789772 //when a 'delete message' parent div is clicked
@@ -10511,14 +10505,16 @@ jQuery(async function () {
1051110505 .closest('.mes_block')
1051210506 .find('.mes_text')
1051310507 .append(
1051410508 '<textarea id=\'curEditTextarea\' class=\'edit_textarea mdHotkeys\' style=\'max-width:auto;\'></textarea>',
1051510509 );
1051610510 $('#curEditTextarea').val(text);
1051710511 let edit_textarea = $(this)
1051810512 .closest('.mes_block')
1051910513 .find('.edit_textarea');
10520- edit_textarea.height(0);
10514+ if (!cssAutofit) {
1052110515 edit_textarea.height(edit_textarea[0].scrollHeight);
10516+ edit_textarea.height(edit_textarea[0].scrollHeight);
10517+ }
1052210518 edit_textarea.focus();
1052310519 edit_textarea[0].setSelectionRange( //this sets the cursor at the end of the text
1052410520 String(edit_textarea.val()).length,
public/scripts/RossAscends-mods.js+33 -1
@@ -887,7 +887,40 @@ export function initRossMods() {
887887 saveSettingsDebounced();
888888 });
889889
890+ const cssAutofit = CSS.supports('field-sizing', 'content');
891+
892+ if (cssAutofit) {
893+ let lastHeight = chatBlock.offsetHeight;
894+ const chatBlockResizeObserver = new ResizeObserver((entries) => {
895+ for (const entry of entries) {
896+ if (entry.target !== chatBlock) {
897+ continue;
898+ }
899+
900+ const threshold = 1;
901+ const newHeight = chatBlock.offsetHeight;
902+ const deltaHeight = newHeight - lastHeight;
903+ const isScrollAtBottom = Math.abs(chatBlock.scrollHeight - chatBlock.scrollTop - newHeight) <= threshold;
904+
905+ if (!isScrollAtBottom && Math.abs(deltaHeight) > threshold) {
906+ chatBlock.scrollTop -= deltaHeight;
907+ }
908+ lastHeight = newHeight;
909+ }
910+ });
911+
912+ chatBlockResizeObserver.observe(chatBlock);
913+ }
914+
890915 sendTextArea.addEventListener('input', () => {
916+ saveUserInputDebounced();
917+
918+ if (cssAutofit) {
919+ // Unset modifications made with a manual resize
920+ sendTextArea.style.height = 'auto';
921+ return;
922+ }
923+
891924 const hasContent = sendTextArea.value !== '';
892925 const fitsCurrentSize = sendTextArea.scrollHeight <= sendTextArea.offsetHeight;
893926 const isScrollbarShown = sendTextArea.clientWidth < sendTextArea.offsetWidth;
@@ -895,7 +928,6 @@ export function initRossMods() {
895928 const needsDebounce = hasContent && (fitsCurrentSize || (isScrollbarShown && isHalfScreenHeight));
896929 if (needsDebounce) autoFitSendTextAreaDebounced();
897930 else autoFitSendTextArea();
898- saveUserInputDebounced();
899931 });
900932
901933 restoreUserInput();
public/style.css+2 -0
@@ -1264,6 +1264,7 @@ button {
12641264 text-shadow: 0px 0px calc(var(--shadowWidth) * 1px) var(--SmartThemeShadowColor);
12651265 flex: 1;
12661266 order: 3;
1267+ field-sizing: content;
12671268
12681269 --progColor: rgb(146, 190, 252);
12691270 --progFlashColor: rgb(215, 136, 114);
@@ -4111,6 +4112,7 @@ input[type="range"]::-webkit-slider-thumb {
41114112 line-height: calc(var(--mainFontSize) + .25rem);
41124113 max-height: 75vh;
41134114 max-height: 75dvh;
4115+ field-sizing: content;
41144116}
41154117
41164118#anchor_order {