From f1f150e5d1943c9a6775abce36ec885d2786c2a2 Mon Sep 17 00:00:00 2001
From: RossAscends <124905043+RossAscends@users.noreply.github.com>
Date: Sat, 6 May 2023 21:28:24 +0900
Subject: [PATCH] -fix WI entry 2ndary key height -initHeight and resetHeight
 functions moved from WI to utils

---
 public/index.html            |  2 +-
 public/scripts/utils.js      | 14 ++++++++++++++
 public/scripts/world-info.js | 25 ++++++++++---------------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/public/index.html b/public/index.html
index 7f2cf082c..53ebb56ab 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2077,7 +2077,7 @@
                                     <h4>Keywords</h4>
                                     <h5>Seperate by commas</h5>
                                 </label>
-                                <textarea class="text_pole" name="key" rows="1" placeholder="" maxlength="250"></textarea>
+                                <textarea class="text_pole" name="key" class="key" rows="1" placeholder="" maxlength="250"></textarea>
                             </div>
                             <div class="world_entry_form_control keysecondary">
                                 <label for="keysecondary">
diff --git a/public/scripts/utils.js b/public/scripts/utils.js
index 469980ad8..06bdd5c32 100644
--- a/public/scripts/utils.js
+++ b/public/scripts/utils.js
@@ -161,4 +161,18 @@ export function restoreCaretPosition(element, position) {
     const selection = window.getSelection();
     selection.removeAllRanges();
     selection.addRange(range);
+}
+
+export async function resetScrollHeight(element) {
+    element.style.height = '';
+    element.style.height = (element.scrollHeight) + 3 + 'px';
+}
+
+export async function initScrollHeight(element) {
+    await delay(1);
+    const height = Number($(element).prop("scrollHeight") + 3);
+    console.log(`init height to ${height}`);
+    //console.log(element.style.height);
+    $(element).css("height", "");
+    $(element).css("height", `${height}px`);
 }
\ No newline at end of file
diff --git a/public/scripts/world-info.js b/public/scripts/world-info.js
index 028fb0720..85da5f962 100644
--- a/public/scripts/world-info.js
+++ b/public/scripts/world-info.js
@@ -1,5 +1,5 @@
 import { saveSettings, callPopup, substituteParams, getTokenCount, getRequestHeaders } from "../script.js";
-import { download, debounce, delay } from "./utils.js";
+import { download, debounce, delay, initScrollHeight, resetScrollHeight } from "./utils.js";
 
 export {
     world_info,
@@ -234,7 +234,16 @@ function appendWorldEntry(entry) {
         const keysecondary = $(this)
             .closest(".world_entry")
             .find(".keysecondary");
+
+        const keyPrimary = $(this)
+            .closest(".world_entry")
+            .find(".key");
+
+        const keyPrimaryHeight = $(keyPrimary).css('height');
+
+        keysecondary.css('height', keyPrimaryHeight) + 'px';
         value ? keysecondary.show() : keysecondary.hide();
+
     });
     selectiveInput.prop("checked", entry.selective).trigger("input");
     selectiveInput.siblings(".checkbox_fancy").click(function () {
@@ -319,20 +328,6 @@ function appendWorldEntry(entry) {
     return template;
 }
 
-async function resetScrollHeight(element) {
-    element.style.height = '';
-    element.style.height = (element.scrollHeight) + 3 + 'px';
-}
-
-async function initScrollHeight(element) {
-    await delay(1);
-    const height = Number($(element).prop("scrollHeight") + 3);
-    console.log(height);
-    //console.log(element.style.height);
-    $(element).css("height", "");
-    $(element).css("height", `${height}px`);
-}
-
 async function deleteWorldInfoEntry(uid) {
     if (!world_info_data || !("entries" in world_info_data)) {
         return;