From fcb4eaac913e7325c6dd38936689d5a6f5ba253f Mon Sep 17 00:00:00 2001 From: BFlat Date: Tue, 7 May 2024 10:37:45 +0700 Subject: [PATCH] bug fix: choosing a style overwrites the user's prompt input (#321) - added a state so that if there's user custom prompt input, prompt won't randomize on style change. randomize button resets this state. --- .../itemTabs/StylizeTab/Prompts.tsx | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/StylizeTab/Prompts.tsx b/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/StylizeTab/Prompts.tsx index f4c2b42984..5125d0e237 100644 --- a/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/StylizeTab/Prompts.tsx +++ b/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/StylizeTab/Prompts.tsx @@ -20,32 +20,41 @@ export const Prompts = ({ selection }: Props) => { const [textBufferPositive, setTextBufferPositive] = useState(""); const [textBufferNegative, setTextBufferNegative] = useState(""); + const [isUserInputPositive, setIsUserInputPositive] = useState(false); + const [isUserInputNegative, setIsUserInputNegative] = useState(false); + useEffect(() => { if (editorEngine === null) { return; } - const randomIndexPositive = Math.floor( - Math.random() * RandomTextsPositive[selection].length, - ); - const randomTextPositive = - RandomTextsPositive[selection][randomIndexPositive]; - editorEngine.positive_prompt = randomTextPositive; - setTextBufferPositive(randomTextPositive); - const randomIndexNegative = Math.floor( - Math.random() * RandomTextsNegative[selection].length, - ); - const randomTextNegative = - RandomTextsNegative[selection][randomIndexNegative]; - editorEngine.negative_prompt = randomTextNegative; - setTextBufferNegative(randomTextNegative); - }, [selection, editorEngine]); + if (!isUserInputPositive) { + const randomIndexPositive = Math.floor( + Math.random() * RandomTextsPositive[selection].length, + ); + const randomTextPositive = + RandomTextsPositive[selection][randomIndexPositive]; + editorEngine.positive_prompt = randomTextPositive; + setTextBufferPositive(randomTextPositive); + } + + if (!isUserInputNegative) { + const randomIndexNegative = Math.floor( + Math.random() * RandomTextsNegative[selection].length, + ); + const randomTextNegative = + RandomTextsNegative[selection][randomIndexNegative]; + editorEngine.negative_prompt = randomTextNegative; + setTextBufferNegative(randomTextNegative); + } + }, [selection, editorEngine, isUserInputPositive, isUserInputNegative]); const onChangeHandlerNegative = (event: ChangeEvent) => { if (editorEngine === null) { console.log("Editor is null"); return; } + setIsUserInputNegative(true); editorEngine.negative_prompt = event.target.value; setTextBufferNegative(event.target.value); }; @@ -55,6 +64,7 @@ export const Prompts = ({ selection }: Props) => { console.log("Editor is null"); return; } + setIsUserInputPositive(true); editorEngine.positive_prompt = event.target.value; setTextBufferPositive(event.target.value); }; @@ -67,6 +77,7 @@ export const Prompts = ({ selection }: Props) => { if (editorEngine !== null) { editorEngine.positive_prompt = randomText; } + setIsUserInputPositive(false); setTextBufferPositive(randomText); }; @@ -78,6 +89,7 @@ export const Prompts = ({ selection }: Props) => { if (editorEngine !== null) { editorEngine.negative_prompt = randomText; } + setIsUserInputNegative(false); setTextBufferNegative(randomText); };