Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/add edit filters through filter bar #2591

Merged
merged 21 commits into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/vs/base/browser/ui/codicons/codicon/codicon.ttf
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
border: none;
cursor: pointer;
background-color: transparent;
font-family: unset !important;
}

.button:focus {
Expand Down
1 change: 1 addition & 0 deletions src/vs/base/common/codicons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2022 Posit Software, PBC. All rights reserved.
*--------------------------------------------------------------------------------------------*/

// CSS>
// CSS.
import 'vs/css!./okActionBar';

// React.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export const PositronModalDialog = (props: PropsWithChildren<PositronModalDialog
// Enter accepts dialog.
case 'Enter': {
consumeEvent();
props.onAccept?.();
props.onAccept();
break;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export interface PositronModalPopupProps {
height: number | 'min-content';
focusableElementSelectors?: string;
keyboardNavigation: KeyboardNavigation;
onAccept?: () => void;
}

/**
Expand Down Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Loading
Loading