Merge branch 'fix-text-area-disabled-bug' of github.com:yaminmomo15/r…

…eact-chatbotify into fix-text-area-disabled-bug
tjtanjin · Oct 12, 2024 · c6cee87 · c6cee87
2 parents 574a8ff + d7ba632
commit c6cee87
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/components/ChatBotBody/ChatBotBody.tsx b/src/components/ChatBotBody/ChatBotBody.tsx
@@ -47,6 +47,7 @@ const ChatBotBody = ({
 		isBotTyping,
 		isLoadingChatHistory,
 		setIsLoadingChatHistory,
+		setIsChatHistoryLoaded,
 		isScrolling,
 		setIsScrolling,
 		setUnreadCount
@@ -99,6 +100,7 @@ const ChatBotBody = ({
 			const scrollDifference = scrollHeight - chatScrollHeight;
 			chatBodyRef.current.scrollTop = chatBodyRef.current.scrollTop + scrollDifference;
 			setIsLoadingChatHistory(false);
+			setIsChatHistoryLoaded(true);
 			return;
 		}
 

diff --git a/src/context/BotStatesContext.tsx b/src/context/BotStatesContext.tsx
@@ -21,6 +21,9 @@ export type BotStatesContextType = {
 	notificationsToggledOn: boolean;
 	setNotificationsToggledOn: Dispatch<SetStateAction<boolean>>;
 
+	isChatHistoryLoaded: boolean;
+	setIsChatHistoryLoaded: Dispatch<SetStateAction<boolean>>;
+
 	isLoadingChatHistory: boolean;
 	setIsLoadingChatHistory: Dispatch<SetStateAction<boolean>>;
 
@@ -78,6 +81,7 @@ const BotStatesProvider = ({
 	const [notificationsToggledOn, setNotificationsToggledOn] = useState<boolean>(
 		settings?.notification?.defaultToggledOn ?? true
 	);
+	const [isChatHistoryLoaded, setIsChatHistoryLoaded] = useState<boolean>(false);
 	const [isLoadingChatHistory, setIsLoadingChatHistory] = useState<boolean>(false);
 	const [isScrolling, setIsScrolling] = useState<boolean>(false);
 	const [textAreaDisabled, setTextAreaDisabled] = useState<boolean>(true);
@@ -107,6 +111,8 @@ const BotStatesProvider = ({
 			setVoiceToggledOn,
 			notificationsToggledOn,
 			setNotificationsToggledOn,
+			isChatHistoryLoaded,
+			setIsChatHistoryLoaded,
 			isLoadingChatHistory,
 			setIsLoadingChatHistory,
 			isScrolling,

diff --git a/src/hooks/internal/useBotEffectsInternal.tsx b/src/hooks/internal/useBotEffectsInternal.tsx
@@ -50,6 +50,7 @@ export const useBotEffectInternal = () => {
 
 	// handles bot states
 	const {
+		isChatHistoryLoaded,
 		isChatWindowOpen,
 		isBotTyping,
 		isScrolling,
@@ -120,6 +121,11 @@ export const useBotEffectInternal = () => {
 		}, 1)
 	}, [])
 
+	// enables text area when chat history is loaded
+	useEffect(() => {
+		setTextAreaDisabled(settings.chatInput?.disabled as boolean);
+	}, [isChatHistoryLoaded])
+
 	// renders chat history button if enabled and triggers update if chat history configurations change
 	useEffect(() => {
 		if (settings.chatHistory?.disabled) {