@jupyterlab/shortcuts-extension 5.0.0-beta.2 → 5.0.0-rc.0
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/ShortcutItem.js +2 -2
- package/lib/components/ShortcutItem.js.map +1 -1
- package/lib/components/ShortcutUI.js +8 -1
- package/lib/components/ShortcutUI.js.map +1 -1
- package/lib/components/TopNav.js +2 -2
- package/lib/components/TopNav.js.map +1 -1
- package/package.json +6 -6
- package/src/components/ShortcutItem.tsx +3 -6
- package/src/components/ShortcutUI.tsx +9 -1
- package/src/components/TopNav.tsx +5 -7
- package/style/base.css +6 -14
|
@@ -128,7 +128,7 @@ export class ShortcutItem extends React.Component {
|
|
|
128
128
|
}, toSymbols: this.toSymbols, displayInput: this.getDisplayReplaceInput(location), placeholder: this.toSymbols(binding.keys.join(', ')), translator: this.props.external.translator }));
|
|
129
129
|
}
|
|
130
130
|
getShortCutForDisplayOnly(binding) {
|
|
131
|
-
return binding.keys.map((keyboardKey, index) => (React.createElement("div", { className: "jp-Shortcuts-ShortcutKeysContainer", key: index
|
|
131
|
+
return binding.keys.map((keyboardKey, index) => (React.createElement("div", { className: "jp-Shortcuts-ShortcutKeysContainer", key: index },
|
|
132
132
|
React.createElement("div", { className: "jp-Shortcuts-ShortcutKeys" }, this.toSymbols(keyboardKey)),
|
|
133
133
|
index + 1 < binding.keys.length ? (React.createElement("div", { className: "jp-Shortcuts-Comma" }, ",")) : null)));
|
|
134
134
|
}
|
|
@@ -136,7 +136,7 @@ export class ShortcutItem extends React.Component {
|
|
|
136
136
|
return this.state.displayReplaceInput[location];
|
|
137
137
|
}
|
|
138
138
|
getDivForKey(index, binding, nonEmptyBindings) {
|
|
139
|
-
return (React.createElement("div", { className: "jp-Shortcuts-ShortcutContainer", key: this.props.shortcut.id + '_' + index, onClick: () => this.toggleInputReplaceMethod(index) },
|
|
139
|
+
return (React.createElement("div", { className: "jp-Shortcuts-ShortcutContainer", key: this.props.shortcut.id + '_' + index, "data-keybinding": index, "data-shortcut": this.props.shortcut.id, onClick: () => this.toggleInputReplaceMethod(index) },
|
|
140
140
|
this.isLocationBeingEdited(index)
|
|
141
141
|
? this.getShortCutAsInput(binding, index)
|
|
142
142
|
: this.getShortCutForDisplayOnly(binding),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShortcutItem.js","sourceRoot":"","sources":["../../src/components/ShortcutItem.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ShortcutItem.js","sourceRoot":"","sources":["../../src/components/ShortcutItem.tsx"],"names":[],"mappings":"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"}
|
|
@@ -249,13 +249,20 @@ export class ShortcutUI extends React.Component {
|
|
|
249
249
|
const userShortcuts = (_a = settings.user.shortcuts) !== null && _a !== void 0 ? _a : [];
|
|
250
250
|
const newUserShortcuts = [];
|
|
251
251
|
let found = false;
|
|
252
|
+
// Copy over existing user keybindings
|
|
252
253
|
for (let shortcut of userShortcuts) {
|
|
254
|
+
// If this is the query keybinding, update it with new `keys`
|
|
253
255
|
if (shortcut.command === target.command &&
|
|
254
256
|
shortcut.selector === target.selector &&
|
|
255
|
-
JSONExt.deepEqual((_b = shortcut.args) !== null && _b !== void 0 ? _b : {}, (_c = target.args) !== null && _c !== void 0 ? _c : {})
|
|
257
|
+
JSONExt.deepEqual((_b = shortcut.args) !== null && _b !== void 0 ? _b : {}, (_c = target.args) !== null && _c !== void 0 ? _c : {}) &&
|
|
258
|
+
keybinding &&
|
|
259
|
+
JSONExt.deepEqual(keybinding.keys, shortcut.keys)) {
|
|
256
260
|
const matchesDefault = keybinding &&
|
|
257
261
|
keybinding.isDefault &&
|
|
258
262
|
JSONExt.deepEqual(keybinding.keys, keys);
|
|
263
|
+
// If the new `keys` are empty, do not copy this one over.
|
|
264
|
+
// Also, if the keybinding is a default keybinding and the desired
|
|
265
|
+
// new `keys` are the same as default, it does not need to be added.
|
|
259
266
|
if (keys.length !== 0 && !matchesDefault) {
|
|
260
267
|
newUserShortcuts.push({
|
|
261
268
|
command: shortcut.command,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShortcutUI.js","sourceRoot":"","sources":["../../src/components/ShortcutUI.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ShortcutUI.js","sourceRoot":"","sources":["../../src/components/ShortcutUI.tsx"],"names":[],"mappings":"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"}
|
package/lib/components/TopNav.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Jupyter Development Team.
|
|
3
3
|
* Distributed under the terms of the Modified BSD License.
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import { FilterBox } from '@jupyterlab/ui-components';
|
|
6
6
|
import * as React from 'react';
|
|
7
7
|
import { ShortcutTitleItem } from './ShortcutTitleItem';
|
|
8
8
|
function Symbols(props) {
|
|
@@ -46,7 +46,7 @@ export class TopNav extends React.Component {
|
|
|
46
46
|
return (React.createElement("div", { className: "jp-Shortcuts-Top" },
|
|
47
47
|
React.createElement("div", { className: "jp-Shortcuts-TopNav" },
|
|
48
48
|
React.createElement(Symbols, null),
|
|
49
|
-
React.createElement(
|
|
49
|
+
React.createElement(FilterBox, { "aria-label": trans.__('Search shortcuts'), updateFilter: (_, query) => this.props.updateSearchQuery(query !== null && query !== void 0 ? query : ''), placeholder: trans.__('Search…'), useFuzzyFilter: false }),
|
|
50
50
|
React.createElement(AdvancedOptions, { toggleSelectors: this.props.toggleSelectors, showSelectors: this.props.showSelectors, resetShortcuts: this.props.resetShortcuts, translator: this.props.translator })),
|
|
51
51
|
React.createElement("div", { className: "jp-Shortcuts-HeaderRowContainer" },
|
|
52
52
|
React.createElement("div", { className: "jp-Shortcuts-HeaderRow" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TopNav.js","sourceRoot":"","sources":["../../src/components/TopNav.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"TopNav.js","sourceRoot":"","sources":["../../src/components/TopNav.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/shortcuts-extension",
|
|
3
|
-
"version": "5.0.0-
|
|
3
|
+
"version": "5.0.0-rc.0",
|
|
4
4
|
"description": "JupyterLab - Shortcuts Extension",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -40,10 +40,10 @@
|
|
|
40
40
|
"watch": "tsc -b --watch"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@jupyterlab/application": "^4.2.0-
|
|
44
|
-
"@jupyterlab/settingregistry": "^4.2.0-
|
|
45
|
-
"@jupyterlab/translation": "^4.2.0-
|
|
46
|
-
"@jupyterlab/ui-components": "^4.2.0-
|
|
43
|
+
"@jupyterlab/application": "^4.2.0-rc.0",
|
|
44
|
+
"@jupyterlab/settingregistry": "^4.2.0-rc.0",
|
|
45
|
+
"@jupyterlab/translation": "^4.2.0-rc.0",
|
|
46
|
+
"@jupyterlab/ui-components": "^4.2.0-rc.0",
|
|
47
47
|
"@lumino/algorithm": "^2.0.1",
|
|
48
48
|
"@lumino/commands": "^2.3.0",
|
|
49
49
|
"@lumino/coreutils": "^2.1.2",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"react": "^18.2.0"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
|
-
"@jupyterlab/testing": "^4.2.0-
|
|
57
|
+
"@jupyterlab/testing": "^4.2.0-rc.0",
|
|
58
58
|
"@types/jest": "^29.2.0",
|
|
59
59
|
"jest": "^29.2.0",
|
|
60
60
|
"rimraf": "~5.0.5",
|
|
@@ -219,12 +219,7 @@ export class ShortcutItem extends React.Component<
|
|
|
219
219
|
|
|
220
220
|
getShortCutForDisplayOnly(binding: IKeybinding): JSX.Element[] {
|
|
221
221
|
return binding.keys.map((keyboardKey: string, index: number) => (
|
|
222
|
-
<div
|
|
223
|
-
className="jp-Shortcuts-ShortcutKeysContainer"
|
|
224
|
-
key={index}
|
|
225
|
-
data-keybinding={index}
|
|
226
|
-
data-shortcut={this.props.shortcut.id}
|
|
227
|
-
>
|
|
222
|
+
<div className="jp-Shortcuts-ShortcutKeysContainer" key={index}>
|
|
228
223
|
<div className="jp-Shortcuts-ShortcutKeys">
|
|
229
224
|
{this.toSymbols(keyboardKey)}
|
|
230
225
|
</div>
|
|
@@ -248,6 +243,8 @@ export class ShortcutItem extends React.Component<
|
|
|
248
243
|
<div
|
|
249
244
|
className="jp-Shortcuts-ShortcutContainer"
|
|
250
245
|
key={this.props.shortcut.id + '_' + index}
|
|
246
|
+
data-keybinding={index}
|
|
247
|
+
data-shortcut={this.props.shortcut.id}
|
|
251
248
|
onClick={() => this.toggleInputReplaceMethod(index)}
|
|
252
249
|
>
|
|
253
250
|
{this.isLocationBeingEdited(index)
|
|
@@ -358,16 +358,24 @@ export class ShortcutUI
|
|
|
358
358
|
const userShortcuts = settings.user.shortcuts ?? [];
|
|
359
359
|
const newUserShortcuts = [];
|
|
360
360
|
let found = false;
|
|
361
|
+
// Copy over existing user keybindings
|
|
361
362
|
for (let shortcut of userShortcuts) {
|
|
363
|
+
// If this is the query keybinding, update it with new `keys`
|
|
362
364
|
if (
|
|
363
365
|
shortcut.command === target.command &&
|
|
364
366
|
shortcut.selector === target.selector &&
|
|
365
|
-
JSONExt.deepEqual(shortcut.args ?? {}, target.args ?? {})
|
|
367
|
+
JSONExt.deepEqual(shortcut.args ?? {}, target.args ?? {}) &&
|
|
368
|
+
keybinding &&
|
|
369
|
+
JSONExt.deepEqual(keybinding.keys, shortcut.keys)
|
|
366
370
|
) {
|
|
367
371
|
const matchesDefault =
|
|
368
372
|
keybinding &&
|
|
369
373
|
keybinding.isDefault &&
|
|
370
374
|
JSONExt.deepEqual(keybinding.keys, keys);
|
|
375
|
+
|
|
376
|
+
// If the new `keys` are empty, do not copy this one over.
|
|
377
|
+
// Also, if the keybinding is a default keybinding and the desired
|
|
378
|
+
// new `keys` are the same as default, it does not need to be added.
|
|
371
379
|
if (keys.length !== 0 && !matchesDefault) {
|
|
372
380
|
newUserShortcuts.push({
|
|
373
381
|
command: shortcut.command,
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
import { ITranslator } from '@jupyterlab/translation';
|
|
7
|
-
import {
|
|
7
|
+
import { FilterBox } from '@jupyterlab/ui-components';
|
|
8
8
|
import * as React from 'react';
|
|
9
9
|
|
|
10
10
|
import { ShortcutTitleItem } from './ShortcutTitleItem';
|
|
@@ -109,15 +109,13 @@ export class TopNav extends React.Component<ITopNavProps> {
|
|
|
109
109
|
<div className="jp-Shortcuts-Top">
|
|
110
110
|
<div className="jp-Shortcuts-TopNav">
|
|
111
111
|
<Symbols />
|
|
112
|
-
<
|
|
113
|
-
className="jp-Shortcuts-Search"
|
|
112
|
+
<FilterBox
|
|
114
113
|
aria-label={trans.__('Search shortcuts')}
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
this.props.updateSearchQuery(event.target['value'])
|
|
114
|
+
updateFilter={(_, query) =>
|
|
115
|
+
this.props.updateSearchQuery(query ?? '')
|
|
118
116
|
}
|
|
119
117
|
placeholder={trans.__('Search…')}
|
|
120
|
-
|
|
118
|
+
useFuzzyFilter={false}
|
|
121
119
|
/>
|
|
122
120
|
<AdvancedOptions
|
|
123
121
|
toggleSelectors={this.props.toggleSelectors}
|
package/style/base.css
CHANGED
|
@@ -215,6 +215,7 @@
|
|
|
215
215
|
border-radius: var(--jp-border-radius);
|
|
216
216
|
padding: 5px 6px;
|
|
217
217
|
margin: 3px 0;
|
|
218
|
+
cursor: pointer;
|
|
218
219
|
}
|
|
219
220
|
|
|
220
221
|
.jp-Shortcuts-Or {
|
|
@@ -248,6 +249,7 @@
|
|
|
248
249
|
margin: 3px 0;
|
|
249
250
|
padding: 5px 6px;
|
|
250
251
|
color: var(--jp-ui-inverse-font-color1);
|
|
252
|
+
cursor: pointer;
|
|
251
253
|
}
|
|
252
254
|
|
|
253
255
|
.jp-Shortcuts-Plus:hover {
|
|
@@ -336,25 +338,15 @@
|
|
|
336
338
|
padding-right: 10px;
|
|
337
339
|
}
|
|
338
340
|
|
|
339
|
-
.jp-Shortcuts-
|
|
340
|
-
|
|
341
|
-
}
|
|
342
|
-
|
|
343
|
-
.jp-Shortcuts-Search > input {
|
|
344
|
-
box-shadow: none;
|
|
345
|
-
}
|
|
346
|
-
|
|
347
|
-
.jp-Shortcuts-AdvancedOptionsSmall {
|
|
348
|
-
width: 30%;
|
|
349
|
-
}
|
|
350
|
-
|
|
351
|
-
.jp-Shortcuts-AdvancedOptionsRight {
|
|
352
|
-
margin-top: 8px;
|
|
341
|
+
.jp-Shortcuts-AdvancedOptions {
|
|
342
|
+
padding-left: 12px;
|
|
353
343
|
}
|
|
354
344
|
|
|
355
345
|
.jp-Shortcuts-AdvancedOptionsLink {
|
|
356
346
|
color: var(--jp-content-link-color);
|
|
357
347
|
margin-right: 15px;
|
|
348
|
+
display: inline-block;
|
|
349
|
+
cursor: pointer;
|
|
358
350
|
}
|
|
359
351
|
|
|
360
352
|
.jp-Shortcuts-AdvancedOptionsLink:hover {
|