fix cell editor and notebook output selection (#15384)

---------

Signed-off-by: Jonah Iden <[email protected]>

Author: jonah-iden

packages/notebook/src/browser/contributions/notebook-actions-contribution.ts

@@ -23,7 +23,10 @@ import { CellEditType, CellKind, NotebookCommand } from '../../common';
 import { NotebookKernelQuickPickService } from '../service/notebook-kernel-quick-pick-service';
 import { NotebookExecutionService } from '../service/notebook-execution-service';
 import { NotebookEditorWidgetService } from '../service/notebook-editor-widget-service';
-import { NOTEBOOK_CELL_CURSOR_FIRST_LINE, NOTEBOOK_CELL_CURSOR_LAST_LINE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_HAS_OUTPUTS } from './notebook-context-keys';
+import {
+    NOTEBOOK_CELL_CURSOR_FIRST_LINE, NOTEBOOK_CELL_CURSOR_LAST_LINE,
+    NOTEBOOK_CELL_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_OUTPUT_FOCUSED
+} from './notebook-context-keys';
 import { NotebookClipboardService } from '../service/notebook-clipboard-service';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { NotebookEditorWidget } from '../notebook-editor-widget';
@@ -344,17 +347,17 @@ export class NotebookActionsContribution implements CommandContribution, MenuCon
             {
                 command: NotebookCommands.CUT_SELECTED_CELL.id,
                 keybinding: 'ctrlcmd+x',
-                when: `${NOTEBOOK_EDITOR_FOCUSED} && !inputFocus`
+                when: `${NOTEBOOK_EDITOR_FOCUSED} && !inputFocus && !${NOTEBOOK_OUTPUT_FOCUSED}`
             },
             {
                 command: NotebookCommands.COPY_SELECTED_CELL.id,
                 keybinding: 'ctrlcmd+c',
-                when: `${NOTEBOOK_EDITOR_FOCUSED} && !inputFocus`
+                when: `${NOTEBOOK_EDITOR_FOCUSED} && !inputFocus && !${NOTEBOOK_OUTPUT_FOCUSED}`
             },
             {
                 command: NotebookCommands.PASTE_CELL.id,
                 keybinding: 'ctrlcmd+v',
-                when: `${NOTEBOOK_EDITOR_FOCUSED} && !inputFocus`
+                when: `${NOTEBOOK_EDITOR_FOCUSED} && !inputFocus && !${NOTEBOOK_OUTPUT_FOCUSED}`
             },
             {
                 command: NotebookCommands.NOTEBOOK_FIND.id,

packages/plugin-ext/src/main/browser/notebooks/renderers/cell-output-webview.tsx

@@ -43,6 +43,8 @@ import { NotebookCellModel } from '@theia/notebook/lib/browser/view-model/notebo
 import { CellOutput, NotebookCellsChangeType } from '@theia/notebook/lib/common';
 import { NotebookCellOutputModel } from '@theia/notebook/lib/browser/view-model/notebook-cell-output-model';
 import { Deferred } from '@theia/core/lib/common/promise-util';
+import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
+import { NOTEBOOK_OUTPUT_FOCUSED } from '@theia/notebook/lib/browser/contributions/notebook-context-keys';
 
 export const AdditionalNotebookCellOutputCss = Symbol('AdditionalNotebookCellOutputCss');
 
@@ -228,6 +230,9 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
     @inject(NotebookOptionsService)
     protected readonly notebookOptionsService: NotebookOptionsService;
 
+    @inject(ContextKeyService)
+    protected readonly contextKeyService: ContextKeyService;
+
     // returns the output Height
     protected readonly onDidRenderOutputEmitter = new Emitter<OutputRenderEvent>();
     readonly onDidRenderOutput = this.onDidRenderOutputEmitter.event;
@@ -524,6 +529,12 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
                     this.notebook.setSelectedCell(selectedCell);
                 }
                 break;
+            case 'webviewFocusChanged':
+                if (message.focused) {
+                    window.getSelection()?.empty();
+                }
+                this.contextKeyService.setContext(NOTEBOOK_OUTPUT_FOCUSED, message.focused);
+                break;
             case 'cellHeightRequest':
                 const cellHeight = this.notebook.getCellByHandle(message.cellHandle)?.cellHeight ?? 0;
                 this.webviewWidget.sendMessage({

packages/plugin-ext/src/main/browser/notebooks/renderers/output-webview-internal.ts

@@ -801,11 +801,15 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
             theia.postMessage({ type: 'inputFocusChanged', focused: focus } as webviewCommunication.InputFocusChange);
         }
     };
-
     window.addEventListener('focusin', (event: FocusEvent) => focusChange(event, true));
-
     window.addEventListener('focusout', (event: FocusEvent) => focusChange(event, false));
 
+    const webviewFocuseChange = (focus: boolean) => {
+        theia.postMessage({ type: 'webviewFocusChanged', focused: focus } as webviewCommunication.WebviewFocusChange);
+    };
+    window.addEventListener('focus', () => webviewFocuseChange(true));
+    window.addEventListener('blur', () => webviewFocuseChange(false));
+
     new ResizeObserver(() => {
         theia.postMessage({
             type: 'bodyHeightChange',

packages/plugin-ext/src/main/browser/notebooks/renderers/webview-communication.ts

@@ -150,6 +150,11 @@ export interface CellOuputFocus {
     readonly cellHandle: number;
 }
 
+export interface WebviewFocusChange {
+    readonly type: 'webviewFocusChanged';
+    readonly focused: boolean;
+}
+
 export interface CellHeightRequest {
     readonly type: 'cellHeightRequest';
     readonly cellHandle: number;
@@ -167,6 +172,7 @@ export type FromWebviewMessage = WebviewInitialized
     | KernelMessage
     | InputFocusChange
     | CellOuputFocus
+    | WebviewFocusChange
     | CellHeightRequest
     | BodyHeightChange;