From a85917f548b8ca91a802ddf5eabbb99649355d9e Mon Sep 17 00:00:00 2001 From: wil Date: Thu, 22 Feb 2024 11:42:59 -0500 Subject: [PATCH] select modal for weight list now shows the title of the weight list instead --- .../common/SelectModal/SelectModalV2.tsx | 20 +++++++------------ .../SelectModalWeightsTabs.tsx | 2 +- .../pageWorkflowControls/helpers.tsx | 2 ++ .../pageWorkflowControls.tsx | 6 +++++- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/fakeyou.com/src/components/common/SelectModal/SelectModalV2.tsx b/packages/fakeyou.com/src/components/common/SelectModal/SelectModalV2.tsx index 4a341e9e0e..0408f0aec2 100644 --- a/packages/fakeyou.com/src/components/common/SelectModal/SelectModalV2.tsx +++ b/packages/fakeyou.com/src/components/common/SelectModal/SelectModalV2.tsx @@ -21,7 +21,7 @@ export type SelectModalData = { interface SelectModalProps { label?: string; modalTitle?: string; - value?: string; + value?: string | SelectModalData; onClear: () => void; required?: boolean; children: ReactNode @@ -32,21 +32,15 @@ export default memo(function SelectModal ({ // tabs, modalTitle = "Select", onClear, - value = "", + value:valueProps = "", required, children }: SelectModalProps) { - const [isModalOpen, setModalOpen] = useState(false - ) - const openModal = () => { - setModalOpen(true); - }; - - const closeModal = () => { - setModalOpen(false); - }; - - useEffect(closeModal, [value]); + const [isModalOpen, setModalOpen] = useState(false) + const openModal = () => setModalOpen(true); + const closeModal = () => setModalOpen(false); + useEffect(closeModal, [valueProps]); + const value = typeof valueProps === "string" ? valueProps : valueProps.title; return ( <> diff --git a/packages/fakeyou.com/src/components/common/SelectModalWeightsTabs/SelectModalWeightsTabs.tsx b/packages/fakeyou.com/src/components/common/SelectModalWeightsTabs/SelectModalWeightsTabs.tsx index 03b8204440..df5369def8 100644 --- a/packages/fakeyou.com/src/components/common/SelectModalWeightsTabs/SelectModalWeightsTabs.tsx +++ b/packages/fakeyou.com/src/components/common/SelectModalWeightsTabs/SelectModalWeightsTabs.tsx @@ -41,7 +41,7 @@ export default memo(function SelectModalWrapper({ {onSelect({title:"",token:""})}} > diff --git a/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageWorkflowControls/helpers.tsx b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageWorkflowControls/helpers.tsx index 8ccad27ece..57fe469b0b 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageWorkflowControls/helpers.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageWorkflowControls/helpers.tsx @@ -17,7 +17,9 @@ export type WorkflowValuesType = { workflowConfig: string; seed: string; sdModelToken: string; + sdModelTitle: string; loraModelToken: string; + loraModelTitle: string; posPrompt: string; negPrompt: string; // Advance Options Values diff --git a/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageWorkflowControls/pageWorkflowControls.tsx b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageWorkflowControls/pageWorkflowControls.tsx index 5ccec551bd..af32811177 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageWorkflowControls/pageWorkflowControls.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageWorkflowControls/pageWorkflowControls.tsx @@ -57,7 +57,9 @@ export default function PageFilterControls({ workflowConfig: "weight_q8sz47gmfw2zx02snrbz88ns9", seed: "", sdModelToken: "", + sdModelTitle:"", loraModelToken: "", + loraModelTitle: "", posPrompt: "", negPrompt: "", ...VideoIvs, @@ -75,7 +77,9 @@ export default function PageFilterControls({ workflowConfig: "weight_q8sz47gmfw2zx02snrbz88ns9", seed: curr.seed, sdModelToken: "", + sdModelTitle: "", loraModelToken: "", + loraModelTitle: "", posPrompt: "", negPrompt: "", ...VideoIvs, @@ -178,7 +182,7 @@ export default function PageFilterControls({ }} value={{ token:workflowValues.sdModelToken, - title:"" + title:workflowValues.sdModelTitle, }} />