Feature/add edit filters through filter bar (#2591)

posit-dev · Apr 1, 2024 · 899dced · 899dced
1 parent 0aa7255
commit 899dced
Show file tree

Hide file tree

Showing 20 changed files with 619 additions and 290 deletions.
diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
diff --git a/src/vs/base/browser/ui/positronComponents/button/button.css b/src/vs/base/browser/ui/positronComponents/button/button.css
@@ -6,6 +6,7 @@
 	border: none;
 	cursor: pointer;
 	background-color: transparent;
+	font-family: unset !important;
 }
 
 .button:focus {

diff --git a/src/vs/base/common/codicons.ts b/src/vs/base/common/codicons.ts
@@ -667,6 +667,7 @@ export const Codicon = {
 	positronClearRowFilters: register('positron-clear-row-filters', 0xf273),
 	positronPowerButtonThin: register('positron-power-button-thin', 0xf274),
 	positronRestartRuntimeThin: register('positron-restart-runtime-thin', 0xf275),
+	positronClearFilter: register('positron-clear-filter', 0xf276),
 	// --- End Positron ---
 
 

diff --git a/src/vs/workbench/browser/positronComponents/positronModalDialog/components/okActionBar.tsx b/src/vs/workbench/browser/positronComponents/positronModalDialog/components/okActionBar.tsx
@@ -2,7 +2,7 @@
  *  Copyright (C) 2022 Posit Software, PBC. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
-// CSS>
+// CSS.
 import 'vs/css!./okActionBar';
 
 // React.

diff --git 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
@@ -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) {
+				// Enter accepts the modal popup.
+				case 'Enter': {
+					consumeEvent();
+					props.onAccept?.();
+					break;
+				}
+
 				// Escape dismisses the modal popup.
 				case 'Escape': {
 					consumeEvent();

diff --git a/...ts/dataExplorerPanel/components/addEditRowFilterModalPopup/addEditRowFilterModalPopup.css b/...ts/dataExplorerPanel/components/addEditRowFilterModalPopup/addEditRowFilterModalPopup.css
@@ -19,13 +19,14 @@
 
 .positron-modal-popup
 .add-edit-row-filter-modal-popup-body
-.button-apply-filter {
+.button-apply-row-filter {
 	height: 26px;
 	padding: 4px;
 	display: flex;
 	border-radius: 4px;
 	align-items: center;
 	justify-content: center;
+	text-transform: uppercase;
 	color: var(--vscode-positronModalDialog-defaultButtonForeground);
 	background-color: var(--vscode-positronModalDialog-defaultButtonBackground);
 }