@theia/core 1.32.0-next.17 → 1.32.0-next.20
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/README.md +6 -6
- package/lib/browser/context-key-service.d.ts +17 -6
- package/lib/browser/context-key-service.d.ts.map +1 -1
- package/lib/browser/context-key-service.js +6 -0
- package/lib/browser/context-key-service.js.map +1 -1
- package/lib/browser/context-menu-renderer.d.ts +2 -0
- package/lib/browser/context-menu-renderer.d.ts.map +1 -1
- package/lib/browser/context-menu-renderer.js.map +1 -1
- package/lib/browser/menu/browser-context-menu-renderer.d.ts +1 -1
- package/lib/browser/menu/browser-context-menu-renderer.d.ts.map +1 -1
- package/lib/browser/menu/browser-context-menu-renderer.js +2 -2
- package/lib/browser/menu/browser-context-menu-renderer.js.map +1 -1
- package/lib/browser/menu/browser-menu-plugin.d.ts +4 -3
- package/lib/browser/menu/browser-menu-plugin.d.ts.map +1 -1
- package/lib/browser/menu/browser-menu-plugin.js +9 -6
- package/lib/browser/menu/browser-menu-plugin.js.map +1 -1
- package/lib/electron-browser/menu/electron-context-menu-renderer.js +2 -2
- package/lib/electron-browser/menu/electron-context-menu-renderer.js.map +1 -1
- package/lib/electron-browser/menu/electron-main-menu-factory.d.ts +8 -2
- package/lib/electron-browser/menu/electron-main-menu-factory.d.ts.map +1 -1
- package/lib/electron-browser/menu/electron-main-menu-factory.js +8 -6
- package/lib/electron-browser/menu/electron-main-menu-factory.js.map +1 -1
- package/package.json +4 -4
- package/src/browser/context-key-service.ts +23 -7
- package/src/browser/context-menu-renderer.ts +2 -0
- package/src/browser/menu/browser-context-menu-renderer.ts +2 -2
- package/src/browser/menu/browser-menu-plugin.ts +10 -7
- package/src/electron-browser/menu/electron-context-menu-renderer.ts +2 -2
- package/src/electron-browser/menu/electron-main-menu-factory.ts +14 -6
package/README.md
CHANGED
|
@@ -86,12 +86,12 @@ export class SomeClass {
|
|
|
86
86
|
- `@phosphor/signaling` (from [`@phosphor/signaling@1`](https://www.npmjs.com/package/@phosphor/signaling))
|
|
87
87
|
- `@phosphor/virtualdom` (from [`@phosphor/virtualdom@1`](https://www.npmjs.com/package/@phosphor/virtualdom))
|
|
88
88
|
- `@phosphor/widgets` (from [`@phosphor/widgets@1`](https://www.npmjs.com/package/@phosphor/widgets))
|
|
89
|
-
- `@theia/application-package` (from [`@theia/application-package@1.32.0-next.
|
|
90
|
-
- `@theia/application-package/lib/api` (from [`@theia/application-package@1.32.0-next.
|
|
91
|
-
- `@theia/application-package/lib/environment` (from [`@theia/application-package@1.32.0-next.
|
|
92
|
-
- `@theia/request` (from [`@theia/request@1.32.0-next.
|
|
93
|
-
- `@theia/request/lib/proxy` (from [`@theia/request@1.32.0-next.
|
|
94
|
-
- `@theia/request/lib/node-request-service` (from [`@theia/request@1.32.0-next.
|
|
89
|
+
- `@theia/application-package` (from [`@theia/application-package@1.32.0-next.20+6b14f040f`](https://www.npmjs.com/package/@theia/application-package/v/1.32.0-next.20))
|
|
90
|
+
- `@theia/application-package/lib/api` (from [`@theia/application-package@1.32.0-next.20+6b14f040f`](https://www.npmjs.com/package/@theia/application-package/v/1.32.0-next.20))
|
|
91
|
+
- `@theia/application-package/lib/environment` (from [`@theia/application-package@1.32.0-next.20+6b14f040f`](https://www.npmjs.com/package/@theia/application-package/v/1.32.0-next.20))
|
|
92
|
+
- `@theia/request` (from [`@theia/request@1.32.0-next.20+6b14f040f`](https://www.npmjs.com/package/@theia/request/v/1.32.0-next.20))
|
|
93
|
+
- `@theia/request/lib/proxy` (from [`@theia/request@1.32.0-next.20+6b14f040f`](https://www.npmjs.com/package/@theia/request/v/1.32.0-next.20))
|
|
94
|
+
- `@theia/request/lib/node-request-service` (from [`@theia/request@1.32.0-next.20+6b14f040f`](https://www.npmjs.com/package/@theia/request/v/1.32.0-next.20))
|
|
95
95
|
- `fs-extra` (from [`fs-extra@^4.0.2`](https://www.npmjs.com/package/fs-extra))
|
|
96
96
|
- `fuzzy` (from [`fuzzy@^0.1.3`](https://www.npmjs.com/package/fuzzy))
|
|
97
97
|
- `inversify` (from [`inversify@^5.1.1`](https://www.npmjs.com/package/inversify))
|
|
@@ -14,20 +14,22 @@ export interface ContextKeyChangeEvent {
|
|
|
14
14
|
}): boolean;
|
|
15
15
|
}
|
|
16
16
|
export declare const ContextKeyService: unique symbol;
|
|
17
|
-
export interface
|
|
18
|
-
readonly onDidChange: Event<ContextKeyChangeEvent>;
|
|
19
|
-
createKey<T>(key: string, defaultValue: T | undefined): ContextKey<T>;
|
|
17
|
+
export interface ContextMatcher extends Disposable {
|
|
20
18
|
/**
|
|
21
19
|
* Whether the expression is satisfied. If `context` provided, the service will attempt to retrieve a context object associated with that element.
|
|
22
20
|
*/
|
|
23
21
|
match(expression: string, context?: HTMLElement): boolean;
|
|
22
|
+
}
|
|
23
|
+
export interface ContextKeyService extends ContextMatcher {
|
|
24
|
+
readonly onDidChange: Event<ContextKeyChangeEvent>;
|
|
25
|
+
createKey<T>(key: string, defaultValue: T | undefined): ContextKey<T>;
|
|
24
26
|
/**
|
|
25
27
|
* @returns a Set of the keys used by the given `expression` or `undefined` if none are used or the expression cannot be parsed.
|
|
26
28
|
*/
|
|
27
29
|
parseKeys(expression: string): Set<string> | undefined;
|
|
28
30
|
/**
|
|
29
|
-
* Creates a temporary context that will use the `values` passed in when evaluating
|
|
30
|
-
*
|
|
31
|
+
* Creates a temporary context that will use the `values` passed in when evaluating {@link callback}.
|
|
32
|
+
* {@link callback | The callback} must be synchronous.
|
|
31
33
|
*/
|
|
32
34
|
with<T>(values: Record<string, unknown>, callback: () => T): T;
|
|
33
35
|
/**
|
|
@@ -35,12 +37,17 @@ export interface ContextKeyService extends Disposable {
|
|
|
35
37
|
* Useful for e.g. setting the {view} context value for particular widgets.
|
|
36
38
|
*/
|
|
37
39
|
createScoped(target: HTMLElement): ScopedValueStore;
|
|
40
|
+
/**
|
|
41
|
+
* @param overlay values to be used in the new {@link ContextKeyService}. These values will be static.
|
|
42
|
+
* Creates a child service with a separate context and a set of fixed values to override parent values.
|
|
43
|
+
*/
|
|
44
|
+
createOverlay(overlay: Iterable<[string, unknown]>): ContextMatcher;
|
|
38
45
|
/**
|
|
39
46
|
* Set or modify a value in the service's context.
|
|
40
47
|
*/
|
|
41
48
|
setContext(key: string, value: unknown): void;
|
|
42
49
|
}
|
|
43
|
-
export declare type ScopedValueStore = Omit<ContextKeyService, 'onDidChange' | 'match' | 'parseKeys' | 'with'>;
|
|
50
|
+
export declare type ScopedValueStore = Omit<ContextKeyService, 'onDidChange' | 'match' | 'parseKeys' | 'with' | 'createOverlay'>;
|
|
44
51
|
export declare class ContextKeyServiceDummyImpl implements ContextKeyService {
|
|
45
52
|
protected readonly onDidChangeEmitter: Emitter<ContextKeyChangeEvent>;
|
|
46
53
|
readonly onDidChange: Event<ContextKeyChangeEvent>;
|
|
@@ -63,6 +70,10 @@ export declare class ContextKeyServiceDummyImpl implements ContextKeyService {
|
|
|
63
70
|
* Details should implemented by an extension, e.g. by the monaco extension.
|
|
64
71
|
*/
|
|
65
72
|
createScoped(target: HTMLElement): ContextKeyService;
|
|
73
|
+
/**
|
|
74
|
+
* Details should be implemented by an extension, e.g. the monaco extension.
|
|
75
|
+
*/
|
|
76
|
+
createOverlay(overlay: Iterable<[string, unknown]>): ContextMatcher;
|
|
66
77
|
/**
|
|
67
78
|
* Details should be implemented by an extension, e.g. by the monaco extension.
|
|
68
79
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-key-service.d.ts","sourceRoot":"","sources":["../../src/browser/context-key-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,WAAW,UAAU,CAAC,CAAC;IACzB,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;IAChC,KAAK,IAAI,IAAI,CAAC;IACd,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;CACxB;AAED,yBAAiB,UAAU,CAAC;IAEjB,MAAM,IAAI,EAAE,UAAU,CAAC,GAAG,CAI/B,CAAC;CACN;AAED,MAAM,WAAW,qBAAqB;IAClC,OAAO,CAAC,IAAI,EAAE;QAAE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC;CACzD;AAED,eAAO,MAAM,iBAAiB,eAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"context-key-service.d.ts","sourceRoot":"","sources":["../../src/browser/context-key-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,6 +70,12 @@ let ContextKeyServiceDummyImpl = class ContextKeyServiceDummyImpl {
|
|
|
70
70
|
createScoped(target) {
|
|
71
71
|
return this;
|
|
72
72
|
}
|
|
73
|
+
/**
|
|
74
|
+
* Details should be implemented by an extension, e.g. the monaco extension.
|
|
75
|
+
*/
|
|
76
|
+
createOverlay(overlay) {
|
|
77
|
+
return this;
|
|
78
|
+
}
|
|
73
79
|
/**
|
|
74
80
|
* Details should be implemented by an extension, e.g. by the monaco extension.
|
|
75
81
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-key-service.js","sourceRoot":"","sources":["../../src/browser/context-key-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,yCAAuC;AAEvC,2CAAiD;AAQjD,IAAiB,UAAU,CAO1B;AAPD,WAAiB,UAAU;IACvB,8DAA8D;IACjD,eAAI,GAAoB,MAAM,CAAC,MAAM,CAAC;QAC/C,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACd,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;QAChB,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS;KACvB,CAAC,CAAC;AACP,CAAC,EAPgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAO1B;AAMY,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"context-key-service.js","sourceRoot":"","sources":["../../src/browser/context-key-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,yCAAuC;AAEvC,2CAAiD;AAQjD,IAAiB,UAAU,CAO1B;AAPD,WAAiB,UAAU;IACvB,8DAA8D;IACjD,eAAI,GAAoB,MAAM,CAAC,MAAM,CAAC;QAC/C,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACd,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;QAChB,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS;KACvB,CAAC,CAAC;AACP,CAAC,EAPgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAO1B;AAMY,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AA8C7D,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IAAvC;QAEuB,uBAAkB,GAAG,IAAI,eAAO,EAAyB,CAAC;QACpE,gBAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;IAkDzD,CAAC;IAjDa,aAAa,CAAC,KAA4B;QAChD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;IAED,SAAS,CAAI,GAAW,EAAE,YAA2B;QACjD,OAAO,UAAU,CAAC,IAAI,CAAC;IAC3B,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,UAAkB,EAAE,OAAqB;QAC3C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,SAAS,CAAC,UAAkB;QACxB,OAAO,IAAI,GAAG,EAAU,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACH,IAAI,CAAI,MAA+B,EAAE,QAAiB;QACtD,OAAO,QAAQ,EAAE,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,YAAY,CAAC,MAAmB;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,OAAoC;QAC9C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,GAAW,EAAE,KAAc,IAAU,CAAC;IAEjD,OAAO,KAAW,CAAC;CACtB,CAAA;AArDY,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CAqDtC;AArDY,gEAA0B"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { MenuPath } from '../common/menu';
|
|
2
2
|
import { Disposable, DisposableCollection } from '../common/disposable';
|
|
3
|
+
import { ContextMatcher } from './context-key-service';
|
|
3
4
|
export interface Coordinate {
|
|
4
5
|
x: number;
|
|
5
6
|
y: number;
|
|
@@ -44,6 +45,7 @@ export interface RenderContextMenuOptions {
|
|
|
44
45
|
* of menu items registered for this item.
|
|
45
46
|
*/
|
|
46
47
|
context?: HTMLElement;
|
|
48
|
+
contextKeyService?: ContextMatcher;
|
|
47
49
|
onHide?: () => void;
|
|
48
50
|
}
|
|
49
51
|
//# sourceMappingURL=context-menu-renderer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-menu-renderer.d.ts","sourceRoot":"","sources":["../../src/browser/context-menu-renderer.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"context-menu-renderer.d.ts","sourceRoot":"","sources":["../../src/browser/context-menu-renderer.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,WAAW,UAAU;IAAG,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;CAAE;AACrD,eAAO,MAAM,UAAU,eAAuB,CAAC;AAE/C,oBAAY,MAAM,GAAG,UAAU,GAAG,UAAU,CAAC;AAE7C,wBAAgB,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,CAEjE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAG/D;AAED,8BAAsB,iBAAkB,YAAW,UAAU;IAEzD,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAC1D,QAAQ,CAAC,SAAS,kCAA4B;gBAElC,OAAO,EAAE,UAAU;IAI/B,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,OAAO,IAAI,IAAI;CAIlB;AAED,8BACsB,mBAAmB;IAErC,SAAS,CAAC,QAAQ,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,uBAA8B;IACtE;;;OAGG;IACH,IAAI,OAAO,IAAI,iBAAiB,GAAG,SAAS,CAE3C;IACD,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,SAAS,GAAG,IAAI;IAclE,MAAM,CAAC,OAAO,EAAE,wBAAwB,GAAG,iBAAiB;IAO5D,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB,GAAG,iBAAiB;IAEjF,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,wBAAwB,GAAG,wBAAwB;CAWjF;AAED,MAAM,WAAW,wBAAwB;IACrC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACb;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,iBAAiB,CAAC,EAAE,cAAc,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-menu-renderer.js","sourceRoot":"","sources":["../../src/browser/context-menu-renderer.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,uDAAuD;AAEvD,yCAAuC;AAEvC,qDAAwE;
|
|
1
|
+
{"version":3,"file":"context-menu-renderer.js","sourceRoot":"","sources":["../../src/browser/context-menu-renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,6 @@ export declare class BrowserContextMenuAccess extends ContextMenuAccess {
|
|
|
8
8
|
export declare class BrowserContextMenuRenderer extends ContextMenuRenderer {
|
|
9
9
|
private menuFactory;
|
|
10
10
|
constructor(menuFactory: BrowserMainMenuFactory);
|
|
11
|
-
protected doRender({ menuPath, anchor, args, onHide, context }: RenderContextMenuOptions): ContextMenuAccess;
|
|
11
|
+
protected doRender({ menuPath, anchor, args, onHide, context, contextKeyService }: RenderContextMenuOptions): ContextMenuAccess;
|
|
12
12
|
}
|
|
13
13
|
//# sourceMappingURL=browser-context-menu-renderer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-context-menu-renderer.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/browser-context-menu-renderer.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAwB,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAClI,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,qBAAa,wBAAyB,SAAQ,iBAAiB;aAEvC,IAAI,EAAE,IAAI;gBAAV,IAAI,EAAE,IAAI;CAIjC;AAED,qBACa,0BAA2B,SAAQ,mBAAmB;IAEnB,OAAO,CAAC,WAAW;gBAAX,WAAW,EAAE,sBAAsB;IAIvF,SAAS,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,wBAAwB,GAAG,iBAAiB;
|
|
1
|
+
{"version":3,"file":"browser-context-menu-renderer.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/browser-context-menu-renderer.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAwB,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAClI,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,qBAAa,wBAAyB,SAAQ,iBAAiB;aAEvC,IAAI,EAAE,IAAI;gBAAV,IAAI,EAAE,IAAI;CAIjC;AAED,qBACa,0BAA2B,SAAQ,mBAAmB;IAEnB,OAAO,CAAC,WAAW;gBAAX,WAAW,EAAE,sBAAsB;IAIvF,SAAS,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,wBAAwB,GAAG,iBAAiB;CAUlI"}
|
|
@@ -43,8 +43,8 @@ let BrowserContextMenuRenderer = class BrowserContextMenuRenderer extends contex
|
|
|
43
43
|
super();
|
|
44
44
|
this.menuFactory = menuFactory;
|
|
45
45
|
}
|
|
46
|
-
doRender({ menuPath, anchor, args, onHide, context }) {
|
|
47
|
-
const contextMenu = this.menuFactory.createContextMenu(menuPath, args, context);
|
|
46
|
+
doRender({ menuPath, anchor, args, onHide, context, contextKeyService }) {
|
|
47
|
+
const contextMenu = this.menuFactory.createContextMenu(menuPath, args, context, contextKeyService);
|
|
48
48
|
const { x, y } = (0, context_menu_renderer_1.coordinateFromAnchor)(anchor);
|
|
49
49
|
if (onHide) {
|
|
50
50
|
contextMenu.aboutToClose.connect(() => onHide());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-context-menu-renderer.js","sourceRoot":"","sources":["../../../src/browser/menu/browser-context-menu-renderer.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;;;AAEhF,yCAA+C;AAE/C,oEAAkI;AAClI,+DAA+D;AAE/D,MAAa,wBAAyB,SAAQ,yCAAiB;IAC3D,YACoB,IAAU;QAE1B,KAAK,CAAC,IAAI,CAAC,CAAC;QAFI,SAAI,GAAJ,IAAI,CAAM;IAG9B,CAAC;CACJ;AAND,4DAMC;AAGD,IAAa,0BAA0B,GAAvC,MAAa,0BAA2B,SAAQ,2CAAmB;IAE/D,YAAoD,WAAmC;QACnF,KAAK,EAAE,CAAC;QADwC,gBAAW,GAAX,WAAW,CAAwB;IAEvF,CAAC;IAES,QAAQ,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAA4B;
|
|
1
|
+
{"version":3,"file":"browser-context-menu-renderer.js","sourceRoot":"","sources":["../../../src/browser/menu/browser-context-menu-renderer.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;;;AAEhF,yCAA+C;AAE/C,oEAAkI;AAClI,+DAA+D;AAE/D,MAAa,wBAAyB,SAAQ,yCAAiB;IAC3D,YACoB,IAAU;QAE1B,KAAK,CAAC,IAAI,CAAC,CAAC;QAFI,SAAI,GAAJ,IAAI,CAAM;IAG9B,CAAC;CACJ;AAND,4DAMC;AAGD,IAAa,0BAA0B,GAAvC,MAAa,0BAA2B,SAAQ,2CAAmB;IAE/D,YAAoD,WAAmC;QACnF,KAAK,EAAE,CAAC;QADwC,gBAAW,GAAX,WAAW,CAAwB;IAEvF,CAAC;IAES,QAAQ,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAA4B;QACvG,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;QACnG,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,IAAA,4CAAoB,EAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,MAAM,EAAE;YACR,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAO,EAAE,CAAC,CAAC;SACrD;QACD,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvB,OAAO,IAAI,wBAAwB,CAAC,WAAW,CAAC,CAAC;IACrD,CAAC;CAEJ,CAAA;AAhBY,0BAA0B;IADtC,IAAA,sBAAU,GAAE;IAGI,WAAA,IAAA,kBAAM,EAAC,4CAAsB,CAAC,CAAA;qCAAsB,4CAAsB;GAF9E,0BAA0B,CAgBtC;AAhBY,gEAA0B"}
|
|
@@ -3,7 +3,7 @@ import { CommandRegistry as PhosphorCommandRegistry } from '@phosphor/commands';
|
|
|
3
3
|
import { CommandRegistry, CompositeMenuNode, MenuModelRegistry, MenuPath, DisposableCollection, Disposable, MenuNode, MenuCommandExecutor, CommandMenuNode } from '../../common';
|
|
4
4
|
import { KeybindingRegistry } from '../keybinding';
|
|
5
5
|
import { FrontendApplicationContribution, FrontendApplication } from '../frontend-application';
|
|
6
|
-
import { ContextKeyService } from '../context-key-service';
|
|
6
|
+
import { ContextKeyService, ContextMatcher } from '../context-key-service';
|
|
7
7
|
import { ContextMenuContext } from './context-menu-context';
|
|
8
8
|
import { ApplicationShell } from '../shell';
|
|
9
9
|
import { CorePreferences } from '../core-preferences';
|
|
@@ -15,6 +15,7 @@ export declare abstract class MenuBarWidget extends MenuBar {
|
|
|
15
15
|
export interface BrowserMenuOptions extends MenuWidget.IOptions {
|
|
16
16
|
commands: MenuCommandRegistry;
|
|
17
17
|
context?: HTMLElement;
|
|
18
|
+
contextKeyService?: ContextMatcher;
|
|
18
19
|
rootMenuPath: MenuPath;
|
|
19
20
|
}
|
|
20
21
|
export declare class BrowserMainMenuFactory implements MenuWidgetFactory {
|
|
@@ -28,7 +29,7 @@ export declare class BrowserMainMenuFactory implements MenuWidgetFactory {
|
|
|
28
29
|
createMenuBar(): MenuBarWidget;
|
|
29
30
|
protected showMenuBar(menuBar: DynamicMenuBarWidget, preference: string | undefined): void;
|
|
30
31
|
protected fillMenuBar(menuBar: MenuBarWidget): void;
|
|
31
|
-
createContextMenu(path: MenuPath, args?: unknown[], context?: HTMLElement): MenuWidget;
|
|
32
|
+
createContextMenu(path: MenuPath, args?: unknown[], context?: HTMLElement, contextKeyService?: ContextMatcher): MenuWidget;
|
|
32
33
|
createMenuWidget(menu: CompositeMenuNode, options: BrowserMenuOptions): DynamicMenuWidget;
|
|
33
34
|
protected createMenuCommandRegistry(menu: CompositeMenuNode, args?: unknown[]): MenuCommandRegistry;
|
|
34
35
|
protected registerMenu(menuCommandRegistry: MenuCommandRegistry, menu: MenuNode, args: unknown[]): void;
|
|
@@ -72,7 +73,7 @@ export declare class DynamicMenuWidget extends MenuWidget {
|
|
|
72
73
|
open(x: number, y: number, options?: MenuWidget.IOpenOptions): void;
|
|
73
74
|
protected updateSubMenus(parent: MenuWidget, menu: CompositeMenuNode, commands: MenuCommandRegistry): void;
|
|
74
75
|
protected buildSubMenus(parentItems: MenuWidget.IItemOptions[], menu: MenuNode, commands: MenuCommandRegistry): MenuWidget.IItemOptions[];
|
|
75
|
-
protected undefinedOrMatch(expression?: string, context?: HTMLElement): boolean;
|
|
76
|
+
protected undefinedOrMatch(contextKeyService: ContextMatcher, expression?: string, context?: HTMLElement): boolean;
|
|
76
77
|
protected preserveFocusedElement(previousFocusedElement?: Element | null): boolean;
|
|
77
78
|
protected restoreFocusedElement(): boolean;
|
|
78
79
|
protected runWithPreservedFocusContext(what: () => void): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-menu-plugin.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/browser-menu-plugin.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,eAAe,IAAI,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,EACH,eAAe,EAAE,iBAAiB,EAClC,iBAAiB,EAAiB,QAAQ,EAAE,oBAAoB,EAAE,UAAU,EAAE,QAAQ,EAAE,mBAAmB,EAA0C,eAAe,EACvK,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,+BAA+B,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"browser-menu-plugin.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/browser-menu-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,10 +84,10 @@ let BrowserMainMenuFactory = class BrowserMainMenuFactory {
|
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
-
createContextMenu(path, args, context) {
|
|
87
|
+
createContextMenu(path, args, context, contextKeyService) {
|
|
88
88
|
const menuModel = this.menuProvider.getMenu(path);
|
|
89
89
|
const menuCommandRegistry = this.createMenuCommandRegistry(menuModel, args).snapshot(path);
|
|
90
|
-
const contextMenu = this.createMenuWidget(menuModel, { commands: menuCommandRegistry, context, rootMenuPath: path });
|
|
90
|
+
const contextMenu = this.createMenuWidget(menuModel, { commands: menuCommandRegistry, context, rootMenuPath: path, contextKeyService });
|
|
91
91
|
return contextMenu;
|
|
92
92
|
}
|
|
93
93
|
createMenuWidget(menu, options) {
|
|
@@ -258,7 +258,10 @@ class DynamicMenuWidget extends widgets_1.Menu {
|
|
|
258
258
|
}
|
|
259
259
|
}
|
|
260
260
|
buildSubMenus(parentItems, menu, commands) {
|
|
261
|
-
|
|
261
|
+
var _a, _b;
|
|
262
|
+
if (common_1.CompoundMenuNode.is(menu)
|
|
263
|
+
&& menu.children.length
|
|
264
|
+
&& this.undefinedOrMatch((_a = this.options.contextKeyService) !== null && _a !== void 0 ? _a : this.services.contextKeyService, menu.when, this.options.context)) {
|
|
262
265
|
const role = menu === this.menu ? 1 /* Group */ : common_1.CompoundMenuNode.getRole(menu);
|
|
263
266
|
if (role === 0 /* Submenu */) {
|
|
264
267
|
const submenu = this.services.menuWidgetFactory.createMenuWidget(menu, this.options);
|
|
@@ -281,7 +284,7 @@ class DynamicMenuWidget extends widgets_1.Menu {
|
|
|
281
284
|
}
|
|
282
285
|
else if (menu.command) {
|
|
283
286
|
const node = menu.altNode && this.services.context.altPressed ? menu.altNode : menu;
|
|
284
|
-
if (commands.isVisible(node.command) && this.undefinedOrMatch(node.when, this.options.context)) {
|
|
287
|
+
if (commands.isVisible(node.command) && this.undefinedOrMatch((_b = this.options.contextKeyService) !== null && _b !== void 0 ? _b : this.services.contextKeyService, node.when, this.options.context)) {
|
|
285
288
|
parentItems.push({
|
|
286
289
|
command: node.command,
|
|
287
290
|
type: 'command'
|
|
@@ -290,9 +293,9 @@ class DynamicMenuWidget extends widgets_1.Menu {
|
|
|
290
293
|
}
|
|
291
294
|
return parentItems;
|
|
292
295
|
}
|
|
293
|
-
undefinedOrMatch(expression, context) {
|
|
296
|
+
undefinedOrMatch(contextKeyService, expression, context) {
|
|
294
297
|
if (expression) {
|
|
295
|
-
return
|
|
298
|
+
return contextKeyService.match(expression, context);
|
|
296
299
|
}
|
|
297
300
|
return true;
|
|
298
301
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-menu-plugin.js","sourceRoot":"","sources":["../../../src/browser/menu/browser-menu-plugin.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;;;AAEhF,yCAA+C;AAC/C,+CAAwE;AACxE,iDAAgF;AAChF,yCAGsB;AACtB,8CAAmD;AAEnD,gEAA2D;AAC3D,iEAA4D;AAC5D,wCAA6C;AAC7C,oCAA4C;AAC5C,0DAAsD;AACtD,0EAAsE;AAEtE,MAAsB,aAAc,SAAQ,iBAAO;CAGlD;AAHD,sCAGC;AAMA,CAAC;AAGF,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAuB/B,aAAa;QACT,MAAM,OAAO,GAAG,IAAI,oBAAoB,EAAE,CAAC;QAC3C,OAAO,CAAC,EAAE,GAAG,eAAe,CAAC;QAC7B,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;QACH,MAAM,kBAAkB,GAAG,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE;YAC7E,IAAI,UAAU,CAAC,cAAc,KAAK,0BAA0B,EAAE;gBAC1D,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;aAClD;QACL,CAAC,CAAC,CAAC;QACH,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,GAAG,EAAE;YACzE,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAAC;YACpE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE;YAC1B,kBAAkB,CAAC,OAAO,EAAE,CAAC;YAC7B,kBAAkB,CAAC,OAAO,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACnB,CAAC;IAES,WAAW,CAAC,OAA6B,EAAE,UAA8B;QAC/E,IAAI,UAAU,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC3D,OAAO,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SAC7B;aAAM;YACH,OAAO,CAAC,UAAU,EAAE,CAAC;SACxB;IACL,CAAC;IAES,WAAW,CAAC,OAAsB;QACxC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,sBAAa,CAAC,CAAC;QAC3D,MAAM,mBAAmB,GAAG,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;QACtE,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,QAAQ,EAAE;YACnC,IAAI,IAAI,YAAY,0BAAiB,EAAE;gBACnC,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,mBAAmB,EAAE,YAAY,EAAE,sBAAa,EAAE,CAAC,CAAC;gBAC/G,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;aAC/B;SACJ;IACL,CAAC;IAED,iBAAiB,CAAC,IAAc,EAAE,IAAgB,EAAE,OAAqB;QACrE,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,mBAAmB,GAAG,IAAI,CAAC,yBAAyB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC3F,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,mBAAmB,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QACrH,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,gBAAgB,CAAC,IAAuB,EAAE,OAA2B;QACjE,OAAO,IAAI,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAES,yBAAyB,CAAC,IAAuB,EAAE,OAAkB,EAAE;QAC7E,MAAM,mBAAmB,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACnD,OAAO,mBAAmB,CAAC;IAC/B,CAAC;IAES,YAAY,CAAC,mBAAwC,EAAE,IAAc,EAAE,IAAe;QAC5F,IAAI,yBAAgB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;YAC3B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;SACvF;aAAM,IAAI,wBAAe,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;YACjC,mBAAmB,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACnD,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,mBAAmB,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;aAC9D;SAEJ;IACL,CAAC;IAED,IAAc,QAAQ;QAClB,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;YAC3C,iBAAiB,EAAE,IAAI;YACvB,eAAe,EAAE,IAAI,CAAC,mBAAmB;SAC5C,CAAC;IACN,CAAC;CAEJ,CAAA;AAtGG;IADC,IAAA,kBAAM,EAAC,uCAAiB,CAAC;;iEAC8B;AAGxD;IADC,IAAA,kBAAM,EAAC,yCAAkB,CAAC;8BACC,yCAAkB;uDAAC;AAG/C;IADC,IAAA,kBAAM,EAAC,wBAAe,CAAC;8BACY,wBAAe;+DAAC;AAGpD;IADC,IAAA,kBAAM,EAAC,4BAAmB,CAAC;;mEACgC;AAG5D;IADC,IAAA,kBAAM,EAAC,kCAAe,CAAC;;+DAC4B;AAGpD;IADC,IAAA,kBAAM,EAAC,+BAAkB,CAAC;8BACY,+BAAkB;kEAAC;AAG1D;IADC,IAAA,kBAAM,EAAC,0BAAiB,CAAC;8BACO,0BAAiB;4DAAC;AArB1C,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAyGlC;AAzGY,wDAAsB;AA2GnC,MAAa,oBAAqB,SAAQ,aAAa;IAOnD;QACI,KAAK,EAAE,CAAC;QACR,mFAAmF;QACnF,oBAAoB,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,GAAG,EAAE;YACpD,IAAI,IAAI,CAAC,UAAU,YAAY,iBAAiB,EAAE;gBAC9C,qGAAqG;gBACrG,sGAAsG;gBACtG,6DAA6D;gBAC7D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;oBACjB,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAC;oBACnC,IAAI,aAAa,YAAY,WAAW,EAAE;wBACtC,IAAI,CAAC,sBAAsB,GAAG,aAAa,CAAC;qBAC/C;iBACJ;gBACD,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,sBAAsB,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;aACxF;YACD,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAC9B,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,GAAG,MAAgB;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,IAAI,KAAK,CAAC,mBAAmB,KAAK,QAAQ,CAAC,CAAC;SACrD;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,MAAM,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAC;QAE5B,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,CAAC;QAEzB,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,KAAK,MAAM,SAAS,IAAI,MAAM,EAAE;YAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;YAC5D,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACxB,MAAM,IAAI,KAAK,CAAC,mBAAmB,KAAK,gBAAgB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aACjH;YACD,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;YAC1B,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC5B,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YACvB,MAAM,IAAA,yBAAe,EAAC,OAAO,CAAC,CAAC;SAClC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,KAAa,EAAE,GAAG,MAAgB;QACpD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;SACvD;QACD,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAChE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,IAAI,KAAK,CAAC,mBAAmB,KAAK,aAAa,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SAC9G;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;CAEJ;AAnED,oDAmEC;AAED,MAAa,YAAY;CAOxB;AAPD,oCAOC;AAMD;;GAEG;AACH,MAAa,iBAAkB,SAAQ,cAAU;IAO7C,YACc,IAAuB,EACvB,OAA2B,EAC3B,QAAsB;QAEhC,KAAK,CAAC,OAAO,CAAC,CAAC;QAJL,SAAI,GAAJ,IAAI,CAAmB;QACvB,YAAO,GAAP,OAAO,CAAoB;QAC3B,aAAQ,GAAR,QAAQ,CAAc;QAGhC,IAAI,IAAI,CAAC,KAAK,EAAE;YACZ,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;SACjC;QACD,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;SACzC;QACD,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChE,CAAC;IAEM,WAAW,CAAC,EAAE,sBAAsB,EAAuD;QAC9F,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE;YACnC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAC1D,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACP,CAAC;IAEe,IAAI,CAAC,CAAS,EAAE,CAAS,EAAE,OAAiC;QACxE,MAAM,EAAE,GAAG,GAAG,EAAE;YACZ,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC;IAES,cAAc,CAAC,MAAkB,EAAE,IAAuB,EAAE,QAA6B;;QAC/F,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QACrD,OAAO,CAAA,MAAA,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,0CAAE,IAAI,MAAK,WAAW,EAAE;YAClD,KAAK,CAAC,GAAG,EAAE,CAAC;SACf;QACD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACxB;IACL,CAAC;IAES,aAAa,CAAC,WAAsC,EAAE,IAAc,EAAE,QAA6B;QACzG,IAAI,yBAAgB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC7G,MAAM,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,eAA4B,CAAC,CAAC,yBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC9F,IAAI,IAAI,oBAAiC,EAAE;gBACvC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrF,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;iBAClD;aACJ;iBAAM,IAAI,IAAI,kBAA+B,IAAI,IAAI,CAAC,EAAE,KAAK,QAAQ,EAAE;gBACpE,MAAM,QAAQ,GAAG,yBAAgB,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACjE,MAAM,OAAO,GAA8B,EAAE,CAAC;gBAC9C,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;gBACxE,IAAI,OAAO,CAAC,MAAM,EAAE;oBAChB,IAAI,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,EAAE;wBAChF,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;qBAC3C;oBACD,WAAW,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;oBAC7B,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;iBAC3C;aACJ;SACJ;aAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YACrB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAE,IAAmC,CAAC;YACpH,IAAI,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC5F,WAAW,CAAC,IAAI,CAAC;oBACb,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,IAAI,EAAE,SAAS;iBAClB,CAAC,CAAC;aACN;SACJ;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;IAES,gBAAgB,CAAC,UAAmB,EAAE,OAAqB;QACjE,IAAI,UAAU,EAAE;YAAE,OAAO,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;SAAE;QACtF,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,sBAAsB,CAAC,yBAAyC,QAAQ,CAAC,aAAa;QAC5F,IAAI,CAAC,IAAI,CAAC,sBAAsB,IAAI,sBAAsB,YAAY,WAAW,EAAE;YAC/E,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;YACrD,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,qBAAqB;QAC3B,IAAI,IAAI,CAAC,sBAAsB,EAAE;YAC7B,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,sBAAsB,GAAG,SAAS,CAAC;YACxC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,4BAA4B,CAAC,IAAgB;QACnD,IAAI,cAAc,GAA4B,SAAS,CAAC;QACxD,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAC;QACnC,IAAI,IAAI,CAAC,sBAAsB,IAAI,aAAa,YAAY,WAAW,IAAI,IAAI,CAAC,sBAAsB,KAAK,aAAa,EAAE;YACtH,cAAc,GAAG,aAAa,CAAC;YAC/B,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;SAC9D;QACD,IAAI;YACA,IAAI,EAAE,CAAC;SACV;gBAAS;YACN,IAAI,cAAc,EAAE;gBAChB,cAAc,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;aACjD;SACJ;IACL,CAAC;CAEJ;AAzHD,8CAyHC;AAGD,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IAQnC,YACuD,OAA+B;QAA/B,YAAO,GAAP,OAAO,CAAwB;IAClF,CAAC;IAEL,OAAO,CAAC,GAAwB;QAC5B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,aAAa,CAA8B,CAAC;IAC1G,CAAC;IAES,UAAU,CAAC,KAAuB;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC/B,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC1C,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACvC,gDAAgD;QAChD,6CAA6C;QAC7C,IAAI,oBAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE;YAC3B,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/G,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE;gBAChD,IAAI,MAAM,CAAC,cAAc,KAAK,0BAA0B,EAAE;oBACtD,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;iBACnE;YACL,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAES,UAAU;QAChB,MAAM,IAAI,GAAG,IAAI,gBAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,EAAE,GAAG,YAAY,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AA1CG;IADC,IAAA,kBAAM,EAAC,wBAAgB,CAAC;8BACC,wBAAgB;yDAAC;AAG3C;IADC,IAAA,kBAAM,EAAC,sCAAiB,CAAC;;qEAC8B;AAN/C,0BAA0B;IADtC,IAAA,sBAAU,GAAE;IAUJ,WAAA,IAAA,kBAAM,EAAC,sBAAsB,CAAC,CAAA;qCAA6B,sBAAsB;GAT7E,0BAA0B,CA6CtC;AA7CY,gEAA0B;AA+CvC;;GAEG;AACH,MAAa,mBAAoB,SAAQ,0BAAuB;IAK5D,YAAsB,QAAsB;QACxC,KAAK,EAAE,CAAC;QADU,aAAQ,GAAR,QAAQ,CAAc;QAHlC,YAAO,GAAG,IAAI,GAAG,EAAmD,CAAC;QACrE,cAAS,GAAG,IAAI,6BAAoB,EAAE,CAAC;IAIjD,CAAC;IAED,kBAAkB,CAAC,IAAgC,EAAE,IAAe;QAChE,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC1C,MAAM,OAAO,GAAG,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,EAAE;YACV,OAAO;SACV;QACD,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;QACvB,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACtB,OAAO;SACV;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,QAAQ,CAAC,QAAkB;QACvB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;YAC9C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;SACnE;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,eAAe,CAAC,IAAgC,EAAE,IAAe,EAAE,QAAkB;QAC3F,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/E,MAAM,OAAO,GAAG,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,EAAE;YACV,OAAO,mBAAU,CAAC,IAAI,CAAC;SAC1B;QACD,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;QACvB,IAAI,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE;YACrB,kFAAkF;YAClF,OAAO,mBAAU,CAAC,IAAI,CAAC;SAC1B;QAED,uFAAuF;QACvF,MAAM,OAAO,GAAG,eAAe,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,eAAe,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,eAAe,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;QACjE,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE;YAC1C,OAAO,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;YACpE,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO;YACxB,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO;YACxB,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO;SAC3B,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,kBAAkB,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;QACjE,sCAAsC;QACtC,IAAI,QAAQ,CAAC,MAAM,EAAE;YACjB,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC5B,MAAM,IAAI,GAAG,kBAAkB,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YACnE,IAAI,CAAC,aAAa,CAAC;gBACf,OAAO,EAAE,EAAE;gBACX,IAAI;gBACJ,QAAQ,EAAE,WAAW,CAAC,4CAA4C;aACrE,CAAC,CAAC;SACN;QACD,OAAO,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,CAAC;IAChE,CAAC;CAEJ;AArED,kDAqEC"}
|
|
1
|
+
{"version":3,"file":"browser-menu-plugin.js","sourceRoot":"","sources":["../../../src/browser/menu/browser-menu-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -100,8 +100,8 @@ let ElectronContextMenuRenderer = class ElectronContextMenuRenderer extends brow
|
|
|
100
100
|
}
|
|
101
101
|
doRender(options) {
|
|
102
102
|
if (this.useNativeStyle) {
|
|
103
|
-
const { menuPath, anchor, args, onHide, context } = options;
|
|
104
|
-
const menu = this.electronMenuFactory.createElectronContextMenu(menuPath, args, context);
|
|
103
|
+
const { menuPath, anchor, args, onHide, context, contextKeyService } = options;
|
|
104
|
+
const menu = this.electronMenuFactory.createElectronContextMenu(menuPath, args, context, contextKeyService);
|
|
105
105
|
const { x, y } = (0, browser_1.coordinateFromAnchor)(anchor);
|
|
106
106
|
const zoom = electron.webFrame.getZoomFactor();
|
|
107
107
|
// TODO: Remove the offset once Electron fixes https://github.com/electron/electron/issues/31641
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-context-menu-renderer.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"electron-context-menu-renderer.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { MenuPath, MenuNode } from '../../common';
|
|
|
2
2
|
import { Keybinding } from '../../common/keybinding';
|
|
3
3
|
import { PreferenceService } from '../../browser';
|
|
4
4
|
import { BrowserMainMenuFactory } from '../../browser/menu/browser-menu-plugin';
|
|
5
|
+
import { ContextMatcher } from 'src/browser/context-key-service';
|
|
5
6
|
/**
|
|
6
7
|
* Representation of possible electron menu options.
|
|
7
8
|
*/
|
|
@@ -16,6 +17,11 @@ export interface ElectronMenuOptions {
|
|
|
16
17
|
* of menu items registered for this item.
|
|
17
18
|
*/
|
|
18
19
|
context?: HTMLElement;
|
|
20
|
+
/**
|
|
21
|
+
* A context key service to use when evaluating any `when` clauses.
|
|
22
|
+
* If none is provided, the global context will be used.
|
|
23
|
+
*/
|
|
24
|
+
contextKeyService?: ContextMatcher;
|
|
19
25
|
/**
|
|
20
26
|
* The root menu path for which the menu is being built.
|
|
21
27
|
*/
|
|
@@ -33,9 +39,9 @@ export declare class ElectronMainMenuFactory extends BrowserMainMenuFactory {
|
|
|
33
39
|
postConstruct(): void;
|
|
34
40
|
setMenuBar(): Promise<void>;
|
|
35
41
|
createElectronMenuBar(): Electron.Menu | null;
|
|
36
|
-
createElectronContextMenu(menuPath: MenuPath, args?: any[], context?: HTMLElement): Electron.Menu;
|
|
42
|
+
createElectronContextMenu(menuPath: MenuPath, args?: any[], context?: HTMLElement, contextKeyService?: ContextMatcher): Electron.Menu;
|
|
37
43
|
protected fillMenuTemplate(parentItems: Electron.MenuItemConstructorOptions[], menu: MenuNode, args: unknown[] | undefined, options: ElectronMenuOptions): Electron.MenuItemConstructorOptions[];
|
|
38
|
-
protected undefinedOrMatch(expression?: string, context?: HTMLElement): boolean;
|
|
44
|
+
protected undefinedOrMatch(contextKeyService: ContextMatcher, expression?: string, context?: HTMLElement): boolean;
|
|
39
45
|
/**
|
|
40
46
|
* Return a user visible representation of a keybinding.
|
|
41
47
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-main-menu-factory.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAwB,QAAQ,EAAE,QAAQ,EAA2D,MAAM,cAAc,CAAC;AACjI,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAkB,MAAM,eAAe,CAAC;AAGlE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"electron-main-menu-factory.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAwB,QAAQ,EAAE,QAAQ,EAA2D,MAAM,cAAc,CAAC;AACjI,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAkB,MAAM,eAAe,CAAC;AAGlE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC;;;OAGG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,cAAc,CAAC;IACnC;;OAEG;IACH,YAAY,EAAE,QAAQ,CAAA;CACzB;AAED;;;GAGG;AACH,oBAAY,oBAAoB,GAAG,CAAC,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAC1E,oBAAoB,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,aAAa,GACxE,gBAAgB,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,kBAAkB,GAC1E,QAAQ,GAAG,UAAU,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAClD,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,QAAQ,GAAG,MAAM,GACtD,eAAe,GAAG,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAC/D,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,iBAAiB,GAAG,cAAc,GACzE,eAAe,GAAG,mBAAmB,GAAG,iBAAiB,GAAG,sBAAsB,GAClF,oBAAoB,GAAG,YAAY,CAAC,CAAC;AAEzC,qBACa,uBAAwB,SAAQ,sBAAsB;IAE/D,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC;IAChC,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAGpD,SAAS,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;IAGhD,aAAa,IAAI,IAAI;IAsBf,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWjC,qBAAqB,IAAI,QAAQ,CAAC,IAAI,GAAG,IAAI;IAqB7C,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,cAAc,GAAG,QAAQ,CAAC,IAAI;IAMrI,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,QAAQ,CAAC,0BAA0B,EAAE,EACzE,IAAI,EAAE,QAAQ,EACd,IAAI,uBAAgB,EACpB,OAAO,EAAE,mBAAmB,GAC7B,QAAQ,CAAC,0BAA0B,EAAE;IAuExC,SAAS,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO;IAOlH;;OAEG;IACH,SAAS,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;IAexD,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS;cA2B/C,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBxF,SAAS,CAAC,aAAa,IAAI,QAAQ,CAAC,0BAA0B;CAoCjE"}
|
|
@@ -88,14 +88,15 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory extends browser_menu
|
|
|
88
88
|
// eslint-disable-next-line no-null/no-null
|
|
89
89
|
return null;
|
|
90
90
|
}
|
|
91
|
-
createElectronContextMenu(menuPath, args, context) {
|
|
91
|
+
createElectronContextMenu(menuPath, args, context, contextKeyService) {
|
|
92
92
|
const menuModel = this.menuProvider.getMenu(menuPath);
|
|
93
|
-
const template = this.fillMenuTemplate([], menuModel, args, { showDisabled: false, context, rootMenuPath: menuPath });
|
|
93
|
+
const template = this.fillMenuTemplate([], menuModel, args, { showDisabled: false, context, rootMenuPath: menuPath, contextKeyService });
|
|
94
94
|
return electronRemote.Menu.buildFromTemplate(template);
|
|
95
95
|
}
|
|
96
96
|
fillMenuTemplate(parentItems, menu, args = [], options) {
|
|
97
|
+
var _a, _b;
|
|
97
98
|
const showDisabled = (options === null || options === void 0 ? void 0 : options.showDisabled) !== false;
|
|
98
|
-
if (common_1.CompoundMenuNode.is(menu) && menu.children.length && this.undefinedOrMatch(menu.when, options.context)) {
|
|
99
|
+
if (common_1.CompoundMenuNode.is(menu) && menu.children.length && this.undefinedOrMatch((_a = options.contextKeyService) !== null && _a !== void 0 ? _a : this.contextKeyService, menu.when, options.context)) {
|
|
99
100
|
const role = common_1.CompoundMenuNode.getRole(menu);
|
|
100
101
|
if (role === 1 /* Group */ && menu.id === 'inline') {
|
|
101
102
|
return parentItems;
|
|
@@ -125,7 +126,8 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory extends browser_menu
|
|
|
125
126
|
console.debug(`Skipping menu item with missing command: "${commandId}".`);
|
|
126
127
|
return parentItems;
|
|
127
128
|
}
|
|
128
|
-
if (!this.menuCommandExecutor.isVisible(options.rootMenuPath, commandId, ...args)
|
|
129
|
+
if (!this.menuCommandExecutor.isVisible(options.rootMenuPath, commandId, ...args)
|
|
130
|
+
|| !this.undefinedOrMatch((_b = options.contextKeyService) !== null && _b !== void 0 ? _b : this.contextKeyService, node.when, options.context)) {
|
|
129
131
|
return parentItems;
|
|
130
132
|
}
|
|
131
133
|
// We should omit rendering context-menu items which are disabled.
|
|
@@ -158,9 +160,9 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory extends browser_menu
|
|
|
158
160
|
}
|
|
159
161
|
return parentItems;
|
|
160
162
|
}
|
|
161
|
-
undefinedOrMatch(expression, context) {
|
|
163
|
+
undefinedOrMatch(contextKeyService, expression, context) {
|
|
162
164
|
if (expression) {
|
|
163
|
-
return
|
|
165
|
+
return contextKeyService.match(expression, context);
|
|
164
166
|
}
|
|
165
167
|
return true;
|
|
166
168
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-main-menu-factory.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,uDAAuD;AAEvD,4EAA4E;AAC5E,yCAA8D;AAC9D,yCAAiI;AAEjI,2CAAkE;AAClE,4CAA6C;AAC7C,2EAAuE;AACvE,gFAAgF;
|
|
1
|
+
{"version":3,"file":"electron-main-menu-factory.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.32.0-next.
|
|
3
|
+
"version": "1.32.0-next.20+6b14f040f",
|
|
4
4
|
"description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"@phosphor/signaling": "1",
|
|
17
17
|
"@phosphor/virtualdom": "1",
|
|
18
18
|
"@phosphor/widgets": "1",
|
|
19
|
-
"@theia/application-package": "1.32.0-next.
|
|
20
|
-
"@theia/request": "1.32.0-next.
|
|
19
|
+
"@theia/application-package": "1.32.0-next.20+6b14f040f",
|
|
20
|
+
"@theia/request": "1.32.0-next.20+6b14f040f",
|
|
21
21
|
"@types/body-parser": "^1.16.4",
|
|
22
22
|
"@types/cookie": "^0.3.3",
|
|
23
23
|
"@types/dompurify": "^2.2.2",
|
|
@@ -202,5 +202,5 @@
|
|
|
202
202
|
"nyc": {
|
|
203
203
|
"extends": "../../configs/nyc.json"
|
|
204
204
|
},
|
|
205
|
-
"gitHead": "
|
|
205
|
+
"gitHead": "6b14f040f82f0e99de711978ae1cfdc38f288756"
|
|
206
206
|
}
|
|
@@ -38,15 +38,18 @@ export interface ContextKeyChangeEvent {
|
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
export const ContextKeyService = Symbol('ContextKeyService');
|
|
41
|
-
export interface ContextKeyService extends Disposable {
|
|
42
|
-
readonly onDidChange: Event<ContextKeyChangeEvent>;
|
|
43
|
-
|
|
44
|
-
createKey<T>(key: string, defaultValue: T | undefined): ContextKey<T>;
|
|
45
41
|
|
|
42
|
+
export interface ContextMatcher extends Disposable {
|
|
46
43
|
/**
|
|
47
44
|
* Whether the expression is satisfied. If `context` provided, the service will attempt to retrieve a context object associated with that element.
|
|
48
45
|
*/
|
|
49
46
|
match(expression: string, context?: HTMLElement): boolean;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export interface ContextKeyService extends ContextMatcher {
|
|
50
|
+
readonly onDidChange: Event<ContextKeyChangeEvent>;
|
|
51
|
+
|
|
52
|
+
createKey<T>(key: string, defaultValue: T | undefined): ContextKey<T>;
|
|
50
53
|
|
|
51
54
|
/**
|
|
52
55
|
* @returns a Set of the keys used by the given `expression` or `undefined` if none are used or the expression cannot be parsed.
|
|
@@ -54,8 +57,8 @@ export interface ContextKeyService extends Disposable {
|
|
|
54
57
|
parseKeys(expression: string): Set<string> | undefined;
|
|
55
58
|
|
|
56
59
|
/**
|
|
57
|
-
* Creates a temporary context that will use the `values` passed in when evaluating
|
|
58
|
-
*
|
|
60
|
+
* Creates a temporary context that will use the `values` passed in when evaluating {@link callback}.
|
|
61
|
+
* {@link callback | The callback} must be synchronous.
|
|
59
62
|
*/
|
|
60
63
|
with<T>(values: Record<string, unknown>, callback: () => T): T;
|
|
61
64
|
|
|
@@ -65,13 +68,19 @@ export interface ContextKeyService extends Disposable {
|
|
|
65
68
|
*/
|
|
66
69
|
createScoped(target: HTMLElement): ScopedValueStore;
|
|
67
70
|
|
|
71
|
+
/**
|
|
72
|
+
* @param overlay values to be used in the new {@link ContextKeyService}. These values will be static.
|
|
73
|
+
* Creates a child service with a separate context and a set of fixed values to override parent values.
|
|
74
|
+
*/
|
|
75
|
+
createOverlay(overlay: Iterable<[string, unknown]>): ContextMatcher;
|
|
76
|
+
|
|
68
77
|
/**
|
|
69
78
|
* Set or modify a value in the service's context.
|
|
70
79
|
*/
|
|
71
80
|
setContext(key: string, value: unknown): void;
|
|
72
81
|
}
|
|
73
82
|
|
|
74
|
-
export type ScopedValueStore = Omit<ContextKeyService, 'onDidChange' | 'match' | 'parseKeys' | 'with'>;
|
|
83
|
+
export type ScopedValueStore = Omit<ContextKeyService, 'onDidChange' | 'match' | 'parseKeys' | 'with' | 'createOverlay'>;
|
|
75
84
|
|
|
76
85
|
@injectable()
|
|
77
86
|
export class ContextKeyServiceDummyImpl implements ContextKeyService {
|
|
@@ -114,6 +123,13 @@ export class ContextKeyServiceDummyImpl implements ContextKeyService {
|
|
|
114
123
|
return this;
|
|
115
124
|
}
|
|
116
125
|
|
|
126
|
+
/**
|
|
127
|
+
* Details should be implemented by an extension, e.g. the monaco extension.
|
|
128
|
+
*/
|
|
129
|
+
createOverlay(overlay: Iterable<[string, unknown]>): ContextMatcher {
|
|
130
|
+
return this;
|
|
131
|
+
}
|
|
132
|
+
|
|
117
133
|
/**
|
|
118
134
|
* Details should be implemented by an extension, e.g. by the monaco extension.
|
|
119
135
|
*/
|
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
import { injectable } from 'inversify';
|
|
20
20
|
import { MenuPath } from '../common/menu';
|
|
21
21
|
import { Disposable, DisposableCollection } from '../common/disposable';
|
|
22
|
+
import { ContextMatcher } from './context-key-service';
|
|
22
23
|
|
|
23
24
|
export interface Coordinate { x: number; y: number; }
|
|
24
25
|
export const Coordinate = Symbol('Coordinate');
|
|
@@ -117,5 +118,6 @@ export interface RenderContextMenuOptions {
|
|
|
117
118
|
* of menu items registered for this item.
|
|
118
119
|
*/
|
|
119
120
|
context?: HTMLElement;
|
|
121
|
+
contextKeyService?: ContextMatcher;
|
|
120
122
|
onHide?: () => void;
|
|
121
123
|
}
|
|
@@ -34,8 +34,8 @@ export class BrowserContextMenuRenderer extends ContextMenuRenderer {
|
|
|
34
34
|
super();
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
-
protected doRender({ menuPath, anchor, args, onHide, context }: RenderContextMenuOptions): ContextMenuAccess {
|
|
38
|
-
const contextMenu = this.menuFactory.createContextMenu(menuPath, args, context);
|
|
37
|
+
protected doRender({ menuPath, anchor, args, onHide, context, contextKeyService }: RenderContextMenuOptions): ContextMenuAccess {
|
|
38
|
+
const contextMenu = this.menuFactory.createContextMenu(menuPath, args, context, contextKeyService);
|
|
39
39
|
const { x, y } = coordinateFromAnchor(anchor);
|
|
40
40
|
if (onHide) {
|
|
41
41
|
contextMenu.aboutToClose.connect(() => onHide!());
|
|
@@ -23,7 +23,7 @@ import {
|
|
|
23
23
|
} from '../../common';
|
|
24
24
|
import { KeybindingRegistry } from '../keybinding';
|
|
25
25
|
import { FrontendApplicationContribution, FrontendApplication } from '../frontend-application';
|
|
26
|
-
import { ContextKeyService } from '../context-key-service';
|
|
26
|
+
import { ContextKeyService, ContextMatcher } from '../context-key-service';
|
|
27
27
|
import { ContextMenuContext } from './context-menu-context';
|
|
28
28
|
import { waitForRevealed } from '../widgets';
|
|
29
29
|
import { ApplicationShell } from '../shell';
|
|
@@ -38,6 +38,7 @@ export abstract class MenuBarWidget extends MenuBar {
|
|
|
38
38
|
export interface BrowserMenuOptions extends MenuWidget.IOptions {
|
|
39
39
|
commands: MenuCommandRegistry,
|
|
40
40
|
context?: HTMLElement,
|
|
41
|
+
contextKeyService?: ContextMatcher;
|
|
41
42
|
rootMenuPath: MenuPath
|
|
42
43
|
};
|
|
43
44
|
|
|
@@ -107,10 +108,10 @@ export class BrowserMainMenuFactory implements MenuWidgetFactory {
|
|
|
107
108
|
}
|
|
108
109
|
}
|
|
109
110
|
|
|
110
|
-
createContextMenu(path: MenuPath, args?: unknown[], context?: HTMLElement): MenuWidget {
|
|
111
|
+
createContextMenu(path: MenuPath, args?: unknown[], context?: HTMLElement, contextKeyService?: ContextMatcher): MenuWidget {
|
|
111
112
|
const menuModel = this.menuProvider.getMenu(path);
|
|
112
113
|
const menuCommandRegistry = this.createMenuCommandRegistry(menuModel, args).snapshot(path);
|
|
113
|
-
const contextMenu = this.createMenuWidget(menuModel, { commands: menuCommandRegistry, context, rootMenuPath: path });
|
|
114
|
+
const contextMenu = this.createMenuWidget(menuModel, { commands: menuCommandRegistry, context, rootMenuPath: path, contextKeyService });
|
|
114
115
|
return contextMenu;
|
|
115
116
|
}
|
|
116
117
|
|
|
@@ -286,7 +287,9 @@ export class DynamicMenuWidget extends MenuWidget {
|
|
|
286
287
|
}
|
|
287
288
|
|
|
288
289
|
protected buildSubMenus(parentItems: MenuWidget.IItemOptions[], menu: MenuNode, commands: MenuCommandRegistry): MenuWidget.IItemOptions[] {
|
|
289
|
-
if (CompoundMenuNode.is(menu)
|
|
290
|
+
if (CompoundMenuNode.is(menu)
|
|
291
|
+
&& menu.children.length
|
|
292
|
+
&& this.undefinedOrMatch(this.options.contextKeyService ?? this.services.contextKeyService, menu.when, this.options.context)) {
|
|
290
293
|
const role = menu === this.menu ? CompoundMenuNodeRole.Group : CompoundMenuNode.getRole(menu);
|
|
291
294
|
if (role === CompoundMenuNodeRole.Submenu) {
|
|
292
295
|
const submenu = this.services.menuWidgetFactory.createMenuWidget(menu, this.options);
|
|
@@ -307,7 +310,7 @@ export class DynamicMenuWidget extends MenuWidget {
|
|
|
307
310
|
}
|
|
308
311
|
} else if (menu.command) {
|
|
309
312
|
const node = menu.altNode && this.services.context.altPressed ? menu.altNode : (menu as MenuNode & CommandMenuNode);
|
|
310
|
-
if (commands.isVisible(node.command) && this.undefinedOrMatch(node.when, this.options.context)) {
|
|
313
|
+
if (commands.isVisible(node.command) && this.undefinedOrMatch(this.options.contextKeyService ?? this.services.contextKeyService, node.when, this.options.context)) {
|
|
311
314
|
parentItems.push({
|
|
312
315
|
command: node.command,
|
|
313
316
|
type: 'command'
|
|
@@ -317,8 +320,8 @@ export class DynamicMenuWidget extends MenuWidget {
|
|
|
317
320
|
return parentItems;
|
|
318
321
|
}
|
|
319
322
|
|
|
320
|
-
protected undefinedOrMatch(expression?: string, context?: HTMLElement): boolean {
|
|
321
|
-
if (expression) { return
|
|
323
|
+
protected undefinedOrMatch(contextKeyService: ContextMatcher, expression?: string, context?: HTMLElement): boolean {
|
|
324
|
+
if (expression) { return contextKeyService.match(expression, context); }
|
|
322
325
|
return true;
|
|
323
326
|
}
|
|
324
327
|
|
|
@@ -101,8 +101,8 @@ export class ElectronContextMenuRenderer extends BrowserContextMenuRenderer {
|
|
|
101
101
|
|
|
102
102
|
protected override doRender(options: RenderContextMenuOptions): ContextMenuAccess {
|
|
103
103
|
if (this.useNativeStyle) {
|
|
104
|
-
const { menuPath, anchor, args, onHide, context } = options;
|
|
105
|
-
const menu = this.electronMenuFactory.createElectronContextMenu(menuPath, args, context);
|
|
104
|
+
const { menuPath, anchor, args, onHide, context, contextKeyService } = options;
|
|
105
|
+
const menu = this.electronMenuFactory.createElectronContextMenu(menuPath, args, context, contextKeyService);
|
|
106
106
|
const { x, y } = coordinateFromAnchor(anchor);
|
|
107
107
|
const zoom = electron.webFrame.getZoomFactor();
|
|
108
108
|
// TODO: Remove the offset once Electron fixes https://github.com/electron/electron/issues/31641
|
|
@@ -24,6 +24,7 @@ import { PreferenceService, CommonCommands } from '../../browser';
|
|
|
24
24
|
import debounce = require('lodash.debounce');
|
|
25
25
|
import { MAXIMIZED_CLASS } from '../../browser/shell/theia-dock-panel';
|
|
26
26
|
import { BrowserMainMenuFactory } from '../../browser/menu/browser-menu-plugin';
|
|
27
|
+
import { ContextMatcher } from 'src/browser/context-key-service';
|
|
27
28
|
|
|
28
29
|
/**
|
|
29
30
|
* Representation of possible electron menu options.
|
|
@@ -39,6 +40,11 @@ export interface ElectronMenuOptions {
|
|
|
39
40
|
* of menu items registered for this item.
|
|
40
41
|
*/
|
|
41
42
|
context?: HTMLElement;
|
|
43
|
+
/**
|
|
44
|
+
* A context key service to use when evaluating any `when` clauses.
|
|
45
|
+
* If none is provided, the global context will be used.
|
|
46
|
+
*/
|
|
47
|
+
contextKeyService?: ContextMatcher;
|
|
42
48
|
/**
|
|
43
49
|
* The root menu path for which the menu is being built.
|
|
44
50
|
*/
|
|
@@ -123,9 +129,9 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
|
|
|
123
129
|
return null;
|
|
124
130
|
}
|
|
125
131
|
|
|
126
|
-
createElectronContextMenu(menuPath: MenuPath, args?: any[], context?: HTMLElement): Electron.Menu {
|
|
132
|
+
createElectronContextMenu(menuPath: MenuPath, args?: any[], context?: HTMLElement, contextKeyService?: ContextMatcher): Electron.Menu {
|
|
127
133
|
const menuModel = this.menuProvider.getMenu(menuPath);
|
|
128
|
-
const template = this.fillMenuTemplate([], menuModel, args, { showDisabled: false, context, rootMenuPath: menuPath });
|
|
134
|
+
const template = this.fillMenuTemplate([], menuModel, args, { showDisabled: false, context, rootMenuPath: menuPath, contextKeyService });
|
|
129
135
|
return electronRemote.Menu.buildFromTemplate(template);
|
|
130
136
|
}
|
|
131
137
|
|
|
@@ -136,7 +142,7 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
|
|
|
136
142
|
): Electron.MenuItemConstructorOptions[] {
|
|
137
143
|
const showDisabled = options?.showDisabled !== false;
|
|
138
144
|
|
|
139
|
-
if (CompoundMenuNode.is(menu) && menu.children.length && this.undefinedOrMatch(menu.when, options.context)) {
|
|
145
|
+
if (CompoundMenuNode.is(menu) && menu.children.length && this.undefinedOrMatch(options.contextKeyService ?? this.contextKeyService, menu.when, options.context)) {
|
|
140
146
|
const role = CompoundMenuNode.getRole(menu);
|
|
141
147
|
if (role === CompoundMenuNodeRole.Group && menu.id === 'inline') { return parentItems; }
|
|
142
148
|
const children = CompoundMenuNode.getFlatChildren(menu.children);
|
|
@@ -162,7 +168,9 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
|
|
|
162
168
|
return parentItems;
|
|
163
169
|
}
|
|
164
170
|
|
|
165
|
-
if (
|
|
171
|
+
if (
|
|
172
|
+
!this.menuCommandExecutor.isVisible(options.rootMenuPath, commandId, ...args)
|
|
173
|
+
|| !this.undefinedOrMatch(options.contextKeyService ?? this.contextKeyService, node.when, options.context)) {
|
|
166
174
|
return parentItems;
|
|
167
175
|
}
|
|
168
176
|
|
|
@@ -202,9 +210,9 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
|
|
|
202
210
|
return parentItems;
|
|
203
211
|
}
|
|
204
212
|
|
|
205
|
-
protected undefinedOrMatch(expression?: string, context?: HTMLElement): boolean {
|
|
213
|
+
protected undefinedOrMatch(contextKeyService: ContextMatcher, expression?: string, context?: HTMLElement): boolean {
|
|
206
214
|
if (expression) {
|
|
207
|
-
return
|
|
215
|
+
return contextKeyService.match(expression, context);
|
|
208
216
|
}
|
|
209
217
|
return true;
|
|
210
218
|
}
|