From 8864ad1b5004dec92de9a6ec1b987151420109ce Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Sat, 15 Jun 2024 20:25:07 +1000 Subject: [PATCH] refactor(ui): canvas v2 (wip) fix entity count select --- .../features/controlLayers/store/selectors.ts | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/invokeai/frontend/web/src/features/controlLayers/store/selectors.ts b/invokeai/frontend/web/src/features/controlLayers/store/selectors.ts index 44ac9f32b8..2269f393f3 100644 --- a/invokeai/frontend/web/src/features/controlLayers/store/selectors.ts +++ b/invokeai/frontend/web/src/features/controlLayers/store/selectors.ts @@ -1,17 +1,8 @@ import { createSelector } from '@reduxjs/toolkit'; -import { selectControlAdaptersV2Slice } from 'features/controlLayers/store/controlAdaptersSlice'; -import { selectIPAdaptersSlice } from 'features/controlLayers/store/ipAdaptersSlice'; -import { selectLayersSlice } from 'features/controlLayers/store/layersSlice'; -import { selectRegionalGuidanceSlice } from 'features/controlLayers/store/regionalGuidanceSlice'; +import { selectCanvasSlice } from 'features/canvas/store/canvasSlice'; -export const selectEntityCount = createSelector( - selectRegionalGuidanceSlice, - selectControlAdaptersV2Slice, - selectIPAdaptersSlice, - selectLayersSlice, - (rgState, caState, ipaState, layersState) => { - return ( - rgState.regions.length + caState.controlAdapters.length + ipaState.ipAdapters.length + layersState.layers.length - ); - } -); +export const selectEntityCount = createSelector(selectCanvasSlice, (canvasV2) => { + return ( + canvasV2.regions.length + canvasV2.controlAdapters.length + canvasV2.ipAdapters.length + canvasV2.layers.length + ); +});