@jupyterlab/markdownviewer 4.0.10 → 4.0.11
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/toc.d.ts +3 -2
- package/lib/toc.js +4 -3
- package/lib/toc.js.map +1 -1
- package/package.json +7 -7
- package/src/toc.ts +6 -4
package/lib/toc.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IWidgetTracker } from '@jupyterlab/apputils';
|
|
2
|
-
import { IMarkdownParser } from '@jupyterlab/rendermime';
|
|
2
|
+
import { IMarkdownParser, IRenderMime } from '@jupyterlab/rendermime';
|
|
3
3
|
import { TableOfContents, TableOfContentsFactory, TableOfContentsModel, TableOfContentsUtils } from '@jupyterlab/toc';
|
|
4
4
|
import { MarkdownDocument } from './widget';
|
|
5
5
|
/**
|
|
@@ -49,13 +49,14 @@ export declare class MarkdownViewerTableOfContentsModel extends TableOfContentsM
|
|
|
49
49
|
*/
|
|
50
50
|
export declare class MarkdownViewerTableOfContentsFactory extends TableOfContentsFactory<MarkdownDocument> {
|
|
51
51
|
protected parser: IMarkdownParser | null;
|
|
52
|
+
protected sanitizer: IRenderMime.ISanitizer;
|
|
52
53
|
/**
|
|
53
54
|
* Constructor
|
|
54
55
|
*
|
|
55
56
|
* @param tracker Widget tracker
|
|
56
57
|
* @param parser Markdown parser
|
|
57
58
|
*/
|
|
58
|
-
constructor(tracker: IWidgetTracker<MarkdownDocument>, parser: IMarkdownParser | null);
|
|
59
|
+
constructor(tracker: IWidgetTracker<MarkdownDocument>, parser: IMarkdownParser | null, sanitizer: IRenderMime.ISanitizer);
|
|
59
60
|
/**
|
|
60
61
|
* Create a new table of contents model for the widget
|
|
61
62
|
*
|
package/lib/toc.js
CHANGED
|
@@ -64,9 +64,10 @@ export class MarkdownViewerTableOfContentsFactory extends TableOfContentsFactory
|
|
|
64
64
|
* @param tracker Widget tracker
|
|
65
65
|
* @param parser Markdown parser
|
|
66
66
|
*/
|
|
67
|
-
constructor(tracker, parser) {
|
|
67
|
+
constructor(tracker, parser, sanitizer) {
|
|
68
68
|
super(tracker);
|
|
69
69
|
this.parser = parser;
|
|
70
|
+
this.sanitizer = sanitizer;
|
|
70
71
|
}
|
|
71
72
|
/**
|
|
72
73
|
* Create a new table of contents model for the widget
|
|
@@ -104,11 +105,11 @@ export class MarkdownViewerTableOfContentsFactory extends TableOfContentsFactory
|
|
|
104
105
|
headingToElement = new WeakMap();
|
|
105
106
|
model.headings.forEach(async (heading) => {
|
|
106
107
|
var _a;
|
|
107
|
-
const elementId = await TableOfContentsUtils.Markdown.getHeadingId(this.parser, heading.raw, heading.level);
|
|
108
|
+
const elementId = await TableOfContentsUtils.Markdown.getHeadingId(this.parser, heading.raw, heading.level, this.sanitizer);
|
|
108
109
|
if (!elementId) {
|
|
109
110
|
return;
|
|
110
111
|
}
|
|
111
|
-
const selector = `h${heading.level}[id="${elementId}"]`;
|
|
112
|
+
const selector = `h${heading.level}[id="${CSS.escape(elementId)}"]`;
|
|
112
113
|
headingToElement.set(heading, TableOfContentsUtils.addPrefix(widget.content.node, selector, (_a = heading.prefix) !== null && _a !== void 0 ? _a : ''));
|
|
113
114
|
});
|
|
114
115
|
};
|
package/lib/toc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toc.js","sourceRoot":"","sources":["../src/toc.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAI3D,OAAO,EAEL,sBAAsB,EACtB,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AASzB;;GAEG;AACH,MAAM,OAAO,kCAAmC,SAAQ,oBAGvD;IACC;;;;;;OAMG;IACH,YACE,MAAwB,EACd,MAA8B,EACxC,aAAuC;QAEvC,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAHnB,WAAM,GAAN,MAAM,CAAwB;IAI1C,CAAC;IAED;;;;;;OAMG;IACH,IAAI,YAAY;QACd,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACH,IAAc,cAAc;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,IAAI,gBAAgB;QAClB,OAAO,CAAC,cAAc,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAC1D,CAAC;IAED;;;;OAIG;IACO,WAAW;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,cAAc,CAClD,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,EAClD;YACE,GAAG,IAAI,CAAC,aAAa;YACrB,qCAAqC;YACrC,aAAa,EAAE,CAAC;SACjB,CACF,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,oCAAqC,SAAQ,sBAAwC;IAChG;;;;;OAKG;IACH,YACE,OAAyC,EAC/B,MAA8B;
|
|
1
|
+
{"version":3,"file":"toc.js","sourceRoot":"","sources":["../src/toc.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/markdownviewer",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.11",
|
|
4
4
|
"description": "JupyterLab - Markdown viewer Widget",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -37,12 +37,12 @@
|
|
|
37
37
|
"watch": "tsc -b --watch"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@jupyterlab/apputils": "^4.1.
|
|
41
|
-
"@jupyterlab/coreutils": "^6.0.
|
|
42
|
-
"@jupyterlab/docregistry": "^4.0.
|
|
43
|
-
"@jupyterlab/rendermime": "^4.0.
|
|
44
|
-
"@jupyterlab/toc": "^6.0.
|
|
45
|
-
"@jupyterlab/translation": "^4.0.
|
|
40
|
+
"@jupyterlab/apputils": "^4.1.11",
|
|
41
|
+
"@jupyterlab/coreutils": "^6.0.11",
|
|
42
|
+
"@jupyterlab/docregistry": "^4.0.11",
|
|
43
|
+
"@jupyterlab/rendermime": "^4.0.11",
|
|
44
|
+
"@jupyterlab/toc": "^6.0.11",
|
|
45
|
+
"@jupyterlab/translation": "^4.0.11",
|
|
46
46
|
"@lumino/coreutils": "^2.1.2",
|
|
47
47
|
"@lumino/messaging": "^2.0.1",
|
|
48
48
|
"@lumino/signaling": "^2.1.2",
|
package/src/toc.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Distributed under the terms of the Modified BSD License.
|
|
3
3
|
|
|
4
4
|
import { IWidgetTracker } from '@jupyterlab/apputils';
|
|
5
|
-
import { IMarkdownParser } from '@jupyterlab/rendermime';
|
|
5
|
+
import { IMarkdownParser, IRenderMime } from '@jupyterlab/rendermime';
|
|
6
6
|
import {
|
|
7
7
|
TableOfContents,
|
|
8
8
|
TableOfContentsFactory,
|
|
@@ -96,7 +96,8 @@ export class MarkdownViewerTableOfContentsFactory extends TableOfContentsFactory
|
|
|
96
96
|
*/
|
|
97
97
|
constructor(
|
|
98
98
|
tracker: IWidgetTracker<MarkdownDocument>,
|
|
99
|
-
protected parser: IMarkdownParser | null
|
|
99
|
+
protected parser: IMarkdownParser | null,
|
|
100
|
+
protected sanitizer: IRenderMime.ISanitizer
|
|
100
101
|
) {
|
|
101
102
|
super(tracker);
|
|
102
103
|
}
|
|
@@ -165,13 +166,14 @@ export class MarkdownViewerTableOfContentsFactory extends TableOfContentsFactory
|
|
|
165
166
|
const elementId = await TableOfContentsUtils.Markdown.getHeadingId(
|
|
166
167
|
this.parser!,
|
|
167
168
|
heading.raw,
|
|
168
|
-
heading.level
|
|
169
|
+
heading.level,
|
|
170
|
+
this.sanitizer
|
|
169
171
|
);
|
|
170
172
|
|
|
171
173
|
if (!elementId) {
|
|
172
174
|
return;
|
|
173
175
|
}
|
|
174
|
-
const selector = `h${heading.level}[id="${elementId}"]`;
|
|
176
|
+
const selector = `h${heading.level}[id="${CSS.escape(elementId)}"]`;
|
|
175
177
|
|
|
176
178
|
headingToElement.set(
|
|
177
179
|
heading,
|