diff --git a/client/src/components/Chat/Input/AskUserQuestionPopover.tsx b/client/src/components/Chat/Input/AskUserQuestionPopover.tsx index c8d7c25565..a8341ae27e 100644 --- a/client/src/components/Chat/Input/AskUserQuestionPopover.tsx +++ b/client/src/components/Chat/Input/AskUserQuestionPopover.tsx @@ -1,4 +1,4 @@ -import { memo, useEffect, useRef } from 'react'; +import { memo, useCallback, useEffect, useRef } from 'react'; import { useWatch } from 'react-hook-form'; import { Button, TooltipAnchor } from '@librechat/client'; import { ChevronDown, CornerDownLeft, TriangleAlert } from 'lucide-react'; @@ -6,6 +6,7 @@ import AskUserQuestions from '~/components/Chat/Messages/Content/AskUserQuestion import useAskAnswerMode from '~/hooks/Input/useAskAnswerMode'; import AskOptions from '~/components/Chat/ask/options'; import { useChatFormContext } from '~/Providers'; +import { isCancelKey } from '~/utils/shortcuts'; import { useComposerOverlay } from './overlay'; import { useLocalize } from '~/hooks'; @@ -32,20 +33,47 @@ function AskUserQuestionPopoverContent({ textAreaRef?: React.RefObject; }) { const ask = useAskAnswerMode(conversationId); - useComposerOverlay(conversationId, ask.popoverVisible); + const { collapse, popoverVisible } = ask; + useComposerOverlay(conversationId, popoverVisible); - if (!ask.popoverVisible || !ask.liveAsk) { + /** + * Escape from inside the popover does what it does from the composer: moves + * the question to the chat. Focus then returns to the composer, which a + * batch keeps disabled until the popover is gone, hence after the commit. + */ + const refocusComposer = useRef(false); + const escapeToChat = useCallback(() => { + refocusComposer.current = true; + collapse(); + }, [collapse]); + useEffect(() => { + if (popoverVisible || !refocusComposer.current) { + return; + } + refocusComposer.current = false; + textAreaRef?.current?.focus(); + }, [popoverVisible, textAreaRef]); + + if (!popoverVisible || !ask.liveAsk) { return null; } if (ask.liveAsk.questions != null && ask.liveAsk.questions.length > 0) { - return ; + return ; } - return ; + return ( + + ); } -function AskUserQuestionsPopoverPanel({ ask }: { ask: ReturnType }) { +function AskUserQuestionsPopoverPanel({ + ask, + onEscape, +}: { + ask: ReturnType; + onEscape: () => void; +}) { const { liveAsk, collapse } = ask; const questions = liveAsk?.questions; if (liveAsk == null || questions == null || questions.length === 0) { @@ -62,6 +90,8 @@ function AskUserQuestionsPopoverPanel({ ask }: { ask: ReturnType} /> @@ -101,9 +131,11 @@ function MoveToChatButton({ onClick }: { onClick: () => void }) { function AskUserQuestionPopoverPanel({ ask, textAreaRef, + onEscape, }: { ask: ReturnType; textAreaRef?: React.RefObject; + onEscape: () => void; }) { const localize = useLocalize(); const { control } = useChatFormContext(); @@ -165,7 +197,14 @@ function AskUserQuestionPopoverPanel({ overflows it is unreachable by page scroll. */}
{ + if (isCancelKey(e.nativeEvent) && !e.nativeEvent.isComposing) { + e.preventDefault(); + onEscape(); + return; + } + handlePopoverKeyDown(e); + }} >
diff --git a/client/src/components/Chat/Input/__tests__/AskUserQuestionPopover.test.tsx b/client/src/components/Chat/Input/__tests__/AskUserQuestionPopover.test.tsx new file mode 100644 index 0000000000..2f73186a26 --- /dev/null +++ b/client/src/components/Chat/Input/__tests__/AskUserQuestionPopover.test.tsx @@ -0,0 +1,132 @@ +import React, { createRef } from 'react'; +import { RecoilRoot } from 'recoil'; +import { useForm, FormProvider } from 'react-hook-form'; +import { act, fireEvent, render, screen } from '@testing-library/react'; +import type { Agents } from 'librechat-data-provider'; +import AskUserQuestionPopover from '../AskUserQuestionPopover'; + +const mockCollapse = jest.fn(); +const mockHandlePopoverKeyDown = jest.fn(); +/** The popover is memoized, so visibility changes reach it the way the real + * hook's state does: through a store it subscribes to. */ +const mockVisibility = { + visible: true, + listeners: new Set<() => void>(), + set(visible: boolean) { + this.visible = visible; + this.listeners.forEach((listener) => listener()); + }, + subscribe(listener: () => void) { + mockVisibility.listeners.add(listener); + return () => mockVisibility.listeners.delete(listener); + }, +}; +let mockQuestions: Agents.AskUserQuestionBatchItem[] | undefined; + +jest.mock('~/hooks', () => ({ + useLocalize: () => (key: string) => key, +})); + +jest.mock('~/components/Chat/Messages/Content/ApprovalContext', () => ({ + useAskSubmitStatus: () => ({ getAskStatus: () => 'idle' }), + useResumeSubmit: () => ({ submitAskAnswer: jest.fn() }), +})); + +jest.mock('../overlay', () => ({ + useComposerOverlay: jest.fn(), +})); + +jest.mock('~/Providers', () => ({ + useChatFormContext: () => jest.requireActual('react-hook-form').useFormContext(), +})); + +jest.mock('~/hooks/Input/useAskAnswerMode', () => ({ + __esModule: true, + default: () => ({ + popoverVisible: jest + .requireActual('react') + .useSyncExternalStore(mockVisibility.subscribe, () => mockVisibility.visible), + liveAsk: { + actionId: 'ask-1', + question: { question: 'Which environment?', options: [{ label: 'Staging', value: 's' }] }, + questions: mockQuestions, + }, + options: [{ label: 'Staging', value: 's' }], + selected: null, + checked: [], + multiSelect: false, + locked: false, + errored: false, + toggleChecked: jest.fn(), + canSubmit: false, + submit: jest.fn(), + submitOption: jest.fn(), + skip: jest.fn(), + collapse: mockCollapse, + handlePopoverKeyDown: mockHandlePopoverKeyDown, + }), +})); + +function Host({ textAreaRef }: { textAreaRef: React.RefObject }) { + const methods = useForm({ defaultValues: { text: '' } }); + return ( + + +