@jupyterlab/imageviewer 4.7.0-alpha.0 → 4.7.0-alpha.2
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/widget.d.ts +5 -0
- package/lib/widget.js +37 -8
- package/lib/widget.js.map +1 -1
- package/package.json +8 -8
- package/src/widget.ts +40 -8
package/lib/widget.d.ts
CHANGED
|
@@ -73,6 +73,10 @@ export declare class ImageViewer extends Widget implements Printing.IPrintable {
|
|
|
73
73
|
* Render the widget content.
|
|
74
74
|
*/
|
|
75
75
|
private _render;
|
|
76
|
+
/**
|
|
77
|
+
* Revoke the active object URL if the image viewer has one.
|
|
78
|
+
*/
|
|
79
|
+
private _revokeObjectUrl;
|
|
76
80
|
/**
|
|
77
81
|
* Update the image CSS style, including the transform and filter.
|
|
78
82
|
*/
|
|
@@ -83,6 +87,7 @@ export declare class ImageViewer extends Widget implements Printing.IPrintable {
|
|
|
83
87
|
private _colorinversion;
|
|
84
88
|
private _ready;
|
|
85
89
|
private _img;
|
|
90
|
+
private _objectUrl;
|
|
86
91
|
}
|
|
87
92
|
/**
|
|
88
93
|
* A widget factory for images.
|
package/lib/widget.js
CHANGED
|
@@ -9,6 +9,14 @@ import { Widget } from '@lumino/widgets';
|
|
|
9
9
|
* The class name added to a imageviewer.
|
|
10
10
|
*/
|
|
11
11
|
const IMAGE_CLASS = 'jp-ImageViewer';
|
|
12
|
+
/**
|
|
13
|
+
* The class name added to an SVG imageviewer.
|
|
14
|
+
*/
|
|
15
|
+
const SVG_CLASS = 'jp-mod-svg';
|
|
16
|
+
/**
|
|
17
|
+
* The MIME type for SVG images.
|
|
18
|
+
*/
|
|
19
|
+
const SVG_MIME_TYPE = 'image/svg+xml';
|
|
12
20
|
/**
|
|
13
21
|
* A widget for images.
|
|
14
22
|
*/
|
|
@@ -22,6 +30,7 @@ export class ImageViewer extends Widget {
|
|
|
22
30
|
this._matrix = [1, 0, 0, 1];
|
|
23
31
|
this._colorinversion = 0;
|
|
24
32
|
this._ready = new PromiseDelegate();
|
|
33
|
+
this._objectUrl = null;
|
|
25
34
|
this.context = context;
|
|
26
35
|
this.node.tabIndex = 0;
|
|
27
36
|
this.addClass(IMAGE_CLASS);
|
|
@@ -84,9 +93,7 @@ export class ImageViewer extends Widget {
|
|
|
84
93
|
* Dispose of resources held by the image viewer.
|
|
85
94
|
*/
|
|
86
95
|
dispose() {
|
|
87
|
-
|
|
88
|
-
URL.revokeObjectURL(this._img.src || '');
|
|
89
|
-
}
|
|
96
|
+
this._revokeObjectUrl();
|
|
90
97
|
super.dispose();
|
|
91
98
|
}
|
|
92
99
|
/**
|
|
@@ -154,16 +161,38 @@ export class ImageViewer extends Widget {
|
|
|
154
161
|
if (!cm) {
|
|
155
162
|
return;
|
|
156
163
|
}
|
|
157
|
-
|
|
158
|
-
|
|
164
|
+
this._mimeType = cm.mimetype;
|
|
165
|
+
this.toggleClass(SVG_CLASS, this._mimeType === SVG_MIME_TYPE);
|
|
166
|
+
this._revokeObjectUrl();
|
|
167
|
+
const content = context.model.toString();
|
|
159
168
|
if (cm.format === 'base64') {
|
|
160
169
|
this._img.src = `data:${this._mimeType};base64,${content}`;
|
|
161
170
|
}
|
|
162
171
|
else {
|
|
163
|
-
const
|
|
164
|
-
|
|
172
|
+
const blob = new Blob([content], { type: this._mimeType });
|
|
173
|
+
const objectUrl = URL.createObjectURL(blob);
|
|
174
|
+
this._objectUrl = objectUrl;
|
|
175
|
+
const revokeObjectUrl = () => {
|
|
176
|
+
this._img.removeEventListener('load', revokeObjectUrl);
|
|
177
|
+
this._img.removeEventListener('error', revokeObjectUrl);
|
|
178
|
+
if (this._objectUrl === objectUrl) {
|
|
179
|
+
this._objectUrl = null;
|
|
180
|
+
}
|
|
181
|
+
URL.revokeObjectURL(objectUrl);
|
|
182
|
+
};
|
|
183
|
+
this._img.addEventListener('load', revokeObjectUrl);
|
|
184
|
+
this._img.addEventListener('error', revokeObjectUrl);
|
|
185
|
+
this._img.src = objectUrl;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
/**
|
|
189
|
+
* Revoke the active object URL if the image viewer has one.
|
|
190
|
+
*/
|
|
191
|
+
_revokeObjectUrl() {
|
|
192
|
+
if (this._objectUrl) {
|
|
193
|
+
URL.revokeObjectURL(this._objectUrl);
|
|
194
|
+
this._objectUrl = null;
|
|
165
195
|
}
|
|
166
|
-
URL.revokeObjectURL(oldurl);
|
|
167
196
|
}
|
|
168
197
|
/**
|
|
169
198
|
* Update the image CSS style, including the transform and filter.
|
package/lib/widget.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"widget.js","sourceRoot":"","sources":["../src/widget.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAMhD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,GAAG,gBAAgB,CAAC;AAErC;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,MAAM;IACrC;;OAEG;IACH,YAAY,OAAiC;QAC3C,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"widget.js","sourceRoot":"","sources":["../src/widget.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/imageviewer",
|
|
3
|
-
"version": "4.7.0-alpha.
|
|
3
|
+
"version": "4.7.0-alpha.2",
|
|
4
4
|
"description": "JupyterLab - Image Widget",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -41,15 +41,15 @@
|
|
|
41
41
|
"watch": "tsc -b --watch"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@jupyterlab/apputils": "^4.8.0-alpha.
|
|
45
|
-
"@jupyterlab/coreutils": "^6.7.0-alpha.
|
|
46
|
-
"@jupyterlab/docregistry": "^4.7.0-alpha.
|
|
47
|
-
"@lumino/coreutils": "^2.2.
|
|
48
|
-
"@lumino/messaging": "^2.0.
|
|
49
|
-
"@lumino/widgets": "^2.
|
|
44
|
+
"@jupyterlab/apputils": "^4.8.0-alpha.2",
|
|
45
|
+
"@jupyterlab/coreutils": "^6.7.0-alpha.2",
|
|
46
|
+
"@jupyterlab/docregistry": "^4.7.0-alpha.2",
|
|
47
|
+
"@lumino/coreutils": "^2.2.3",
|
|
48
|
+
"@lumino/messaging": "^2.0.5",
|
|
49
|
+
"@lumino/widgets": "^2.9.0"
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
52
|
-
"@jupyterlab/testing": "^4.7.0-alpha.
|
|
52
|
+
"@jupyterlab/testing": "^4.7.0-alpha.2",
|
|
53
53
|
"@types/jest": "^29.2.0",
|
|
54
54
|
"jest": "^29.2.0",
|
|
55
55
|
"rimraf": "~5.0.5",
|
package/src/widget.ts
CHANGED
|
@@ -22,6 +22,16 @@ import { Widget } from '@lumino/widgets';
|
|
|
22
22
|
*/
|
|
23
23
|
const IMAGE_CLASS = 'jp-ImageViewer';
|
|
24
24
|
|
|
25
|
+
/**
|
|
26
|
+
* The class name added to an SVG imageviewer.
|
|
27
|
+
*/
|
|
28
|
+
const SVG_CLASS = 'jp-mod-svg';
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* The MIME type for SVG images.
|
|
32
|
+
*/
|
|
33
|
+
const SVG_MIME_TYPE = 'image/svg+xml';
|
|
34
|
+
|
|
25
35
|
/**
|
|
26
36
|
* A widget for images.
|
|
27
37
|
*/
|
|
@@ -106,9 +116,7 @@ export class ImageViewer extends Widget implements Printing.IPrintable {
|
|
|
106
116
|
* Dispose of resources held by the image viewer.
|
|
107
117
|
*/
|
|
108
118
|
dispose(): void {
|
|
109
|
-
|
|
110
|
-
URL.revokeObjectURL(this._img.src || '');
|
|
111
|
-
}
|
|
119
|
+
this._revokeObjectUrl();
|
|
112
120
|
super.dispose();
|
|
113
121
|
}
|
|
114
122
|
|
|
@@ -188,15 +196,38 @@ export class ImageViewer extends Widget implements Printing.IPrintable {
|
|
|
188
196
|
if (!cm) {
|
|
189
197
|
return;
|
|
190
198
|
}
|
|
191
|
-
|
|
192
|
-
|
|
199
|
+
this._mimeType = cm.mimetype;
|
|
200
|
+
this.toggleClass(SVG_CLASS, this._mimeType === SVG_MIME_TYPE);
|
|
201
|
+
this._revokeObjectUrl();
|
|
202
|
+
const content = context.model.toString();
|
|
193
203
|
if (cm.format === 'base64') {
|
|
194
204
|
this._img.src = `data:${this._mimeType};base64,${content}`;
|
|
195
205
|
} else {
|
|
196
|
-
const
|
|
197
|
-
|
|
206
|
+
const blob = new Blob([content], { type: this._mimeType });
|
|
207
|
+
const objectUrl = URL.createObjectURL(blob);
|
|
208
|
+
this._objectUrl = objectUrl;
|
|
209
|
+
const revokeObjectUrl = () => {
|
|
210
|
+
this._img.removeEventListener('load', revokeObjectUrl);
|
|
211
|
+
this._img.removeEventListener('error', revokeObjectUrl);
|
|
212
|
+
if (this._objectUrl === objectUrl) {
|
|
213
|
+
this._objectUrl = null;
|
|
214
|
+
}
|
|
215
|
+
URL.revokeObjectURL(objectUrl);
|
|
216
|
+
};
|
|
217
|
+
this._img.addEventListener('load', revokeObjectUrl);
|
|
218
|
+
this._img.addEventListener('error', revokeObjectUrl);
|
|
219
|
+
this._img.src = objectUrl;
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
/**
|
|
224
|
+
* Revoke the active object URL if the image viewer has one.
|
|
225
|
+
*/
|
|
226
|
+
private _revokeObjectUrl(): void {
|
|
227
|
+
if (this._objectUrl) {
|
|
228
|
+
URL.revokeObjectURL(this._objectUrl);
|
|
229
|
+
this._objectUrl = null;
|
|
198
230
|
}
|
|
199
|
-
URL.revokeObjectURL(oldurl);
|
|
200
231
|
}
|
|
201
232
|
|
|
202
233
|
/**
|
|
@@ -218,6 +249,7 @@ export class ImageViewer extends Widget implements Printing.IPrintable {
|
|
|
218
249
|
private _colorinversion = 0;
|
|
219
250
|
private _ready = new PromiseDelegate<void>();
|
|
220
251
|
private _img: HTMLImageElement;
|
|
252
|
+
private _objectUrl: string | null = null;
|
|
221
253
|
}
|
|
222
254
|
|
|
223
255
|
/**
|