From b08b333ab4a51d5cb16086c11e054fe602f95244 Mon Sep 17 00:00:00 2001
From: Nikita <nkdevinfo@gmail.com>
Date: Wed, 2 Aug 2023 16:48:06 +0300
Subject: [PATCH] added support for Enter key to insert the response

---
 src/popup/index.js | 73 ++++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/popup/index.js b/src/popup/index.js
index 6b2709f..b0c336f 100644
--- a/src/popup/index.js
+++ b/src/popup/index.js
@@ -170,12 +170,23 @@ export default function Popup(props) {
 		}
 	}
 
+	function onInsert() {
+		insertResponse();
+
+		reset();
+		close();
+
+		if (onClose) {
+			onClose();
+		}
+	}
+
 	// Set focus on Input.
 	useEffect(() => {
-		if (isOpen && ref?.current) {
+		if (isOpen && !loading && ref?.current) {
 			focusInput();
 		}
-	}, [isOpen, ref]);
+	}, [isOpen, loading, ref]);
 
 	// Open request page if something is in input.
 	useEffect(() => {
@@ -184,6 +195,25 @@ export default function Popup(props) {
 		}
 	}, [screen, input, setScreen]);
 
+	function onKeyDown(e) {
+		// Go back to starter screen.
+		if (screen !== '' && e.key === 'Backspace' && !e.target.value) {
+			reset();
+			return;
+		}
+
+		// Insert request to post.
+		if (response && e.key === 'Enter') {
+			onInsert();
+			return;
+		}
+
+		// Send request to AI.
+		if (screen === 'request' && e.key === 'Enter') {
+			requestAI();
+		}
+	}
+
 	if (!isOpen) {
 		return null;
 	}
@@ -214,22 +244,7 @@ export default function Popup(props) {
 					onChange={(val) => {
 						setInput(val);
 					}}
-					onKeyDown={(e) => {
-						// Go back to starter screen.
-						if (
-							screen !== '' &&
-							e.key === 'Backspace' &&
-							!e.target.value
-						) {
-							reset();
-							return;
-						}
-
-						// Send request to AI.
-						if (screen === 'request' && e.key === 'Enter') {
-							requestAI();
-						}
-					}}
+					onKeyDown={onKeyDown}
 					disabled={loading}
 				/>
 				{contextLabel ? (
@@ -263,7 +278,6 @@ export default function Popup(props) {
 									onClick={() => {
 										setInput(data.request);
 										setScreen('request');
-										focusInput();
 									}}
 								>
 									{data.icon || ''}
@@ -304,17 +318,11 @@ export default function Popup(props) {
 							<>
 								<Button
 									onClick={() => {
-										insertResponse();
-
-										reset();
-										close();
-
-										if (onClose) {
-											onClose();
-										}
+										setError('');
+										requestAI();
 									}}
 								>
-									{__('Insert', 'mind')} <kbd>⏎</kbd>
+									{__('Regenerate', 'mind')} <kbd>↻</kbd>
 								</Button>
 								<Button
 									onClick={() => {
@@ -330,13 +338,8 @@ export default function Popup(props) {
 								>
 									{__('Copy', 'mind')}
 								</Button>
-								<Button
-									onClick={() => {
-										setError('');
-										requestAI();
-									}}
-								>
-									{__('Regenerate', 'mind')} <kbd>↻</kbd>
+								<Button onClick={onInsert}>
+									{__('Insert', 'mind')} <kbd>⏎</kbd>
 								</Button>
 							</>
 						)}