@theia/notebook 1.67.0-next.3 → 1.67.0-next.59

package/lib/browser/view-model/notebook-view-model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"notebook-view-model.d.ts","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-view-model.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,WAAW,uBAAuB;IACpC,IAAI,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACpC,cAAc,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;AAErE;;GAEG;AACH,qBACa,iBAAkB,YAAW,UAAU;IAEhD,SAAS,CAAC,QAAQ,CAAC,8BAA8B,mCAA0C;IAC3F,QAAQ,CAAC,uBAAuB,uDAA6C;IAE7E,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,IAAI,qBAAqB,IAAI,aAAa,GAAG,SAAS,CAIrD;IAGD,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAa;IAEhE,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IA+BzC,eAAe,CAAC,IAAI,EAAE,iBAAiB,EAAE,cAAc,GAAE,OAAc,GAAG,IAAI;IAO9E,OAAO,IAAI,IAAI;CAIlB;AAED,qBAAa,aAAc,YAAW,UAAU;IAgBhC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,iBAAiB;IAAE,SAAS,CAAC,SAAS,EAAE,MAAM,IAAI;IAdvF,SAAS,CAAC,QAAQ,CAAC,iCAAiC,mBAA0B;IAC9E,QAAQ,CAAC,0BAA0B,uCAAgD;IAEnF,SAAS,CAAC,QAAQ,CAAC,4BAA4B,kCAAyC;IACxF,QAAQ,CAAC,qBAAqB,sDAA2C;IAEzE,SAAS,CAAC,QAAQ,CAAC,2BAA2B,gBAAuB;IACrE,QAAQ,CAAC,oBAAoB,oCAA0C;IAEvE,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAS;IACpC,IAAI,OAAO,IAAI,OAAO,CAErB;gBAE8B,IAAI,EAAE,iBAAiB,EAAY,SAAS,EAAE,MAAM,IAAI;IAIvF,WAAW,IAAI,IAAI;IAOnB,eAAe,IAAI,IAAI;IAKvB,kBAAkB,CAAC,YAAY,CAAC,EAAE,sBAAsB,GAAG,IAAI;IAK/D,iBAAiB,IAAI,IAAI;IAKzB,OAAO,IAAI,IAAI;CAIlB"}

package/lib/browser/view-model/notebook-view-model.js

@@ -0,0 +1,120 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CellViewModel = exports.NotebookViewModel = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const core_1 = require("@theia/core");
+/**
+ * Model containing the editor state/view information of a notebook editor. The actual notebook data can be found in the {@link NotebookModel}.
+ */
+let NotebookViewModel = class NotebookViewModel {
+    constructor() {
+        this.onDidChangeSelectedCellEmitter = new core_1.Emitter();
+        this.onDidChangeSelectedCell = this.onDidChangeSelectedCellEmitter.event;
+        // Cell handle to CellViewModel mapping
+        this.cellViewModels = new Map();
+    }
+    get selectedCellViewModel() {
+        if (this.selectedCell) {
+            return this.cellViewModels.get(this.selectedCell.handle);
+        }
+    }
+    initDataModel(model) {
+        model.onDidAddOrRemoveCell(e => {
+            var _a, _b;
+            for (const cellId of e.newCellIds || []) {
+                const cell = model.getCellByHandle(cellId);
+                if (cell) {
+                    this.cellViewModels.set(cell.handle, new CellViewModel(cell, () => {
+                        this.cellViewModels.delete(cell.handle);
+                    }));
+                }
+            }
+            if (e.newCellIds && ((_a = e.newCellIds) === null || _a === void 0 ? void 0 : _a.length) > 0 && e.externalEvent) {
+                const lastNewCellHandle = e.newCellIds[e.newCellIds.length - 1];
+                const newSelectedCell = model.getCellByHandle(lastNewCellHandle);
+                this.setSelectedCell(newSelectedCell, true);
+                (_b = this.cellViewModels.get(newSelectedCell.handle)) === null || _b === void 0 ? void 0 : _b.requestEdit();
+            }
+            else if (this.selectedCell && !model.getCellByHandle(this.selectedCell.handle)) {
+                const newSelectedIndex = e.rawEvent.changes[e.rawEvent.changes.length - 1].start;
+                const newSelectedCell = model.cells[Math.min(newSelectedIndex, model.cells.length - 1)];
+                this.setSelectedCell(newSelectedCell, false);
+            }
+        });
+        for (const cell of model.cells) {
+            this.cellViewModels.set(cell.handle, new CellViewModel(cell, () => {
+                this.cellViewModels.delete(cell.handle);
+            }));
+        }
+    }
+    setSelectedCell(cell, scrollIntoView = true) {
+        if (this.selectedCell !== cell) {
+            this.selectedCell = cell;
+            this.onDidChangeSelectedCellEmitter.fire({ cell, scrollIntoView });
+        }
+    }
+    dispose() {
+        this.onDidChangeSelectedCellEmitter.dispose();
+    }
+};
+exports.NotebookViewModel = NotebookViewModel;
+exports.NotebookViewModel = NotebookViewModel = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], NotebookViewModel);
+class CellViewModel {
+    get editing() {
+        return this._editing;
+    }
+    constructor(cell, onDispose) {
+        this.cell = cell;
+        this.onDispose = onDispose;
+        this.onDidRequestCellEditChangeEmitter = new core_1.Emitter();
+        this.onDidRequestCellEditChange = this.onDidRequestCellEditChangeEmitter.event;
+        this.onWillFocusCellEditorEmitter = new core_1.Emitter();
+        this.onWillFocusCellEditor = this.onWillFocusCellEditorEmitter.event;
+        this.onWillBlurCellEditorEmitter = new core_1.Emitter();
+        this.onWillBlurCellEditor = this.onWillBlurCellEditorEmitter.event;
+        this._editing = false;
+        cell.toDispose.push(this);
+    }
+    requestEdit() {
+        if (this.cell.isTextModelWritable) {
+            this._editing = true;
+            this.onDidRequestCellEditChangeEmitter.fire(true);
+        }
+    }
+    requestStopEdit() {
+        this._editing = false;
+        this.onDidRequestCellEditChangeEmitter.fire(false);
+    }
+    requestFocusEditor(focusRequest) {
+        this.requestEdit();
+        this.onWillFocusCellEditorEmitter.fire(focusRequest);
+    }
+    requestBlurEditor() {
+        this.requestStopEdit();
+        this.onWillBlurCellEditorEmitter.fire();
+    }
+    dispose() {
+        this.onDispose();
+        this.onDidRequestCellEditChangeEmitter.dispose();
+    }
+}
+exports.CellViewModel = CellViewModel;
+//# sourceMappingURL=notebook-view-model.js.map

package/lib/browser/view-model/notebook-view-model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notebook-view-model.js","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-view-model.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@theia/notebook",
-  "version": "1.67.0-next.3+7946ca874",
+  "version": "1.67.0-next.59+3f14297ea",
   "description": "Theia - Notebook Extension",
   "dependencies": {
-    "@theia/core": "1.67.0-next.3+7946ca874",
-    "@theia/editor": "1.67.0-next.3+7946ca874",
-    "@theia/filesystem": "1.67.0-next.3+7946ca874",
-    "@theia/monaco": "1.67.0-next.3+7946ca874",
+    "@theia/core": "1.67.0-next.59+3f14297ea",
+    "@theia/editor": "1.67.0-next.59+3f14297ea",
+    "@theia/filesystem": "1.67.0-next.59+3f14297ea",
+    "@theia/monaco": "1.67.0-next.59+3f14297ea",
     "@theia/monaco-editor-core": "1.96.302",
-    "@theia/outline-view": "1.67.0-next.3+7946ca874",
+    "@theia/outline-view": "1.67.0-next.59+3f14297ea",
     "advanced-mark.js": "^2.6.0",
     "react-perfect-scrollbar": "^1.5.8",
     "tslib": "^2.6.2"
@@ -54,5 +54,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "7946ca874b04e6249d883e9a586f193194df1365"
+  "gitHead": "3f14297ea2edcdb1fffd74afee0613e70b43e125"
 }

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

@@ -131,13 +131,14 @@ export class NotebookActionsContribution implements CommandContribution, MenuCon
         commands.registerCommand(NotebookCommands.ADD_NEW_CELL_COMMAND, {
             execute: (notebookModel: NotebookModel, cellKind: CellKind = CellKind.Markup, index?: number | 'above' | 'below', focusContainer?: boolean) => {
                 notebookModel = notebookModel ?? this.notebookEditorWidgetService.focusedEditor?.model;
+                const viewModel = this.notebookEditorWidgetService.focusedEditor?.viewModel;
 
                 let insertIndex: number = 0;
                 if (typeof index === 'number' && index >= 0) {
                     insertIndex = index;
-                } else if (notebookModel.selectedCell && typeof index === 'string') {
+                } else if (viewModel?.selectedCell && typeof index === 'string') {
                     // if index is -1 insert below otherwise at the index of the selected cell which is above the selected.
-                    insertIndex = notebookModel.cells.indexOf(notebookModel.selectedCell) + (index === 'below' ? 1 : 0);
+                    insertIndex = notebookModel.cells.indexOf(viewModel.selectedCell) + (index === 'below' ? 1 : 0);
                 }
 
                 let cellLanguage: string = 'markdown';
@@ -158,7 +159,7 @@ export class NotebookActionsContribution implements CommandContribution, MenuCon
                     }]
                 }], true);
                 if (focusContainer) {
-                    notebookModel.selectedCell?.requestBlurEditor();
+                    viewModel?.cellViewModels.get(viewModel.selectedCell?.handle ?? -1)?.requestBlurEditor();
                 }
             }
         });
@@ -191,27 +192,28 @@ export class NotebookActionsContribution implements CommandContribution, MenuCon
                 execute: (change: number | CellChangeDirection) => {
                     const focusedEditor = this.notebookEditorWidgetService.focusedEditor;
                     const model = focusedEditor?.model;
+                    const viewModel = focusedEditor?.viewModel;
                     if (model && typeof change === 'number') {
-                        model.setSelectedCell(model.cells[change]);
-                    } else if (model && model.selectedCell) {
-                        const currentIndex = model.cells.indexOf(model.selectedCell);
+                        viewModel?.setSelectedCell(model.cells[change]);
+                    } else if (model && viewModel?.selectedCell) {
+                        const currentIndex = model.cells.indexOf(viewModel?.selectedCell);
                         const shouldFocusEditor = this.contextKeyService.match('editorTextFocus');
 
                         if (change === CellChangeDirection.Up && currentIndex > 0) {
-                            model.setSelectedCell(model.cells[currentIndex - 1]);
-                            if ((model.selectedCell?.cellKind === CellKind.Code
-                                || (model.selectedCell?.cellKind === CellKind.Markup && model.selectedCell?.editing)) && shouldFocusEditor) {
-                                model.selectedCell.requestFocusEditor('lastLine');
+                            viewModel?.setSelectedCell(model.cells[currentIndex - 1]);
+                            if ((viewModel?.selectedCell?.cellKind === CellKind.Code
+                                || (viewModel?.selectedCell?.cellKind === CellKind.Markup && viewModel?.selectedCellViewModel?.editing)) && shouldFocusEditor) {
+                                viewModel?.cellViewModels.get(viewModel.selectedCell.handle)?.requestFocusEditor('lastLine');
                             }
                         } else if (change === CellChangeDirection.Down && currentIndex < model.cells.length - 1) {
-                            model.setSelectedCell(model.cells[currentIndex + 1]);
-                            if ((model.selectedCell?.cellKind === CellKind.Code
-                                || (model.selectedCell?.cellKind === CellKind.Markup && model.selectedCell?.editing)) && shouldFocusEditor) {
-                                model.selectedCell.requestFocusEditor();
+                            viewModel?.setSelectedCell(model.cells[currentIndex + 1]);
+                            if ((viewModel?.selectedCell?.cellKind === CellKind.Code
+                                || (viewModel?.selectedCell?.cellKind === CellKind.Markup && viewModel?.selectedCellViewModel?.editing)) && shouldFocusEditor) {
+                                viewModel?.cellViewModels.get(viewModel.selectedCell.handle)?.requestFocusEditor();
                             }
                         }
 
-                        if (model.selectedCell.cellKind === CellKind.Markup) {
+                        if (viewModel?.selectedCell.cellKind === CellKind.Markup) {
                             // since were losing focus from the cell editor, we need to focus the notebook editor again
                             focusedEditor?.node.focus();
                         }
@@ -229,8 +231,8 @@ export class NotebookActionsContribution implements CommandContribution, MenuCon
         commands.registerCommand(NotebookCommands.CUT_SELECTED_CELL, this.editableCommandHandler(
             () => {
                 const model = this.notebookEditorWidgetService.focusedEditor?.model;
-                const selectedCell = model?.selectedCell;
-                if (selectedCell) {
+                const selectedCell = this.notebookEditorWidgetService.focusedEditor?.viewModel?.selectedCell;
+                if (selectedCell && model) {
                     model.applyEdits([{ editType: CellEditType.Replace, index: model.cells.indexOf(selectedCell), count: 1, cells: [] }], true);
                     this.notebookClipboardService.copyCell(selectedCell);
                 }
@@ -238,8 +240,8 @@ export class NotebookActionsContribution implements CommandContribution, MenuCon
 
         commands.registerCommand(NotebookCommands.COPY_SELECTED_CELL, {
             execute: () => {
-                const model = this.notebookEditorWidgetService.focusedEditor?.model;
-                const selectedCell = model?.selectedCell;
+                const viewModel = this.notebookEditorWidgetService.focusedEditor?.viewModel;
+                const selectedCell = viewModel?.selectedCell;
                 if (selectedCell) {
                     this.notebookClipboardService.copyCell(selectedCell);
                 }
@@ -253,7 +255,8 @@ export class NotebookActionsContribution implements CommandContribution, MenuCon
                 const copiedCell = this.notebookClipboardService.getCell();
                 if (copiedCell) {
                     const model = this.notebookEditorWidgetService.focusedEditor?.model;
-                    const insertIndex = model?.selectedCell ? model.cells.indexOf(model.selectedCell) + (position === 'above' ? 0 : 1) : 0;
+                    const viewModel = this.notebookEditorWidgetService.focusedEditor?.viewModel;
+                    const insertIndex = viewModel?.selectedCell && model ? model.cells.indexOf(viewModel?.selectedCell) + (position === 'above' ? 0 : 1) : 0;
                     model?.applyEdits([{ editType: CellEditType.Replace, index: insertIndex, count: 0, cells: [copiedCell] }], true);
                 }
             }
@@ -267,8 +270,8 @@ export class NotebookActionsContribution implements CommandContribution, MenuCon
 
         commands.registerCommand(NotebookCommands.CENTER_ACTIVE_CELL, {
             execute: (editor?: NotebookEditorWidget) => {
-                const model = editor ? editor.model : this.notebookEditorWidgetService.focusedEditor?.model;
-                model?.selectedCell?.requestCenterEditor();
+                const viewModel = editor ? editor.viewModel : this.notebookEditorWidgetService.focusedEditor?.viewModel;
+                viewModel?.selectedCell?.requestCenterEditor();
             }
         });
 

package/src/browser/contributions/notebook-cell-actions-contribution.ts

@@ -284,8 +284,16 @@ export class NotebookCellActionContribution implements MenuContribution, Command
     }
 
     registerCommands(commands: CommandRegistry): void {
-        commands.registerCommand(NotebookCellCommands.EDIT_COMMAND, this.editableCellCommandHandler((_, cell) => cell.requestFocusEditor()));
-        commands.registerCommand(NotebookCellCommands.STOP_EDIT_COMMAND, { execute: (_, cell: NotebookCellModel) => (cell ?? this.getSelectedCell()).requestBlurEditor() });
+        commands.registerCommand(NotebookCellCommands.EDIT_COMMAND, this.editableCellCommandHandler((_, cell) => {
+            const cellViewModel = this.notebookEditorWidgetService.focusedEditor?.viewModel.cellViewModels.get(cell.handle);
+            cellViewModel?.requestFocusEditor();
+        }));
+        commands.registerCommand(NotebookCellCommands.STOP_EDIT_COMMAND, {
+            execute: (_, cell: NotebookCellModel) => {
+                const cellViewModel = this.notebookEditorWidgetService.focusedEditor?.viewModel.cellViewModels.get(cell.handle);
+                cellViewModel?.requestBlurEditor();
+            }
+        });
         commands.registerCommand(NotebookCellCommands.DELETE_COMMAND,
             this.editableCellCommandHandler((notebookModel, cell) => {
                 notebookModel.applyEdits([{
@@ -346,6 +354,8 @@ export class NotebookCellActionContribution implements MenuContribution, Command
 
         commands.registerCommand(NotebookCellCommands.EXECUTE_SINGLE_CELL_AND_FOCUS_NEXT_COMMAND, this.editableCellCommandHandler(
             (notebookModel, cell) => {
+                const viewModel = this.notebookEditorWidgetService.focusedEditor?.viewModel;
+
                 if (cell.cellKind === CellKind.Code) {
                     commands.executeCommand(NotebookCellCommands.EXECUTE_SINGLE_CELL_COMMAND.id, notebookModel, cell);
                 } else {
@@ -353,7 +363,7 @@ export class NotebookCellActionContribution implements MenuContribution, Command
                 }
                 const index = notebookModel.cells.indexOf(cell);
                 if (index < notebookModel.cells.length - 1) {
-                    notebookModel.setSelectedCell(notebookModel.cells[index + 1]);
+                    viewModel?.setSelectedCell(notebookModel.cells[index + 1]);
                 } else if (cell.cellKind === CellKind.Code) {
                     commands.executeCommand(NotebookCellCommands.INSERT_NEW_CELL_BELOW_COMMAND.id);
                 } else {
@@ -375,7 +385,8 @@ export class NotebookCellActionContribution implements MenuContribution, Command
                 }
 
                 const index = notebookModel.cells.indexOf(cell);
-                notebookModel.setSelectedCell(notebookModel.cells[index + 1]);
+                const viewModel = this.notebookEditorWidgetService.focusedEditor?.viewModel;
+                viewModel?.setSelectedCell(notebookModel.cells[index + 1]);
             })
         );
 
@@ -436,7 +447,7 @@ export class NotebookCellActionContribution implements MenuContribution, Command
 
         commands.registerCommand(NotebookCellCommands.TOGGLE_CELL_OUTPUT, {
             execute: () => {
-                const selectedCell = this.notebookEditorWidgetService.focusedEditor?.model?.selectedCell;
+                const selectedCell = this.notebookEditorWidgetService.focusedEditor?.viewModel?.selectedCell;
                 if (selectedCell) {
                     selectedCell.outputVisible = !selectedCell.outputVisible;
                 }
@@ -444,9 +455,9 @@ export class NotebookCellActionContribution implements MenuContribution, Command
         });
 
         commands.registerCommand(NotebookCellCommands.CHANGE_CELL_LANGUAGE, {
-            isVisible: () => !!this.notebookEditorWidgetService.focusedEditor?.model?.selectedCell,
+            isVisible: () => !!this.notebookEditorWidgetService.focusedEditor?.viewModel?.selectedCell,
             execute: async (notebook?: NotebookModel, cell?: NotebookCellModel) => {
-                const selectedCell = cell ?? this.notebookEditorWidgetService.focusedEditor?.model?.selectedCell;
+                const selectedCell = cell ?? this.notebookEditorWidgetService.focusedEditor?.viewModel?.selectedCell;
                 const activeNotebook = notebook ?? this.notebookEditorWidgetService.focusedEditor?.model;
                 if (!selectedCell || !activeNotebook) {
                     return;
@@ -475,7 +486,7 @@ export class NotebookCellActionContribution implements MenuContribution, Command
 
         commands.registerCommand(NotebookCellCommands.TOGGLE_LINE_NUMBERS, {
             execute: () => {
-                const selectedCell = this.notebookEditorWidgetService.focusedEditor?.model?.selectedCell;
+                const selectedCell = this.notebookEditorWidgetService.focusedEditor?.viewModel?.selectedCell;
                 if (selectedCell) {
                     const currentLineNumber = selectedCell.editorOptions?.lineNumbers;
                     selectedCell.editorOptions = { ...selectedCell.editorOptions, lineNumbers: !currentLineNumber || currentLineNumber === 'off' ? 'on' : 'off' };
@@ -498,7 +509,7 @@ export class NotebookCellActionContribution implements MenuContribution, Command
     }
 
     protected getSelectedCell(): NotebookCellModel | undefined {
-        return this.notebookEditorWidgetService.focusedEditor?.model?.selectedCell;
+        return this.notebookEditorWidgetService.focusedEditor?.viewModel?.selectedCell;
     }
 
     registerKeybindings(keybindings: KeybindingRegistry): void {

package/src/browser/contributions/notebook-label-provider-contribution.ts

@@ -21,6 +21,7 @@ import { NotebookService } from '../service/notebook-service';
 import { NotebookCellOutlineNode } from './notebook-outline-contribution';
 import type Token = require('markdown-it/lib/token');
 import markdownit = require('@theia/core/shared/markdown-it');
+import * as markdownitemoji from '@theia/core/shared/markdown-it-emoji';
 import { NotebookCellModel } from '../view-model/notebook-cell-model';
 import { URI } from '@theia/core';
 
@@ -33,7 +34,7 @@ export class NotebookLabelProviderContribution implements LabelProviderContribut
     @inject(LabelProvider)
     protected readonly labelProvider: LabelProvider;
 
-    protected markdownIt = markdownit();
+    protected markdownIt = markdownit().use(markdownitemoji.full);
 
     canHandle(element: object): number {
         if (NotebookCellOutlineNode.is(element)) {

package/src/browser/contributions/notebook-outline-contribution.ts

@@ -24,6 +24,7 @@ import { NotebookEditorWidget } from '../notebook-editor-widget';
 import { DisposableCollection, isObject, URI } from '@theia/core';
 import { CellKind, CellUri } from '../../common';
 import { NotebookService } from '../service/notebook-service';
+import { NotebookViewModel } from '../view-model/notebook-view-model';
 export interface NotebookCellOutlineNode extends OutlineSymbolInformationNode {
     uri: URI;
 }
@@ -77,36 +78,37 @@ export class NotebookOutlineContribution implements FrontendApplicationContribut
             }));
             if (editor.model) {
                 this.editorModelListeners.dispose();
-                this.editorModelListeners.push(editor.model.onDidChangeSelectedCell(() => {
+                this.editorModelListeners.push(editor.viewModel.onDidChangeSelectedCell(() => {
                     if (editor === this.currentEditor) {
                         this.updateOutline(editor);
                     }
                 }));
-                const roots = editor && editor.model && await this.createRoots(editor.model);
+                const roots = editor && editor.model && await this.createRoots(editor.model, editor.viewModel);
                 this.outlineViewService.publish(roots || []);
             }
         }
     }
 
-    protected async createRoots(model: NotebookModel): Promise<OutlineSymbolInformationNode[] | undefined> {
+    protected async createRoots(model: NotebookModel, viewModel: NotebookViewModel): Promise<OutlineSymbolInformationNode[] | undefined> {
         return model.cells.map(cell => ({
             id: cell.uri.toString(),
             iconClass: cell.cellKind === CellKind.Markup ? codicon('markdown') : codicon('code'),
             parent: undefined,
             children: [],
-            selected: model.selectedCell === cell,
+            selected: viewModel.selectedCell === cell,
             expanded: false,
             uri: cell.uri,
         } as NotebookCellOutlineNode));
     }
 
-    selectCell(node: object): void {
+    protected selectCell(node: object): void {
         if (NotebookCellOutlineNode.is(node)) {
             const parsed = CellUri.parse(node.uri);
             const model = parsed && this.notebookService.getNotebookEditorModel(parsed.notebook);
+            const viewModel = this.currentEditor?.viewModel;
             const cell = model?.cells.find(c => c.handle === parsed?.handle);
             if (model && cell) {
-                model.setSelectedCell(cell);
+                viewModel?.setSelectedCell(cell);
             }
         }
     }

package/src/browser/contributions/notebook-status-bar-contribution.ts

@@ -33,10 +33,8 @@ export class NotebookStatusBarContribution implements WidgetStatusBarContributio
     }
 
     activate(statusBar: StatusBar, widget: NotebookEditorWidget): void {
-        widget.ready.then(model => {
-            this.onDeactivate = model.onDidChangeSelectedCell(() => {
-                this.updateStatusbar(statusBar, widget);
-            });
+        this.onDeactivate = widget.viewModel.onDidChangeSelectedCell(() => {
+            this.updateStatusbar(statusBar, widget);
         });
         this.updateStatusbar(statusBar, widget);
     }
@@ -48,12 +46,12 @@ export class NotebookStatusBarContribution implements WidgetStatusBarContributio
 
     protected async updateStatusbar(statusBar: StatusBar, editor?: NotebookEditorWidget): Promise<void> {
         const model = await editor?.ready;
-        if (!model || model.cells.length === 0 || !model.selectedCell) {
+        if (!model || model.cells.length === 0 || !editor?.viewModel.selectedCell) {
             statusBar.removeElement(NOTEBOOK_CELL_SELECTION_STATUS_BAR_ID);
             return;
         }
 
-        const selectedCellIndex = model.cells.indexOf(model.selectedCell) + 1;
+        const selectedCellIndex = model.cells.indexOf(editor.viewModel.selectedCell) + 1;
 
         statusBar.setElement(NOTEBOOK_CELL_SELECTION_STATUS_BAR_ID, {
             text: nls.localizeByDefault('Cell {0} of {1}', selectedCellIndex, model.cells.length),

package/src/browser/index.ts

@@ -26,3 +26,4 @@ export * from './service/notebook-renderer-messaging-service';
 export * from './service/notebook-cell-editor-service';
 export * from './renderers/cell-output-webview';
 export * from './notebook-types';
+export * from './notebook-editor-split-contribution';

package/src/browser/notebook-cell-open-handler.ts

@@ -44,9 +44,9 @@ export class NotebookCellOpenHandler implements OpenHandler {
 
         const executionCount = parseInt(executionCountParam);
 
-        this.notebookEditorWidgetService.currentEditor?.model?.cells
-            .find(c => c.metadata.execution_count === executionCount)
-            ?.requestFocusEditor(parseInt(lineParam));
+        const cell = this.notebookEditorWidgetService.currentEditor?.model?.cells
+            .find(c => c.metadata.execution_count === executionCount);
+        this.notebookEditorWidgetService.currentEditor?.viewModel.cellViewModels.get(cell?.handle ?? -1)?.requestFocusEditor();
     }
 
 }

package/src/browser/notebook-editor-split-contribution.ts

@@ -0,0 +1,51 @@
+// *****************************************************************************
+// Copyright (C) 2025 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 { inject, injectable } from '@theia/core/shared/inversify';
+import { Widget, DockLayout } from '@theia/core/lib/browser';
+import { SplitEditorContribution } from '@theia/editor/lib/browser/split-editor-contribution';
+import { NotebookEditorWidget } from './notebook-editor-widget';
+import { NotebookOpenHandler } from './notebook-open-handler';
+
+/**
+ * Implementation of SplitEditorContribution for notebook editors (NotebookEditorWidget).
+ * Delegates to NotebookOpenHandler.openToSide which handles counter management for splits.
+ */
+@injectable()
+export class NotebookEditorSplitContribution implements SplitEditorContribution<NotebookEditorWidget> {
+
+    @inject(NotebookOpenHandler)
+    protected readonly notebookOpenHandler: NotebookOpenHandler;
+
+    canHandle(widget: Widget): number {
+        return widget instanceof NotebookEditorWidget ? 100 : 0;
+    }
+
+    async split(widget: NotebookEditorWidget, splitMode: DockLayout.InsertMode): Promise<NotebookEditorWidget | undefined> {
+        const uri = widget.getResourceUri();
+        if (!uri) {
+            return undefined;
+        }
+
+        const newNotebook = await this.notebookOpenHandler.openToSide(uri, {
+            notebookType: widget.notebookType,
+            widgetOptions: { mode: splitMode, ref: widget }
+        });
+
+        return newNotebook;
+    }
+}
+

package/src/browser/notebook-editor-widget-factory.ts

@@ -17,7 +17,7 @@
 import { nls, URI } from '@theia/core';
 import { WidgetFactory, NavigatableWidgetOptions, LabelProvider } from '@theia/core/lib/browser';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { NotebookEditorWidget, NotebookEditorWidgetContainerFactory, NotebookEditorProps } from './notebook-editor-widget';
+import { NotebookEditorWidget, NotebookEditorWidgetContainerFactory, NotebookEditorProps, NOTEBOOK_EDITOR_ID_PREFIX } from './notebook-editor-widget';
 import { NotebookService } from './service/notebook-service';
 import { NotebookModelResolverService } from './service/notebook-model-resolver-service';
 import { Deferred } from '@theia/core/lib/common/promise-util';
@@ -29,6 +29,13 @@ export interface NotebookEditorWidgetOptions extends NavigatableWidgetOptions {
 
 @injectable()
 export class NotebookEditorWidgetFactory implements WidgetFactory {
+
+    static createID(uri: URI, counter?: number): string {
+        return NOTEBOOK_EDITOR_ID_PREFIX
+            + uri.toString()
+            + (counter !== undefined ? `:${counter}` : '');
+    }
+
     readonly id: string = NotebookEditorWidget.ID;
 
     @inject(NotebookService)
@@ -53,6 +60,9 @@ export class NotebookEditorWidgetFactory implements WidgetFactory {
 
         const editor = await this.createEditor(uri, options.notebookType);
 
+        // Set the widget ID with counter to support multiple instances
+        editor.id = NotebookEditorWidgetFactory.createID(uri, options.counter);
+
         this.setLabels(editor, uri);
         const labelListener = this.labelProvider.onDidChange(event => {
             if (event.affects(uri)) {

package/src/browser/notebook-editor-widget.tsx

@@ -37,6 +37,7 @@ import { NotebookFindWidget } from './view/notebook-find-widget';
 import debounce = require('@theia/core/shared/lodash.debounce');
 import { CellOutputWebview, CellOutputWebviewFactory } from './renderers/cell-output-webview';
 import { NotebookCellOutputModel } from './view-model/notebook-cell-output-model';
+import { NotebookViewModel } from './view-model/notebook-view-model';
 const PerfectScrollbar = require('react-perfect-scrollbar');
 
 export const NotebookEditorWidgetContainerFactory = Symbol('NotebookEditorWidgetContainerFactory');
@@ -49,6 +50,8 @@ export function createNotebookEditorWidgetContainer(parent: interfaces.Container
     const cellOutputWebviewFactory: CellOutputWebviewFactory = parent.get(CellOutputWebviewFactory);
     child.bind(CellOutputWebview).toConstantValue(cellOutputWebviewFactory());
 
+    child.bind(NotebookViewModel).toSelf().inSingletonScope();
+
     child.bind(NotebookContextManager).toSelf().inSingletonScope();
     child.bind(NotebookMainToolbarRenderer).toSelf().inSingletonScope();
     child.bind(NotebookCellToolbarFactory).toSelf().inSingletonScope();
@@ -113,6 +116,9 @@ export class NotebookEditorWidget extends ReactWidget implements Navigatable, Sa
     @inject(CellOutputWebview)
     protected readonly cellOutputWebview: CellOutputWebview;
 
+    @inject(NotebookViewModel)
+    protected readonly _viewModel: NotebookViewModel;
+
     protected readonly onDidChangeModelEmitter = new Emitter<void>();
     readonly onDidChangeModel = this.onDidChangeModelEmitter.event;
 
@@ -161,9 +167,16 @@ export class NotebookEditorWidget extends ReactWidget implements Navigatable, Sa
         return this._model;
     }
 
+    get viewModel(): NotebookViewModel {
+        return this._viewModel;
+    }
+
     @postConstruct()
     protected init(): void {
-        this.id = NOTEBOOK_EDITOR_ID_PREFIX + this.props.uri.toString();
+        // ID is set by NotebookEditorWidgetFactory to include counter for multiple instances
+        if (!this.id) {
+            this.id = NOTEBOOK_EDITOR_ID_PREFIX + this.props.uri.toString();
+        }
 
         this.scrollOptions = {
             suppressScrollY: true
@@ -181,7 +194,7 @@ export class NotebookEditorWidget extends ReactWidget implements Navigatable, Sa
         this.ready.then(model => {
             if (model.cells.length === 1 && model.cells[0].source === '') {
                 this.commandRegistry.executeCommand(NotebookCellCommands.EDIT_COMMAND.id, model, model.cells[0]);
-                model.setSelectedCell(model.cells[0]);
+                this.viewModel.setSelectedCell(model.cells[0]);
             }
             model.onDidChangeContent(changeEvents => {
                 const cellEvent = changeEvents.filter(event => event.kind === NotebookCellsChangeType.Move || event.kind === NotebookCellsChangeType.ModelChange);
@@ -198,6 +211,7 @@ export class NotebookEditorWidget extends ReactWidget implements Navigatable, Sa
 
     protected async waitForData(): Promise<NotebookModel> {
         this._model = await this.props.notebookData;
+        this.viewModel.initDataModel(this._model);
         this.cellOutputWebview.init(this._model, this);
         this.saveable.delegate = this._model;
         this.toDispose.push(this._model);
@@ -225,7 +239,7 @@ export class NotebookEditorWidget extends ReactWidget implements Navigatable, Sa
         }
         // Ensure that the model is loaded before adding the editor
         this.notebookEditorService.addNotebookEditor(this);
-        this._model.selectedCell = this._model.cells[0];
+        this.viewModel.selectedCell = this._model.cells[0];
         this.update();
         this.notebookContextManager.init(this);
         return this._model;
@@ -286,6 +300,7 @@ export class NotebookEditorWidget extends ReactWidget implements Navigatable, Sa
                             {this.cellOutputWebview.render()}
                             <NotebookCellListView renderers={this.renderers}
                                 notebookModel={this._model}
+                                notebookViewModel={this.viewModel}
                                 notebookContext={this.notebookContextManager}
                                 toolbarRenderer={this.cellToolbarFactory}
                                 commandRegistry={this.commandRegistry}