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

Merge branch 'main' into maryhipp/hide-some-things

Browse Source
This commit is contained in:
Mary Hipp Rogers
2023-07-07 11:34:32 -04:00
committed by GitHub
parent 2933d81118 d368a1de0c
commit 1ed72cdbed
3 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamPositiveConditioning.tsx
View File

@ -1,11 +1,10 @@
import { Box, FormControl, useDisclosure } from '@chakra-ui/react';
import { RootState } from 'app/store/store';
import { stateSelector } from 'app/store/store';
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
import { ChangeEvent, KeyboardEvent, useCallback, useRef } from 'react';
import { createSelector } from '@reduxjs/toolkit';
import {
GenerationState,
clampSymmetrySteps,
setPositivePrompt,
} from 'features/parameters/store/generationSlice';
@ -23,10 +22,11 @@ import { useTranslation } from 'react-i18next';
import { useFeatureStatus } from '../../../../system/hooks/useFeatureStatus';
const promptInputSelector = createSelector(
[(state: RootState) => state.generation, activeTabNameSelector],
(parameters: GenerationState, activeTabName) => {
[stateSelector, activeTabNameSelector],
({ generation, ui }, activeTabName) => {
return {
prompt: parameters.positivePrompt,
shouldPinParametersPanel: ui.shouldPinParametersPanel,
prompt: generation.positivePrompt,
activeTabName,
};
},
@ -42,7 +42,8 @@ const promptInputSelector = createSelector(
*/
const ParamPositiveConditioning = () => {
const dispatch = useAppDispatch();
const { prompt, activeTabName } = useAppSelector(promptInputSelector);
const { prompt, shouldPinParametersPanel, activeTabName } =
useAppSelector(promptInputSelector);
const isReady = useIsReadyToInvoke();
const promptRef = useRef<HTMLTextAreaElement>(null);
const { isOpen, onClose, onOpen } = useDisclosure();
@ -123,7 +124,7 @@ const ParamPositiveConditioning = () => {
// };
return (
<Box>
<Box position="relative">
<FormControl>
<ParamEmbeddingPopover
isOpen={isOpen}
@ -147,7 +148,7 @@ const ParamPositiveConditioning = () => {
<Box
sx={{
position: 'absolute',
top: 6,
top: shouldPinParametersPanel ? 6 : 0,
insetInlineEnd: 0,
}}
>