From d9361f971be9fa6b22740062a42cf5634ed5be2c Mon Sep 17 00:00:00 2001
From: Brian Lambert <brianlambert@gmail.com>
Date: Sat, 30 Mar 2024 15:19:26 -0700
Subject: [PATCH] Updates so that pressing enter tries to apply a row filter

---
 .../positronModalDialog/positronModalDialog.tsx           | 2 +-
 .../positronModalPopup/positronModalPopup.tsx             | 8 ++++++++
 .../addEditRowFilterModalPopup.tsx                        | 7 ++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/browser/positronComponents/positronModalDialog/positronModalDialog.tsx b/src/vs/workbench/browser/positronComponents/positronModalDialog/positronModalDialog.tsx
index df8cefcfe11..4231a62c1fb 100644
--- a/src/vs/workbench/browser/positronComponents/positronModalDialog/positronModalDialog.tsx
+++ b/src/vs/workbench/browser/positronComponents/positronModalDialog/positronModalDialog.tsx
@@ -110,7 +110,7 @@ export const PositronModalDialog = (props: PropsWithChildren<PositronModalDialog
 				// Enter accepts dialog.
 				case 'Enter': {
 					consumeEvent();
-					props.onAccept?.();
+					props.onAccept();
 					break;
 				}
 
diff --git a/src/vs/workbench/browser/positronComponents/positronModalPopup/positronModalPopup.tsx b/src/vs/workbench/browser/positronComponents/positronModalPopup/positronModalPopup.tsx
index c25410b827a..691580fe9af 100644
--- a/src/vs/workbench/browser/positronComponents/positronModalPopup/positronModalPopup.tsx
+++ b/src/vs/workbench/browser/positronComponents/positronModalPopup/positronModalPopup.tsx
@@ -63,6 +63,7 @@ export interface PositronModalPopupProps {
 	height: number | 'min-content';
 	focusableElementSelectors?: string;
 	keyboardNavigation: KeyboardNavigation;
+	onAccept?: () => void;
 }
 
 /**
@@ -195,6 +196,13 @@ export const PositronModalPopup = (props: PropsWithChildren<PositronModalPopupPr
 
 			// Handle the event.
 			switch (e.code) {
+				// Ender accepts the modal popup.
+				case 'Enter': {
+					consumeEvent();
+					props.onAccept?.();
+					break;
+				}
+
 				// Escape dismisses the modal popup.
 				case 'Escape': {
 					consumeEvent();
diff --git a/src/vs/workbench/browser/positronDataExplorer/components/dataExplorerPanel/components/addEditRowFilterModalPopup/addEditRowFilterModalPopup.tsx b/src/vs/workbench/browser/positronDataExplorer/components/dataExplorerPanel/components/addEditRowFilterModalPopup/addEditRowFilterModalPopup.tsx
index 5823942c5e7..2c511bf0efe 100644
--- a/src/vs/workbench/browser/positronDataExplorer/components/dataExplorerPanel/components/addEditRowFilterModalPopup/addEditRowFilterModalPopup.tsx
+++ b/src/vs/workbench/browser/positronDataExplorer/components/dataExplorerPanel/components/addEditRowFilterModalPopup/addEditRowFilterModalPopup.tsx
@@ -319,9 +319,9 @@ export const AddEditRowFilterModalPopup = (props: AddEditRowFilterModalPopupProp
 	})();
 
 	/**
-	 * Apply row filter button onPressed handler.
+	 * Applies the row filter, if it is valid.
 	 */
-	const applyRowFilterButtonPressed = () => {
+	const applyRowFilter = () => {
 		// Ensure that the user has selected a column schema.
 		if (!selectedColumnSchema) {
 			setErrorText(localize(
@@ -546,6 +546,7 @@ export const AddEditRowFilterModalPopup = (props: AddEditRowFilterModalPopupProp
 			width={275}
 			height={'min-content'}
 			keyboardNavigation='dialog'
+			onAccept={applyRowFilter}
 		>
 			<div className='add-edit-row-filter-modal-popup-body'>
 				<DropDownColumnSelector
@@ -593,7 +594,7 @@ export const AddEditRowFilterModalPopup = (props: AddEditRowFilterModalPopupProp
 				)}
 				<Button
 					className='solid button-apply-row-filter'
-					onPressed={applyRowFilterButtonPressed}
+					onPressed={applyRowFilter}
 				>
 					{localize(
 						'positron.addEditRowFilter.applyFilter',