@theia/notebook 1.53.0-next.4 → 1.53.0-next.55

package/src/browser/view/notebook-cell-toolbar-factory.tsx

@@ -1,102 +1,102 @@
-// *****************************************************************************
-// Copyright (C) 2023 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as React from '@theia/core/shared/react';
-import { CommandRegistry, CompoundMenuNodeRole, MenuModelRegistry, MenuNode } from '@theia/core';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
-import { NotebookCellSidebar, NotebookCellToolbar } from './notebook-cell-toolbar';
-import { ContextMenuRenderer } from '@theia/core/lib/browser';
-import { NotebookCellModel } from '../view-model/notebook-cell-model';
-import { NotebookContextManager } from '../service/notebook-context-manager';
-
-export interface NotebookCellToolbarItem {
-    id: string;
-    icon?: string;
-    label?: string;
-    onClick: (e: React.MouseEvent) => void;
-    isVisible: () => boolean;
-    contextKeys?: Set<string>
-}
-
-export interface toolbarItemOptions {
-    contextMenuArgs?: () => unknown[];
-    commandArgs?: () => unknown[];
-}
-
-@injectable()
-export class NotebookCellToolbarFactory {
-
-    @inject(MenuModelRegistry)
-    protected menuRegistry: MenuModelRegistry;
-
-    @inject(ContextKeyService)
-    protected contextKeyService: ContextKeyService;
-
-    @inject(ContextMenuRenderer)
-    protected readonly contextMenuRenderer: ContextMenuRenderer;
-
-    @inject(CommandRegistry)
-    protected readonly commandRegistry: CommandRegistry;
-
-    @inject(NotebookContextManager)
-    protected readonly notebookContextManager: NotebookContextManager;
-
-    renderCellToolbar(menuPath: string[], cell: NotebookCellModel, itemOptions: toolbarItemOptions): React.ReactNode {
-        return <NotebookCellToolbar getMenuItems={() => this.getMenuItems(menuPath, cell, itemOptions)}
-            onContextKeysChanged={this.notebookContextManager.onDidChangeContext} />;
-    }
-
-    renderSidebar(menuPath: string[], cell: NotebookCellModel, itemOptions: toolbarItemOptions): React.ReactNode {
-        return <NotebookCellSidebar getMenuItems={() => this.getMenuItems(menuPath, cell, itemOptions)}
-            onContextKeysChanged={this.notebookContextManager.onDidChangeContext} />;
-    }
-
-    private getMenuItems(menuItemPath: string[], cell: NotebookCellModel, itemOptions: toolbarItemOptions): NotebookCellToolbarItem[] {
-        const inlineItems: NotebookCellToolbarItem[] = [];
-        for (const menuNode of this.menuRegistry.getMenu(menuItemPath).children) {
-            if (!menuNode.when || this.notebookContextManager.getCellContext(cell.handle).match(menuNode.when, this.notebookContextManager.context)) {
-                if (menuNode.role === CompoundMenuNodeRole.Flat) {
-                    inlineItems.push(...menuNode.children?.map(child => this.createToolbarItem(child, itemOptions)) ?? []);
-                } else {
-                    inlineItems.push(this.createToolbarItem(menuNode, itemOptions));
-                }
-            }
-        }
-        return inlineItems;
-    }
-
-    private createToolbarItem(menuNode: MenuNode, itemOptions: toolbarItemOptions): NotebookCellToolbarItem {
-        const menuPath = menuNode.role === CompoundMenuNodeRole.Submenu ? this.menuRegistry.getPath(menuNode) : undefined;
-        return {
-            id: menuNode.id,
-            icon: menuNode.icon,
-            label: menuNode.label,
-            onClick: menuPath ?
-                e => this.contextMenuRenderer.render(
-                    {
-                        anchor: e.nativeEvent,
-                        menuPath,
-                        includeAnchorArg: false,
-                        args: itemOptions.contextMenuArgs?.(),
-                        context: this.notebookContextManager.context
-                    }) :
-                () => this.commandRegistry.executeCommand(menuNode.command!, ...(itemOptions.commandArgs?.() ?? [])),
-            isVisible: () => menuPath ? true : Boolean(this.commandRegistry.getVisibleHandler(menuNode.command!, ...(itemOptions.commandArgs?.() ?? []))),
-            contextKeys: menuNode.when ? this.contextKeyService.parseKeys(menuNode.when) : undefined
-        };
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2023 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as React from '@theia/core/shared/react';
+import { CommandRegistry, CompoundMenuNodeRole, MenuModelRegistry, MenuNode } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
+import { NotebookCellSidebar, NotebookCellToolbar } from './notebook-cell-toolbar';
+import { ContextMenuRenderer } from '@theia/core/lib/browser';
+import { NotebookCellModel } from '../view-model/notebook-cell-model';
+import { NotebookContextManager } from '../service/notebook-context-manager';
+
+export interface NotebookCellToolbarItem {
+    id: string;
+    icon?: string;
+    label?: string;
+    onClick: (e: React.MouseEvent) => void;
+    isVisible: () => boolean;
+    contextKeys?: Set<string>
+}
+
+export interface toolbarItemOptions {
+    contextMenuArgs?: () => unknown[];
+    commandArgs?: () => unknown[];
+}
+
+@injectable()
+export class NotebookCellToolbarFactory {
+
+    @inject(MenuModelRegistry)
+    protected menuRegistry: MenuModelRegistry;
+
+    @inject(ContextKeyService)
+    protected contextKeyService: ContextKeyService;
+
+    @inject(ContextMenuRenderer)
+    protected readonly contextMenuRenderer: ContextMenuRenderer;
+
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    @inject(NotebookContextManager)
+    protected readonly notebookContextManager: NotebookContextManager;
+
+    renderCellToolbar(menuPath: string[], cell: NotebookCellModel, itemOptions: toolbarItemOptions): React.ReactNode {
+        return <NotebookCellToolbar getMenuItems={() => this.getMenuItems(menuPath, cell, itemOptions)}
+            onContextKeysChanged={this.notebookContextManager.onDidChangeContext} />;
+    }
+
+    renderSidebar(menuPath: string[], cell: NotebookCellModel, itemOptions: toolbarItemOptions): React.ReactNode {
+        return <NotebookCellSidebar getMenuItems={() => this.getMenuItems(menuPath, cell, itemOptions)}
+            onContextKeysChanged={this.notebookContextManager.onDidChangeContext} />;
+    }
+
+    private getMenuItems(menuItemPath: string[], cell: NotebookCellModel, itemOptions: toolbarItemOptions): NotebookCellToolbarItem[] {
+        const inlineItems: NotebookCellToolbarItem[] = [];
+        for (const menuNode of this.menuRegistry.getMenu(menuItemPath).children) {
+            if (!menuNode.when || this.notebookContextManager.getCellContext(cell.handle).match(menuNode.when, this.notebookContextManager.context)) {
+                if (menuNode.role === CompoundMenuNodeRole.Flat) {
+                    inlineItems.push(...menuNode.children?.map(child => this.createToolbarItem(child, itemOptions)) ?? []);
+                } else {
+                    inlineItems.push(this.createToolbarItem(menuNode, itemOptions));
+                }
+            }
+        }
+        return inlineItems;
+    }
+
+    private createToolbarItem(menuNode: MenuNode, itemOptions: toolbarItemOptions): NotebookCellToolbarItem {
+        const menuPath = menuNode.role === CompoundMenuNodeRole.Submenu ? this.menuRegistry.getPath(menuNode) : undefined;
+        return {
+            id: menuNode.id,
+            icon: menuNode.icon,
+            label: menuNode.label,
+            onClick: menuPath ?
+                e => this.contextMenuRenderer.render(
+                    {
+                        anchor: e.nativeEvent,
+                        menuPath,
+                        includeAnchorArg: false,
+                        args: itemOptions.contextMenuArgs?.(),
+                        context: this.notebookContextManager.context
+                    }) :
+                () => this.commandRegistry.executeCommand(menuNode.command!, ...(itemOptions.commandArgs?.() ?? [])),
+            isVisible: () => menuPath ? true : Boolean(this.commandRegistry.getVisibleHandler(menuNode.command!, ...(itemOptions.commandArgs?.() ?? []))),
+            contextKeys: menuNode.when ? this.contextKeyService.parseKeys(menuNode.when) : undefined
+        };
+    }
+}

package/src/browser/view/notebook-cell-toolbar.tsx

@@ -1,74 +1,74 @@
-// *****************************************************************************
-// Copyright (C) 2023 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-import * as React from '@theia/core/shared/react';
-import { ACTION_ITEM } from '@theia/core/lib/browser';
-import { NotebookCellToolbarItem } from './notebook-cell-toolbar-factory';
-import { DisposableCollection, Event } from '@theia/core';
-import { ContextKeyChangeEvent } from '@theia/core/lib/browser/context-key-service';
-
-export interface NotebookCellToolbarProps {
-    getMenuItems: () => NotebookCellToolbarItem[];
-    onContextKeysChanged: Event<ContextKeyChangeEvent>;
-}
-
-interface NotebookCellToolbarState {
-    inlineItems: NotebookCellToolbarItem[];
-}
-
-abstract class NotebookCellActionBar extends React.Component<NotebookCellToolbarProps, NotebookCellToolbarState> {
-
-    protected toDispose = new DisposableCollection();
-
-    constructor(props: NotebookCellToolbarProps) {
-        super(props);
-        this.toDispose.push(props.onContextKeysChanged(e => {
-            const menuItems = this.props.getMenuItems();
-            if (menuItems.some(item => item.contextKeys ? e.affects(item.contextKeys) : false)) {
-                this.setState({ inlineItems: menuItems });
-            }
-        }));
-        this.state = { inlineItems: this.props.getMenuItems() };
-    }
-
-    override componentWillUnmount(): void {
-        this.toDispose.dispose();
-    }
-
-    protected renderItem(item: NotebookCellToolbarItem): React.ReactNode {
-        return <div key={item.id} title={item.label} onClick={item.onClick} className={`${item.icon} ${ACTION_ITEM} theia-notebook-cell-toolbar-item`} />;
-    }
-
-}
-
-export class NotebookCellToolbar extends NotebookCellActionBar {
-
-    override render(): React.ReactNode {
-        return <div className='theia-notebook-cell-toolbar'>
-            {this.state.inlineItems.filter(e => e.isVisible()).map(item => this.renderItem(item))}
-        </div>;
-    }
-
-}
-
-export class NotebookCellSidebar extends NotebookCellActionBar {
-
-    override render(): React.ReactNode {
-        return <div className='theia-notebook-cell-sidebar-toolbar'>
-            {this.state.inlineItems.filter(e => e.isVisible()).map(item => this.renderItem(item))}
-        </div>;
-    }
-}
-
+// *****************************************************************************
+// Copyright (C) 2023 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+import * as React from '@theia/core/shared/react';
+import { ACTION_ITEM } from '@theia/core/lib/browser';
+import { NotebookCellToolbarItem } from './notebook-cell-toolbar-factory';
+import { DisposableCollection, Event } from '@theia/core';
+import { ContextKeyChangeEvent } from '@theia/core/lib/browser/context-key-service';
+
+export interface NotebookCellToolbarProps {
+    getMenuItems: () => NotebookCellToolbarItem[];
+    onContextKeysChanged: Event<ContextKeyChangeEvent>;
+}
+
+interface NotebookCellToolbarState {
+    inlineItems: NotebookCellToolbarItem[];
+}
+
+abstract class NotebookCellActionBar extends React.Component<NotebookCellToolbarProps, NotebookCellToolbarState> {
+
+    protected toDispose = new DisposableCollection();
+
+    constructor(props: NotebookCellToolbarProps) {
+        super(props);
+        this.toDispose.push(props.onContextKeysChanged(e => {
+            const menuItems = this.props.getMenuItems();
+            if (menuItems.some(item => item.contextKeys ? e.affects(item.contextKeys) : false)) {
+                this.setState({ inlineItems: menuItems });
+            }
+        }));
+        this.state = { inlineItems: this.props.getMenuItems() };
+    }
+
+    override componentWillUnmount(): void {
+        this.toDispose.dispose();
+    }
+
+    protected renderItem(item: NotebookCellToolbarItem): React.ReactNode {
+        return <div key={item.id} title={item.label} onClick={item.onClick} className={`${item.icon} ${ACTION_ITEM} theia-notebook-cell-toolbar-item`} />;
+    }
+
+}
+
+export class NotebookCellToolbar extends NotebookCellActionBar {
+
+    override render(): React.ReactNode {
+        return <div className='theia-notebook-cell-toolbar'>
+            {this.state.inlineItems.filter(e => e.isVisible()).map(item => this.renderItem(item))}
+        </div>;
+    }
+
+}
+
+export class NotebookCellSidebar extends NotebookCellActionBar {
+
+    override render(): React.ReactNode {
+        return <div className='theia-notebook-cell-sidebar-toolbar'>
+            {this.state.inlineItems.filter(e => e.isVisible()).map(item => this.renderItem(item))}
+        </div>;
+    }
+}
+