@theia/notebook 1.77.0-next.99 → 1.78.0-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/contributions/cell-operations.d.ts +3 -3
- package/lib/browser/contributions/cell-operations.d.ts.map +1 -1
- package/lib/browser/contributions/cell-operations.js +3 -6
- package/lib/browser/contributions/cell-operations.js.map +1 -1
- package/lib/browser/contributions/notebook-actions-contribution.d.ts +6 -6
- package/lib/browser/contributions/notebook-actions-contribution.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-actions-contribution.js +81 -91
- package/lib/browser/contributions/notebook-actions-contribution.js.map +1 -1
- package/lib/browser/contributions/notebook-cell-actions-contribution.d.ts +6 -6
- package/lib/browser/contributions/notebook-cell-actions-contribution.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-cell-actions-contribution.js +119 -130
- package/lib/browser/contributions/notebook-cell-actions-contribution.js.map +1 -1
- package/lib/browser/contributions/notebook-color-contribution.js +18 -21
- package/lib/browser/contributions/notebook-color-contribution.js.map +1 -1
- package/lib/browser/contributions/notebook-context-keys.js +72 -75
- package/lib/browser/contributions/notebook-context-keys.js.map +1 -1
- package/lib/browser/contributions/notebook-label-provider-contribution.d.ts +5 -5
- package/lib/browser/contributions/notebook-label-provider-contribution.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-label-provider-contribution.js +20 -25
- package/lib/browser/contributions/notebook-label-provider-contribution.js.map +1 -1
- package/lib/browser/contributions/notebook-outline-contribution.d.ts +5 -5
- package/lib/browser/contributions/notebook-outline-contribution.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-outline-contribution.js +31 -38
- package/lib/browser/contributions/notebook-outline-contribution.js.map +1 -1
- package/lib/browser/contributions/notebook-output-action-contribution.d.ts +3 -3
- package/lib/browser/contributions/notebook-output-action-contribution.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-output-action-contribution.js +15 -20
- package/lib/browser/contributions/notebook-output-action-contribution.js.map +1 -1
- package/lib/browser/contributions/notebook-status-bar-contribution.d.ts +1 -1
- package/lib/browser/contributions/notebook-status-bar-contribution.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-status-bar-contribution.js +16 -19
- package/lib/browser/contributions/notebook-status-bar-contribution.js.map +1 -1
- package/lib/browser/contributions/notebook-undo-redo-handler.d.ts +1 -1
- package/lib/browser/contributions/notebook-undo-redo-handler.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-undo-redo-handler.js +10 -14
- package/lib/browser/contributions/notebook-undo-redo-handler.js.map +1 -1
- package/lib/browser/index.d.ts +13 -13
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +13 -16
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/notebook-cell-open-handler.d.ts +1 -1
- package/lib/browser/notebook-cell-open-handler.d.ts.map +1 -1
- package/lib/browser/notebook-cell-open-handler.js +14 -19
- package/lib/browser/notebook-cell-open-handler.js.map +1 -1
- package/lib/browser/notebook-cell-resource-resolver.d.ts +3 -3
- package/lib/browser/notebook-cell-resource-resolver.d.ts.map +1 -1
- package/lib/browser/notebook-cell-resource-resolver.js +21 -27
- package/lib/browser/notebook-cell-resource-resolver.js.map +1 -1
- package/lib/browser/notebook-editor-split-contribution.d.ts +2 -2
- package/lib/browser/notebook-editor-split-contribution.d.ts.map +1 -1
- package/lib/browser/notebook-editor-split-contribution.js +10 -14
- package/lib/browser/notebook-editor-split-contribution.js.map +1 -1
- package/lib/browser/notebook-editor-widget-factory.d.ts +3 -3
- package/lib/browser/notebook-editor-widget-factory.d.ts.map +1 -1
- package/lib/browser/notebook-editor-widget-factory.js +25 -32
- package/lib/browser/notebook-editor-widget-factory.js.map +1 -1
- package/lib/browser/notebook-editor-widget.d.ts +23 -24
- package/lib/browser/notebook-editor-widget.d.ts.map +1 -1
- package/lib/browser/notebook-editor-widget.js +92 -108
- package/lib/browser/notebook-editor-widget.js.map +1 -1
- package/lib/browser/notebook-frontend-module.js +97 -99
- package/lib/browser/notebook-frontend-module.js.map +1 -1
- package/lib/browser/notebook-open-handler.d.ts +3 -3
- package/lib/browser/notebook-open-handler.d.ts.map +1 -1
- package/lib/browser/notebook-open-handler.js +18 -22
- package/lib/browser/notebook-open-handler.js.map +1 -1
- package/lib/browser/notebook-output-utils.js +9 -13
- package/lib/browser/notebook-output-utils.js.map +1 -1
- package/lib/browser/notebook-renderer-registry.d.ts +1 -1
- package/lib/browser/notebook-renderer-registry.d.ts.map +1 -1
- package/lib/browser/notebook-renderer-registry.js +11 -14
- package/lib/browser/notebook-renderer-registry.js.map +1 -1
- package/lib/browser/notebook-type-registry.d.ts +2 -2
- package/lib/browser/notebook-type-registry.d.ts.map +1 -1
- package/lib/browser/notebook-type-registry.js +14 -19
- package/lib/browser/notebook-type-registry.js.map +1 -1
- package/lib/browser/notebook-types.d.ts +2 -2
- package/lib/browser/notebook-types.d.ts.map +1 -1
- package/lib/browser/notebook-types.js +2 -5
- package/lib/browser/notebook-types.js.map +1 -1
- package/lib/browser/renderers/cell-output-webview.d.ts +5 -5
- package/lib/browser/renderers/cell-output-webview.d.ts.map +1 -1
- package/lib/browser/renderers/cell-output-webview.js +2 -5
- package/lib/browser/renderers/cell-output-webview.js.map +1 -1
- package/lib/browser/service/notebook-cell-editor-service.d.ts +2 -2
- package/lib/browser/service/notebook-cell-editor-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-cell-editor-service.js +18 -26
- package/lib/browser/service/notebook-cell-editor-service.js.map +1 -1
- package/lib/browser/service/notebook-cell-status-bar-service.d.ts +1 -1
- package/lib/browser/service/notebook-cell-status-bar-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-cell-status-bar-service.js +12 -16
- package/lib/browser/service/notebook-cell-status-bar-service.js.map +1 -1
- package/lib/browser/service/notebook-clipboard-service.d.ts +2 -2
- package/lib/browser/service/notebook-clipboard-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-clipboard-service.js +10 -14
- package/lib/browser/service/notebook-clipboard-service.js.map +1 -1
- package/lib/browser/service/notebook-context-manager.d.ts +5 -5
- package/lib/browser/service/notebook-context-manager.d.ts.map +1 -1
- package/lib/browser/service/notebook-context-manager.js +39 -45
- package/lib/browser/service/notebook-context-manager.js.map +1 -1
- package/lib/browser/service/notebook-editor-widget-service.d.ts +1 -1
- package/lib/browser/service/notebook-editor-widget-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-editor-widget-service.js +28 -37
- package/lib/browser/service/notebook-editor-widget-service.js.map +1 -1
- package/lib/browser/service/notebook-execution-service.d.ts +6 -6
- package/lib/browser/service/notebook-execution-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-execution-service.js +27 -36
- package/lib/browser/service/notebook-execution-service.js.map +1 -1
- package/lib/browser/service/notebook-execution-state-service.d.ts +4 -4
- package/lib/browser/service/notebook-execution-state-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-execution-state-service.js +34 -41
- package/lib/browser/service/notebook-execution-state-service.js.map +1 -1
- package/lib/browser/service/notebook-kernel-history-service.d.ts +2 -2
- package/lib/browser/service/notebook-kernel-history-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-kernel-history-service.js +18 -27
- package/lib/browser/service/notebook-kernel-history-service.js.map +1 -1
- package/lib/browser/service/notebook-kernel-quick-pick-service.d.ts +5 -5
- package/lib/browser/service/notebook-kernel-quick-pick-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-kernel-quick-pick-service.js +42 -51
- package/lib/browser/service/notebook-kernel-quick-pick-service.js.map +1 -1
- package/lib/browser/service/notebook-kernel-service.d.ts +3 -3
- package/lib/browser/service/notebook-kernel-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-kernel-service.js +25 -34
- package/lib/browser/service/notebook-kernel-service.js.map +1 -1
- package/lib/browser/service/notebook-model-resolver-service.d.ts +5 -5
- package/lib/browser/service/notebook-model-resolver-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-model-resolver-service.js +27 -35
- package/lib/browser/service/notebook-model-resolver-service.js.map +1 -1
- package/lib/browser/service/notebook-monaco-text-model-service.d.ts +1 -1
- package/lib/browser/service/notebook-monaco-text-model-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-monaco-text-model-service.js +17 -22
- package/lib/browser/service/notebook-monaco-text-model-service.js.map +1 -1
- package/lib/browser/service/notebook-options.d.ts +1 -1
- package/lib/browser/service/notebook-options.d.ts.map +1 -1
- package/lib/browser/service/notebook-options.js +36 -43
- package/lib/browser/service/notebook-options.js.map +1 -1
- package/lib/browser/service/notebook-renderer-messaging-service.d.ts +1 -1
- package/lib/browser/service/notebook-renderer-messaging-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-renderer-messaging-service.js +11 -15
- package/lib/browser/service/notebook-renderer-messaging-service.js.map +1 -1
- package/lib/browser/service/notebook-service.d.ts +5 -5
- package/lib/browser/service/notebook-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-service.js +35 -43
- package/lib/browser/service/notebook-service.js.map +1 -1
- package/lib/browser/view/notebook-cell-editor.d.ts +8 -8
- package/lib/browser/view/notebook-cell-editor.d.ts.map +1 -1
- package/lib/browser/view/notebook-cell-editor.js +31 -36
- package/lib/browser/view/notebook-cell-editor.js.map +1 -1
- package/lib/browser/view/notebook-cell-list-view.d.ts +6 -6
- package/lib/browser/view/notebook-cell-list-view.d.ts.map +1 -1
- package/lib/browser/view/notebook-cell-list-view.js +28 -35
- package/lib/browser/view/notebook-cell-list-view.js.map +1 -1
- package/lib/browser/view/notebook-cell-toolbar-factory.d.ts +2 -2
- package/lib/browser/view/notebook-cell-toolbar-factory.d.ts.map +1 -1
- package/lib/browser/view/notebook-cell-toolbar-factory.js +29 -37
- package/lib/browser/view/notebook-cell-toolbar-factory.js.map +1 -1
- package/lib/browser/view/notebook-cell-toolbar.d.ts +1 -1
- package/lib/browser/view/notebook-cell-toolbar.d.ts.map +1 -1
- package/lib/browser/view/notebook-cell-toolbar.js +10 -16
- package/lib/browser/view/notebook-cell-toolbar.js.map +1 -1
- package/lib/browser/view/notebook-code-cell-view.d.ts +13 -13
- package/lib/browser/view/notebook-code-cell-view.d.ts.map +1 -1
- package/lib/browser/view/notebook-code-cell-view.js +89 -110
- package/lib/browser/view/notebook-code-cell-view.js.map +1 -1
- package/lib/browser/view/notebook-find-widget.js +20 -25
- package/lib/browser/view/notebook-find-widget.js.map +1 -1
- package/lib/browser/view/notebook-main-toolbar.d.ts +3 -3
- package/lib/browser/view/notebook-main-toolbar.d.ts.map +1 -1
- package/lib/browser/view/notebook-main-toolbar.js +41 -51
- package/lib/browser/view/notebook-main-toolbar.js.map +1 -1
- package/lib/browser/view/notebook-markdown-cell-view.d.ts +8 -8
- package/lib/browser/view/notebook-markdown-cell-view.d.ts.map +1 -1
- package/lib/browser/view/notebook-markdown-cell-view.js +48 -60
- package/lib/browser/view/notebook-markdown-cell-view.js.map +1 -1
- package/lib/browser/view/notebook-viewport-service.d.ts +1 -1
- package/lib/browser/view/notebook-viewport-service.d.ts.map +1 -1
- package/lib/browser/view/notebook-viewport-service.js +7 -10
- package/lib/browser/view/notebook-viewport-service.js.map +1 -1
- package/lib/browser/view-model/notebook-cell-model.d.ts +5 -5
- package/lib/browser/view-model/notebook-cell-model.d.ts.map +1 -1
- package/lib/browser/view-model/notebook-cell-model.js +45 -57
- package/lib/browser/view-model/notebook-cell-model.js.map +1 -1
- package/lib/browser/view-model/notebook-cell-output-model.d.ts +1 -1
- package/lib/browser/view-model/notebook-cell-output-model.d.ts.map +1 -1
- package/lib/browser/view-model/notebook-cell-output-model.js +7 -11
- package/lib/browser/view-model/notebook-cell-output-model.js.map +1 -1
- package/lib/browser/view-model/notebook-model.d.ts +6 -6
- package/lib/browser/view-model/notebook-model.d.ts.map +1 -1
- package/lib/browser/view-model/notebook-model.js +49 -62
- package/lib/browser/view-model/notebook-model.js.map +1 -1
- package/lib/browser/view-model/notebook-view-model.d.ts +2 -2
- package/lib/browser/view-model/notebook-view-model.d.ts.map +1 -1
- package/lib/browser/view-model/notebook-view-model.js +11 -15
- package/lib/browser/view-model/notebook-view-model.js.map +1 -1
- package/lib/common/index.d.ts +2 -2
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +2 -5
- package/lib/common/index.js.map +1 -1
- package/lib/common/notebook-common.js +20 -24
- package/lib/common/notebook-common.js.map +1 -1
- package/lib/common/notebook-preferences.js +16 -20
- package/lib/common/notebook-preferences.js.map +1 -1
- package/lib/common/notebook-protocol.js +1 -2
- package/lib/common/notebook-protocol.js.map +1 -1
- package/lib/common/notebook-range.js +1 -2
- package/lib/common/notebook-range.js.map +1 -1
- package/lib/node/notebook-backend-module.js +4 -6
- package/lib/node/notebook-backend-module.js.map +1 -1
- package/package.json +18 -8
- package/src/browser/contributions/cell-operations.ts +3 -3
- package/src/browser/contributions/notebook-actions-contribution.ts +9 -9
- package/src/browser/contributions/notebook-cell-actions-contribution.ts +12 -12
- package/src/browser/contributions/notebook-label-provider-contribution.ts +6 -6
- package/src/browser/contributions/notebook-outline-contribution.ts +6 -6
- package/src/browser/contributions/notebook-output-action-contribution.ts +3 -3
- package/src/browser/contributions/notebook-status-bar-contribution.ts +2 -2
- package/src/browser/contributions/notebook-undo-redo-handler.ts +1 -1
- package/src/browser/index.ts +13 -13
- package/src/browser/notebook-cell-open-handler.ts +2 -2
- package/src/browser/notebook-cell-resource-resolver.ts +4 -4
- package/src/browser/notebook-editor-split-contribution.ts +2 -2
- package/src/browser/notebook-editor-widget-factory.ts +4 -4
- package/src/browser/notebook-editor-widget.tsx +22 -18
- package/src/browser/notebook-frontend-module.ts +33 -33
- package/src/browser/notebook-open-handler.ts +3 -3
- package/src/browser/notebook-renderer-registry.ts +1 -1
- package/src/browser/notebook-type-registry.ts +2 -2
- package/src/browser/notebook-types.ts +2 -2
- package/src/browser/renderers/cell-output-webview.ts +5 -5
- package/src/browser/service/notebook-cell-editor-service.ts +3 -3
- package/src/browser/service/notebook-cell-status-bar-service.ts +1 -1
- package/src/browser/service/notebook-clipboard-service.ts +2 -2
- package/src/browser/service/notebook-context-manager.ts +7 -7
- package/src/browser/service/notebook-editor-widget-service.ts +2 -2
- package/src/browser/service/notebook-execution-service.ts +7 -7
- package/src/browser/service/notebook-execution-state-service.ts +4 -4
- package/src/browser/service/notebook-kernel-history-service.ts +3 -3
- package/src/browser/service/notebook-kernel-quick-pick-service.ts +6 -6
- package/src/browser/service/notebook-kernel-service.ts +3 -3
- package/src/browser/service/notebook-model-resolver-service.ts +5 -5
- package/src/browser/service/notebook-monaco-text-model-service.ts +2 -2
- package/src/browser/service/notebook-options.ts +7 -6
- package/src/browser/service/notebook-renderer-messaging-service.ts +1 -1
- package/src/browser/service/notebook-service.ts +5 -5
- package/src/browser/view/notebook-cell-editor.tsx +12 -12
- package/src/browser/view/notebook-cell-list-view.tsx +8 -8
- package/src/browser/view/notebook-cell-toolbar-factory.tsx +3 -3
- package/src/browser/view/notebook-cell-toolbar.tsx +1 -1
- package/src/browser/view/notebook-code-cell-view.tsx +16 -16
- package/src/browser/view/notebook-find-widget.tsx +1 -1
- package/src/browser/view/notebook-main-toolbar.tsx +4 -4
- package/src/browser/view/notebook-markdown-cell-view.tsx +11 -11
- package/src/browser/view-model/notebook-cell-model.ts +6 -6
- package/src/browser/view-model/notebook-cell-output-model.ts +2 -2
- package/src/browser/view-model/notebook-model.ts +6 -6
- package/src/browser/view-model/notebook-view-model.ts +2 -2
- package/src/common/index.ts +2 -2
- package/src/node/notebook-backend-module.ts +1 -1
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.NotebookMainToolbar = exports.NotebookMainToolbarRenderer = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const jsx_runtime_1 = require("@theia/core/shared/react/jsx-runtime");
|
|
1
|
+
import { __decorate } from "tslib";
|
|
2
|
+
import { jsx as _jsx, jsxs as _jsxs } from "@theia/core/shared/react/jsx-runtime";
|
|
6
3
|
// *****************************************************************************
|
|
7
4
|
// Copyright (C) 2023 TypeFox and others.
|
|
8
5
|
//
|
|
@@ -18,56 +15,50 @@ const jsx_runtime_1 = require("@theia/core/shared/react/jsx-runtime");
|
|
|
18
15
|
//
|
|
19
16
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
20
17
|
// *****************************************************************************
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
18
|
+
import { ArrayUtils, CommandMenu, CommandRegistry, DisposableCollection, Group, GroupImpl, MenuModelRegistry, nls } from '@theia/core';
|
|
19
|
+
import * as React from '@theia/core/shared/react';
|
|
20
|
+
import { codicon, ContextMenuRenderer } from '@theia/core/lib/browser';
|
|
21
|
+
import { NotebookCommands, NotebookMenus } from '../contributions/notebook-actions-contribution.js';
|
|
22
|
+
import { NotebookKernelService } from '../service/notebook-kernel-service.js';
|
|
23
|
+
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
24
|
+
import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
|
|
25
|
+
import { NotebookContextManager } from '../service/notebook-context-manager.js';
|
|
29
26
|
let NotebookMainToolbarRenderer = class NotebookMainToolbarRenderer {
|
|
30
27
|
render(notebookModel, editorNode) {
|
|
31
|
-
return (
|
|
28
|
+
return _jsx(NotebookMainToolbar, { notebookModel: notebookModel, menuRegistry: this.menuRegistry, notebookKernelService: this.notebookKernelService, commandRegistry: this.commandRegistry, contextKeyService: this.contextKeyService, editorNode: editorNode, notebookContextManager: this.notebookContextManager, contextMenuRenderer: this.contextMenuRenderer });
|
|
32
29
|
}
|
|
33
30
|
};
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
(0, inversify_1.inject)(notebook_kernel_service_1.NotebookKernelService),
|
|
37
|
-
tslib_1.__metadata("design:type", notebook_kernel_service_1.NotebookKernelService)
|
|
31
|
+
__decorate([
|
|
32
|
+
inject(NotebookKernelService)
|
|
38
33
|
], NotebookMainToolbarRenderer.prototype, "notebookKernelService", void 0);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
tslib_1.__metadata("design:type", core_1.CommandRegistry)
|
|
34
|
+
__decorate([
|
|
35
|
+
inject(CommandRegistry)
|
|
42
36
|
], NotebookMainToolbarRenderer.prototype, "commandRegistry", void 0);
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
tslib_1.__metadata("design:type", core_1.MenuModelRegistry)
|
|
37
|
+
__decorate([
|
|
38
|
+
inject(MenuModelRegistry)
|
|
46
39
|
], NotebookMainToolbarRenderer.prototype, "menuRegistry", void 0);
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
tslib_1.__metadata("design:type", Object)
|
|
40
|
+
__decorate([
|
|
41
|
+
inject(ContextKeyService)
|
|
50
42
|
], NotebookMainToolbarRenderer.prototype, "contextKeyService", void 0);
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
tslib_1.__metadata("design:type", notebook_context_manager_1.NotebookContextManager)
|
|
43
|
+
__decorate([
|
|
44
|
+
inject(NotebookContextManager)
|
|
54
45
|
], NotebookMainToolbarRenderer.prototype, "notebookContextManager", void 0);
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
tslib_1.__metadata("design:type", browser_1.ContextMenuRenderer)
|
|
46
|
+
__decorate([
|
|
47
|
+
inject(ContextMenuRenderer)
|
|
58
48
|
], NotebookMainToolbarRenderer.prototype, "contextMenuRenderer", void 0);
|
|
59
|
-
|
|
60
|
-
|
|
49
|
+
NotebookMainToolbarRenderer = __decorate([
|
|
50
|
+
injectable()
|
|
61
51
|
], NotebookMainToolbarRenderer);
|
|
62
|
-
|
|
52
|
+
export { NotebookMainToolbarRenderer };
|
|
53
|
+
export class NotebookMainToolbar extends React.Component {
|
|
63
54
|
// The minimum area between items and kernel select before hiding items in a context menu
|
|
64
55
|
static { this.MIN_FREE_AREA = 10; }
|
|
65
56
|
constructor(props) {
|
|
66
57
|
super(props);
|
|
67
|
-
this.toDispose = new
|
|
58
|
+
this.toDispose = new DisposableCollection();
|
|
68
59
|
this.nativeSubmenus = [
|
|
69
|
-
|
|
70
|
-
|
|
60
|
+
NotebookMenus.NOTEBOOK_MAIN_TOOLBAR_CELL_ADD_GROUP[NotebookMenus.NOTEBOOK_MAIN_TOOLBAR_CELL_ADD_GROUP.length - 1],
|
|
61
|
+
NotebookMenus.NOTEBOOK_MAIN_TOOLBAR_EXECUTION_GROUP[NotebookMenus.NOTEBOOK_MAIN_TOOLBAR_EXECUTION_GROUP.length - 1]
|
|
71
62
|
];
|
|
72
63
|
this.lastGapElementWidth = 0;
|
|
73
64
|
this.resizeObserver = new ResizeObserver(() => this.calculateItemsToHide());
|
|
@@ -116,11 +107,11 @@ class NotebookMainToolbar extends React.Component {
|
|
|
116
107
|
}
|
|
117
108
|
renderContextMenu(event, menuItems) {
|
|
118
109
|
const hiddenItems = menuItems.slice(menuItems.length - this.calculateNumberOfHiddenItems(menuItems));
|
|
119
|
-
const menu = new
|
|
110
|
+
const menu = new GroupImpl(NotebookMenus.NOTEBOOK_MAIN_TOOLBAR_HIDDEN_ITEMS_CONTEXT_MENU[0]);
|
|
120
111
|
hiddenItems.forEach(item => menu.addNode(item));
|
|
121
112
|
this.props.contextMenuRenderer.render({
|
|
122
113
|
anchor: event,
|
|
123
|
-
menuPath:
|
|
114
|
+
menuPath: NotebookMenus.NOTEBOOK_MAIN_TOOLBAR_HIDDEN_ITEMS_CONTEXT_MENU,
|
|
124
115
|
menu: menu,
|
|
125
116
|
contextKeyService: this.props.contextKeyService,
|
|
126
117
|
context: this.props.editorNode,
|
|
@@ -129,8 +120,8 @@ class NotebookMainToolbar extends React.Component {
|
|
|
129
120
|
}
|
|
130
121
|
render() {
|
|
131
122
|
const menuItems = this.getMenuItems();
|
|
132
|
-
return (
|
|
133
|
-
(
|
|
123
|
+
return _jsxs("div", { className: 'theia-notebook-main-toolbar', id: 'notebook-main-toolbar', children: [menuItems.slice(0, menuItems.length - this.calculateNumberOfHiddenItems(menuItems)).map(item => this.renderMenuItem(NotebookMenus.NOTEBOOK_MAIN_TOOLBAR, item)), this.state.numberOfHiddenItems > 0 &&
|
|
124
|
+
_jsx("span", { className: `${codicon('ellipsis')} action-label theia-notebook-main-toolbar-item`, onClick: e => this.renderContextMenu(e.nativeEvent, menuItems) }), _jsx("div", { ref: element => this.gapElementChanged(element), style: { flexGrow: 1 } }), _jsxs("div", { className: 'theia-notebook-main-toolbar-item action-label', id: NotebookCommands.SELECT_KERNEL_COMMAND.id, onClick: () => this.props.commandRegistry.executeCommand(NotebookCommands.SELECT_KERNEL_COMMAND.id, this.props.notebookModel), children: [_jsx("span", { className: codicon('server-environment') }), _jsx("span", { className: ' theia-notebook-main-toolbar-item-text', id: 'kernel-text', children: this.state.selectedKernelLabel ?? nls.localizeByDefault('Select Kernel') })] })] });
|
|
134
125
|
}
|
|
135
126
|
gapElementChanged(element) {
|
|
136
127
|
if (this.gapElement) {
|
|
@@ -143,19 +134,19 @@ class NotebookMainToolbar extends React.Component {
|
|
|
143
134
|
}
|
|
144
135
|
}
|
|
145
136
|
renderMenuItem(itemPath, item, submenu) {
|
|
146
|
-
if (
|
|
147
|
-
const itemNodes =
|
|
148
|
-
return (
|
|
137
|
+
if (Group.is(item)) {
|
|
138
|
+
const itemNodes = ArrayUtils.coalesce(item.children?.map(child => this.renderMenuItem([...itemPath, child.id], child, item.id)) ?? []);
|
|
139
|
+
return _jsxs(React.Fragment, { children: [itemNodes, itemNodes && itemNodes.length > 0 && _jsx("span", { className: 'theia-notebook-toolbar-separator' }, `${item.id}-separator`)] }, item.id);
|
|
149
140
|
}
|
|
150
|
-
else if (
|
|
151
|
-
return (
|
|
141
|
+
else if (CommandMenu.is(item) && ((this.nativeSubmenus.includes(submenu ?? '')) || item.isVisible(itemPath, this.props.contextKeyService, this.props.editorNode))) {
|
|
142
|
+
return _jsxs("div", { id: item.id, title: item.label, className: `theia-notebook-main-toolbar-item action-label${this.getAdditionalClasses(itemPath, item)}`, onClick: () => {
|
|
152
143
|
item.run(itemPath, this.props.notebookModel.uri);
|
|
153
|
-
}, children: [(
|
|
144
|
+
}, children: [_jsx("span", { className: item.icon }), _jsx("span", { className: 'theia-notebook-main-toolbar-item-text', children: item.label })] }, item.id);
|
|
154
145
|
}
|
|
155
146
|
return undefined;
|
|
156
147
|
}
|
|
157
148
|
getMenuItems() {
|
|
158
|
-
return this.props.menuRegistry.getMenu(
|
|
149
|
+
return this.props.menuRegistry.getMenu(NotebookMenus.NOTEBOOK_MAIN_TOOLBAR).children; // we contribute to this menu, so it exists
|
|
159
150
|
}
|
|
160
151
|
getAdditionalClasses(itemPath, item) {
|
|
161
152
|
return item.isEnabled(itemPath, this.props.editorNode) ? '' : ' theia-mod-disabled';
|
|
@@ -166,5 +157,4 @@ class NotebookMainToolbar extends React.Component {
|
|
|
166
157
|
this.state.numberOfHiddenItems % allMenuItems.length;
|
|
167
158
|
}
|
|
168
159
|
}
|
|
169
|
-
exports.NotebookMainToolbar = NotebookMainToolbar;
|
|
170
160
|
//# sourceMappingURL=notebook-main-toolbar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-main-toolbar.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-main-toolbar.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"notebook-main-toolbar.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-main-toolbar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import * as React from '@theia/core/shared/react';
|
|
2
|
-
import { NotebookModel } from '../view-model/notebook-model';
|
|
3
|
-
import { CellRenderer } from './notebook-cell-list-view';
|
|
4
|
-
import { NotebookCellModel } from '../view-model/notebook-cell-model';
|
|
2
|
+
import { NotebookModel } from '../view-model/notebook-model.js';
|
|
3
|
+
import { CellRenderer } from './notebook-cell-list-view.js';
|
|
4
|
+
import { NotebookCellModel } from '../view-model/notebook-cell-model.js';
|
|
5
5
|
import { MonacoEditorServices } from '@theia/monaco/lib/browser/monaco-editor';
|
|
6
6
|
import { CommandRegistry } from '@theia/core';
|
|
7
|
-
import { NotebookContextManager } from '../service/notebook-context-manager';
|
|
8
|
-
import { NotebookOptionsService } from '../service/notebook-options';
|
|
9
|
-
import { NotebookCellEditorService } from '../service/notebook-cell-editor-service';
|
|
10
|
-
import { NotebookCellStatusBarService } from '../service/notebook-cell-status-bar-service';
|
|
7
|
+
import { NotebookContextManager } from '../service/notebook-context-manager.js';
|
|
8
|
+
import { NotebookOptionsService } from '../service/notebook-options.js';
|
|
9
|
+
import { NotebookCellEditorService } from '../service/notebook-cell-editor-service.js';
|
|
10
|
+
import { NotebookCellStatusBarService } from '../service/notebook-cell-status-bar-service.js';
|
|
11
11
|
import { LabelParser } from '@theia/core/lib/browser/label-parser';
|
|
12
|
-
import { NotebookViewModel } from '../view-model/notebook-view-model';
|
|
12
|
+
import { NotebookViewModel } from '../view-model/notebook-view-model.js';
|
|
13
13
|
export declare class NotebookMarkdownCellRenderer implements CellRenderer {
|
|
14
14
|
private readonly markdownRenderer;
|
|
15
15
|
protected readonly monacoServices: MonacoEditorServices;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-markdown-cell-view.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-markdown-cell-view.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAGlD,OAAO,EAAE,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"notebook-markdown-cell-view.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-markdown-cell-view.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAGlD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAqB,MAAM,8BAA8B,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAGzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAO,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAIxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,EAAE,4BAA4B,EAAE,MAAM,gDAAgD,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,qBACa,4BAA6B,YAAW,YAAY;IAG7D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IAEpD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAGlE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAGlE,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAGxE,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B,CAAC;IAG9E,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,MAAM,CAAC,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,GAAG,KAAK,CAAC,SAAS;IAgB9E,aAAa,CAAC,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,GAAG,KAAK,CAAC,SAAS;IAIrF,eAAe,CAAC,IAAI,EAAE,iBAAiB,GAAG,WAAW;CAQxD"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.NotebookMarkdownCellRenderer = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const jsx_runtime_1 = require("@theia/core/shared/react/jsx-runtime");
|
|
1
|
+
import { __decorate } from "tslib";
|
|
2
|
+
import { jsx as _jsx, jsxs as _jsxs } from "@theia/core/shared/react/jsx-runtime";
|
|
6
3
|
// *****************************************************************************
|
|
7
4
|
// Copyright (C) 2023 TypeFox and others.
|
|
8
5
|
//
|
|
@@ -18,78 +15,69 @@ const jsx_runtime_1 = require("@theia/core/shared/react/jsx-runtime");
|
|
|
18
15
|
//
|
|
19
16
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
20
17
|
// *****************************************************************************
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
18
|
+
import * as React from '@theia/core/shared/react';
|
|
19
|
+
import { MarkdownRenderer } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
|
|
20
|
+
import { MarkdownStringImpl } from '@theia/core/lib/common/markdown-rendering/markdown-string';
|
|
21
|
+
import { observeCellHeight } from './notebook-cell-list-view.js';
|
|
22
|
+
import { CellEditor } from './notebook-cell-editor.js';
|
|
23
|
+
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
24
|
+
import { MonacoEditorServices } from '@theia/monaco/lib/browser/monaco-editor';
|
|
25
|
+
import { CommandRegistry, nls } from '@theia/core';
|
|
26
|
+
import { NotebookContextManager } from '../service/notebook-context-manager.js';
|
|
27
|
+
import { NotebookOptionsService } from '../service/notebook-options.js';
|
|
28
|
+
import { NotebookCodeCellStatus } from './notebook-code-cell-view.js';
|
|
29
|
+
import mark from 'advanced-mark.js';
|
|
30
|
+
import { NotebookCellEditorService } from '../service/notebook-cell-editor-service.js';
|
|
31
|
+
import { NotebookCellStatusBarService } from '../service/notebook-cell-status-bar-service.js';
|
|
32
|
+
import { LabelParser } from '@theia/core/lib/browser/label-parser';
|
|
33
|
+
import { NotebookViewModel } from '../view-model/notebook-view-model.js';
|
|
37
34
|
let NotebookMarkdownCellRenderer = class NotebookMarkdownCellRenderer {
|
|
38
35
|
render(notebookModel, cell) {
|
|
39
|
-
return (
|
|
36
|
+
return _jsx(MarkdownCell, { markdownRenderer: this.markdownRenderer, commandRegistry: this.commandRegistry, monacoServices: this.monacoServices, notebookOptionsService: this.notebookOptionsService, cell: cell, notebookModel: notebookModel, notebookViewModel: this.notebookViewModel, notebookContextManager: this.notebookContextManager, notebookCellEditorService: this.notebookCellEditorService, notebookCellStatusBarService: this.notebookCellStatusBarService, labelParser: this.labelParser });
|
|
40
37
|
}
|
|
41
38
|
renderSidebar(notebookModel, cell) {
|
|
42
|
-
return (
|
|
39
|
+
return _jsx("div", { className: 'theia-notebook-markdown-sidebar' });
|
|
43
40
|
}
|
|
44
41
|
renderDragImage(cell) {
|
|
45
42
|
const dragImage = document.createElement('div');
|
|
46
43
|
dragImage.style.width = this.notebookContextManager.context?.clientWidth + 'px';
|
|
47
|
-
const markdownString = new
|
|
44
|
+
const markdownString = new MarkdownStringImpl(cell.source, { supportHtml: true, isTrusted: true });
|
|
48
45
|
const markdownElement = this.markdownRenderer.render(markdownString).element;
|
|
49
46
|
dragImage.appendChild(markdownElement);
|
|
50
47
|
return dragImage;
|
|
51
48
|
}
|
|
52
49
|
};
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
(0, inversify_1.inject)(markdown_renderer_1.MarkdownRenderer),
|
|
56
|
-
tslib_1.__metadata("design:type", Object)
|
|
50
|
+
__decorate([
|
|
51
|
+
inject(MarkdownRenderer)
|
|
57
52
|
], NotebookMarkdownCellRenderer.prototype, "markdownRenderer", void 0);
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
tslib_1.__metadata("design:type", monaco_editor_1.MonacoEditorServices)
|
|
53
|
+
__decorate([
|
|
54
|
+
inject(MonacoEditorServices)
|
|
61
55
|
], NotebookMarkdownCellRenderer.prototype, "monacoServices", void 0);
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
tslib_1.__metadata("design:type", notebook_context_manager_1.NotebookContextManager)
|
|
56
|
+
__decorate([
|
|
57
|
+
inject(NotebookContextManager)
|
|
65
58
|
], NotebookMarkdownCellRenderer.prototype, "notebookContextManager", void 0);
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
tslib_1.__metadata("design:type", core_1.CommandRegistry)
|
|
59
|
+
__decorate([
|
|
60
|
+
inject(CommandRegistry)
|
|
69
61
|
], NotebookMarkdownCellRenderer.prototype, "commandRegistry", void 0);
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
tslib_1.__metadata("design:type", notebook_options_1.NotebookOptionsService)
|
|
62
|
+
__decorate([
|
|
63
|
+
inject(NotebookOptionsService)
|
|
73
64
|
], NotebookMarkdownCellRenderer.prototype, "notebookOptionsService", void 0);
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
tslib_1.__metadata("design:type", notebook_cell_editor_service_1.NotebookCellEditorService)
|
|
65
|
+
__decorate([
|
|
66
|
+
inject(NotebookCellEditorService)
|
|
77
67
|
], NotebookMarkdownCellRenderer.prototype, "notebookCellEditorService", void 0);
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
tslib_1.__metadata("design:type", notebook_cell_status_bar_service_1.NotebookCellStatusBarService)
|
|
68
|
+
__decorate([
|
|
69
|
+
inject(NotebookCellStatusBarService)
|
|
81
70
|
], NotebookMarkdownCellRenderer.prototype, "notebookCellStatusBarService", void 0);
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
tslib_1.__metadata("design:type", label_parser_1.LabelParser)
|
|
71
|
+
__decorate([
|
|
72
|
+
inject(LabelParser)
|
|
85
73
|
], NotebookMarkdownCellRenderer.prototype, "labelParser", void 0);
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
tslib_1.__metadata("design:type", notebook_view_model_1.NotebookViewModel)
|
|
74
|
+
__decorate([
|
|
75
|
+
inject(NotebookViewModel)
|
|
89
76
|
], NotebookMarkdownCellRenderer.prototype, "notebookViewModel", void 0);
|
|
90
|
-
|
|
91
|
-
|
|
77
|
+
NotebookMarkdownCellRenderer = __decorate([
|
|
78
|
+
injectable()
|
|
92
79
|
], NotebookMarkdownCellRenderer);
|
|
80
|
+
export { NotebookMarkdownCellRenderer };
|
|
93
81
|
function MarkdownCell({ markdownRenderer, monacoServices, cell, notebookModel, notebookViewModel, notebookContextManager, notebookOptionsService, commandRegistry, notebookCellEditorService, notebookCellStatusBarService, labelParser }) {
|
|
94
82
|
const [editMode, setEditMode] = React.useState(notebookViewModel.cellViewModels.get(cell.handle)?.editing || false);
|
|
95
83
|
const [, forceUpdate] = React.useReducer(x => x + 1, 0);
|
|
@@ -111,7 +99,7 @@ function MarkdownCell({ markdownRenderer, monacoServices, cell, notebookModel, n
|
|
|
111
99
|
}, [editMode, notebookViewModel, cell]);
|
|
112
100
|
React.useEffect(() => {
|
|
113
101
|
if (!editMode) {
|
|
114
|
-
const instance = new
|
|
102
|
+
const instance = new mark(markdownContent);
|
|
115
103
|
cell.onMarkdownFind = options => {
|
|
116
104
|
instance.unmark();
|
|
117
105
|
if (empty) {
|
|
@@ -126,7 +114,7 @@ function MarkdownCell({ markdownRenderer, monacoServices, cell, notebookModel, n
|
|
|
126
114
|
}
|
|
127
115
|
}, [editMode, cell.source]);
|
|
128
116
|
let markdownContent = React.useMemo(() => {
|
|
129
|
-
const markdownString = new
|
|
117
|
+
const markdownString = new MarkdownStringImpl(cell.source, { supportHtml: true, isTrusted: true });
|
|
130
118
|
const rendered = markdownRenderer.render(markdownString).element;
|
|
131
119
|
const children = [];
|
|
132
120
|
rendered.childNodes.forEach(child => {
|
|
@@ -139,16 +127,16 @@ function MarkdownCell({ markdownRenderer, monacoServices, cell, notebookModel, n
|
|
|
139
127
|
if (markdownContent.length === 0) {
|
|
140
128
|
const italic = document.createElement('i');
|
|
141
129
|
italic.className = 'theia-notebook-empty-markdown';
|
|
142
|
-
italic.innerText =
|
|
130
|
+
italic.innerText = nls.localizeByDefault('Empty markdown cell, double-click or press enter to edit.');
|
|
143
131
|
italic.style.pointerEvents = 'none';
|
|
144
132
|
markdownContent = [italic];
|
|
145
133
|
empty = true;
|
|
146
134
|
}
|
|
147
135
|
return editMode ?
|
|
148
|
-
((
|
|
149
|
-
((
|
|
136
|
+
(_jsxs("div", { className: 'theia-notebook-markdown-editor-container', ref: ref => observeCellHeight(ref, cell), children: [_jsx(CellEditor, { notebookModel: notebookModel, cell: cell, notebookViewModel: notebookViewModel, monacoServices: monacoServices, notebookContextManager: notebookContextManager, notebookCellEditorService: notebookCellEditorService, fontInfo: notebookOptionsService.editorFontInfo }), _jsx(NotebookCodeCellStatus, { cell: cell, notebook: notebookModel, commandRegistry: commandRegistry, cellStatusBarService: notebookCellStatusBarService, labelParser: labelParser, onClick: () => notebookViewModel.cellViewModels.get(cell.handle)?.requestFocusEditor() })] }, "code")) :
|
|
137
|
+
(_jsx("div", { className: 'theia-notebook-markdown-content', onDoubleClick: () => notebookViewModel.cellViewModels.get(cell.handle)?.requestEdit(), ref: node => {
|
|
150
138
|
node?.replaceChildren(...markdownContent);
|
|
151
|
-
|
|
139
|
+
observeCellHeight(node, cell);
|
|
152
140
|
} }, "markdown"));
|
|
153
141
|
}
|
|
154
142
|
function searchInMarkdown(instance, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-markdown-cell-view.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-markdown-cell-view.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"notebook-markdown-cell-view.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-markdown-cell-view.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { Emitter } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
|
6
6
|
*/
|
|
7
7
|
export declare class NotebookViewportService implements Disposable {
|
|
8
8
|
protected onDidChangeViewportEmitter: Emitter<void>;
|
|
9
|
-
readonly onDidChangeViewport: import("vscode-jsonrpc").Event<void>;
|
|
9
|
+
readonly onDidChangeViewport: import("vscode-jsonrpc/lib/common/events.js").Event<void>;
|
|
10
10
|
protected _viewportElement: HTMLDivElement | undefined;
|
|
11
11
|
protected resizeObserver?: ResizeObserver;
|
|
12
12
|
set viewportElement(element: HTMLDivElement | undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-viewport-service.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-viewport-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,mDAAmD,CAAC;AAE5E;;;GAGG;AACH,qBACa,uBAAwB,YAAW,UAAU;IAEtD,SAAS,CAAC,0BAA0B,gBAAuB;IAC3D,QAAQ,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"notebook-viewport-service.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-viewport-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,mDAAmD,CAAC;AAE5E;;;GAGG;AACH,qBACa,uBAAwB,YAAW,UAAU;IAEtD,SAAS,CAAC,0BAA0B,gBAAuB;IAC3D,QAAQ,CAAC,mBAAmB,4DAAyC;IAErE,SAAS,CAAC,gBAAgB,EAAE,cAAc,GAAG,SAAS,CAAC;IAEvD,SAAS,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IAE1C,IAAI,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,EAQtD;IAED,mBAAmB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO;IASlD,QAAQ,CAAC,CAAC,EAAE,cAAc,GAAG,IAAI;IAIjC,OAAO,IAAI,IAAI;CAGlB"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2024 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -14,18 +13,16 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
-
const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { injectable } from '@theia/core/shared/inversify';
|
|
18
|
+
import { Emitter } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
22
19
|
/**
|
|
23
20
|
* this service is for managing the viewport and scroll state of a notebook editor.
|
|
24
21
|
* its used both for restoring scroll state after reopening an editor and for cell to check if they are in the viewport.
|
|
25
22
|
*/
|
|
26
23
|
let NotebookViewportService = class NotebookViewportService {
|
|
27
24
|
constructor() {
|
|
28
|
-
this.onDidChangeViewportEmitter = new
|
|
25
|
+
this.onDidChangeViewportEmitter = new Emitter();
|
|
29
26
|
this.onDidChangeViewport = this.onDidChangeViewportEmitter.event;
|
|
30
27
|
}
|
|
31
28
|
set viewportElement(element) {
|
|
@@ -52,8 +49,8 @@ let NotebookViewportService = class NotebookViewportService {
|
|
|
52
49
|
this.resizeObserver?.disconnect();
|
|
53
50
|
}
|
|
54
51
|
};
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
(0, inversify_1.injectable)()
|
|
52
|
+
NotebookViewportService = __decorate([
|
|
53
|
+
injectable()
|
|
58
54
|
], NotebookViewportService);
|
|
55
|
+
export { NotebookViewportService };
|
|
59
56
|
//# sourceMappingURL=notebook-viewport-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-viewport-service.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-viewport-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"notebook-viewport-service.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-viewport-service.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAGhF,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,mDAAmD,CAAC;AAE5E;;;GAGG;AAEI,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QAEO,+BAA0B,GAAG,IAAI,OAAO,EAAQ,CAAC;QAClD,wBAAmB,GAAG,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;IAgCzE,CAAC;IA1BG,IAAI,eAAe,CAAC,OAAmC;QACnD,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;QAChC,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,CAAC;YACvC,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,CAAC;YAClC,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,CAAC,CAAC;YACvF,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC;IACL,CAAC;IAED,mBAAmB,CAAC,OAAoB;QACpC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;YAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,EAAE,CAAC;YAC/D,OAAO,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC7F,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,QAAQ,CAAC,CAAiB;QACtB,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC;IAED,OAAO;QACH,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,CAAC;IACtC,CAAC;CACJ,CAAA;AAnCY,uBAAuB;IADnC,UAAU,EAAE;GACA,uBAAuB,CAmCnC"}
|
|
@@ -2,13 +2,13 @@ import { Disposable, DisposableCollection, Emitter, Event, URI } from '@theia/co
|
|
|
2
2
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
3
3
|
import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
|
|
4
4
|
import { type MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
|
|
5
|
-
import { CellKind, NotebookCellCollapseState, NotebookCellInternalMetadata, NotebookCellMetadata, CellOutput, CellData, CellOutputItem } from '../../common';
|
|
6
|
-
import { NotebookCellOutputsSplice } from '../notebook-types';
|
|
7
|
-
import { NotebookMonacoTextModelService } from '../service/notebook-monaco-text-model-service';
|
|
8
|
-
import { NotebookCellOutputModel } from './notebook-cell-output-model';
|
|
5
|
+
import { CellKind, NotebookCellCollapseState, NotebookCellInternalMetadata, NotebookCellMetadata, CellOutput, CellData, CellOutputItem } from '../../common/index.js';
|
|
6
|
+
import { NotebookCellOutputsSplice } from '../notebook-types.js';
|
|
7
|
+
import { NotebookMonacoTextModelService } from '../service/notebook-monaco-text-model-service.js';
|
|
8
|
+
import { NotebookCellOutputModel } from './notebook-cell-output-model.js';
|
|
9
9
|
import { PreferenceService } from '@theia/core/lib/common';
|
|
10
10
|
import { LanguageService } from '@theia/core/lib/browser/language-service';
|
|
11
|
-
import { NotebookEditorFindMatch, NotebookEditorFindMatchOptions } from '../view/notebook-find-widget';
|
|
11
|
+
import { NotebookEditorFindMatch, NotebookEditorFindMatchOptions } from '../view/notebook-find-widget.js';
|
|
12
12
|
import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
13
13
|
export declare const NotebookCellModelFactory: unique symbol;
|
|
14
14
|
export type NotebookCellModelFactory = (props: NotebookCellModelProps) => NotebookCellModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-model.d.ts","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-model.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACpF,OAAO,EAAsB,UAAU,EAAiB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EACH,QAAQ,EAAE,yBAAyB,EAAE,4BAA4B,EACjE,oBAAoB,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAC7D,MAAM,
|
|
1
|
+
{"version":3,"file":"notebook-cell-model.d.ts","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-model.ts"],"names":[],"mappings":"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"}
|