github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-02-02 17:45:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

tidy(ui): rename canvas state "regions" -> "regionalGuidance"

Browse Source
This commit is contained in:
psychedelicious
2024-09-16 19:53:41 +10:00
committed by Kent Keirsey
parent 7725baf6c8
commit 0e0076d819
13 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelsLoaded.ts
View File

@@ -189,7 +189,7 @@ const handleIPAdapterModels: ModelHandler = (models, state, dispatch, _log) => {
dispatch(referenceImageIPAdapterModelChanged({ entityIdentifier: getEntityIdentifier(entity), modelConfig: null }));
});
selectCanvasSlice(state).regions.entities.forEach((entity) => {
selectCanvasSlice(state).regionalGuidance.entities.forEach((entity) => {
entity.referenceImages.forEach(({ id: referenceImageId, ipAdapter }) => {
const isModelAvailable = ipaModels.some((m) => m.key === ipAdapter.model?.key);
if (isModelAvailable) {

2
invokeai/frontend/web/src/common/hooks/useIsReadyToEnqueue.ts
View File

@@ -205,7 +205,7 @@ const createSelector = (
}
});
canvas.regions.entities
canvas.regionalGuidance.entities
.filter((entity) => entity.isEnabled)
.forEach((entity, i) => {
const layerLiteral = i18n.t('controlLayers.layer_one');

2
invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceEntityList.tsx
View File

@@ -8,7 +8,7 @@ import { selectCanvasSlice, selectSelectedEntityIdentifier } from 'features/cont
import { memo } from 'react';
const selectEntityIds = createMemoizedSelector(selectCanvasSlice, (canvas) => {
return canvas.regions.entities.map(mapId).reverse();
return canvas.regionalGuidance.entities.map(mapId).reverse();
});
const selectIsSelected = createSelector(selectSelectedEntityIdentifier, (selectedEntityIdentifier) => {
return selectedEntityIdentifier?.type === 'regional_guidance';

4
invokeai/frontend/web/src/features/controlLayers/components/common/CanvasEntityMenuItemsArrange.tsx
View File

@@ -31,8 +31,8 @@ const getIndexAndCount = (
};
} else if (type === 'regional_guidance') {
return {
index: canvas.regions.entities.findIndex((entity) => entity.id === id),
count: canvas.regions.entities.length,
index: canvas.regionalGuidance.entities.findIndex((entity) => entity.id === id),
count: canvas.regionalGuidance.entities.length,
};
} else if (type === 'inpaint_mask') {
return {

2
invokeai/frontend/web/src/features/controlLayers/hooks/useEntityTypeCount.ts
View File

@@ -16,7 +16,7 @@ export const useEntityTypeCount = (type: CanvasEntityIdentifier['type']): number
case 'inpaint_mask':
return canvas.inpaintMasks.entities.length;
case 'regional_guidance':
return canvas.regions.entities.length;
return canvas.regionalGuidance.entities.length;
case 'reference_image':
return canvas.referenceImages.entities.length;
default:

2
invokeai/frontend/web/src/features/controlLayers/hooks/useEntityTypeIsHidden.ts
View File

@@ -16,7 +16,7 @@ export const useEntityTypeIsHidden = (type: CanvasEntityIdentifier['type']): boo
case 'inpaint_mask':
return canvas.inpaintMasks.isHidden;
case 'regional_guidance':
return canvas.regions.isHidden;
return canvas.regionalGuidance.isHidden;
case 'reference_image':
default:
return false;

6
invokeai/frontend/web/src/features/controlLayers/konva/CanvasEntityRendererModule.ts
View File

@@ -64,8 +64,8 @@ export class CanvasEntityRendererModule extends CanvasModuleBase {
};
createNewRegionalGuidance = async (state: CanvasState, prevState: CanvasState | null) => {
if (!prevState || state.regions.entities !== prevState.regions.entities) {
for (const entityState of state.regions.entities) {
if (!prevState || state.regionalGuidance.entities !== prevState.regionalGuidance.entities) {
for (const entityState of state.regionalGuidance.entities) {
if (!this.manager.adapters.regionMasks.has(entityState.id)) {
const adapter = this.manager.createAdapter(getEntityIdentifier(entityState));
await adapter.initialize();
@@ -90,7 +90,7 @@ export class CanvasEntityRendererModule extends CanvasModuleBase {
!prevState ||
state.rasterLayers.entities !== prevState.rasterLayers.entities ||
state.controlLayers.entities !== prevState.controlLayers.entities ||
state.regions.entities !== prevState.regions.entities ||
state.regionalGuidance.entities !== prevState.regionalGuidance.entities ||
state.inpaintMasks.entities !== prevState.inpaintMasks.entities ||
state.selectedEntityIdentifier?.id !== prevState.selectedEntityIdentifier?.id
) {

2
invokeai/frontend/web/src/features/controlLayers/konva/CanvasStateApiModule.ts
View File

@@ -228,7 +228,7 @@ export class CanvasStateApiModule extends CanvasModuleBase {
* Gets the regions state from redux.
*/
getRegionsState = () => {
return this.getCanvasState().regions;
return this.getCanvasState().regionalGuidance;
};
/**

14
invokeai/frontend/web/src/features/controlLayers/store/canvasSlice.ts
View File

@@ -89,7 +89,7 @@ const getInitialState = (): CanvasState => {
isHidden: false,
entities: [initialInpaintMaskState],
},
regions: {
regionalGuidance: {
isHidden: false,
entities: [],
},
@@ -425,7 +425,7 @@ export const canvasSlice = createSlice({
const entityState = getRegionalGuidanceState(id, overrides);
state.regions.entities.push(entityState);
state.regionalGuidance.entities.push(entityState);
if (isSelected) {
state.selectedEntityIdentifier = getEntityIdentifier(entityState);
@@ -437,7 +437,7 @@ export const canvasSlice = createSlice({
},
rgRecalled: (state, action: PayloadAction<{ data: CanvasRegionalGuidanceState }>) => {
const { data } = action.payload;
state.regions.entities.push(data);
state.regionalGuidance.entities.push(data);
state.selectedEntityIdentifier = { type: 'regional_guidance', id: data.id };
},
rgPositivePromptChanged: (
@@ -817,7 +817,7 @@ export const canvasSlice = createSlice({
break;
case 'regional_guidance':
newEntity.id = getPrefixedId('regional_guidance');
state.regions.entities.push(newEntity);
state.regionalGuidance.entities.push(newEntity);
break;
case 'reference_image':
newEntity.id = getPrefixedId('reference_image');
@@ -961,7 +961,9 @@ export const canvasSlice = createSlice({
state.controlLayers.entities = state.controlLayers.entities.filter((rg) => rg.id !== entityIdentifier.id);
break;
case 'regional_guidance':
state.regions.entities = state.regions.entities.filter((rg) => rg.id !== entityIdentifier.id);
state.regionalGuidance.entities = state.regionalGuidance.entities.filter(
(rg) => rg.id !== entityIdentifier.id
);
break;
case 'reference_image':
state.referenceImages.entities = state.referenceImages.entities.filter((rg) => rg.id !== entityIdentifier.id);
@@ -1030,7 +1032,7 @@ export const canvasSlice = createSlice({
state.inpaintMasks.isHidden = !state.inpaintMasks.isHidden;
break;
case 'regional_guidance':
state.regions.isHidden = !state.regions.isHidden;
state.regionalGuidance.isHidden = !state.regionalGuidance.isHidden;
break;
case 'reference_image':
// no-op

14
invokeai/frontend/web/src/features/controlLayers/store/selectors.ts
View File

@@ -31,7 +31,7 @@ export const selectCanvasSlice = (state: RootState) => state.canvas.present;
*/
const selectEntityCountAll = createSelector(selectCanvasSlice, (canvas) => {
return (
canvas.regions.entities.length +
canvas.regionalGuidance.entities.length +
canvas.referenceImages.entities.length +
canvas.rasterLayers.entities.length +
canvas.controlLayers.entities.length +
@@ -52,7 +52,7 @@ const selectActiveInpaintMaskEntities = createSelector(selectCanvasSlice, (canva
);
const selectActiveRegionalGuidanceEntities = createSelector(selectCanvasSlice, (canvas) =>
canvas.regions.entities.filter((e) => e.isEnabled && e.objects.length > 0)
canvas.regionalGuidance.entities.filter((e) => e.isEnabled && e.objects.length > 0)
);
const selectActiveIPAdapterEntities = createSelector(selectCanvasSlice, (canvas) =>
@@ -127,7 +127,7 @@ export function selectEntity<T extends CanvasEntityIdentifier>(
entity = state.inpaintMasks.entities.find((entity) => entity.id === id);
break;
case 'regional_guidance':
entity = state.regions.entities.find((entity) => entity.id === id);
entity = state.regionalGuidance.entities.find((entity) => entity.id === id);
break;
case 'reference_image':
entity = state.referenceImages.entities.find((entity) => entity.id === id);
@@ -171,7 +171,7 @@ export function selectAllEntitiesOfType<T extends CanvasEntityState['type']>(
entities = state.inpaintMasks.entities;
break;
case 'regional_guidance':
entities = state.regions.entities;
entities = state.regionalGuidance.entities;
break;
case 'reference_image':
entities = state.referenceImages.entities;
@@ -189,7 +189,7 @@ export function selectAllEntities(state: CanvasState): CanvasEntityState[] {
// These are in the same order as they are displayed in the list!
return [
...state.inpaintMasks.entities.toReversed(),
...state.regions.entities.toReversed(),
...state.regionalGuidance.entities.toReversed(),
...state.referenceImages.entities.toReversed(),
...state.controlLayers.entities.toReversed(),
...state.rasterLayers.entities.toReversed(),
@@ -210,7 +210,7 @@ export function selectAllRenderableEntities(
...state.rasterLayers.entities,
...state.controlLayers.entities,
...state.inpaintMasks.entities,
...state.regions.entities,
...state.regionalGuidance.entities,
];
}
@@ -264,7 +264,7 @@ export const selectSelectedEntityFill = createSelector(
const selectRasterLayersIsHidden = createSelector(selectCanvasSlice, (canvas) => canvas.rasterLayers.isHidden);
const selectControlLayersIsHidden = createSelector(selectCanvasSlice, (canvas) => canvas.controlLayers.isHidden);
const selectInpaintMasksIsHidden = createSelector(selectCanvasSlice, (canvas) => canvas.inpaintMasks.isHidden);
const selectRegionalGuidanceIsHidden = createSelector(selectCanvasSlice, (canvas) => canvas.regions.isHidden);
const selectRegionalGuidanceIsHidden = createSelector(selectCanvasSlice, (canvas) => canvas.regionalGuidance.isHidden);
/**
* Returns the hidden selector for the given entity type.

2
invokeai/frontend/web/src/features/controlLayers/store/types.ts
View File

@@ -261,7 +261,7 @@ export type CanvasState = {
isHidden: boolean;
entities: CanvasControlLayerState[];
};
regions: {
regionalGuidance: {
isHidden: boolean;
entities: CanvasRegionalGuidanceState[];
};

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

@@ -252,7 +252,7 @@ export const buildSD1Graph = async (
const regionsResult = await addRegions(
manager,
canvas.regions.entities,
canvas.regionalGuidance.entities,
g,
canvas.bbox.rect,
modelConfig.base,

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

@@ -255,7 +255,7 @@ export const buildSDXLGraph = async (
const regionsResult = await addRegions(
manager,
canvas.regions.entities,
canvas.regionalGuidance.entities,
g,
canvas.bbox.rect,
modelConfig.base,