@theia/preferences 1.25.0-next.3 → 1.25.0-next.32

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 (7) hide show
  1. package/lib/browser/views/components/preference-select-input.d.ts +8 -3
  2. package/lib/browser/views/components/preference-select-input.d.ts.map +1 -1
  3. package/lib/browser/views/components/preference-select-input.js +46 -18
  4. package/lib/browser/views/components/preference-select-input.js.map +1 -1
  5. package/package.json +8 -8
  6. package/src/browser/style/index.css +16 -0
  7. package/src/browser/views/components/preference-select-input.ts +46 -20
package/lib/browser/views/components/preference-select-input.d.ts CHANGED
@@ -1,18 +1,23 @@
1
+ /// <reference types="react" />
1
2
  import { PreferenceLeafNodeRenderer, PreferenceNodeRenderer } from './preference-node-renderer';
2
3
  import { interfaces } from '@theia/core/shared/inversify';
3
4
  import { JSONValue } from '@theia/core/shared/@phosphor/coreutils';
5
+ import { SelectComponent, SelectOption } from '@theia/core/lib/browser/widgets/select-component';
4
6
  import { Preference } from '../../util/preference-types';
5
7
  import { PreferenceLeafNodeRendererContribution } from './preference-node-renderer-creator';
6
- export declare class PreferenceSelectInputRenderer extends PreferenceLeafNodeRenderer<JSONValue, HTMLSelectElement> {
8
+ import * as React from '@theia/core/shared/react';
9
+ export declare class PreferenceSelectInputRenderer extends PreferenceLeafNodeRenderer<JSONValue, HTMLDivElement> {
10
+ protected readonly selectComponent: React.RefObject<SelectComponent>;
7
11
  protected get enumValues(): JSONValue[];
12
+ protected get selectOptions(): SelectOption[];
8
13
  protected createInteractable(parent: HTMLElement): void;
9
14
  protected getFallbackValue(): JSONValue;
10
15
  protected doHandleValueChange(): void;
11
16
  /**
12
17
  * Returns the stringified index corresponding to the currently selected value.
13
18
  */
14
- protected getDataValue(): string;
15
- protected handleUserInteraction(): void;
19
+ protected getDataValue(): number;
20
+ protected handleUserInteraction(selected: number): void;
16
21
  }
17
22
  export declare class PreferenceSelectInputRendererContribution extends PreferenceLeafNodeRendererContribution {
18
23
  static ID: string;
package/lib/browser/views/components/preference-select-input.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"preference-select-input.d.ts","sourceRoot":"","sources":["../../../../src/browser/views/components/preference-select-input.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAChG,OAAO,EAAc,UAAU,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,sCAAsC,EAAE,MAAM,oCAAoC,CAAC;AAE5F,qBACa,6BAA8B,SAAQ,0BAA0B,CAAC,SAAS,EAAE,iBAAiB,CAAC;IAEvG,SAAS,KAAK,UAAU,IAAI,SAAS,EAAE,CAEtC;IAED,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAgBvD,SAAS,CAAC,gBAAgB,IAAI,SAAS;IAIvC,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAUrC;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,MAAM;IAMhC,SAAS,CAAC,qBAAqB,IAAI,IAAI;CAI1C;AAED,qBACa,yCAA0C,SAAQ,sCAAsC;IACjG,MAAM,CAAC,EAAE,SAAsC;IAC/C,EAAE,SAAgD;IAElD,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,GAAG,MAAM;IAIpD,sBAAsB,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,GAAG,sBAAsB;CAGlF"}
1
+ {"version":3,"file":"preference-select-input.d.ts","sourceRoot":"","sources":["../../../../src/browser/views/components/preference-select-input.ts"],"names":[],"mappings":";AAgBA,OAAO,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAChG,OAAO,EAAc,UAAU,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AAEnE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,kDAAkD,CAAC;AACjG,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,sCAAsC,EAAE,MAAM,oCAAoC,CAAC;AAC5F,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAGlD,qBACa,6BAA8B,SAAQ,0BAA0B,CAAC,SAAS,EAAE,cAAc,CAAC;IAEpG,SAAS,CAAC,QAAQ,CAAC,eAAe,mCAAsC;IAExE,SAAS,KAAK,UAAU,IAAI,SAAS,EAAE,CAEtC;IAED,SAAS,KAAK,aAAa,IAAI,YAAY,EAAE,CAsB5C;IAED,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAavD,SAAS,CAAC,gBAAgB,IAAI,SAAS;IAIvC,SAAS,CAAC,mBAAmB,IAAI,IAAI;IASrC;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,MAAM;IAMhC,SAAS,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;CAI1D;AAED,qBACa,yCAA0C,SAAQ,sCAAsC;IACjG,MAAM,CAAC,EAAE,SAAsC;IAC/C,EAAE,SAAgD;IAElD,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,GAAG,MAAM;IAIpD,sBAAsB,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,GAAG,sBAAsB;CAGlF"}
package/lib/browser/views/components/preference-select-input.js CHANGED
@@ -25,36 +25,64 @@ Object.defineProperty(exports, "__esModule", { value: true });
25
25
  exports.PreferenceSelectInputRendererContribution = exports.PreferenceSelectInputRenderer = void 0;
26
26
  const preference_node_renderer_1 = require("./preference-node-renderer");
27
27
  const inversify_1 = require("@theia/core/shared/inversify");
28
+ const preference_provider_1 = require("@theia/core/lib/browser/preferences/preference-provider");
29
+ const select_component_1 = require("@theia/core/lib/browser/widgets/select-component");
28
30
  const preference_node_renderer_creator_1 = require("./preference-node-renderer-creator");
31
+ const React = require("@theia/core/shared/react");
32
+ const ReactDOM = require("@theia/core/shared/react-dom");
29
33
  let PreferenceSelectInputRenderer = class PreferenceSelectInputRenderer extends preference_node_renderer_1.PreferenceLeafNodeRenderer {
34
+ constructor() {
35
+ super(...arguments);
36
+ this.selectComponent = React.createRef();
37
+ }
30
38
  get enumValues() {
31
39
  return this.preferenceNode.preference.data.enum;
32
40
  }
41
+ get selectOptions() {
42
+ var _a, _b;
43
+ const items = [];
44
+ const values = this.enumValues;
45
+ const defaultValue = this.preferenceNode.preference.data.default;
46
+ for (let i = 0; i < values.length; i++) {
47
+ const value = `${values[i]}`;
48
+ const detail = preference_provider_1.PreferenceProvider.deepEqual(defaultValue, value) ? 'default' : undefined;
49
+ let enumDescription = (_a = this.preferenceNode.preference.data.enumDescriptions) === null || _a === void 0 ? void 0 : _a[i];
50
+ let markdown = false;
51
+ const markdownEnumDescription = (_b = this.preferenceNode.preference.data.markdownEnumDescriptions) === null || _b === void 0 ? void 0 : _b[i];
52
+ if (markdownEnumDescription) {
53
+ enumDescription = this.markdownRenderer.renderInline(markdownEnumDescription);
54
+ markdown = true;
55
+ }
56
+ items.push({
57
+ value,
58
+ detail,
59
+ description: enumDescription,
60
+ markdown
61
+ });
62
+ }
63
+ return items;
64
+ }
33
65
  createInteractable(parent) {
34
- const { enumValues } = this;
35
- const interactable = document.createElement('select');
66
+ const interactable = document.createElement('div');
67
+ const selectComponent = React.createElement(select_component_1.SelectComponent, {
68
+ options: this.selectOptions,
69
+ value: this.getDataValue(),
70
+ onChange: (_, index) => this.handleUserInteraction(index),
71
+ ref: this.selectComponent
72
+ });
36
73
  this.interactable = interactable;
37
- interactable.classList.add('theia-select');
38
- interactable.onchange = this.handleUserInteraction.bind(this);
39
- for (const [index, value] of enumValues.entries()) {
40
- const option = document.createElement('option');
41
- option.value = index.toString();
42
- option.textContent = `${value}`;
43
- interactable.appendChild(option);
44
- }
45
- interactable.value = this.getDataValue();
74
+ ReactDOM.render(selectComponent, interactable);
46
75
  parent.appendChild(interactable);
47
76
  }
48
77
  getFallbackValue() {
49
78
  return this.preferenceNode.preference.data.enum[0];
50
79
  }
51
80
  doHandleValueChange() {
52
- const currentValue = this.interactable.value || undefined;
53
81
  this.updateInspection();
54
82
  const newValue = this.getDataValue();
55
83
  this.updateModificationStatus(this.getValue());
56
- if (newValue !== currentValue && document.activeElement !== this.interactable) {
57
- this.interactable.value = newValue;
84
+ if (document.activeElement !== this.interactable && this.selectComponent.current) {
85
+ this.selectComponent.current.value = newValue;
58
86
  }
59
87
  }
60
88
  /**
@@ -62,11 +90,11 @@ let PreferenceSelectInputRenderer = class PreferenceSelectInputRenderer extends
62
90
  */
63
91
  getDataValue() {
64
92
  const currentValue = this.getValue();
65
- const selected = this.enumValues.findIndex(value => value === currentValue);
66
- return selected > -1 ? selected.toString() : '0';
93
+ const selected = this.enumValues.findIndex(value => preference_provider_1.PreferenceProvider.deepEqual(value, currentValue));
94
+ return Math.max(selected, 0);
67
95
  }
68
- handleUserInteraction() {
69
- const value = this.enumValues[Number(this.interactable.value)];
96
+ handleUserInteraction(selected) {
97
+ const value = this.enumValues[selected];
70
98
  this.setPreferenceImmediately(value);
71
99
  }
72
100
  };
package/lib/browser/views/components/preference-select-input.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"preference-select-input.js","sourceRoot":"","sources":["../../../../src/browser/views/components/preference-select-input.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"preference-select-input.js","sourceRoot":"","sources":["../../../../src/browser/views/components/preference-select-input.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "name": "@theia/preferences",
3
- "version": "1.25.0-next.3+3893fdec2fc",
3
+ "version": "1.25.0-next.32+edd747a3e60",
4
4
  "description": "Theia - Preferences Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.25.0-next.3+3893fdec2fc",
7
- "@theia/editor": "1.25.0-next.3+3893fdec2fc",
8
- "@theia/filesystem": "1.25.0-next.3+3893fdec2fc",
9
- "@theia/monaco": "1.25.0-next.3+3893fdec2fc",
6
+ "@theia/core": "1.25.0-next.32+edd747a3e60",
7
+ "@theia/editor": "1.25.0-next.32+edd747a3e60",
8
+ "@theia/filesystem": "1.25.0-next.32+edd747a3e60",
9
+ "@theia/monaco": "1.25.0-next.32+edd747a3e60",
10
10
  "@theia/monaco-editor-core": "1.65.2",
11
- "@theia/userstorage": "1.25.0-next.3+3893fdec2fc",
12
- "@theia/workspace": "1.25.0-next.3+3893fdec2fc",
11
+ "@theia/userstorage": "1.25.0-next.32+edd747a3e60",
12
+ "@theia/workspace": "1.25.0-next.32+edd747a3e60",
13
13
  "async-mutex": "^0.3.1",
14
14
  "jsonc-parser": "^2.2.0",
15
15
  "p-debounce": "^2.1.0"
@@ -52,5 +52,5 @@
52
52
  "nyc": {
53
53
  "extends": "../../configs/nyc.json"
54
54
  },
55
- "gitHead": "3893fdec2fc07766da986e12b62457a897b3b64e"
55
+ "gitHead": "edd747a3e60c38ff1b3cb75c487a38a05203425a"
56
56
  }
package/src/browser/style/index.css CHANGED
@@ -92,6 +92,14 @@
92
92
  z-index: -1;
93
93
  }
94
94
 
95
+ #theia-main-content-panel .theia-settings-container #preferences-scope-tab-bar .preferences-scope-tab {
96
+ color: var(--theia-panelTitle-inactiveForeground);
97
+ }
98
+
99
+ #theia-main-content-panel .theia-settings-container #preferences-scope-tab-bar .preferences-scope-tab:hover {
100
+ color: var(--theia-panelTitle-activeForeground);
101
+ }
102
+
95
103
  #theia-main-content-panel .theia-settings-container #preferences-scope-tab-bar .preferences-scope-tab.p-mod-current {
96
104
  color: var(--theia-panelTitle-activeForeground);
97
105
  border-bottom: var(--theia-border-width) solid var(--theia-panelTitle-activeBorder);
@@ -434,3 +442,11 @@
434
442
  .theia-settings-container .preference-modified-scope-wrapper:not(:last-child)::after {
435
443
  content: ', ';
436
444
  }
445
+
446
+ /** Select component */
447
+
448
+ .theia-settings-container .theia-select-component {
449
+ height: 26px;
450
+ width: 100%;
451
+ max-width: 320px;
452
+ }
package/src/browser/views/components/preference-select-input.ts CHANGED
@@ -17,29 +17,56 @@
17
17
  import { PreferenceLeafNodeRenderer, PreferenceNodeRenderer } from './preference-node-renderer';
18
18
  import { injectable, interfaces } from '@theia/core/shared/inversify';
19
19
  import { JSONValue } from '@theia/core/shared/@phosphor/coreutils';
20
+ import { PreferenceProvider } from '@theia/core/lib/browser/preferences/preference-provider';
21
+ import { SelectComponent, SelectOption } from '@theia/core/lib/browser/widgets/select-component';
20
22
  import { Preference } from '../../util/preference-types';
21
23
  import { PreferenceLeafNodeRendererContribution } from './preference-node-renderer-creator';
24
+ import * as React from '@theia/core/shared/react';
25
+ import * as ReactDOM from '@theia/core/shared/react-dom';
22
26
 
23
27
  @injectable()
24
- export class PreferenceSelectInputRenderer extends PreferenceLeafNodeRenderer<JSONValue, HTMLSelectElement> {
28
+ export class PreferenceSelectInputRenderer extends PreferenceLeafNodeRenderer<JSONValue, HTMLDivElement> {
29
+
30
+ protected readonly selectComponent = React.createRef<SelectComponent>();
25
31
 
26
32
  protected get enumValues(): JSONValue[] {
27
33
  return this.preferenceNode.preference.data.enum!;
28
34
  }
29
35
 
36
+ protected get selectOptions(): SelectOption[] {
37
+ const items: SelectOption[] = [];
38
+ const values = this.enumValues;
39
+ const defaultValue = this.preferenceNode.preference.data.default;
40
+ for (let i = 0; i < values.length; i++) {
41
+ const value = `${values[i]}`;
42
+ const detail = PreferenceProvider.deepEqual(defaultValue, value) ? 'default' : undefined;
43
+ let enumDescription = this.preferenceNode.preference.data.enumDescriptions?.[i];
44
+ let markdown = false;
45
+ const markdownEnumDescription = this.preferenceNode.preference.data.markdownEnumDescriptions?.[i];
46
+ if (markdownEnumDescription) {
47
+ enumDescription = this.markdownRenderer.renderInline(markdownEnumDescription);
48
+ markdown = true;
49
+ }
50
+ items.push({
51
+ value,
52
+ detail,
53
+ description: enumDescription,
54
+ markdown
55
+ });
56
+ }
57
+ return items;
58
+ }
59
+
30
60
  protected createInteractable(parent: HTMLElement): void {
31
- const { enumValues } = this;
32
- const interactable = document.createElement('select');
61
+ const interactable = document.createElement('div');
62
+ const selectComponent = React.createElement(SelectComponent, {
63
+ options: this.selectOptions,
64
+ value: this.getDataValue(),
65
+ onChange: (_, index) => this.handleUserInteraction(index),
66
+ ref: this.selectComponent
67
+ });
33
68
  this.interactable = interactable;
34
- interactable.classList.add('theia-select');
35
- interactable.onchange = this.handleUserInteraction.bind(this);
36
- for (const [index, value] of enumValues.entries()) {
37
- const option = document.createElement('option');
38
- option.value = index.toString();
39
- option.textContent = `${value}`;
40
- interactable.appendChild(option);
41
- }
42
- interactable.value = this.getDataValue();
69
+ ReactDOM.render(selectComponent, interactable);
43
70
  parent.appendChild(interactable);
44
71
  }
45
72
 
@@ -48,26 +75,25 @@ export class PreferenceSelectInputRenderer extends PreferenceLeafNodeRenderer<JS
48
75
  }
49
76
 
50
77
  protected doHandleValueChange(): void {
51
- const currentValue = this.interactable.value || undefined;
52
78
  this.updateInspection();
53
79
  const newValue = this.getDataValue();
54
80
  this.updateModificationStatus(this.getValue());
55
- if (newValue !== currentValue && document.activeElement !== this.interactable) {
56
- this.interactable.value = newValue;
81
+ if (document.activeElement !== this.interactable && this.selectComponent.current) {
82
+ this.selectComponent.current.value = newValue;
57
83
  }
58
84
  }
59
85
 
60
86
  /**
61
87
  * Returns the stringified index corresponding to the currently selected value.
62
88
  */
63
- protected getDataValue(): string {
89
+ protected getDataValue(): number {
64
90
  const currentValue = this.getValue();
65
- const selected = this.enumValues.findIndex(value => value === currentValue);
66
- return selected > -1 ? selected.toString() : '0';
91
+ const selected = this.enumValues.findIndex(value => PreferenceProvider.deepEqual(value, currentValue));
92
+ return Math.max(selected, 0);
67
93
  }
68
94
 
69
- protected handleUserInteraction(): void {
70
- const value = this.enumValues[Number(this.interactable.value)];
95
+ protected handleUserInteraction(selected: number): void {
96
+ const value = this.enumValues[selected];
71
97
  this.setPreferenceImmediately(value);
72
98
  }
73
99
  }