@jupyterlab/ui-components 3.4.1 → 3.4.4
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/components/menu.js +28 -23
- package/lib/components/menu.js.map +1 -1
- package/package.json +5 -5
package/lib/components/menu.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
// Copyright (c) Jupyter Development Team.
|
|
2
2
|
// Distributed under the terms of the Modified BSD License.
|
|
3
|
+
/* global WeakRef */
|
|
3
4
|
import { ArrayExt } from '@lumino/algorithm';
|
|
4
5
|
import { DisposableDelegate } from '@lumino/disposable';
|
|
6
|
+
import { Signal } from '@lumino/signaling';
|
|
5
7
|
import { Menu } from '@lumino/widgets';
|
|
6
8
|
/**
|
|
7
9
|
* Namespace for JupyterLabMenu interfaces
|
|
@@ -174,14 +176,14 @@ class DisposableMenuItem {
|
|
|
174
176
|
* @param menu Menu
|
|
175
177
|
*/
|
|
176
178
|
constructor(item, menu) {
|
|
177
|
-
this._item = item;
|
|
179
|
+
this._item = new WeakRef(item);
|
|
178
180
|
this._menu = menu;
|
|
179
181
|
// dispose this item if the parent menu is disposed
|
|
180
182
|
const dispose = (menu) => {
|
|
181
|
-
menu.disposed.disconnect(dispose);
|
|
183
|
+
menu.disposed.disconnect(dispose, this);
|
|
182
184
|
this.dispose();
|
|
183
185
|
};
|
|
184
|
-
this._menu.disposed.connect(dispose);
|
|
186
|
+
this._menu.disposed.connect(dispose, this);
|
|
185
187
|
}
|
|
186
188
|
/**
|
|
187
189
|
* Whether the menu item is disposed or not.
|
|
@@ -193,108 +195,111 @@ class DisposableMenuItem {
|
|
|
193
195
|
* The type of the menu item.
|
|
194
196
|
*/
|
|
195
197
|
get type() {
|
|
196
|
-
return this._item.type;
|
|
198
|
+
return this._item.deref().type;
|
|
197
199
|
}
|
|
198
200
|
/**
|
|
199
201
|
* The command to execute when the item is triggered.
|
|
200
202
|
*/
|
|
201
203
|
get command() {
|
|
202
|
-
return this._item.command;
|
|
204
|
+
return this._item.deref().command;
|
|
203
205
|
}
|
|
204
206
|
/**
|
|
205
207
|
* The arguments for the command.
|
|
206
208
|
*/
|
|
207
209
|
get args() {
|
|
208
|
-
return this._item.args;
|
|
210
|
+
return this._item.deref().args;
|
|
209
211
|
}
|
|
210
212
|
/**
|
|
211
213
|
* The submenu for a `'submenu'` type item.
|
|
212
214
|
*/
|
|
213
215
|
get submenu() {
|
|
214
|
-
return this._item.submenu;
|
|
216
|
+
return this._item.deref().submenu;
|
|
215
217
|
}
|
|
216
218
|
/**
|
|
217
219
|
* The display label for the menu item.
|
|
218
220
|
*/
|
|
219
221
|
get label() {
|
|
220
|
-
return this._item.label;
|
|
222
|
+
return this._item.deref().label;
|
|
221
223
|
}
|
|
222
224
|
/**
|
|
223
225
|
* The mnemonic index for the menu item.
|
|
224
226
|
*/
|
|
225
227
|
get mnemonic() {
|
|
226
|
-
return this._item.mnemonic;
|
|
228
|
+
return this._item.deref().mnemonic;
|
|
227
229
|
}
|
|
228
230
|
/**
|
|
229
231
|
* The icon renderer for the menu item.
|
|
230
232
|
*/
|
|
231
233
|
get icon() {
|
|
232
|
-
return this._item.icon;
|
|
234
|
+
return this._item.deref().icon;
|
|
233
235
|
}
|
|
234
236
|
/**
|
|
235
237
|
* The icon class for the menu item.
|
|
236
238
|
*/
|
|
237
239
|
get iconClass() {
|
|
238
|
-
return this._item.iconClass;
|
|
240
|
+
return this._item.deref().iconClass;
|
|
239
241
|
}
|
|
240
242
|
/**
|
|
241
243
|
* The icon label for the menu item.
|
|
242
244
|
*/
|
|
243
245
|
get iconLabel() {
|
|
244
|
-
return this._item.iconLabel;
|
|
246
|
+
return this._item.deref().iconLabel;
|
|
245
247
|
}
|
|
246
248
|
/**
|
|
247
249
|
* The display caption for the menu item.
|
|
248
250
|
*/
|
|
249
251
|
get caption() {
|
|
250
|
-
return this._item.caption;
|
|
252
|
+
return this._item.deref().caption;
|
|
251
253
|
}
|
|
252
254
|
/**
|
|
253
255
|
* The extra class name for the menu item.
|
|
254
256
|
*/
|
|
255
257
|
get className() {
|
|
256
|
-
return this._item.className;
|
|
258
|
+
return this._item.deref().className;
|
|
257
259
|
}
|
|
258
260
|
/**
|
|
259
261
|
* The dataset for the menu item.
|
|
260
262
|
*/
|
|
261
263
|
get dataset() {
|
|
262
|
-
return this._item.dataset;
|
|
264
|
+
return this._item.deref().dataset;
|
|
263
265
|
}
|
|
264
266
|
/**
|
|
265
267
|
* Whether the menu item is enabled.
|
|
266
268
|
*/
|
|
267
269
|
get isEnabled() {
|
|
268
|
-
return this._item.isEnabled;
|
|
270
|
+
return this._item.deref().isEnabled;
|
|
269
271
|
}
|
|
270
272
|
/**
|
|
271
273
|
* Whether the menu item is toggled.
|
|
272
274
|
*/
|
|
273
275
|
get isToggled() {
|
|
274
|
-
return this._item.isToggled;
|
|
276
|
+
return this._item.deref().isToggled;
|
|
275
277
|
}
|
|
276
278
|
/**
|
|
277
279
|
* Whether the menu item is visible.
|
|
278
280
|
*/
|
|
279
281
|
get isVisible() {
|
|
280
|
-
return this.isVisible;
|
|
282
|
+
return this._item.deref().isVisible;
|
|
281
283
|
}
|
|
282
284
|
/**
|
|
283
285
|
* The key binding for the menu item.
|
|
284
286
|
*/
|
|
285
287
|
get keyBinding() {
|
|
286
|
-
return this._item.keyBinding;
|
|
288
|
+
return this._item.deref().keyBinding;
|
|
287
289
|
}
|
|
288
290
|
/**
|
|
289
291
|
* Dispose the menu item by removing it from its menu.
|
|
290
292
|
*/
|
|
291
293
|
dispose() {
|
|
292
|
-
this._isDisposed
|
|
293
|
-
if (this._menu.isDisposed) {
|
|
294
|
-
// Bail early
|
|
294
|
+
if (this._isDisposed) {
|
|
295
295
|
return;
|
|
296
296
|
}
|
|
297
|
-
this.
|
|
297
|
+
this._isDisposed = true;
|
|
298
|
+
const item = this._item.deref();
|
|
299
|
+
if (item && !this._menu.isDisposed) {
|
|
300
|
+
this._menu.removeItem(item);
|
|
301
|
+
}
|
|
302
|
+
Signal.clearData(this);
|
|
298
303
|
}
|
|
299
304
|
}
|
|
300
305
|
//# sourceMappingURL=menu.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.js","sourceRoot":"","sources":["../../src/components/menu.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,OAAO,EAAE,kBAAkB,EAAe,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"menu.js","sourceRoot":"","sources":["../../src/components/menu.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/ui-components",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.4",
|
|
4
4
|
"description": "JupyterLab - UI components written in React",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -44,15 +44,15 @@
|
|
|
44
44
|
"dependencies": {
|
|
45
45
|
"@blueprintjs/core": "^3.36.0",
|
|
46
46
|
"@blueprintjs/select": "^3.15.0",
|
|
47
|
-
"@jupyterlab/coreutils": "^5.4.
|
|
48
|
-
"@jupyterlab/translation": "^3.4.
|
|
47
|
+
"@jupyterlab/coreutils": "^5.4.4",
|
|
48
|
+
"@jupyterlab/translation": "^3.4.4",
|
|
49
49
|
"@lumino/algorithm": "^1.9.0",
|
|
50
50
|
"@lumino/commands": "^1.19.0",
|
|
51
51
|
"@lumino/coreutils": "^1.11.0",
|
|
52
52
|
"@lumino/disposable": "^1.10.0",
|
|
53
53
|
"@lumino/signaling": "^1.10.0",
|
|
54
54
|
"@lumino/virtualdom": "^1.14.0",
|
|
55
|
-
"@lumino/widgets": "^1.
|
|
55
|
+
"@lumino/widgets": "^1.33.0",
|
|
56
56
|
"@rjsf/core": "^3.1.0",
|
|
57
57
|
"react": "^17.0.1",
|
|
58
58
|
"react-dom": "^17.0.1",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"devDependencies": {
|
|
62
62
|
"@babel/core": "^7.10.2",
|
|
63
63
|
"@babel/preset-env": "^7.10.2",
|
|
64
|
-
"@jupyterlab/testutils": "^3.4.
|
|
64
|
+
"@jupyterlab/testutils": "^3.4.4",
|
|
65
65
|
"@storybook/addon-actions": "6.0.20",
|
|
66
66
|
"@storybook/react": "6.0.20",
|
|
67
67
|
"@types/jest": "^26.0.10",
|