Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
} from 'features/stylePresets/store/stylePresetSlice';
import { useRegisteredHotkeys } from 'features/system/components/HotkeysModal/useHotkeyData';
import { selectAllowPromptExpansion } from 'features/system/store/configSlice';
import { selectActiveTab } from 'features/ui/store/uiSelectors';
import { memo, useCallback, useMemo, useRef } from 'react';
import type { HotkeyCallback } from 'react-hotkeys-hook';
import { useTranslation } from 'react-i18next';
Expand All @@ -45,6 +46,7 @@ export const ParamPositivePrompt = memo(() => {
const modelSupportsNegativePrompt = useAppSelector(selectModelSupportsNegativePrompt);
const { isPending: isPromptExpansionPending } = useStore(promptExpansionApi.$state);
const isPromptExpansionEnabled = useAppSelector(selectAllowPromptExpansion);
const activeTab = useAppSelector(selectActiveTab);

const textareaRef = useRef<HTMLTextAreaElement>(null);
usePersistedTextAreaSize('positive_prompt', textareaRef, persistOptions);
Expand Down Expand Up @@ -116,7 +118,7 @@ export const ParamPositivePrompt = memo(() => {
<Flex flexDir="column" gap={2} justifyContent="flex-start" alignItems="center">
<AddPromptTriggerButton isOpen={isOpen} onOpen={onOpen} />
<ShowDynamicPromptsPreviewButton />
{modelSupportsNegativePrompt && <NegativePromptToggleButton />}
{activeTab !== 'video' && modelSupportsNegativePrompt && <NegativePromptToggleButton />}
</Flex>
{isPromptExpansionEnabled && <PromptExpansionMenu />}
</PromptOverlayButtonWrapper>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,20 @@ import {
} from 'features/controlLayers/store/paramsSlice';
import { ParamNegativePrompt } from 'features/parameters/components/Core/ParamNegativePrompt';
import { ParamPositivePrompt } from 'features/parameters/components/Core/ParamPositivePrompt';
import { selectActiveTab } from 'features/ui/store/uiSelectors';
import { memo } from 'react';

export const Prompts = memo(() => {
const modelSupportsNegativePrompt = useAppSelector(selectModelSupportsNegativePrompt);
const modelSupportsRefImages = useAppSelector(selectModelSupportsRefImages);
const hasNegativePrompt = useAppSelector(selectHasNegativePrompt);
const activeTab = useAppSelector(selectActiveTab);

return (
<Flex flexDir="column" gap={2}>
<ParamPositivePrompt />
{modelSupportsNegativePrompt && hasNegativePrompt && <ParamNegativePrompt />}
{modelSupportsRefImages && <RefImageList />}
{activeTab !== 'video' && modelSupportsNegativePrompt && hasNegativePrompt && <ParamNegativePrompt />}
{activeTab !== 'video' && modelSupportsRefImages && <RefImageList />}
</Flex>
);
});
Expand Down