@jupyterlab/apputils
Advanced tools
Comparing version 4.0.0-alpha.13 to 4.0.0-alpha.14
@@ -21,6 +21,11 @@ // Copyright (c) Jupyter Development Team. | ||
function getBoolean(options) { | ||
return showDialog(Object.assign(Object.assign({}, options), { body: new InputBooleanDialog(options), buttons: [ | ||
return showDialog({ | ||
...options, | ||
body: new InputBooleanDialog(options), | ||
buttons: [ | ||
Dialog.cancelButton({ label: options.cancelLabel }), | ||
Dialog.okButton({ label: options.okLabel }) | ||
], focusNodeSelector: 'input' })); | ||
], | ||
focusNodeSelector: 'input' | ||
}); | ||
} | ||
@@ -36,6 +41,11 @@ InputDialog.getBoolean = getBoolean; | ||
function getNumber(options) { | ||
return showDialog(Object.assign(Object.assign({}, options), { body: new InputNumberDialog(options), buttons: [ | ||
return showDialog({ | ||
...options, | ||
body: new InputNumberDialog(options), | ||
buttons: [ | ||
Dialog.cancelButton({ label: options.cancelLabel }), | ||
Dialog.okButton({ label: options.okLabel }) | ||
], focusNodeSelector: 'input' })); | ||
], | ||
focusNodeSelector: 'input' | ||
}); | ||
} | ||
@@ -51,6 +61,11 @@ InputDialog.getNumber = getNumber; | ||
function getItem(options) { | ||
return showDialog(Object.assign(Object.assign({}, options), { body: new InputItemsDialog(options), buttons: [ | ||
return showDialog({ | ||
...options, | ||
body: new InputItemsDialog(options), | ||
buttons: [ | ||
Dialog.cancelButton({ label: options.cancelLabel }), | ||
Dialog.okButton({ label: options.okLabel }) | ||
], focusNodeSelector: options.editable ? 'input' : 'select' })); | ||
], | ||
focusNodeSelector: options.editable ? 'input' : 'select' | ||
}); | ||
} | ||
@@ -66,6 +81,11 @@ InputDialog.getItem = getItem; | ||
function getText(options) { | ||
return showDialog(Object.assign(Object.assign({}, options), { body: new InputTextDialog(options), buttons: [ | ||
return showDialog({ | ||
...options, | ||
body: new InputTextDialog(options), | ||
buttons: [ | ||
Dialog.cancelButton({ label: options.cancelLabel }), | ||
Dialog.okButton({ label: options.okLabel }) | ||
], focusNodeSelector: 'input' })); | ||
], | ||
focusNodeSelector: 'input' | ||
}); | ||
} | ||
@@ -81,6 +101,11 @@ InputDialog.getText = getText; | ||
function getPassword(options) { | ||
return showDialog(Object.assign(Object.assign({}, options), { body: new InputPasswordDialog(options), buttons: [ | ||
return showDialog({ | ||
...options, | ||
body: new InputPasswordDialog(options), | ||
buttons: [ | ||
Dialog.cancelButton({ label: options.cancelLabel }), | ||
Dialog.okButton({ label: options.okLabel }) | ||
], focusNodeSelector: 'input' })); | ||
], | ||
focusNodeSelector: 'input' | ||
}); | ||
} | ||
@@ -87,0 +112,0 @@ InputDialog.getPassword = getPassword; |
@@ -5,13 +5,2 @@ /* | ||
*/ | ||
var __rest = (this && this.__rest) || function (s, e) { | ||
var t = {}; | ||
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) | ||
t[p] = s[p]; | ||
if (s != null && typeof Object.getOwnPropertySymbols === "function") | ||
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) { | ||
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) | ||
t[p[i]] = s[p[i]]; | ||
} | ||
return t; | ||
}; | ||
import { Text } from '@jupyterlab/coreutils'; | ||
@@ -74,5 +63,8 @@ import { LabIcon } from '@jupyterlab/ui-components'; | ||
function addContextItem(item, menu, menuFactory) { | ||
const { submenu } = item, newItem = __rest(item, ["submenu"]); | ||
const { submenu, ...newItem } = item; | ||
// Commands may not have been registered yet; so we don't force it to exist | ||
menu.addItem(Object.assign(Object.assign({}, newItem), { submenu: submenu ? dataToMenu(submenu, menuFactory) : null })); | ||
menu.addItem({ | ||
...newItem, | ||
submenu: submenu ? dataToMenu(submenu, menuFactory) : null | ||
}); | ||
} | ||
@@ -88,5 +80,8 @@ MenuFactory.addContextItem = addContextItem; | ||
function addItem(item, menu, menuFactory) { | ||
const { submenu } = item, newItem = __rest(item, ["submenu"]); | ||
const { submenu, ...newItem } = item; | ||
// Commands may not have been registered yet; so we don't force it to exist | ||
menu.addItem(Object.assign(Object.assign({}, newItem), { submenu: submenu ? dataToMenu(submenu, menuFactory) : null })); | ||
menu.addItem({ | ||
...newItem, | ||
submenu: submenu ? dataToMenu(submenu, menuFactory) : null | ||
}); | ||
} | ||
@@ -93,0 +88,0 @@ /** |
@@ -122,3 +122,9 @@ /* eslint-disable camelcase */ | ||
}; | ||
CssProp.C = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, CssProp._C), CssProp._C1), CssProp._C2), CssProp._C3), CssProp._C4); | ||
CssProp.C = { | ||
...CssProp._C, | ||
...CssProp._C1, | ||
...CssProp._C2, | ||
...CssProp._C3, | ||
...CssProp._C4 | ||
}; | ||
/* | ||
@@ -267,3 +273,3 @@ * Property value regular expressions not dependant on other sub expressions | ||
}; | ||
CssProp.CP = Object.assign(Object.assign({}, CssProp._CP), CssProp._CP1); | ||
CssProp.CP = { ...CssProp._CP, ...CssProp._CP1 }; | ||
// CSS Property value validation regular expressions for use with sanitize-html | ||
@@ -923,3 +929,3 @@ CssProp.BORDER_COLLAPSE = CssProp.reg(CssProp.AP.border_collapse); | ||
sanitize(dirty, options) { | ||
return sanitize(dirty, Object.assign(Object.assign({}, this._options), (options || {}))); | ||
return sanitize(dirty, { ...this._options, ...(options || {}) }); | ||
} | ||
@@ -926,0 +932,0 @@ } |
@@ -21,3 +21,7 @@ /* | ||
} | ||
this._commands.push(Object.assign({ isEnabled: () => true, rank: SemanticCommand.DEFAULT_RANK }, command)); | ||
this._commands.push({ | ||
isEnabled: () => true, | ||
rank: SemanticCommand.DEFAULT_RANK, | ||
...command | ||
}); | ||
} | ||
@@ -24,0 +28,0 @@ /** |
@@ -111,3 +111,3 @@ // Copyright (c) Jupyter Development Team. | ||
// iterate over the union of current and new CSS override keys | ||
Object.keys(Object.assign(Object.assign({}, this._overrides), newOverrides)).forEach(key => { | ||
Object.keys({ ...this._overrides, ...newOverrides }).forEach(key => { | ||
const val = newOverrides[key]; | ||
@@ -174,3 +174,6 @@ if (val && this.validateCSS(key, val)) { | ||
setCSSOverride(key, value) { | ||
return this._settings.set('overrides', Object.assign(Object.assign({}, this._overrides), { [key]: value })); | ||
return this._settings.set('overrides', { | ||
...this._overrides, | ||
[key]: value | ||
}); | ||
} | ||
@@ -177,0 +180,0 @@ /** |
@@ -84,3 +84,3 @@ /* | ||
const id = tId !== null && tId !== void 0 ? tId : ''; | ||
const args = Object.assign({ toolbar: true }, tArgs); | ||
const args = { toolbar: true, ...tArgs }; | ||
const icon = tIcon ? LabIcon.resolve({ icon: tIcon }) : undefined; | ||
@@ -87,0 +87,0 @@ // If there is an icon, undefined label will results in no label |
{ | ||
"name": "@jupyterlab/apputils", | ||
"version": "4.0.0-alpha.13", | ||
"version": "4.0.0-alpha.14", | ||
"description": "JupyterLab - Application Utilities", | ||
@@ -47,20 +47,20 @@ "keywords": [ | ||
"dependencies": { | ||
"@jupyterlab/coreutils": "^6.0.0-alpha.13", | ||
"@jupyterlab/observables": "^5.0.0-alpha.13", | ||
"@jupyterlab/rendermime-interfaces": "^3.8.0-alpha.13", | ||
"@jupyterlab/services": "^7.0.0-alpha.13", | ||
"@jupyterlab/settingregistry": "^4.0.0-alpha.13", | ||
"@jupyterlab/statedb": "^4.0.0-alpha.13", | ||
"@jupyterlab/statusbar": "^4.0.0-alpha.13", | ||
"@jupyterlab/translation": "^4.0.0-alpha.13", | ||
"@jupyterlab/ui-components": "^4.0.0-alpha.28", | ||
"@lumino/algorithm": "^2.0.0-alpha.1", | ||
"@lumino/commands": "^2.0.0-alpha.1", | ||
"@lumino/coreutils": "^2.0.0-alpha.1", | ||
"@lumino/disposable": "^2.0.0-alpha.1", | ||
"@lumino/domutils": "^2.0.0-alpha.1", | ||
"@lumino/messaging": "^2.0.0-alpha.1", | ||
"@lumino/signaling": "^2.0.0-alpha.1", | ||
"@lumino/virtualdom": "^2.0.0-alpha.1", | ||
"@lumino/widgets": "^2.0.0-alpha.1", | ||
"@jupyterlab/coreutils": "^6.0.0-alpha.14", | ||
"@jupyterlab/observables": "^5.0.0-alpha.14", | ||
"@jupyterlab/rendermime-interfaces": "^3.8.0-alpha.14", | ||
"@jupyterlab/services": "^7.0.0-alpha.14", | ||
"@jupyterlab/settingregistry": "^4.0.0-alpha.14", | ||
"@jupyterlab/statedb": "^4.0.0-alpha.14", | ||
"@jupyterlab/statusbar": "^4.0.0-alpha.14", | ||
"@jupyterlab/translation": "^4.0.0-alpha.14", | ||
"@jupyterlab/ui-components": "^4.0.0-alpha.29", | ||
"@lumino/algorithm": "^2.0.0-alpha.6", | ||
"@lumino/commands": "^2.0.0-alpha.6", | ||
"@lumino/coreutils": "^2.0.0-alpha.6", | ||
"@lumino/disposable": "^2.0.0-alpha.6", | ||
"@lumino/domutils": "^2.0.0-alpha.6", | ||
"@lumino/messaging": "^2.0.0-alpha.6", | ||
"@lumino/signaling": "^2.0.0-alpha.6", | ||
"@lumino/virtualdom": "^2.0.0-alpha.6", | ||
"@lumino/widgets": "^2.0.0-alpha.6", | ||
"@types/react": "^17.0.0", | ||
@@ -71,3 +71,3 @@ "react": "^17.0.1", | ||
"devDependencies": { | ||
"@jupyterlab/testutils": "^4.0.0-alpha.13", | ||
"@jupyterlab/testutils": "^4.0.0-alpha.14", | ||
"@types/jest": "^26.0.10", | ||
@@ -74,0 +74,0 @@ "@types/sanitize-html": "^2.3.1", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
9323
483074
3
7
0
49
+ Addedfast-uri@3.0.3(transitive)
- Removedfast-uri@3.0.5(transitive)