diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index fa318da4f..8decf07cd 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -4,3 +4,6 @@ # npm run format on litegraph merge (10,672 insertions, 7,327 deletions across 129 files) c53f197de2a3e0fa66b16dedc65c131235c1c4b6 + +# Reorganize renderer components into domain-driven folder structure +c8a83a9caede7bdb5f8598c5492b07d08c339d49 diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue index 5b893b8d2..1e215c60a 100644 --- a/src/components/graph/GraphCanvas.vue +++ b/src/components/graph/GraphCanvas.vue @@ -89,15 +89,12 @@ import LiteGraphCanvasSplitterOverlay from '@/components/LiteGraphCanvasSplitter import BottomPanel from '@/components/bottomPanel/BottomPanel.vue' import DomWidgets from '@/components/graph/DomWidgets.vue' import GraphCanvasMenu from '@/components/graph/GraphCanvasMenu.vue' -import MiniMap from '@/components/graph/MiniMap.vue' import NodeTooltip from '@/components/graph/NodeTooltip.vue' import SelectionToolbox from '@/components/graph/SelectionToolbox.vue' import TitleEditor from '@/components/graph/TitleEditor.vue' -import TransformPane from '@/components/graph/TransformPane.vue' import NodeSearchboxPopover from '@/components/searchbox/NodeSearchBoxPopover.vue' import SideToolbar from '@/components/sidebar/SideToolbar.vue' import SecondRowWorkflowTabs from '@/components/topbar/SecondRowWorkflowTabs.vue' -import { useTransformState } from '@/composables/element/useTransformState' import { useChainCallback } from '@/composables/functional/useChainCallback' import { useGraphNodeManager } from '@/composables/graph/useGraphNodeManager' import type { @@ -117,12 +114,15 @@ import { useWorkflowPersistence } from '@/composables/useWorkflowPersistence' import { CORE_SETTINGS } from '@/constants/coreSettings' import { i18n, t } from '@/i18n' import type { LGraphCanvas, LGraphNode } from '@/lib/litegraph/src/litegraph' +import TransformPane from '@/renderer/core/layout/TransformPane.vue' import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations' import { layoutStore } from '@/renderer/core/layout/store/layoutStore' import { useLayoutSync } from '@/renderer/core/layout/sync/useLayoutSync' import { useLinkLayoutSync } from '@/renderer/core/layout/sync/useLinkLayoutSync' import { useSlotLayoutSync } from '@/renderer/core/layout/sync/useSlotLayoutSync' import { LayoutSource } from '@/renderer/core/layout/types' +import { useTransformState } from '@/renderer/core/layout/useTransformState' +import MiniMap from '@/renderer/extensions/minimap/MiniMap.vue' import VueGraphNode from '@/renderer/extensions/vueNodes/components/LGraphNode.vue' import { UnauthorizedError, api } from '@/scripts/api' import { app as comfyApp } from '@/scripts/app' diff --git a/src/composables/graph/useGraphNodeManager.ts b/src/composables/graph/useGraphNodeManager.ts index a5079c453..88b32e919 100644 --- a/src/composables/graph/useGraphNodeManager.ts +++ b/src/composables/graph/useGraphNodeManager.ts @@ -6,11 +6,11 @@ import { nextTick, reactive, readonly } from 'vue' import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations' import { LayoutSource } from '@/renderer/core/layout/types' +import { type Bounds, QuadTree } from '@/renderer/core/spatial/QuadTree' import type { WidgetValue } from '@/types/simplifiedWidget' import type { SpatialIndexDebugInfo } from '@/types/spatialIndex' import type { LGraph, LGraphNode } from '../../lib/litegraph/src/litegraph' -import { type Bounds, QuadTree } from '../../utils/spatial/QuadTree' export interface NodeState { visible: boolean diff --git a/src/components/graph/TransformPane.vue b/src/renderer/core/layout/TransformPane.vue similarity index 96% rename from src/components/graph/TransformPane.vue rename to src/renderer/core/layout/TransformPane.vue index 266dd0569..2f623257c 100644 --- a/src/components/graph/TransformPane.vue +++ b/src/renderer/core/layout/TransformPane.vue @@ -13,10 +13,10 @@