From b7b5bd1b4609a8042aef88558e978a50c4166433 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Tue, 16 May 2023 09:57:19 +1000 Subject: [PATCH] chore(ui): clean up uiSlice --- .../ui/components/ParametersDrawer.tsx | 7 +- .../features/ui/store/uiPersistDenylist.ts | 4 +- .../web/src/features/ui/store/uiSlice.ts | 65 +------------------ .../web/src/features/ui/store/uiTypes.ts | 7 -- 4 files changed, 4 insertions(+), 79 deletions(-) diff --git a/invokeai/frontend/web/src/features/ui/components/ParametersDrawer.tsx b/invokeai/frontend/web/src/features/ui/components/ParametersDrawer.tsx index 7a969bc396..9c19d988fe 100644 --- a/invokeai/frontend/web/src/features/ui/components/ParametersDrawer.tsx +++ b/invokeai/frontend/web/src/features/ui/components/ParametersDrawer.tsx @@ -21,11 +21,7 @@ import UnifiedCanvasParameters from './tabs/UnifiedCanvas/UnifiedCanvasParameter const selector = createSelector( [uiSelector, activeTabNameSelector, lightboxSelector], (ui, activeTabName, lightbox) => { - const { - shouldPinParametersPanel, - shouldShowParametersPanel, - shouldShowImageParameters, - } = ui; + const { shouldPinParametersPanel, shouldShowParametersPanel } = ui; const { isLightboxOpen } = lightbox; @@ -33,7 +29,6 @@ const selector = createSelector( activeTabName, shouldPinParametersPanel, shouldShowParametersPanel, - shouldShowImageParameters, }; }, defaultSelectorOptions diff --git a/invokeai/frontend/web/src/features/ui/store/uiPersistDenylist.ts b/invokeai/frontend/web/src/features/ui/store/uiPersistDenylist.ts index e4fd3c6e4e..9f6bd2dd73 100644 --- a/invokeai/frontend/web/src/features/ui/store/uiPersistDenylist.ts +++ b/invokeai/frontend/web/src/features/ui/store/uiPersistDenylist.ts @@ -3,6 +3,4 @@ import { UIState } from './uiTypes'; /** * UI slice persist denylist */ -export const uiPersistDenylist: (keyof UIState)[] = [ - 'floatingProgressImageRect', -]; +export const uiPersistDenylist: (keyof UIState)[] = []; diff --git a/invokeai/frontend/web/src/features/ui/store/uiSlice.ts b/invokeai/frontend/web/src/features/ui/store/uiSlice.ts index 6c3eb95a31..4893bb3bf6 100644 --- a/invokeai/frontend/web/src/features/ui/store/uiSlice.ts +++ b/invokeai/frontend/web/src/features/ui/store/uiSlice.ts @@ -1,16 +1,14 @@ import type { PayloadAction } from '@reduxjs/toolkit'; import { createSlice } from '@reduxjs/toolkit'; import { setActiveTabReducer } from './extraReducers'; -import { InvokeTabName, tabMap } from './tabMap'; -import { AddNewModelType, Coordinates, Rect, UIState } from './uiTypes'; -import { initialImageSelected } from 'features/parameters/store/actions'; +import { InvokeTabName } from './tabMap'; +import { AddNewModelType, UIState } from './uiTypes'; import { initialImageChanged } from 'features/parameters/store/generationSlice'; import { SCHEDULERS } from 'app/constants'; export const initialUIState: UIState = { activeTab: 0, currentTheme: 'dark', - parametersPanelScrollPosition: 0, shouldPinParametersPanel: true, shouldShowParametersPanel: true, shouldShowImageDetails: false, @@ -21,13 +19,7 @@ export const initialUIState: UIState = { shouldPinGallery: true, shouldShowGallery: true, shouldHidePreview: false, - textTabAccordionState: [], - imageTabAccordionState: [], - canvasTabAccordionState: [], - floatingProgressImageRect: { x: 0, y: 0, width: 0, height: 0 }, - shouldShowProgressImages: false, shouldShowProgressInViewer: false, - shouldShowImageParameters: false, schedulers: SCHEDULERS, }; @@ -41,12 +33,6 @@ export const uiSlice = createSlice({ setCurrentTheme: (state, action: PayloadAction) => { state.currentTheme = action.payload; }, - setParametersPanelScrollPosition: ( - state, - action: PayloadAction - ) => { - state.parametersPanelScrollPosition = action.payload; - }, setShouldPinParametersPanel: (state, action: PayloadAction) => { state.shouldPinParametersPanel = action.payload; state.shouldShowParametersPanel = true; @@ -75,9 +61,6 @@ export const uiSlice = createSlice({ setAddNewModelUIOption: (state, action: PayloadAction) => { state.addNewModelUIOption = action.payload; }, - setShouldPinGallery: (state, action: PayloadAction) => { - state.shouldPinGallery = action.payload; - }, setShouldShowGallery: (state, action: PayloadAction) => { state.shouldShowGallery = action.payload; }, @@ -108,46 +91,9 @@ export const uiSlice = createSlice({ state.shouldShowParametersPanel = true; } }, - openAccordionItemsChanged: (state, action: PayloadAction) => { - if (tabMap[state.activeTab] === 'txt2img') { - state.textTabAccordionState = action.payload; - } - - if (tabMap[state.activeTab] === 'img2img') { - state.imageTabAccordionState = action.payload; - } - - if (tabMap[state.activeTab] === 'unifiedCanvas') { - state.canvasTabAccordionState = action.payload; - } - }, - floatingProgressImageMoved: (state, action: PayloadAction) => { - state.floatingProgressImageRect = { - ...state.floatingProgressImageRect, - ...action.payload, - }; - }, - floatingProgressImageResized: ( - state, - action: PayloadAction> - ) => { - state.floatingProgressImageRect = { - ...state.floatingProgressImageRect, - ...action.payload, - }; - }, - setShouldShowProgressImages: (state, action: PayloadAction) => { - state.shouldShowProgressImages = action.payload; - }, setShouldShowProgressInViewer: (state, action: PayloadAction) => { state.shouldShowProgressInViewer = action.payload; }, - shouldShowImageParametersChanged: ( - state, - action: PayloadAction - ) => { - state.shouldShowImageParameters = action.payload; - }, setSchedulers: (state, action: PayloadAction) => { state.schedulers = []; state.schedulers = action.payload; @@ -163,7 +109,6 @@ export const uiSlice = createSlice({ export const { setActiveTab, setCurrentTheme, - setParametersPanelScrollPosition, setShouldPinParametersPanel, setShouldShowParametersPanel, setShouldShowImageDetails, @@ -172,19 +117,13 @@ export const { setShouldUseSliders, setAddNewModelUIOption, setShouldHidePreview, - setShouldPinGallery, setShouldShowGallery, togglePanels, togglePinGalleryPanel, togglePinParametersPanel, toggleParametersPanel, toggleGalleryPanel, - openAccordionItemsChanged, - floatingProgressImageMoved, - floatingProgressImageResized, - setShouldShowProgressImages, setShouldShowProgressInViewer, - shouldShowImageParametersChanged, setSchedulers, } = uiSlice.actions; diff --git a/invokeai/frontend/web/src/features/ui/store/uiTypes.ts b/invokeai/frontend/web/src/features/ui/store/uiTypes.ts index db9c60e292..18a758cdd6 100644 --- a/invokeai/frontend/web/src/features/ui/store/uiTypes.ts +++ b/invokeai/frontend/web/src/features/ui/store/uiTypes.ts @@ -15,7 +15,6 @@ export type Rect = Coordinates & Dimensions; export interface UIState { activeTab: number; currentTheme: string; - parametersPanelScrollPosition: number; shouldPinParametersPanel: boolean; shouldShowParametersPanel: boolean; shouldShowImageDetails: boolean; @@ -26,12 +25,6 @@ export interface UIState { shouldHidePreview: boolean; shouldPinGallery: boolean; shouldShowGallery: boolean; - textTabAccordionState: number[]; - imageTabAccordionState: number[]; - canvasTabAccordionState: number[]; - floatingProgressImageRect: Rect; - shouldShowProgressImages: boolean; shouldShowProgressInViewer: boolean; - shouldShowImageParameters: boolean; schedulers: string[]; }