From ee8975401aa6379dc858d089c049bbef7a2e2b2b Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Wed, 23 Oct 2024 08:31:10 +1000 Subject: [PATCH] fix(ui): remove special handling for flux in `IPAdapterModel` This masked an issue w/ the CLIP Vision model. Issue is now handled in reducer/graph builder. --- .../components/IPAdapter/IPAdapterModel.tsx | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapterModel.tsx b/invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapterModel.tsx index 218582535f..682c272f89 100644 --- a/invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapterModel.tsx +++ b/invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapterModel.tsx @@ -71,19 +71,15 @@ export const IPAdapterModel = memo(({ modelKey, onChangeModel, clipVisionModel, }); const clipVisionOptions = useMemo(() => { - if (isFLUX) { - return CLIP_VISION_OPTIONS.map((option) => ({ ...option, isDisabled: option.value !== FLUX_CLIP_VISION })); - } else { - return CLIP_VISION_OPTIONS; - } + return CLIP_VISION_OPTIONS.map((option) => ({ + ...option, + isDisabled: isFLUX && option.value !== FLUX_CLIP_VISION, + })); }, [isFLUX]); const clipVisionModelValue = useMemo(() => { - if (isFLUX) { - return CLIP_VISION_OPTIONS.find((o) => o.value === FLUX_CLIP_VISION); - } return CLIP_VISION_OPTIONS.find((o) => o.value === clipVisionModel); - }, [clipVisionModel, isFLUX]); + }, [clipVisionModel]); return (