tidy(ui): move regionalPrompts files to controlLayers

invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterImagePreview.tsx

@@ -13,10 +13,10 @@ import {
   controlAdapterImageChanged,
   selectControlAdaptersSlice,
 } from 'features/controlAdapters/store/controlAdaptersSlice';
+import { heightChanged, widthChanged } from 'features/controlLayers/store/regionalPromptsSlice';
 import type { TypesafeDraggableData, TypesafeDroppableData } from 'features/dnd/types';
 import { calculateNewSize } from 'features/parameters/components/ImageSize/calculateNewSize';
 import { selectOptimalDimension } from 'features/parameters/store/generationSlice';
-import { heightChanged, widthChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';

invokeai/frontend/web/src/features/controlLayers/components/AddPromptButtons.tsx

@@ -7,7 +7,7 @@ import {
   maskLayerNegativePromptChanged,
   maskLayerPositivePromptChanged,
   selectRegionalPromptsSlice,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiPlusBold } from 'react-icons/pi';

invokeai/frontend/web/src/features/controlLayers/components/BrushSize.tsx

@@ -10,7 +10,7 @@ import {
   PopoverTrigger,
 } from '@invoke-ai/ui-library';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { brushSizeChanged, initialRegionalPromptsState } from 'features/regionalPrompts/store/regionalPromptsSlice';
+import { brushSizeChanged, initialRegionalPromptsState } from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 

invokeai/frontend/web/src/features/controlLayers/components/CALayerOpacity.tsx

@@ -12,8 +12,8 @@ import {
   PopoverTrigger,
 } from '@invoke-ai/ui-library';
 import { useAppDispatch } from 'app/store/storeHooks';
-import { useLayerOpacity } from 'features/regionalPrompts/hooks/layerStateHooks';
-import { layerOpacityChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
+import { useLayerOpacity } from 'features/controlLayers/hooks/layerStateHooks';
+import { layerOpacityChanged } from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiDropHalfFill } from 'react-icons/pi';

invokeai/frontend/web/src/features/controlLayers/components/ControlAdapterLayerListItem.tsx

@@ -1,17 +1,17 @@
 import { Flex, Spacer } from '@invoke-ai/ui-library';
 import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import CALayerOpacity from 'features/regionalPrompts/components/CALayerOpacity';
-import ControlAdapterLayerConfig from 'features/regionalPrompts/components/controlAdapterOverrides/ControlAdapterLayerConfig';
-import { LayerTitle } from 'features/regionalPrompts/components/LayerTitle';
-import { RPLayerDeleteButton } from 'features/regionalPrompts/components/RPLayerDeleteButton';
-import { RPLayerMenu } from 'features/regionalPrompts/components/RPLayerMenu';
-import { RPLayerVisibilityToggle } from 'features/regionalPrompts/components/RPLayerVisibilityToggle';
+import CALayerOpacity from 'features/controlLayers/components/CALayerOpacity';
+import ControlAdapterLayerConfig from 'features/controlLayers/components/controlAdapterOverrides/ControlAdapterLayerConfig';
+import { LayerTitle } from 'features/controlLayers/components/LayerTitle';
+import { RPLayerDeleteButton } from 'features/controlLayers/components/RPLayerDeleteButton';
+import { RPLayerMenu } from 'features/controlLayers/components/RPLayerMenu';
+import { RPLayerVisibilityToggle } from 'features/controlLayers/components/RPLayerVisibilityToggle';
 import {
   isControlAdapterLayer,
   layerSelected,
   selectRegionalPromptsSlice,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback, useMemo } from 'react';
 import { assert } from 'tsafe';
 

invokeai/frontend/web/src/features/controlLayers/components/ControlLayersSettingsPopover.tsx

@@ -1,5 +1,5 @@
 import { Flex, IconButton, Popover, PopoverBody, PopoverContent, PopoverTrigger } from '@invoke-ai/ui-library';
-import { GlobalMaskLayerOpacity } from 'features/regionalPrompts/components/GlobalMaskLayerOpacity';
+import { GlobalMaskLayerOpacity } from 'features/controlLayers/components/GlobalMaskLayerOpacity';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiSettings4Fill } from 'react-icons/ri';

invokeai/frontend/web/src/features/controlLayers/components/GlobalMaskLayerOpacity.tsx

@@ -3,7 +3,7 @@ import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import {
   globalMaskLayerOpacityChanged,
   initialRegionalPromptsState,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 

invokeai/frontend/web/src/features/controlLayers/components/IPAdapterLayerListItem.tsx

@@ -1,11 +1,11 @@
 import { Flex, Spacer } from '@invoke-ai/ui-library';
 import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
 import { useAppSelector } from 'app/store/storeHooks';
-import ControlAdapterLayerConfig from 'features/regionalPrompts/components/controlAdapterOverrides/ControlAdapterLayerConfig';
-import { LayerTitle } from 'features/regionalPrompts/components/LayerTitle';
-import { RPLayerDeleteButton } from 'features/regionalPrompts/components/RPLayerDeleteButton';
-import { RPLayerVisibilityToggle } from 'features/regionalPrompts/components/RPLayerVisibilityToggle';
-import { isIPAdapterLayer, selectRegionalPromptsSlice } from 'features/regionalPrompts/store/regionalPromptsSlice';
+import ControlAdapterLayerConfig from 'features/controlLayers/components/controlAdapterOverrides/ControlAdapterLayerConfig';
+import { LayerTitle } from 'features/controlLayers/components/LayerTitle';
+import { RPLayerDeleteButton } from 'features/controlLayers/components/RPLayerDeleteButton';
+import { RPLayerVisibilityToggle } from 'features/controlLayers/components/RPLayerVisibilityToggle';
+import { isIPAdapterLayer, selectRegionalPromptsSlice } from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useMemo } from 'react';
 import { assert } from 'tsafe';
 

invokeai/frontend/web/src/features/controlLayers/components/LayerTitle.tsx

@@ -1,5 +1,5 @@
 import { Text } from '@invoke-ai/ui-library';
-import type { Layer } from 'features/regionalPrompts/store/types';
+import type { Layer } from 'features/controlLayers/store/types';
 import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 

invokeai/frontend/web/src/features/controlLayers/components/MaskedGuidanceLayerListItem.tsx

@@ -2,20 +2,20 @@ import { Badge, Flex, Spacer } from '@invoke-ai/ui-library';
 import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { rgbColorToString } from 'features/canvas/util/colorToString';
-import { LayerTitle } from 'features/regionalPrompts/components/LayerTitle';
-import { RPLayerColorPicker } from 'features/regionalPrompts/components/RPLayerColorPicker';
-import { RPLayerDeleteButton } from 'features/regionalPrompts/components/RPLayerDeleteButton';
-import { RPLayerIPAdapterList } from 'features/regionalPrompts/components/RPLayerIPAdapterList';
-import { RPLayerMenu } from 'features/regionalPrompts/components/RPLayerMenu';
-import { RPLayerNegativePrompt } from 'features/regionalPrompts/components/RPLayerNegativePrompt';
-import { RPLayerPositivePrompt } from 'features/regionalPrompts/components/RPLayerPositivePrompt';
-import RPLayerSettingsPopover from 'features/regionalPrompts/components/RPLayerSettingsPopover';
-import { RPLayerVisibilityToggle } from 'features/regionalPrompts/components/RPLayerVisibilityToggle';
+import { LayerTitle } from 'features/controlLayers/components/LayerTitle';
+import { RPLayerColorPicker } from 'features/controlLayers/components/RPLayerColorPicker';
+import { RPLayerDeleteButton } from 'features/controlLayers/components/RPLayerDeleteButton';
+import { RPLayerIPAdapterList } from 'features/controlLayers/components/RPLayerIPAdapterList';
+import { RPLayerMenu } from 'features/controlLayers/components/RPLayerMenu';
+import { RPLayerNegativePrompt } from 'features/controlLayers/components/RPLayerNegativePrompt';
+import { RPLayerPositivePrompt } from 'features/controlLayers/components/RPLayerPositivePrompt';
+import RPLayerSettingsPopover from 'features/controlLayers/components/RPLayerSettingsPopover';
+import { RPLayerVisibilityToggle } from 'features/controlLayers/components/RPLayerVisibilityToggle';
 import {
   isMaskedGuidanceLayer,
   layerSelected,
   selectRegionalPromptsSlice,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { assert } from 'tsafe';

invokeai/frontend/web/src/features/controlLayers/components/RPLayerAutoNegativeCheckbox.tsx

@@ -5,7 +5,7 @@ import {
   isMaskedGuidanceLayer,
   maskLayerAutoNegativeChanged,
   selectRegionalPromptsSlice,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import type { ChangeEvent } from 'react';
 import { memo, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';

invokeai/frontend/web/src/features/controlLayers/components/RPLayerColorPicker.tsx

@@ -7,7 +7,7 @@ import {
   isMaskedGuidanceLayer,
   maskLayerPreviewColorChanged,
   selectRegionalPromptsSlice,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback, useMemo } from 'react';
 import type { RgbColor } from 'react-colorful';
 import { useTranslation } from 'react-i18next';

invokeai/frontend/web/src/features/controlLayers/components/RPLayerIPAdapterList.tsx

@@ -2,8 +2,8 @@ import { Divider, Flex, IconButton, Spacer, Text } from '@invoke-ai/ui-library';
 import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
 import { guidanceLayerIPAdapterDeleted } from 'app/store/middleware/listenerMiddleware/listeners/regionalControlToControlAdapterBridge';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import ControlAdapterLayerConfig from 'features/regionalPrompts/components/controlAdapterOverrides/ControlAdapterLayerConfig';
-import { isMaskedGuidanceLayer, selectRegionalPromptsSlice } from 'features/regionalPrompts/store/regionalPromptsSlice';
+import ControlAdapterLayerConfig from 'features/controlLayers/components/controlAdapterOverrides/ControlAdapterLayerConfig';
+import { isMaskedGuidanceLayer, selectRegionalPromptsSlice } from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback, useMemo } from 'react';
 import { PiTrashSimpleBold } from 'react-icons/pi';
 import { assert } from 'tsafe';

invokeai/frontend/web/src/features/controlLayers/components/RPLayerMenu.tsx

@@ -1,9 +1,9 @@
 import { IconButton, Menu, MenuButton, MenuDivider, MenuItem, MenuList } from '@invoke-ai/ui-library';
 import { useAppDispatch } from 'app/store/storeHooks';
-import { RPLayerMenuArrangeActions } from 'features/regionalPrompts/components/RPLayerMenuArrangeActions';
-import { RPLayerMenuMaskedGuidanceActions } from 'features/regionalPrompts/components/RPLayerMenuMaskedGuidanceActions';
-import { useLayerType } from 'features/regionalPrompts/hooks/layerStateHooks';
-import { layerDeleted, layerReset } from 'features/regionalPrompts/store/regionalPromptsSlice';
+import { RPLayerMenuArrangeActions } from 'features/controlLayers/components/RPLayerMenuArrangeActions';
+import { RPLayerMenuMaskedGuidanceActions } from 'features/controlLayers/components/RPLayerMenuMaskedGuidanceActions';
+import { useLayerType } from 'features/controlLayers/hooks/layerStateHooks';
+import { layerDeleted, layerReset } from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiArrowCounterClockwiseBold, PiDotsThreeVerticalBold, PiTrashSimpleBold } from 'react-icons/pi';

invokeai/frontend/web/src/features/controlLayers/components/RPLayerMenuArrangeActions.tsx

@@ -8,7 +8,7 @@ import {
   layerMovedToBack,
   layerMovedToFront,
   selectRegionalPromptsSlice,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiArrowDownBold, PiArrowLineDownBold, PiArrowLineUpBold, PiArrowUpBold } from 'react-icons/pi';

invokeai/frontend/web/src/features/controlLayers/components/RPLayerMenuMaskedGuidanceActions.tsx

@@ -7,7 +7,7 @@ import {
   maskLayerNegativePromptChanged,
   maskLayerPositivePromptChanged,
   selectRegionalPromptsSlice,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiPlusBold } from 'react-icons/pi';

invokeai/frontend/web/src/features/controlLayers/components/RPLayerNegativePrompt.tsx

@@ -1,12 +1,12 @@
 import { Box, Textarea } from '@invoke-ai/ui-library';
 import { useAppDispatch } from 'app/store/storeHooks';
+import { RPLayerPromptDeleteButton } from 'features/controlLayers/components/RPLayerPromptDeleteButton';
+import { useLayerNegativePrompt } from 'features/controlLayers/hooks/layerStateHooks';
+import { maskLayerNegativePromptChanged } from 'features/controlLayers/store/regionalPromptsSlice';
 import { PromptOverlayButtonWrapper } from 'features/parameters/components/Prompts/PromptOverlayButtonWrapper';
 import { AddPromptTriggerButton } from 'features/prompt/AddPromptTriggerButton';
 import { PromptPopover } from 'features/prompt/PromptPopover';
 import { usePrompt } from 'features/prompt/usePrompt';
-import { RPLayerPromptDeleteButton } from 'features/regionalPrompts/components/RPLayerPromptDeleteButton';
-import { useLayerNegativePrompt } from 'features/regionalPrompts/hooks/layerStateHooks';
-import { maskLayerNegativePromptChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { memo, useCallback, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 

invokeai/frontend/web/src/features/controlLayers/components/RPLayerPositivePrompt.tsx

@@ -1,12 +1,12 @@
 import { Box, Textarea } from '@invoke-ai/ui-library';
 import { useAppDispatch } from 'app/store/storeHooks';
+import { RPLayerPromptDeleteButton } from 'features/controlLayers/components/RPLayerPromptDeleteButton';
+import { useLayerPositivePrompt } from 'features/controlLayers/hooks/layerStateHooks';
+import { maskLayerPositivePromptChanged } from 'features/controlLayers/store/regionalPromptsSlice';
 import { PromptOverlayButtonWrapper } from 'features/parameters/components/Prompts/PromptOverlayButtonWrapper';
 import { AddPromptTriggerButton } from 'features/prompt/AddPromptTriggerButton';
 import { PromptPopover } from 'features/prompt/PromptPopover';
 import { usePrompt } from 'features/prompt/usePrompt';
-import { RPLayerPromptDeleteButton } from 'features/regionalPrompts/components/RPLayerPromptDeleteButton';
-import { useLayerPositivePrompt } from 'features/regionalPrompts/hooks/layerStateHooks';
-import { maskLayerPositivePromptChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { memo, useCallback, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 

invokeai/frontend/web/src/features/controlLayers/components/RPLayerPromptDeleteButton.tsx

@@ -3,7 +3,7 @@ import { useAppDispatch } from 'app/store/storeHooks';
 import {
   maskLayerNegativePromptChanged,
   maskLayerPositivePromptChanged,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiTrashSimpleBold } from 'react-icons/pi';

invokeai/frontend/web/src/features/controlLayers/components/RPLayerSettingsPopover.tsx

@@ -9,7 +9,7 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from '@invoke-ai/ui-library';
-import { MaskedGuidanceLayerAutoNegativeCheckbox } from 'features/regionalPrompts/components/RPLayerAutoNegativeCheckbox';
+import { MaskedGuidanceLayerAutoNegativeCheckbox } from 'features/controlLayers/components/RPLayerAutoNegativeCheckbox';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiGearSixBold } from 'react-icons/pi';

invokeai/frontend/web/src/features/controlLayers/components/RPLayerVisibilityToggle.tsx

@@ -1,7 +1,7 @@
 import { IconButton } from '@invoke-ai/ui-library';
 import { useAppDispatch } from 'app/store/storeHooks';
-import { useLayerIsVisible } from 'features/regionalPrompts/hooks/layerStateHooks';
-import { layerVisibilityToggled } from 'features/regionalPrompts/store/regionalPromptsSlice';
+import { useLayerIsVisible } from 'features/controlLayers/hooks/layerStateHooks';
+import { layerVisibilityToggled } from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiCheckBold } from 'react-icons/pi';

invokeai/frontend/web/src/features/controlLayers/components/RegionalPromptingEditor.stories.tsx

@@ -1,6 +1,6 @@
 import { Flex } from '@invoke-ai/ui-library';
 import type { Meta, StoryObj } from '@storybook/react';
-import { RegionalPromptsEditor } from 'features/regionalPrompts/components/RegionalPromptsEditor';
+import { RegionalPromptsEditor } from 'features/controlLayers/components/RegionalPromptsEditor';
 
 const meta: Meta<typeof RegionalPromptsEditor> = {
   title: 'Feature/RegionalPrompts',

invokeai/frontend/web/src/features/controlLayers/components/RegionalPromptsEditor.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable i18next/no-literal-string */
 import { Flex } from '@invoke-ai/ui-library';
-import { RegionalPromptsToolbar } from 'features/regionalPrompts/components/RegionalPromptsToolbar';
-import { StageComponent } from 'features/regionalPrompts/components/StageComponent';
+import { RegionalPromptsToolbar } from 'features/controlLayers/components/RegionalPromptsToolbar';
+import { StageComponent } from 'features/controlLayers/components/StageComponent';
 import { memo } from 'react';
 
 export const RegionalPromptsEditor = memo(() => {

invokeai/frontend/web/src/features/controlLayers/components/RegionalPromptsPanelContent.tsx

@@ -3,13 +3,13 @@ import { Flex } from '@invoke-ai/ui-library';
 import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
 import { useAppSelector } from 'app/store/storeHooks';
 import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableContent';
-import { AddLayerButton } from 'features/regionalPrompts/components/AddLayerButton';
-import { ControlAdapterLayerListItem } from 'features/regionalPrompts/components/ControlAdapterLayerListItem';
-import { DeleteAllLayersButton } from 'features/regionalPrompts/components/DeleteAllLayersButton';
-import { IPAdapterLayerListItem } from 'features/regionalPrompts/components/IPAdapterLayerListItem';
-import { MaskedGuidanceLayerListItem } from 'features/regionalPrompts/components/MaskedGuidanceLayerListItem';
-import { isRenderableLayer, selectRegionalPromptsSlice } from 'features/regionalPrompts/store/regionalPromptsSlice';
-import type { Layer } from 'features/regionalPrompts/store/types';
+import { AddLayerButton } from 'features/controlLayers/components/AddLayerButton';
+import { ControlAdapterLayerListItem } from 'features/controlLayers/components/ControlAdapterLayerListItem';
+import { DeleteAllLayersButton } from 'features/controlLayers/components/DeleteAllLayersButton';
+import { IPAdapterLayerListItem } from 'features/controlLayers/components/IPAdapterLayerListItem';
+import { MaskedGuidanceLayerListItem } from 'features/controlLayers/components/MaskedGuidanceLayerListItem';
+import { isRenderableLayer, selectRegionalPromptsSlice } from 'features/controlLayers/store/regionalPromptsSlice';
+import type { Layer } from 'features/controlLayers/store/types';
 import { partition } from 'lodash-es';
 import { memo } from 'react';
 

invokeai/frontend/web/src/features/controlLayers/components/RegionalPromptsToolbar.tsx

@@ -1,9 +1,9 @@
 /* eslint-disable i18next/no-literal-string */
 import { Flex } from '@invoke-ai/ui-library';
-import { BrushSize } from 'features/regionalPrompts/components/BrushSize';
-import ControlLayersSettingsPopover from 'features/regionalPrompts/components/ControlLayersSettingsPopover';
-import { ToolChooser } from 'features/regionalPrompts/components/ToolChooser';
-import { UndoRedoButtonGroup } from 'features/regionalPrompts/components/UndoRedoButtonGroup';
+import { BrushSize } from 'features/controlLayers/components/BrushSize';
+import ControlLayersSettingsPopover from 'features/controlLayers/components/ControlLayersSettingsPopover';
+import { ToolChooser } from 'features/controlLayers/components/ToolChooser';
+import { UndoRedoButtonGroup } from 'features/controlLayers/components/UndoRedoButtonGroup';
 import { memo } from 'react';
 
 export const RegionalPromptsToolbar = memo(() => {

invokeai/frontend/web/src/features/controlLayers/components/StageComponent.tsx

@@ -4,7 +4,7 @@ import { createSelector } from '@reduxjs/toolkit';
 import { logger } from 'app/logging/logger';
 import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { useMouseEvents } from 'features/regionalPrompts/hooks/mouseEventHooks';
+import { useMouseEvents } from 'features/controlLayers/hooks/mouseEventHooks';
 import {
   $cursorPosition,
   $isMouseOver,
@@ -14,8 +14,8 @@ import {
   layerBboxChanged,
   layerTranslated,
   selectRegionalPromptsSlice,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
-import { debouncedRenderers, renderers as normalRenderers } from 'features/regionalPrompts/util/renderers';
+} from 'features/controlLayers/store/regionalPromptsSlice';
+import { debouncedRenderers, renderers as normalRenderers } from 'features/controlLayers/util/renderers';
 import Konva from 'konva';
 import type { IRect } from 'konva/lib/types';
 import { memo, useCallback, useLayoutEffect, useMemo, useState } from 'react';

invokeai/frontend/web/src/features/controlLayers/components/ToolChooser.tsx

@@ -7,7 +7,7 @@ import {
   selectedLayerDeleted,
   selectedLayerReset,
   selectRegionalPromptsSlice,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import { useCallback } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { useTranslation } from 'react-i18next';

invokeai/frontend/web/src/features/controlLayers/components/UndoRedoButtonGroup.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable i18next/no-literal-string */
 import { ButtonGroup, IconButton } from '@invoke-ai/ui-library';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { redo, undo } from 'features/regionalPrompts/store/regionalPromptsSlice';
+import { redo, undo } from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { useTranslation } from 'react-i18next';

invokeai/frontend/web/src/features/controlLayers/components/controlAdapterOverrides/ControlAdapterImagePreview.tsx

@@ -13,10 +13,10 @@ import {
   controlAdapterImageChanged,
   selectControlAdaptersSlice,
 } from 'features/controlAdapters/store/controlAdaptersSlice';
+import { heightChanged, widthChanged } from 'features/controlLayers/store/regionalPromptsSlice';
 import type { TypesafeDraggableData, TypesafeDroppableData } from 'features/dnd/types';
 import { calculateNewSize } from 'features/parameters/components/ImageSize/calculateNewSize';
 import { selectOptimalDimension } from 'features/parameters/store/generationSlice';
-import { heightChanged, widthChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';

invokeai/frontend/web/src/features/controlLayers/hooks/layerStateHooks.ts

@@ -4,7 +4,7 @@ import {
   isControlAdapterLayer,
   isMaskedGuidanceLayer,
   selectRegionalPromptsSlice,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import { useMemo } from 'react';
 import { assert } from 'tsafe';
 

invokeai/frontend/web/src/features/controlLayers/hooks/mouseEventHooks.ts

@@ -12,7 +12,7 @@ import {
   maskLayerLineAdded,
   maskLayerPointsAdded,
   maskLayerRectAdded,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import type Konva from 'konva';
 import type { KonvaEventObject } from 'konva/lib/Node';
 import type { Vector2d } from 'konva/lib/types';

invokeai/frontend/web/src/features/controlLayers/hooks/useRegionalControlTitle.ts

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppSelector } from 'app/store/storeHooks';
-import { isMaskedGuidanceLayer, selectRegionalPromptsSlice } from 'features/regionalPrompts/store/regionalPromptsSlice';
+import { isMaskedGuidanceLayer, selectRegionalPromptsSlice } from 'features/controlLayers/store/regionalPromptsSlice';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 

invokeai/frontend/web/src/features/controlLayers/util/bbox.ts

@@ -1,6 +1,6 @@
 import openBase64ImageInTab from 'common/util/openBase64ImageInTab';
 import { imageDataToDataURL } from 'features/canvas/util/blobToDataURL';
-import { MASKED_GUIDANCE_LAYER_OBJECT_GROUP_NAME } from 'features/regionalPrompts/store/regionalPromptsSlice';
+import { MASKED_GUIDANCE_LAYER_OBJECT_GROUP_NAME } from 'features/controlLayers/store/regionalPromptsSlice';
 import Konva from 'konva';
 import type { Layer as KonvaLayerType } from 'konva/lib/Layer';
 import type { IRect } from 'konva/lib/types';

invokeai/frontend/web/src/features/controlLayers/util/getLayerBlobs.ts

@@ -1,8 +1,8 @@
 import { getStore } from 'app/store/nanostores/store';
 import openBase64ImageInTab from 'common/util/openBase64ImageInTab';
 import { blobToDataURL } from 'features/canvas/util/blobToDataURL';
-import { isMaskedGuidanceLayer, MASKED_GUIDANCE_LAYER_NAME } from 'features/regionalPrompts/store/regionalPromptsSlice';
-import { renderers } from 'features/regionalPrompts/util/renderers';
+import { isMaskedGuidanceLayer, MASKED_GUIDANCE_LAYER_NAME } from 'features/controlLayers/store/regionalPromptsSlice';
+import { renderers } from 'features/controlLayers/util/renderers';
 import Konva from 'konva';
 import { assert } from 'tsafe';
 

invokeai/frontend/web/src/features/controlLayers/util/renderers.ts

@@ -1,6 +1,6 @@
 import { getStore } from 'app/store/nanostores/store';
 import { rgbaColorToString, rgbColorToString } from 'features/canvas/util/colorToString';
-import { getScaledFlooredCursorPosition } from 'features/regionalPrompts/hooks/mouseEventHooks';
+import { getScaledFlooredCursorPosition } from 'features/controlLayers/hooks/mouseEventHooks';
 import {
   $tool,
   BACKGROUND_LAYER_ID,
@@ -24,7 +24,7 @@ import {
   TOOL_PREVIEW_BRUSH_GROUP_ID,
   TOOL_PREVIEW_LAYER_ID,
   TOOL_PREVIEW_RECT_ID,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import type {
   ControlAdapterLayer,
   Layer,
@@ -32,8 +32,8 @@ import type {
   Tool,
   VectorMaskLine,
   VectorMaskRect,
-} from 'features/regionalPrompts/store/types';
-import { getLayerBboxFast, getLayerBboxPixels } from 'features/regionalPrompts/util/bbox';
+} from 'features/controlLayers/store/types';
+import { getLayerBboxFast, getLayerBboxPixels } from 'features/controlLayers/util/bbox';
 import Konva from 'konva';
 import type { IRect, Vector2d } from 'konva/lib/types';
 import { debounce } from 'lodash-es';

invokeai/frontend/web/src/features/metadata/util/recallers.ts

@@ -5,6 +5,14 @@ import {
   ipAdaptersReset,
   t2iAdaptersReset,
 } from 'features/controlAdapters/store/controlAdaptersSlice';
+import {
+  heightChanged,
+  negativePrompt2Changed,
+  negativePromptChanged,
+  positivePrompt2Changed,
+  positivePromptChanged,
+  widthChanged,
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import { setHrfEnabled, setHrfMethod, setHrfStrength } from 'features/hrf/store/hrfSlice';
 import type { LoRA } from 'features/lora/store/loraSlice';
 import { loraRecalled, lorasReset } from 'features/lora/store/loraSlice';
@@ -47,14 +55,6 @@ import type {
   ParameterVAEModel,
   ParameterWidth,
 } from 'features/parameters/types/parameterSchemas';
-import {
-  heightChanged,
-  negativePrompt2Changed,
-  negativePromptChanged,
-  positivePrompt2Changed,
-  positivePromptChanged,
-  widthChanged,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
 import {
   refinerModelChanged,
   setRefinerCFGScale,

invokeai/frontend/web/src/features/nodes/util/graph/addControlNetToLinearGraph.ts

@@ -1,8 +1,8 @@
 import type { RootState } from 'app/store/store';
 import { selectValidControlNets } from 'features/controlAdapters/store/controlAdaptersSlice';
 import type { ControlAdapterProcessorType, ControlNetConfig } from 'features/controlAdapters/store/types';
+import { isControlAdapterLayer } from 'features/controlLayers/store/regionalPromptsSlice';
 import type { ImageField } from 'features/nodes/types/common';
-import { isControlAdapterLayer } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import { differenceWith, intersectionWith } from 'lodash-es';
 import type {

invokeai/frontend/web/src/features/nodes/util/graph/addIPAdapterToLinearGraph.ts

@@ -1,8 +1,8 @@
 import type { RootState } from 'app/store/store';
 import { selectValidIPAdapters } from 'features/controlAdapters/store/controlAdaptersSlice';
 import type { IPAdapterConfig } from 'features/controlAdapters/store/types';
+import { isIPAdapterLayer, isMaskedGuidanceLayer } from 'features/controlLayers/store/regionalPromptsSlice';
 import type { ImageField } from 'features/nodes/types/common';
-import { isIPAdapterLayer, isMaskedGuidanceLayer } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import { differenceWith, intersectionWith } from 'lodash-es';
 import type {

invokeai/frontend/web/src/features/nodes/util/graph/addRegionalPromptsToGraph.ts

@@ -1,6 +1,8 @@
 import { getStore } from 'app/store/nanostores/store';
 import type { RootState } from 'app/store/store';
 import { selectAllIPAdapters } from 'features/controlAdapters/store/controlAdaptersSlice';
+import { isMaskedGuidanceLayer } from 'features/controlLayers/store/regionalPromptsSlice';
+import { getRegionalPromptLayerBlobs } from 'features/controlLayers/util/getLayerBlobs';
 import {
   IP_ADAPTER_COLLECT,
   NEGATIVE_CONDITIONING,
@@ -13,8 +15,6 @@ import {
   PROMPT_REGION_POSITIVE_COND_INVERTED_PREFIX,
   PROMPT_REGION_POSITIVE_COND_PREFIX,
 } from 'features/nodes/util/graph/constants';
-import { isMaskedGuidanceLayer } from 'features/regionalPrompts/store/regionalPromptsSlice';
-import { getRegionalPromptLayerBlobs } from 'features/regionalPrompts/util/getLayerBlobs';
 import { size } from 'lodash-es';
 import { imagesApi } from 'services/api/endpoints/images';
 import type { CollectInvocation, Edge, IPAdapterInvocation, NonNullableGraph, S } from 'services/api/types';

invokeai/frontend/web/src/features/nodes/util/graph/addT2IAdapterToLinearGraph.ts

@@ -1,8 +1,8 @@
 import type { RootState } from 'app/store/store';
 import { selectValidT2IAdapters } from 'features/controlAdapters/store/controlAdaptersSlice';
 import type { ControlAdapterProcessorType, T2IAdapterConfig } from 'features/controlAdapters/store/types';
+import { isControlAdapterLayer } from 'features/controlLayers/store/regionalPromptsSlice';
 import type { ImageField } from 'features/nodes/types/common';
-import { isControlAdapterLayer } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import { differenceWith, intersectionWith } from 'lodash-es';
 import type {

invokeai/frontend/web/src/features/parameters/components/Core/ParamNegativePrompt.tsx

@@ -1,10 +1,10 @@
 import { Box, Textarea } from '@invoke-ai/ui-library';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+import { negativePromptChanged } from 'features/controlLayers/store/regionalPromptsSlice';
 import { PromptOverlayButtonWrapper } from 'features/parameters/components/Prompts/PromptOverlayButtonWrapper';
 import { AddPromptTriggerButton } from 'features/prompt/AddPromptTriggerButton';
 import { PromptPopover } from 'features/prompt/PromptPopover';
 import { usePrompt } from 'features/prompt/usePrompt';
-import { negativePromptChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { memo, useCallback, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 

invokeai/frontend/web/src/features/parameters/components/Core/ParamPositivePrompt.tsx

@@ -1,11 +1,11 @@
 import { Box, Textarea } from '@invoke-ai/ui-library';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+import { positivePromptChanged } from 'features/controlLayers/store/regionalPromptsSlice';
 import { ShowDynamicPromptsPreviewButton } from 'features/dynamicPrompts/components/ShowDynamicPromptsPreviewButton';
 import { PromptOverlayButtonWrapper } from 'features/parameters/components/Prompts/PromptOverlayButtonWrapper';
 import { AddPromptTriggerButton } from 'features/prompt/AddPromptTriggerButton';
 import { PromptPopover } from 'features/prompt/PromptPopover';
 import { usePrompt } from 'features/prompt/usePrompt';
-import { positivePromptChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { SDXLConcatButton } from 'features/sdxl/components/SDXLPrompts/SDXLConcatButton';
 import { memo, useCallback, useRef } from 'react';
 import type { HotkeyCallback } from 'react-hotkeys-hook';

invokeai/frontend/web/src/features/parameters/components/ImageSize/AspectRatioCanvasPreview.tsx

@@ -1,5 +1,5 @@
 import { Flex } from '@invoke-ai/ui-library';
-import { StageComponent } from 'features/regionalPrompts/components/StageComponent';
+import { StageComponent } from 'features/controlLayers/components/StageComponent';
 import { memo } from 'react';
 
 export const AspectRatioCanvasPreview = memo(() => {

invokeai/frontend/web/src/features/queue/components/QueueButtonTooltip.tsx

@@ -2,9 +2,9 @@ import { Divider, Flex, ListItem, Text, UnorderedList } from '@invoke-ai/ui-libr
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppSelector } from 'app/store/storeHooks';
 import { useIsReadyToEnqueue } from 'common/hooks/useIsReadyToEnqueue';
+import { selectRegionalPromptsSlice } from 'features/controlLayers/store/regionalPromptsSlice';
 import { selectDynamicPromptsSlice } from 'features/dynamicPrompts/store/dynamicPromptsSlice';
 import { getShouldProcessPrompt } from 'features/dynamicPrompts/util/getShouldProcessPrompt';
-import { selectRegionalPromptsSlice } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useEnqueueBatchMutation } from 'services/api/endpoints/queue';

invokeai/frontend/web/src/features/sdxl/components/SDXLPrompts/ParamSDXLNegativeStylePrompt.tsx

@@ -1,10 +1,10 @@
 import { Box, Textarea } from '@invoke-ai/ui-library';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+import { negativePrompt2Changed } from 'features/controlLayers/store/regionalPromptsSlice';
 import { PromptOverlayButtonWrapper } from 'features/parameters/components/Prompts/PromptOverlayButtonWrapper';
 import { AddPromptTriggerButton } from 'features/prompt/AddPromptTriggerButton';
 import { PromptPopover } from 'features/prompt/PromptPopover';
 import { usePrompt } from 'features/prompt/usePrompt';
-import { negativePrompt2Changed } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { memo, useCallback, useRef } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { useTranslation } from 'react-i18next';

invokeai/frontend/web/src/features/sdxl/components/SDXLPrompts/ParamSDXLPositiveStylePrompt.tsx

@@ -1,10 +1,10 @@
 import { Box, Textarea } from '@invoke-ai/ui-library';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+import { positivePrompt2Changed } from 'features/controlLayers/store/regionalPromptsSlice';
 import { PromptOverlayButtonWrapper } from 'features/parameters/components/Prompts/PromptOverlayButtonWrapper';
 import { AddPromptTriggerButton } from 'features/prompt/AddPromptTriggerButton';
 import { PromptPopover } from 'features/prompt/PromptPopover';
 import { usePrompt } from 'features/prompt/usePrompt';
-import { positivePrompt2Changed } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { memo, useCallback, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 

invokeai/frontend/web/src/features/sdxl/components/SDXLPrompts/SDXLConcatButton.tsx

@@ -1,6 +1,6 @@
 import { IconButton, Tooltip } from '@invoke-ai/ui-library';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { shouldConcatPromptsChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
+import { shouldConcatPromptsChanged } from 'features/controlLayers/store/regionalPromptsSlice';
 import { memo, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiLinkSimpleBold, PiLinkSimpleBreakBold } from 'react-icons/pi';

invokeai/frontend/web/src/features/settingsAccordions/components/ControlSettingsAccordion/ControlSettingsAccordion.tsx

@@ -16,7 +16,7 @@ import {
 import {
   selectAllControlAdapterIds,
   selectRegionalPromptsSlice,
-} from 'features/regionalPrompts/store/regionalPromptsSlice';
+} from 'features/controlLayers/store/regionalPromptsSlice';
 import { useStandaloneAccordionToggle } from 'features/settingsAccordions/hooks/useStandaloneAccordionToggle';
 import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
 import { Fragment, memo } from 'react';

invokeai/frontend/web/src/features/settingsAccordions/components/ImageSettingsAccordion/ImageSettingsAccordion.tsx

@@ -3,6 +3,7 @@ import { Expander, Flex, FormControlGroup, StandaloneAccordion } from '@invoke-a
 import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
 import { useAppSelector } from 'app/store/storeHooks';
 import { selectCanvasSlice } from 'features/canvas/store/canvasSlice';
+import { selectRegionalPromptsSlice } from 'features/controlLayers/store/regionalPromptsSlice';
 import { HrfSettings } from 'features/hrf/components/HrfSettings';
 import { selectHrfSlice } from 'features/hrf/store/hrfSlice';
 import ParamScaleBeforeProcessing from 'features/parameters/components/Canvas/InfillAndScaling/ParamScaleBeforeProcessing';
@@ -14,7 +15,6 @@ import { ParamSeedNumberInput } from 'features/parameters/components/Seed/ParamS
 import { ParamSeedRandomize } from 'features/parameters/components/Seed/ParamSeedRandomize';
 import { ParamSeedShuffle } from 'features/parameters/components/Seed/ParamSeedShuffle';
 import { selectGenerationSlice } from 'features/parameters/store/generationSlice';
-import { selectRegionalPromptsSlice } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { useExpanderToggle } from 'features/settingsAccordions/hooks/useExpanderToggle';
 import { useStandaloneAccordionToggle } from 'features/settingsAccordions/hooks/useStandaloneAccordionToggle';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';

invokeai/frontend/web/src/features/settingsAccordions/components/ImageSettingsAccordion/ImageSizeLinear.tsx

@@ -1,11 +1,11 @@
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+import { aspectRatioChanged, heightChanged, widthChanged } from 'features/controlLayers/store/regionalPromptsSlice';
 import { ParamHeight } from 'features/parameters/components/Core/ParamHeight';
 import { ParamWidth } from 'features/parameters/components/Core/ParamWidth';
 import { AspectRatioCanvasPreview } from 'features/parameters/components/ImageSize/AspectRatioCanvasPreview';
 import { AspectRatioIconPreview } from 'features/parameters/components/ImageSize/AspectRatioIconPreview';
 import { ImageSize } from 'features/parameters/components/ImageSize/ImageSize';
 import type { AspectRatioState } from 'features/parameters/components/ImageSize/types';
-import { aspectRatioChanged, heightChanged, widthChanged } from 'features/regionalPrompts/store/regionalPromptsSlice';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import { memo, useCallback } from 'react';
 

invokeai/frontend/web/src/features/ui/components/ParametersPanelTextToImage.tsx

@@ -1,10 +1,10 @@
 import { Box, Flex, Tab, TabList, TabPanel, TabPanels, Tabs } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
 import { overlayScrollbarsParams } from 'common/components/OverlayScrollbars/constants';
+import { RegionalPromptsPanelContent } from 'features/controlLayers/components/RegionalPromptsPanelContent';
+import { useRegionalControlTitle } from 'features/controlLayers/hooks/useRegionalControlTitle';
 import { Prompts } from 'features/parameters/components/Prompts/Prompts';
 import QueueControls from 'features/queue/components/QueueControls';
-import { RegionalPromptsPanelContent } from 'features/regionalPrompts/components/RegionalPromptsPanelContent';
-import { useRegionalControlTitle } from 'features/regionalPrompts/hooks/useRegionalControlTitle';
 import { SDXLPrompts } from 'features/sdxl/components/SDXLPrompts/SDXLPrompts';
 import { AdvancedSettingsAccordion } from 'features/settingsAccordions/components/AdvancedSettingsAccordion/AdvancedSettingsAccordion';
 import { CompositingSettingsAccordion } from 'features/settingsAccordions/components/CompositingSettingsAccordion/CompositingSettingsAccordion';

invokeai/frontend/web/src/features/ui/components/tabs/TextToImageTab.tsx

@@ -1,7 +1,7 @@
 import { Box, Tab, TabList, TabPanel, TabPanels, Tabs } from '@invoke-ai/ui-library';
+import { RegionalPromptsEditor } from 'features/controlLayers/components/RegionalPromptsEditor';
+import { useRegionalControlTitle } from 'features/controlLayers/hooks/useRegionalControlTitle';
 import CurrentImageDisplay from 'features/gallery/components/CurrentImage/CurrentImageDisplay';
-import { RegionalPromptsEditor } from 'features/regionalPrompts/components/RegionalPromptsEditor';
-import { useRegionalControlTitle } from 'features/regionalPrompts/hooks/useRegionalControlTitle';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';