tidy(ui): organise files

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/enqueueRequestedLinear.ts

@@ -1,6 +1,6 @@
 import { enqueueRequested } from 'app/store/actions';
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
-import { getNodeManager } from 'features/controlLayers/konva/nodeManager';
+import { getNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import { stagingAreaCanceledStaging, stagingAreaStartedStaging } from 'features/controlLayers/store/canvasV2Slice';
 import { prepareLinearUIBatch } from 'features/nodes/util/graph/buildLinearBatchConfig';
 import { buildSD1Graph } from 'features/nodes/util/graph/generation/buildSD1Graph';

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

@@ -3,7 +3,7 @@ import { logger } from 'app/logging/logger';
 import { $isDebugging } from 'app/store/nanostores/isDebugging';
 import { useAppStore } from 'app/store/storeHooks';
 import { HeadsUpDisplay } from 'features/controlLayers/components/HeadsUpDisplay';
-import { KonvaNodeManager, setNodeManager } from 'features/controlLayers/konva/nodeManager';
+import { KonvaNodeManager, setNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import Konva from 'konva';
 import { memo, useCallback, useEffect, useLayoutEffect, useState } from 'react';
 import { useDevicePixelRatio } from 'use-device-pixel-ratio';

invokeai/frontend/web/src/features/controlLayers/konva/CanvasBackground.ts

@@ -1,5 +1,5 @@
 import { getArbitraryBaseColor } from '@invoke-ai/ui-library';
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import Konva from 'konva';
 
 const baseGridLineColor = getArbitraryBaseColor(27);

invokeai/frontend/web/src/features/controlLayers/konva/CanvasBbox.ts

@@ -1,10 +1,10 @@
 import { roundToMultiple, roundToMultipleMin } from 'common/util/roundDownToMultiple';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import {
   PREVIEW_GENERATION_BBOX_DUMMY_RECT,
   PREVIEW_GENERATION_BBOX_GROUP,
   PREVIEW_GENERATION_BBOX_TRANSFORMER,
 } from 'features/controlLayers/konva/naming';
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
 import Konva from 'konva';
 import type { IRect } from 'konva/lib/types';
 import { atom } from 'nanostores';

invokeai/frontend/web/src/features/controlLayers/konva/CanvasDocumentSizeOverlay.ts

@@ -1,6 +1,6 @@
 import { getArbitraryBaseColor } from '@invoke-ai/ui-library';
 import { DOCUMENT_FIT_PADDING_PX } from 'features/controlLayers/konva/constants';
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import Konva from 'konva';
 
 export class CanvasDocumentSizeOverlay {

invokeai/frontend/web/src/features/controlLayers/konva/CanvasInpaintMask.ts

@@ -1,7 +1,7 @@
 import { rgbColorToString } from 'common/util/colorCodeTransformers';
 import { getNodeBboxFast } from 'features/controlLayers/konva/entityBbox';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import { getObjectGroupId,INPAINT_MASK_LAYER_ID } from 'features/controlLayers/konva/naming';
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
 import { KonvaBrushLine, KonvaEraserLine, KonvaRect } from 'features/controlLayers/konva/objects';
 import { mapId } from 'features/controlLayers/konva/util';
 import { type InpaintMaskEntity, isDrawingTool } from 'features/controlLayers/store/types';

invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayer.ts

@@ -1,5 +1,5 @@
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import { getObjectGroupId } from 'features/controlLayers/konva/naming';
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
 import { KonvaBrushLine, KonvaEraserLine, KonvaImage, KonvaRect } from 'features/controlLayers/konva/objects';
 import { mapId } from 'features/controlLayers/konva/util';
 import { isDrawingTool, type LayerEntity } from 'features/controlLayers/store/types';

invokeai/frontend/web/src/features/controlLayers/konva/CanvasPreview.ts

@@ -1,9 +1,9 @@
 import Konva from 'konva';
 
-import type { CanvasBbox } from './bbox';
-import type { CanvasDocumentSizeOverlay } from './documentSizeOverlay';
-import type { CanvasStagingArea } from './stagingArea';
-import type { CanvasTool } from './tool';
+import type { CanvasBbox } from './CanvasBbox';
+import type { CanvasDocumentSizeOverlay } from './CanvasDocumentSizeOverlay';
+import type { CanvasStagingArea } from './CanvasStagingArea';
+import type { CanvasTool } from './CanvasTool';
 
 export class CanvasPreview {
   layer: Konva.Layer;

invokeai/frontend/web/src/features/controlLayers/konva/CanvasRegion.ts

@@ -1,7 +1,7 @@
 import { rgbColorToString } from 'common/util/colorCodeTransformers';
-import { getObjectGroupId } from 'features/controlLayers/konva/naming';
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
 import { getNodeBboxFast } from 'features/controlLayers/konva/entityBbox';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
+import { getObjectGroupId } from 'features/controlLayers/konva/naming';
 import { KonvaBrushLine, KonvaEraserLine, KonvaRect } from 'features/controlLayers/konva/objects';
 import { mapId } from 'features/controlLayers/konva/util';
 import { isDrawingTool, type RegionEntity } from 'features/controlLayers/store/types';

invokeai/frontend/web/src/features/controlLayers/konva/CanvasStagingArea.ts

@@ -1,4 +1,4 @@
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import { KonvaImage, KonvaProgressImage } from 'features/controlLayers/konva/objects';
 import Konva from 'konva';
 import type { ImageDTO } from 'services/api/types';

invokeai/frontend/web/src/features/controlLayers/konva/CanvasTool.ts

@@ -4,8 +4,8 @@ import {
   BRUSH_BORDER_OUTER_COLOR,
   BRUSH_ERASER_BORDER_WIDTH,
 } from 'features/controlLayers/konva/constants';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import { PREVIEW_RECT_ID } from 'features/controlLayers/konva/naming';
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
 import Konva from 'konva';
 
 export class CanvasTool {

invokeai/frontend/web/src/features/controlLayers/konva/KonvaNodeManager.ts

@@ -1,10 +1,6 @@
 import type { Store } from '@reduxjs/toolkit';
 import type { RootState } from 'app/store/store';
 import { getImageDataTransparency } from 'common/util/arrayBuffer';
-import { CanvasBackground } from 'features/controlLayers/konva/background';
-import { setStageEventHandlers } from 'features/controlLayers/konva/events';
-import { CanvasPreview } from 'features/controlLayers/konva/preview';
-import { konvaNodeToBlob, konvaNodeToImageData, previewBlob } from 'features/controlLayers/konva/util';
 import { $lastProgressEvent, $shouldShowStagedImage } from 'features/controlLayers/store/canvasV2Slice';
 import type { CanvasV2State, GenerationMode, Rect } from 'features/controlLayers/store/types';
 import { isValidLayer } from 'features/nodes/util/graph/generation/addLayers';
@@ -14,15 +10,19 @@ import { getImageDTO as defaultGetImageDTO, uploadImage as defaultUploadImage }
 import type { ImageCategory, ImageDTO } from 'services/api/types';
 import { assert } from 'tsafe';
 
-import { CanvasBbox } from './bbox';
-import { CanvasControlAdapter } from './controlAdapters';
-import { CanvasDocumentSizeOverlay } from './documentSizeOverlay';
-import { CanvasInpaintMask } from './inpaintMask';
-import { CanvasLayer } from './layers';
-import { CanvasRegion } from './regions';
-import { CanvasStagingArea } from './stagingArea';
-import { StateApi } from './stateApi';
-import { CanvasTool } from './tool';
+import { CanvasBackground } from './CanvasBackground';
+import { CanvasBbox } from './CanvasBbox';
+import { CanvasControlAdapter } from './CanvasControlAdapter';
+import { CanvasDocumentSizeOverlay } from './CanvasDocumentSizeOverlay';
+import { CanvasInpaintMask } from './CanvasInpaintMask';
+import { CanvasLayer } from './CanvasLayer';
+import { CanvasPreview } from './CanvasPreview';
+import { CanvasRegion } from './CanvasRegion';
+import { CanvasStagingArea } from './CanvasStagingArea';
+import { CanvasTool } from './CanvasTool';
+import { setStageEventHandlers } from './events';
+import { StateApi } from './StateApi';
+import { konvaNodeToBlob, konvaNodeToImageData, previewBlob } from './util';
 
 type Util = {
   getImageDTO: (imageName: string) => Promise<ImageDTO | null>;

invokeai/frontend/web/src/features/controlLayers/konva/events.ts

@@ -1,4 +1,4 @@
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import { getScaledCursorPosition } from 'features/controlLayers/konva/util';
 import type { CanvasEntity } from 'features/controlLayers/store/types';
 import type Konva from 'konva';

invokeai/frontend/web/src/features/nodes/util/graph/generation/addImageToImage.ts

@@ -1,4 +1,4 @@
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import type { CanvasV2State, Size } from 'features/controlLayers/store/types';
 import type { Graph } from 'features/nodes/util/graph/generation/Graph';
 import { isEqual, pick } from 'lodash-es';

invokeai/frontend/web/src/features/nodes/util/graph/generation/addInpaint.ts

@@ -1,4 +1,4 @@
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import type { CanvasV2State, Size } from 'features/controlLayers/store/types';
 import type { Graph } from 'features/nodes/util/graph/generation/Graph';
 import type { ParameterPrecision } from 'features/parameters/types/parameterSchemas';

invokeai/frontend/web/src/features/nodes/util/graph/generation/addOutpaint.ts

@@ -1,4 +1,4 @@
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import type { CanvasV2State, Size } from 'features/controlLayers/store/types';
 import type { Graph } from 'features/nodes/util/graph/generation/Graph';
 import { getInfill } from 'features/nodes/util/graph/graphBuilderUtils';

invokeai/frontend/web/src/features/nodes/util/graph/generation/addRegions.ts

@@ -1,5 +1,5 @@
 import { deepClone } from 'common/util/deepClone';
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import type { IPAdapterEntity, Rect, RegionEntity } from 'features/controlLayers/store/types';
 import {
   PROMPT_REGION_INVERT_TENSOR_MASK_PREFIX,

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildImageToImageSDXLGraph.ts

@@ -1,5 +1,5 @@
 import type { RootState } from 'app/store/store';
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
 import {
   LATENTS_TO_IMAGE,

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSD1Graph.ts

@@ -1,5 +1,5 @@
 import type { RootState } from 'app/store/store';
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
 import {
   CANVAS_OUTPUT,

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSDXLGraph.ts

@@ -1,5 +1,5 @@
 import type { RootState } from 'app/store/store';
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
 import {
   CANVAS_OUTPUT,

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildTextToImageSD1SD2Graph.ts

@@ -1,5 +1,5 @@
 import type { RootState } from 'app/store/store';
-import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager';
+import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager';
 import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
 import {
   CLIP_SKIP,