From 6a432f651872cb14491c27127da9165af05c3385 Mon Sep 17 00:00:00 2001
From: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed, 7 Aug 2024 17:49:02 +1000
Subject: [PATCH] tidy(ui): clearer component names for control adapters
---
.../components/CanvasEntityList.tsx | 4 ++--
.../{CA.tsx => ControlAdapter.tsx} | 16 ++++++-------
...Menu.tsx => ControlAdapterActionsMenu.tsx} | 4 ++--
...sx => ControlAdapterControlModeSelect.tsx} | 4 ++--
...iew.tsx => ControlAdapterImagePreview.tsx} | 4 ++--
...AEntityList.tsx => ControlAdapterList.tsx} | 8 +++----
...elCombobox.tsx => ControlAdapterModel.tsx} | 4 ++--
...tsx => ControlAdapterOpacityAndFilter.tsx} | 4 ++--
....tsx => ControlAdapterProcessorConfig.tsx} | 4 ++--
... => ControlAdapterProcessorTypeSelect.tsx} | 4 ++--
...ettings.tsx => ControlAdapterSettings.tsx} | 24 +++++++++----------
11 files changed, 40 insertions(+), 40 deletions(-)
rename invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/{CA.tsx => ControlAdapter.tsx} (70%)
rename invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/{CAActionsMenu.tsx => ControlAdapterActionsMenu.tsx} (78%)
rename invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/{CAControlModeSelect.tsx => ControlAdapterControlModeSelect.tsx} (90%)
rename invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/{CAImagePreview.tsx => ControlAdapterImagePreview.tsx} (98%)
rename invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/{CAEntityList.tsx => ControlAdapterList.tsx} (82%)
rename invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/{CAModelCombobox.tsx => ControlAdapterModel.tsx} (93%)
rename invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/{CAOpacityAndFilter.tsx => ControlAdapterOpacityAndFilter.tsx} (95%)
rename invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/{CAProcessorConfig.tsx => ControlAdapterProcessorConfig.tsx} (95%)
rename invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/{CAProcessorTypeSelect.tsx => ControlAdapterProcessorTypeSelect.tsx} (93%)
rename invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/{CASettings.tsx => ControlAdapterSettings.tsx} (80%)
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList.tsx b/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList.tsx
index e76b6ab3ed..236ffdb161 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList.tsx
@@ -1,7 +1,7 @@
/* eslint-disable i18next/no-literal-string */
import { Flex } from '@invoke-ai/ui-library';
import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableContent';
-import { CAEntityList } from 'features/controlLayers/components/ControlAdapter/CAEntityList';
+import { ControlAdapterList } from 'features/controlLayers/components/ControlAdapter/ControlAdapterList';
import { IM } from 'features/controlLayers/components/InpaintMask/IM';
import { IPAEntityList } from 'features/controlLayers/components/IPAdapter/IPAEntityList';
import { LayerEntityList } from 'features/controlLayers/components/Layer/LayerEntityList';
@@ -14,7 +14,7 @@ export const CanvasEntityList = memo(() => {
-
+
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/CA.tsx b/invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/ControlAdapter.tsx
similarity index 70%
rename from invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/CA.tsx
rename to invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/ControlAdapter.tsx
index 1ee01e66c6..280fd74288 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/CA.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/ControlAdapter.tsx
@@ -4,9 +4,9 @@ import { CanvasEntityDeleteButton } from 'features/controlLayers/components/comm
import { CanvasEntityEnabledToggle } from 'features/controlLayers/components/common/CanvasEntityEnabledToggle';
import { CanvasEntityHeader } from 'features/controlLayers/components/common/CanvasEntityHeader';
import { CanvasEntityTitle } from 'features/controlLayers/components/common/CanvasEntityTitle';
-import { CAActionsMenu } from 'features/controlLayers/components/ControlAdapter/CAActionsMenu';
-import { CAOpacityAndFilter } from 'features/controlLayers/components/ControlAdapter/CAOpacityAndFilter';
-import { CASettings } from 'features/controlLayers/components/ControlAdapter/CASettings';
+import { ControlAdapterActionsMenu } from 'features/controlLayers/components/ControlAdapter/ControlAdapterActionsMenu';
+import { ControlAdapterOpacityAndFilter } from 'features/controlLayers/components/ControlAdapter/ControlAdapterOpacityAndFilter';
+import { ControlAdapterSettings } from 'features/controlLayers/components/ControlAdapter/ControlAdapterSettings';
import { EntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
import type { CanvasEntityIdentifier } from 'features/controlLayers/store/types';
import { memo, useMemo } from 'react';
@@ -15,7 +15,7 @@ type Props = {
id: string;
};
-export const CA = memo(({ id }: Props) => {
+export const ControlAdapter = memo(({ id }: Props) => {
const entityIdentifier = useMemo(() => ({ id, type: 'control_adapter' }), [id]);
const { isOpen, onToggle } = useDisclosure({ defaultIsOpen: true });
@@ -26,14 +26,14 @@ export const CA = memo(({ id }: Props) => {
-
-
+
+
- {isOpen && }
+ {isOpen && }
);
});
-CA.displayName = 'CA';
+ControlAdapter.displayName = 'ControlAdapter';
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/CAActionsMenu.tsx b/invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/ControlAdapterActionsMenu.tsx
similarity index 78%
rename from invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/CAActionsMenu.tsx
rename to invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/ControlAdapterActionsMenu.tsx
index 6285d7be9c..a9b5815a95 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/CAActionsMenu.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/ControlAdapter/ControlAdapterActionsMenu.tsx
@@ -3,7 +3,7 @@ import { CanvasEntityActionMenuItems } from 'features/controlLayers/components/c
import { CanvasEntityMenuButton } from 'features/controlLayers/components/common/CanvasEntityMenuButton';
import { memo } from 'react';
-export const CAActionsMenu = memo(() => {
+export const ControlAdapterActionsMenu = memo(() => {
return (