Merge pull request #3210 from SillyTavern/sendtextarea-fieldsizing Use CSS resizing for send textarea
Signed| @@ -849,11 +849,9 @@ export let is_send_press = false; //Send generation | ||
| 849 | 849 | |
| 850 | 850 | let this_del_mes = -1; |
| 851 | 851 | |
| 852 | 852 | //message editing and chat scroll position persistence |
| 853 | 853 | var this_edit_mes_chname = ''; |
| 854 | 854 | var this_edit_mes_id; |
| 855 | -var scroll_holder = 0; | |
| 856 | -var is_use_scroll_holder = false; | |
| 857 | 855 | |
| 858 | 856 | //settings |
| 859 | 857 | export let settings; |
| @@ -9727,25 +9725,27 @@ jQuery(async function () { | ||
| 9727 | 9725 | chooseBogusFolder($(this), tagId); |
| 9728 | 9726 | }); |
| 9729 | 9727 | |
| 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 | + }); | |
| 9740 | 9747 | } |
| 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 | - }); | |
| 9749 | 9749 | const chatElementScroll = document.getElementById('chat'); |
| 9750 | 9750 | const chatScrollHandler = function () { |
| 9751 | 9751 | if (power_user.waifuMode) { |
| @@ -9767,12 +9767,6 @@ jQuery(async function () { | ||
| 9767 | 9767 | }; |
| 9768 | 9768 | chatElementScroll.addEventListener('wheel', chatScrollHandler, { passive: true }); |
| 9769 | 9769 | 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 }); | |
| 9776 | 9770 | |
| 9777 | 9771 | $(document).on('click', '.mes', function () { |
| 9778 | 9772 | //when a 'delete message' parent div is clicked |
| @@ -10511,14 +10505,16 @@ jQuery(async function () { | ||
| 10511 | 10505 | .closest('.mes_block') |
| 10512 | 10506 | .find('.mes_text') |
| 10513 | 10507 | .append( |
| 10514 | 10508 | '<textarea id=\'curEditTextarea\' class=\'edit_textarea mdHotkeys\' style=\'max-width:auto;\'></textarea>', |
| 10515 | 10509 | ); |
| 10516 | 10510 | $('#curEditTextarea').val(text); |
| 10517 | 10511 | let edit_textarea = $(this) |
| 10518 | 10512 | .closest('.mes_block') |
| 10519 | 10513 | .find('.edit_textarea'); |
| 10520 | - edit_textarea.height(0); | |
| 10514 | + if (!cssAutofit) { | |
| 10521 | 10515 | edit_textarea.height(edit_textarea[0].scrollHeight); |
| 10516 | + edit_textarea.height(edit_textarea[0].scrollHeight); | |
| 10517 | + } | |
| 10522 | 10518 | edit_textarea.focus(); |
| 10523 | 10519 | edit_textarea[0].setSelectionRange( //this sets the cursor at the end of the text |
| 10524 | 10520 | String(edit_textarea.val()).length, |
| @@ -887,7 +887,40 @@ export function initRossMods() { | ||
| 887 | 887 | saveSettingsDebounced(); |
| 888 | 888 | }); |
| 889 | 889 | |
| 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 | + | |
| 890 | 915 | 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 | + | |
| 891 | 924 | const hasContent = sendTextArea.value !== ''; |
| 892 | 925 | const fitsCurrentSize = sendTextArea.scrollHeight <= sendTextArea.offsetHeight; |
| 893 | 926 | const isScrollbarShown = sendTextArea.clientWidth < sendTextArea.offsetWidth; |
| @@ -895,7 +928,6 @@ export function initRossMods() { | ||
| 895 | 928 | const needsDebounce = hasContent && (fitsCurrentSize || (isScrollbarShown && isHalfScreenHeight)); |
| 896 | 929 | if (needsDebounce) autoFitSendTextAreaDebounced(); |
| 897 | 930 | else autoFitSendTextArea(); |
| 898 | - saveUserInputDebounced(); | |
| 899 | 931 | }); |
| 900 | 932 | |
| 901 | 933 | restoreUserInput(); |
| @@ -1264,6 +1264,7 @@ button { | ||
| 1264 | 1264 | text-shadow: 0px 0px calc(var(--shadowWidth) * 1px) var(--SmartThemeShadowColor); |
| 1265 | 1265 | flex: 1; |
| 1266 | 1266 | order: 3; |
| 1267 | + field-sizing: content; | |
| 1267 | 1268 | |
| 1268 | 1269 | --progColor: rgb(146, 190, 252); |
| 1269 | 1270 | --progFlashColor: rgb(215, 136, 114); |
| @@ -4111,6 +4112,7 @@ input[type="range"]::-webkit-slider-thumb { | ||
| 4111 | 4112 | line-height: calc(var(--mainFontSize) + .25rem); |
| 4112 | 4113 | max-height: 75vh; |
| 4113 | 4114 | max-height: 75dvh; |
| 4115 | + field-sizing: content; | |
| 4114 | 4116 | } |
| 4115 | 4117 | |
| 4116 | 4118 | #anchor_order { |