Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ui): no JSX in metadata handlers

Browse Source
This commit is contained in:
psychedelicious 2024-02-26 10:23:37 +11:00 committed by Kent Keirsey
parent e174ce038f
commit 2555be3058
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
invokeai/frontend/web/src/features/metadata/components/MetadataControlNets.tsx
View File

@ -1,3 +1,4 @@
import { Text } from '@invoke-ai/ui-library';
import type { ControlNetConfig } from 'features/controlAdapters/store/types'; import type { ControlNetConfig } from 'features/controlAdapters/store/types';
import { MetadataItemView } from 'features/metadata/components/MetadataItemView'; import { MetadataItemView } from 'features/metadata/components/MetadataItemView';
import type { MetadataHandlers } from 'features/metadata/types'; import type { MetadataHandlers } from 'features/metadata/types';
@ -59,7 +60,7 @@ const MetadataViewControlNet = ({
if (!handlers.renderItemValue) { if (!handlers.renderItemValue) {
return null; return null;
} }
return handlers.renderItemValue(controlNet); return <Text>{handlers.renderItemValue(controlNet)}</Text>;
}, [handlers, controlNet]); }, [handlers, controlNet]);
return <MetadataItemView label={label} isDisabled={false} onRecall={onRecall} renderedValue={renderedValue} />; return <MetadataItemView label={label} isDisabled={false} onRecall={onRecall} renderedValue={renderedValue} />;

3
invokeai/frontend/web/src/features/metadata/components/MetadataIPAdapters.tsx
View File

@ -1,3 +1,4 @@
import { Text } from '@invoke-ai/ui-library';
import type { IPAdapterConfig } from 'features/controlAdapters/store/types'; import type { IPAdapterConfig } from 'features/controlAdapters/store/types';
import { MetadataItemView } from 'features/metadata/components/MetadataItemView'; import { MetadataItemView } from 'features/metadata/components/MetadataItemView';
import type { MetadataHandlers } from 'features/metadata/types'; import type { MetadataHandlers } from 'features/metadata/types';
@ -59,7 +60,7 @@ const MetadataViewIPAdapter = ({
if (!handlers.renderItemValue) { if (!handlers.renderItemValue) {
return null; return null;
} }
return handlers.renderItemValue(ipAdapter); return <Text>{handlers.renderItemValue(ipAdapter)}</Text>;
}, [handlers, ipAdapter]); }, [handlers, ipAdapter]);
return <MetadataItemView label={label} isDisabled={false} onRecall={onRecall} renderedValue={renderedValue} />; return <MetadataItemView label={label} isDisabled={false} onRecall={onRecall} renderedValue={renderedValue} />;

3
invokeai/frontend/web/src/features/metadata/components/MetadataT2IAdapters.tsx
View File

@ -1,3 +1,4 @@
import { Text } from '@invoke-ai/ui-library';
import type { T2IAdapterConfig } from 'features/controlAdapters/store/types'; import type { T2IAdapterConfig } from 'features/controlAdapters/store/types';
import { MetadataItemView } from 'features/metadata/components/MetadataItemView'; import { MetadataItemView } from 'features/metadata/components/MetadataItemView';
import type { MetadataHandlers } from 'features/metadata/types'; import type { MetadataHandlers } from 'features/metadata/types';
@ -59,7 +60,7 @@ const MetadataViewT2IAdapter = ({
if (!handlers.renderItemValue) { if (!handlers.renderItemValue) {
return null; return null;
} }
return handlers.renderItemValue(t2iAdapter); return <Text>{handlers.renderItemValue(t2iAdapter)}</Text>;
}, [handlers, t2iAdapter]); }, [handlers, t2iAdapter]);
return <MetadataItemView label={label} isDisabled={false} onRecall={onRecall} renderedValue={renderedValue} />; return <MetadataItemView label={label} isDisabled={false} onRecall={onRecall} renderedValue={renderedValue} />;

10
invokeai/frontend/web/src/features/metadata/util/handlers.tsx → invokeai/frontend/web/src/features/metadata/util/handlers.ts
View File

@ -1,6 +1,5 @@
import { Text } from '@invoke-ai/ui-library';
import { toast } from 'common/util/toast'; import { toast } from 'common/util/toast';
import type { ControlNetConfig, IPAdapterConfig, T2IAdapterConfig } from 'features/controlAdapters/store/types'; import type { ControlAdapterConfig } from 'features/controlAdapters/store/types';
import type { LoRA } from 'features/lora/store/loraSlice'; import type { LoRA } from 'features/lora/store/loraSlice';
import type { import type {
BuildMetadataHandlers, BuildMetadataHandlers,
@ -20,10 +19,9 @@ import { recallers } from './recallers';
const renderModelConfigValue: MetadataRenderValueFunc<AnyModelConfig> = (value) => const renderModelConfigValue: MetadataRenderValueFunc<AnyModelConfig> = (value) =>
`${value.name} (${value.base.toUpperCase()}, ${value.key})`; `${value.name} (${value.base.toUpperCase()}, ${value.key})`;
const renderLoRAValue: MetadataRenderValueFunc<LoRA> = (value) => <Text>{`${value.model.key} (${value.weight})`}</Text>; const renderLoRAValue: MetadataRenderValueFunc<LoRA> = (value) => `${value.model.key} (${value.weight})`;
const renderControlAdapterValue: MetadataRenderValueFunc<ControlNetConfig | T2IAdapterConfig | IPAdapterConfig> = ( const renderControlAdapterValue: MetadataRenderValueFunc<ControlAdapterConfig> = (value) =>
value `${value.model?.key} (${value.weight})`;
) => <Text>{`${value.model?.key} (${value.weight})`}</Text>;
const parameterSetToast = (parameter: string, description?: string) => { const parameterSetToast = (parameter: string, description?: string) => {
toast({ toast({