Skip to content

Commit 3f9c36b

Browse files
committed
setup with new typescript version and build
1 parent bd607d7 commit 3f9c36b

File tree

4 files changed

+14
-21
lines changed

4 files changed

+14
-21
lines changed

packages/nbdime/src/diff/widget/linked-cells.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,16 @@ class LazyDisplayLinkedListCell extends LinkedListCell {
200200

201201
showLazyCellUp() {
202202
this.showLazyCell();
203-
this._prev?.expandUp();
203+
if (this._prev) {
204+
this._prev.expandUp();
205+
}
204206
}
205207

206208
showLazyCellDown() {
207209
this.showLazyCell();
208-
this._next?.expandDown();
210+
if (this._next) {
211+
this._next.expandDown();
212+
}
209213
}
210214

211215
showLazyCell() {

packages/nbdime/src/diff/widget/notebook.ts

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type {
88
IRenderMimeRegistry
99
} from '@jupyterlab/rendermime';
1010

11-
import { ILinkedListCell, LazyDisplayLinkedListCell, LinkedListCell } from "./linked-cells";
11+
import { LazyDisplayLinkedListCell, LinkedListCell } from "./linked-cells";
1212
import { CellDiffWidget } from "./cell";
1313
import {
1414
CHUNK_PANEL_CLASS,
@@ -18,30 +18,28 @@ import {
1818

1919
import { MetadataDiffWidget } from "./metadata";
2020

21-
import { NotebookDiffModel, CellDiffModel } from "../model";
21+
import type { NotebookDiffModel, CellDiffModel } from "../model";
2222

2323
const NBDIFF_CLASS = "jp-Notebook-diff";
2424

25-
type Command<T> = new (renderFunc: ()=> CellDiffWidget) => T
26-
2725

2826
/**
2927
* NotebookDiffWidget
3028
*/
3129
export class NotebookDiffWidget extends Panel {
30+
private _model: NotebookDiffModel;
31+
private _rendermime: IRenderMimeRegistry;
32+
private previousCell: LinkedListCell | null;
33+
3234
constructor(
3335
model: NotebookDiffModel,
3436
rendermime: IRenderMimeRegistry,
35-
displayedCellWrapper: Command<ILinkedListCell> = LinkedListCell,
36-
lazyDisplayWrapper: Command<LazyDisplayLinkedListCell> = LazyDisplayLinkedListCell
3737
) {
3838
super();
3939
this._model = model;
4040
this._rendermime = rendermime;
4141
this.addClass(NBDIFF_CLASS);
4242
this.previousCell = null;
43-
this.displayedCellWrapper = displayedCellWrapper;
44-
this.lazyDisplayWrapper = lazyDisplayWrapper;
4543
}
4644

4745
/**
@@ -145,10 +143,4 @@ export class NotebookDiffWidget extends Panel {
145143
get model(): NotebookDiffModel {
146144
return this._model;
147145
}
148-
149-
private _model: NotebookDiffModel;
150-
private _rendermime: IRenderMimeRegistry;
151-
private previousCell: LinkedListCell | null;
152-
private displayedCellWrapper: Command<ILinkedListCell>;
153-
private lazyDisplayWrapper: Command<ILinkedListCell>;
154146
}

packages/nbdime/src/styles/variables.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
--jp-merge-either-color2: #cff4f4;
3030
--jp-expand-outer-wrapper: rgb(221, 244, 255);
3131
--jp-expand-color: rgb(87, 96, 106);
32-
--jp-expand-a-color: rgba(84, 174, 255, 0.4)
32+
--jp-expand-a-color: rgba(84, 174, 255, 0.4);
3333
--jp-expand-svg-color: rgb(87, 96, 106);
3434
--jp-expand-a-hover-color: rgb(14, 94, 208);
3535
--jp-expand-a-hover-svg-color: rgb(255, 255, 255);

packages/webapp/src/app/diff.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,13 @@
22
// Distributed under the terms of the Modified BSD License.
33
"use strict";
44

5-
import * as nbformat from "@jupyterlab/nbformat";
6-
75
import type * as nbformat from '@jupyterlab/nbformat';
86
import { Panel, Widget } from "@lumino/widgets";
97

108
import { RenderMimeRegistry } from "@jupyterlab/rendermime";
119

1210
import { defaultSanitizer } from "@jupyterlab/apputils";
1311

14-
import { PageConfig } from "@jupyterlab/coreutils";
15-
1612
import type {
1713
IDiffEntry
1814
} from 'nbdime/lib/diff/diffentries';
@@ -27,6 +23,7 @@ import { getBaseUrl, getConfigOption, toggleSpinner } from "./common";
2723
import { exportDiff } from "./staticdiff";
2824

2925
import { rendererFactories } from "./rendermime";
26+
import { MathJaxTypesetter } from "@jupyterlab/mathjax2";
3027

3128
let diffWidget: NotebookDiffWidget | null = null;
3229

0 commit comments

Comments
 (0)