Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify fullscreen hotkey selector

Browse Source
This commit is contained in:
blessedcoolant 2022-11-22 20:20:27 +13:00
parent 7b76b79887
commit 69a4a6fec5
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
frontend/src/features/tabs/components/InvokeTabs.tsx
View File

@ -10,6 +10,7 @@ import NodesIcon from 'common/icons/NodesIcon';
import PostprocessingIcon from 'common/icons/PostprocessingIcon'; import PostprocessingIcon from 'common/icons/PostprocessingIcon';
import TextToImageIcon from 'common/icons/TextToImageIcon'; import TextToImageIcon from 'common/icons/TextToImageIcon';
import { import {
OptionsState,
setActiveTab, setActiveTab,
setIsLightBoxOpen, setIsLightBoxOpen,
setShouldShowOptionsPanel, setShouldShowOptionsPanel,
@ -19,8 +20,12 @@ import TextToImageWorkarea from './TextToImage';
import Lightbox from 'features/lightbox/components/Lightbox'; import Lightbox from 'features/lightbox/components/Lightbox';
import { setDoesCanvasNeedScaling } from 'features/canvas/store/canvasSlice'; import { setDoesCanvasNeedScaling } from 'features/canvas/store/canvasSlice';
import UnifiedCanvasWorkarea from './UnifiedCanvas/UnifiedCanvasWorkarea'; import UnifiedCanvasWorkarea from './UnifiedCanvas/UnifiedCanvasWorkarea';
import { setShouldShowGallery } from 'features/gallery/store/gallerySlice'; import {
GalleryState,
setShouldShowGallery,
} from 'features/gallery/store/gallerySlice';
import UnifiedCanvasIcon from 'common/icons/UnifiedCanvasIcon'; import UnifiedCanvasIcon from 'common/icons/UnifiedCanvasIcon';
import { createSelector } from '@reduxjs/toolkit';
export const tabDict = { export const tabDict = {
txt2img: { txt2img: {
@ -57,6 +62,26 @@ export const tabMap = _.map(tabDict, (tab, key) => key);
const tabMapTypes = [...tabMap] as const; const tabMapTypes = [...tabMap] as const;
export type InvokeTabName = typeof tabMapTypes[number]; export type InvokeTabName = typeof tabMapTypes[number];
const fullScreenSelector = createSelector(
[(state: RootState) => state.gallery, (state: RootState) => state.options],
(gallery: GalleryState, options: OptionsState) => {
const { shouldShowGallery, shouldPinGallery } = gallery;
const { shouldShowOptionsPanel, shouldPinOptionsPanel } = options;
return {
shouldShowGallery,
shouldPinGallery,
shouldShowOptionsPanel,
shouldPinOptionsPanel,
};
},
{
memoizeOptions: {
resultEqualityCheck: _.isEqual,
},
}
);
export default function InvokeTabs() { export default function InvokeTabs() {
const activeTab = useAppSelector( const activeTab = useAppSelector(
(state: RootState) => state.options.activeTab (state: RootState) => state.options.activeTab
@ -64,18 +89,13 @@ export default function InvokeTabs() {
const isLightBoxOpen = useAppSelector( const isLightBoxOpen = useAppSelector(
(state: RootState) => state.options.isLightBoxOpen (state: RootState) => state.options.isLightBoxOpen
); );
const shouldShowGallery = useAppSelector(
(state: RootState) => state.gallery.shouldShowGallery const {
); shouldPinGallery,
const shouldShowOptionsPanel = useAppSelector( shouldShowGallery,
(state: RootState) => state.options.shouldShowOptionsPanel shouldPinOptionsPanel,
); shouldShowOptionsPanel,
const shouldPinGallery = useAppSelector( } = useAppSelector(fullScreenSelector);
(state: RootState) => state.gallery.shouldPinGallery
);
const shouldPinOptionsPanel = useAppSelector(
(state: RootState) => state.options.shouldPinOptionsPanel
);
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();