The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
[AI] Fix new chat button stacking side panel and auto-focus editor (#18875)
nitin493830204a34
diff --git a/packages/twenty-front/src/modules/ai/components/internal/AIChatEditorFocusEffect.tsx b/packages/twenty-front/src/modules/ai/components/internal/AIChatEditorFocusEffect.tsxindex 3964c1f9f64..c1985c72690 100644--- a/packages/twenty-front/src/modules/ai/components/internal/AIChatEditorFocusEffect.tsx+++ b/packages/twenty-front/src/modules/ai/components/internal/AIChatEditorFocusEffect.tsx@@ -1,7 +1,7 @@import { type Editor } from '@tiptap/react';import { useEffect } from 'react';-import { focusEditorAfterMigrateState } from '@/ai/states/focusEditorAfterMigrateState';+import { shouldFocusChatEditorState } from '@/ai/states/shouldFocusChatEditorState';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';type AIChatEditorFocusEffectProps = {@@ -11,24 +11,24 @@ type AIChatEditorFocusEffectProps = {export const AIChatEditorFocusEffect = ({editor,}: AIChatEditorFocusEffectProps) => {- const [focusEditorAfterMigrate, setFocusEditorAfterMigrate] = useAtomState(- focusEditorAfterMigrateState,+ const [shouldFocusChatEditor, setShouldFocusChatEditor] = useAtomState(+ shouldFocusChatEditorState,);useEffect(() => {- if (!focusEditorAfterMigrate || !editor) {+ if (!shouldFocusChatEditor || !editor) {return;}const rafId = requestAnimationFrame(() => {editor.commands.focus('end');- setFocusEditorAfterMigrate(false);+ setShouldFocusChatEditor(false);});return () => {cancelAnimationFrame(rafId);};- }, [focusEditorAfterMigrate, editor, setFocusEditorAfterMigrate]);+ }, [shouldFocusChatEditor, editor, setShouldFocusChatEditor]);return null;};diff --git a/packages/twenty-front/src/modules/ai/hooks/useCreateAgentChatThread.ts b/packages/twenty-front/src/modules/ai/hooks/useCreateAgentChatThread.tsindex af025757794..b40ee5783b5 100644--- a/packages/twenty-front/src/modules/ai/hooks/useCreateAgentChatThread.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useCreateAgentChatThread.ts@@ -8,7 +8,7 @@ import { agentChatInputState } from '@/ai/states/agentChatInputState';import { agentChatUsageState } from '@/ai/states/agentChatUsageState';import { currentAIChatThreadState } from '@/ai/states/currentAIChatThreadState';import { currentAIChatThreadTitleState } from '@/ai/states/currentAIChatThreadTitleState';-import { focusEditorAfterMigrateState } from '@/ai/states/focusEditorAfterMigrateState';+import { shouldFocusChatEditorState } from '@/ai/states/shouldFocusChatEditorState';import { hasTriggeredCreateForDraftState } from '@/ai/states/hasTriggeredCreateForDraftState';import { isCreatingChatThreadState } from '@/ai/states/isCreatingChatThreadState';import { isCreatingForFirstSendState } from '@/ai/states/isCreatingForFirstSendState';@@ -60,7 +60,7 @@ export const useCreateAgentChatThread = () => {[newThreadId]: newDraft,[AGENT_CHAT_NEW_THREAD_DRAFT_KEY]: '',}));- store.set(focusEditorAfterMigrateState.atom, true);+ store.set(shouldFocusChatEditorState.atom, true);store.set(skipMessagesSkeletonUntilLoadedState.atom, true);store.set(threadIdCreatedFromDraftState.atom, newThreadId);} else {diff --git a/packages/twenty-front/src/modules/ai/hooks/useSwitchToNewAIChat.ts b/packages/twenty-front/src/modules/ai/hooks/useSwitchToNewAIChat.tsindex 33184a84959..7e04751c38b 100644--- a/packages/twenty-front/src/modules/ai/hooks/useSwitchToNewAIChat.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useSwitchToNewAIChat.ts@@ -8,6 +8,7 @@ import { agentChatInputState } from '@/ai/states/agentChatInputState';import { agentChatUsageState } from '@/ai/states/agentChatUsageState';import { currentAIChatThreadState } from '@/ai/states/currentAIChatThreadState';import { currentAIChatThreadTitleState } from '@/ai/states/currentAIChatThreadTitleState';+import { shouldFocusChatEditorState } from '@/ai/states/shouldFocusChatEditorState';import { hasTriggeredCreateForDraftState } from '@/ai/states/hasTriggeredCreateForDraftState';import { threadIdCreatedFromDraftState } from '@/ai/states/threadIdCreatedFromDraftState';import { useOpenAskAIPageInSidePanel } from '@/side-panel/hooks/useOpenAskAIPageInSidePanel';@@ -48,7 +49,8 @@ export const useSwitchToNewAIChat = () => {setAgentChatInput(newChatDraft);setCurrentAIChatThreadTitle(null);setAgentChatUsage(null);- openAskAIPage({ resetNavigationStack: false });+ openAskAIPage();+ store.set(shouldFocusChatEditorState.atom, true);};return { switchToNewChat };diff --git a/packages/twenty-front/src/modules/ai/states/focusEditorAfterMigrateState.ts b/packages/twenty-front/src/modules/ai/states/focusEditorAfterMigrateState.tsdeleted file mode 100644index c24b44b0a1c..00000000000--- a/packages/twenty-front/src/modules/ai/states/focusEditorAfterMigrateState.ts+++ /dev/null@@ -1,6 +0,0 @@-import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';--export const focusEditorAfterMigrateState = createAtomState<boolean>({- key: 'ai/focusEditorAfterMigrateState',- defaultValue: false,-});diff --git a/packages/twenty-front/src/modules/ai/states/shouldFocusChatEditorState.ts b/packages/twenty-front/src/modules/ai/states/shouldFocusChatEditorState.tsnew file mode 100644index 00000000000..b10abd89a50--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/shouldFocusChatEditorState.ts@@ -0,0 +1,6 @@+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const shouldFocusChatEditorState = createAtomState<boolean>({+ key: 'ai/shouldFocusChatEditorState',+ defaultValue: false,+});