@jupyterlab/shortcuts-extension 4.1.0-beta.2 → 4.1.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.
Files changed (5) hide show
  1. package/lib/components/ShortcutUI.d.ts +10 -2
  2. package/lib/components/ShortcutUI.js +13 -8
  3. package/lib/components/ShortcutUI.js.map +1 -1
  4. package/package.json +6 -6
  5. package/src/components/ShortcutUI.tsx +43 -18
package/lib/components/ShortcutUI.d.ts CHANGED
@@ -1,3 +1,5 @@
1
+ import { ISettingRegistry } from '@jupyterlab/settingregistry';
2
+ import { Menu } from '@lumino/widgets';
1
3
  import { IShortcutUIexternal } from './TopNav';
2
4
  import * as React from 'react';
3
5
  import { ShortcutObject, TakenByObject } from './ShortcutInput';
@@ -20,8 +22,13 @@ export interface IShortcutUIState {
20
22
  keyBindingsUsed: {
21
23
  [index: string]: TakenByObject;
22
24
  };
23
- contextMenu: any;
25
+ contextMenu: Menu;
24
26
  }
27
+ type ShortcutRegistry = {
28
+ [index: string]: ShortcutObject;
29
+ };
30
+ /** Transform SettingRegistry's shortcut list to list of ShortcutObjects */
31
+ export declare function getShortcutObjects(external: IShortcutUIexternal, settings: ISettingRegistry.ISettings): ShortcutRegistry;
25
32
  /** Top level React component for widget */
26
33
  export declare class ShortcutUI extends React.Component<IShortcutUIProps, IShortcutUIState> {
27
34
  constructor(props: IShortcutUIProps);
@@ -32,7 +39,7 @@ export declare class ShortcutUI extends React.Component<IShortcutUIProps, IShort
32
39
  /** Set the current seach query */
33
40
  updateSearchQuery: (event: MouseEvent) => void;
34
41
  /** Filter shortcut list using current search query */
35
- private searchFilterShortcuts;
42
+ private _searchFilterShortcuts;
36
43
  /** Reset all shortcuts to their defaults */
37
44
  resetShortcuts: () => Promise<void>;
38
45
  /** Set new shortcut for command, refresh state */
@@ -54,3 +61,4 @@ export declare class ShortcutUI extends React.Component<IShortcutUIProps, IShort
54
61
  contextMenu: (event: React.MouseEvent, commandIDs: string[]) => void;
55
62
  render(): JSX.Element | null;
56
63
  }
64
+ export {};
package/lib/components/ShortcutUI.js CHANGED
@@ -121,8 +121,9 @@ function matchItems(items, query) {
121
121
  return scores;
122
122
  }
123
123
  /** Transform SettingRegistry's shortcut list to list of ShortcutObjects */
124
- function getShortcutObjects(external, settings) {
125
- const shortcuts = settings.composite.shortcuts;
124
+ export function getShortcutObjects(external, settings) {
125
+ const shortcuts = settings.composite
126
+ .shortcuts;
126
127
  let shortcutObjects = {};
127
128
  shortcuts.forEach((shortcut) => {
128
129
  let key = shortcut.command + '_' + shortcut.selector;
@@ -135,11 +136,14 @@ function getShortcutObjects(external, settings) {
135
136
  let shortcutObject = new ShortcutObject();
136
137
  shortcutObject.commandName = shortcut.command;
137
138
  let label = external.getLabel(shortcut.command);
139
+ const commandParts = shortcut.command.split(':');
138
140
  if (!label) {
139
- label = shortcut.command.split(':')[1];
141
+ // TODO needs translation
142
+ label =
143
+ commandParts.length > 1 ? commandParts[1] : '(Command label missing)';
140
144
  }
141
145
  shortcutObject.label = label;
142
- shortcutObject.category = shortcut.command.split(':')[0];
146
+ shortcutObject.category = commandParts[0];
143
147
  shortcutObject.keys[0] = shortcut.keys;
144
148
  shortcutObject.selector = shortcut.selector;
145
149
  // TODO needs translation
@@ -150,7 +154,8 @@ function getShortcutObjects(external, settings) {
150
154
  }
151
155
  });
152
156
  // find all the shortcuts that have custom settings
153
- const userShortcuts = settings.user.shortcuts;
157
+ const userShortcuts = settings.user
158
+ .shortcuts;
154
159
  userShortcuts.forEach((userSetting) => {
155
160
  const command = userSetting.command;
156
161
  const selector = userSetting.selector;
@@ -186,7 +191,7 @@ export class ShortcutUI extends React.Component {
186
191
  this.setState({
187
192
  searchQuery: event.target['value']
188
193
  }, () => this.setState({
189
- filteredShortcutList: this.searchFilterShortcuts(this.state.shortcutList)
194
+ filteredShortcutList: this._searchFilterShortcuts(this.state.shortcutList)
190
195
  }, () => {
191
196
  this.sortShortcuts();
192
197
  }));
@@ -312,7 +317,7 @@ export class ShortcutUI extends React.Component {
312
317
  const shortcutObjects = getShortcutObjects(this.props.external, shortcuts);
313
318
  this.setState({
314
319
  shortcutList: shortcutObjects,
315
- filteredShortcutList: this.searchFilterShortcuts(shortcutObjects),
320
+ filteredShortcutList: this._searchFilterShortcuts(shortcutObjects),
316
321
  shortcutsFetched: true
317
322
  }, () => {
318
323
  let keyBindingsUsed = getKeyBindingsUsed(shortcutObjects);
@@ -321,7 +326,7 @@ export class ShortcutUI extends React.Component {
321
326
  });
322
327
  }
323
328
  /** Filter shortcut list using current search query */
324
- searchFilterShortcuts(shortcutObjects) {
329
+ _searchFilterShortcuts(shortcutObjects) {
325
330
  const filteredShortcuts = matchItems(shortcutObjects, this.state.searchQuery).map((item) => {
326
331
  return item.item;
327
332
  });
package/lib/components/ShortcutUI.js.map CHANGED
@@ -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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jupyterlab/shortcuts-extension",
3
- "version": "4.1.0-beta.2",
3
+ "version": "4.1.0-rc.0",
4
4
  "description": "JupyterLab - Shortcuts Extension",
5
5
  "homepage": "https://github.com/jupyterlab/jupyterlab",
6
6
  "bugs": {
@@ -41,10 +41,10 @@
41
41
  "watch": "tsc -b --watch"
42
42
  },
43
43
  "dependencies": {
44
- "@jupyterlab/application": "^4.1.0-beta.2",
45
- "@jupyterlab/settingregistry": "^4.1.0-beta.2",
46
- "@jupyterlab/translation": "^4.1.0-beta.2",
47
- "@jupyterlab/ui-components": "^4.1.0-beta.2",
44
+ "@jupyterlab/application": "^4.1.0-rc.0",
45
+ "@jupyterlab/settingregistry": "^4.1.0-rc.0",
46
+ "@jupyterlab/translation": "^4.1.0-rc.0",
47
+ "@jupyterlab/ui-components": "^4.1.0-rc.0",
48
48
  "@lumino/algorithm": "^2.0.1",
49
49
  "@lumino/commands": "^2.2.0",
50
50
  "@lumino/coreutils": "^2.1.2",
@@ -55,7 +55,7 @@
55
55
  "react": "^18.2.0"
56
56
  },
57
57
  "devDependencies": {
58
- "@jupyterlab/testing": "^4.1.0-beta.2",
58
+ "@jupyterlab/testing": "^4.1.0-rc.0",
59
59
  "@types/jest": "^29.2.0",
60
60
  "rimraf": "~5.0.5",
61
61
  "typedoc": "~0.24.7",
package/src/components/ShortcutUI.tsx CHANGED
@@ -7,8 +7,12 @@ import { ISettingRegistry } from '@jupyterlab/settingregistry';
7
7
 
8
8
  import { ArrayExt, StringExt } from '@lumino/algorithm';
9
9
 
10
+ import { CommandRegistry } from '@lumino/commands';
11
+
10
12
  import { ReadonlyJSONArray } from '@lumino/coreutils';
11
13
 
14
+ import { Menu } from '@lumino/widgets';
15
+
12
16
  import { ShortcutList } from './ShortcutList';
13
17
 
14
18
  import { IShortcutUIexternal, TopNav } from './TopNav';
@@ -39,7 +43,16 @@ export interface IShortcutUIState {
39
43
  showSelectors: boolean;
40
44
  currentSort: string;
41
45
  keyBindingsUsed: { [index: string]: TakenByObject };
42
- contextMenu: any;
46
+ contextMenu: Menu;
47
+ }
48
+
49
+ /** Search result data **/
50
+ interface ISearchResult {
51
+ matchType: MatchType;
52
+ categoryIndices: number[] | null;
53
+ labelIndices: number[] | null;
54
+ score: number;
55
+ item: ShortcutObject;
43
56
  }
44
57
 
45
58
  /** Normalize the query text for a fuzzy search. */
@@ -48,7 +61,10 @@ function normalizeQuery(text: string): string {
48
61
  }
49
62
 
50
63
  /** Perform a fuzzy search on a single command item. */
51
- function fuzzySearch(item: any, query: string): any | null {
64
+ function fuzzySearch(
65
+ item: ShortcutObject,
66
+ query: string
67
+ ): ISearchResult | null {
52
68
  // Create the source text to be searched.
53
69
  const category = item.category.toLowerCase();
54
70
  const label = item['label'].toLowerCase();
@@ -140,12 +156,12 @@ function fuzzySearch(item: any, query: string): any | null {
140
156
  }
141
157
 
142
158
  /** Perform a fuzzy match on an array of command items. */
143
- function matchItems(items: any, query: string): any {
159
+ function matchItems(items: ShortcutRegistry, query: string): ISearchResult[] {
144
160
  // Normalize the query text to lower case with no whitespace.
145
161
  query = normalizeQuery(query);
146
162
 
147
163
  // Create the array to hold the scores.
148
- let scores: any[] = [];
164
+ let scores: ISearchResult[] = [];
149
165
  // Iterate over the items and match against the query.
150
166
  let itemList = Object.keys(items);
151
167
  for (let i = 0, n = itemList.length; i < n; ++i) {
@@ -179,14 +195,17 @@ function matchItems(items: any, query: string): any {
179
195
  return scores;
180
196
  }
181
197
 
198
+ type ShortcutRegistry = { [index: string]: ShortcutObject };
199
+
182
200
  /** Transform SettingRegistry's shortcut list to list of ShortcutObjects */
183
- function getShortcutObjects(
201
+ export function getShortcutObjects(
184
202
  external: IShortcutUIexternal,
185
203
  settings: ISettingRegistry.ISettings
186
- ): { [index: string]: ShortcutObject } {
187
- const shortcuts = settings.composite.shortcuts as ReadonlyJSONArray;
188
- let shortcutObjects: { [index: string]: ShortcutObject } = {};
189
- shortcuts.forEach((shortcut: any) => {
204
+ ): ShortcutRegistry {
205
+ const shortcuts = settings.composite
206
+ .shortcuts as unknown as CommandRegistry.IKeyBindingOptions[];
207
+ let shortcutObjects: ShortcutRegistry = {};
208
+ shortcuts.forEach((shortcut: CommandRegistry.IKeyBindingOptions) => {
190
209
  let key = shortcut.command + '_' + shortcut.selector;
191
210
  if (Object.keys(shortcutObjects).indexOf(key) !== -1) {
192
211
  let currentCount = shortcutObjects[key].numberOfShortcuts;
@@ -196,11 +215,14 @@ function getShortcutObjects(
196
215
  let shortcutObject = new ShortcutObject();
197
216
  shortcutObject.commandName = shortcut.command;
198
217
  let label = external.getLabel(shortcut.command);
218
+ const commandParts = shortcut.command.split(':');
199
219
  if (!label) {
200
- label = shortcut.command.split(':')[1];
220
+ // TODO needs translation
221
+ label =
222
+ commandParts.length > 1 ? commandParts[1] : '(Command label missing)';
201
223
  }
202
224
  shortcutObject.label = label;
203
- shortcutObject.category = shortcut.command.split(':')[0];
225
+ shortcutObject.category = commandParts[0];
204
226
  shortcutObject.keys[0] = shortcut.keys;
205
227
  shortcutObject.selector = shortcut.selector;
206
228
  // TODO needs translation
@@ -211,8 +233,9 @@ function getShortcutObjects(
211
233
  }
212
234
  });
213
235
  // find all the shortcuts that have custom settings
214
- const userShortcuts: any = settings.user.shortcuts;
215
- userShortcuts.forEach((userSetting: any) => {
236
+ const userShortcuts = settings.user
237
+ .shortcuts as unknown as CommandRegistry.IKeyBindingOptions[];
238
+ userShortcuts.forEach((userSetting: CommandRegistry.IKeyBindingOptions) => {
216
239
  const command: string = userSetting.command;
217
240
  const selector: string = userSetting.selector;
218
241
  const keyTo = command + '_' + selector;
@@ -232,7 +255,7 @@ function getKeyBindingsUsed(shortcutObjects: {
232
255
  let keyBindingsUsed: { [index: string]: TakenByObject } = {};
233
256
 
234
257
  Object.keys(shortcutObjects).forEach((shortcut: string) => {
235
- Object.keys(shortcutObjects[shortcut].keys).forEach((key: any) => {
258
+ Object.keys(shortcutObjects[shortcut].keys).forEach((key: string) => {
236
259
  const takenBy = new TakenByObject(shortcutObjects[shortcut]);
237
260
  takenBy.takenByKey = key;
238
261
 
@@ -277,7 +300,7 @@ export class ShortcutUI extends React.Component<
277
300
  this.setState(
278
301
  {
279
302
  shortcutList: shortcutObjects,
280
- filteredShortcutList: this.searchFilterShortcuts(shortcutObjects),
303
+ filteredShortcutList: this._searchFilterShortcuts(shortcutObjects),
281
304
  shortcutsFetched: true
282
305
  },
283
306
  () => {
@@ -297,7 +320,7 @@ export class ShortcutUI extends React.Component<
297
320
  () =>
298
321
  this.setState(
299
322
  {
300
- filteredShortcutList: this.searchFilterShortcuts(
323
+ filteredShortcutList: this._searchFilterShortcuts(
301
324
  this.state.shortcutList
302
325
  )
303
326
  },
@@ -309,11 +332,13 @@ export class ShortcutUI extends React.Component<
309
332
  };
310
333
 
311
334
  /** Filter shortcut list using current search query */
312
- private searchFilterShortcuts(shortcutObjects: any): ShortcutObject[] {
335
+ private _searchFilterShortcuts(
336
+ shortcutObjects: ShortcutRegistry
337
+ ): ShortcutObject[] {
313
338
  const filteredShortcuts = matchItems(
314
339
  shortcutObjects,
315
340
  this.state.searchQuery
316
- ).map((item: any) => {
341
+ ).map((item: ISearchResult) => {
317
342
  return item.item;
318
343
  });
319
344
  return filteredShortcuts;