Skip to content

Port trust fixes #12929

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.

Sign up for GitHub

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

Merged
Joyce Er (joyceerhl) merged 3 commits into from
Jul 13, 2020
Merged

Port trust fixes #12929

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e54e2f9
Fix regressions in trusted notebooks (#12902)
joyceerhl Jul 13, 2020
384456f
Recover from ENOENT due to missing parent directory when trusting not…
joyceerhl Jul 13, 2020
5126787
Disable keydown on native cells in untrusted notebooks (#12914)
joyceerhl Jul 13, 2020
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
Prev Previous commit
Disable keydown on native cells in untrusted notebooks (#12914)
  • Loading branch information
@joyceerhl
joyceerhl committed Jul 13, 2020
commit 512678711525752c8e5ada940de29547a33dd5ba
15 changes: 15 additions & 0 deletions src/datascience-ui/native-editor/nativeCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,9 @@ export class NativeCell extends React.Component<INativeCellProps> {

// tslint:disable-next-line: cyclomatic-complexity max-func-body-length
private keyDownInput = (cellId: string, e: IKeyboardEvent) => {
if (!this.isNotebookTrusted() && !isCellNavigationKeyboardEvent(e)) {
return;
}
const isFocusedWhenNotSuggesting = this.isFocused() && e.editorInfo && !e.editorInfo.isSuggesting;
switch (e.code) {
case 'ArrowUp':
Expand Down Expand Up @@ -886,3 +889,15 @@ export class NativeCell extends React.Component<INativeCellProps> {
export function getConnectedNativeCell() {
return connect(null, actionCreators)(NativeCell);
}

function isCellNavigationKeyboardEvent(e: IKeyboardEvent) {
return (
e.code === 'Enter' ||
e.code === 'NumpadEnter' ||
e.code === 'ArrowUp' ||
e.code === 'k' ||
e.code === 'ArrowDown' ||
e.code === 'j' ||
e.code === 'Escape'
);
}