@omegagrid/code 0.6.42 → 0.6.44
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/dist/components/code.d.ts +6 -11
- package/dist/components/code.d.ts.map +1 -1
- package/dist/components/code.js +56 -81
- package/dist/components/code.js.map +1 -1
- package/dist/components/codeBlock.d.ts +3 -0
- package/dist/components/codeBlock.d.ts.map +1 -1
- package/dist/components/codeBlock.js +33 -8
- package/dist/components/codeBlock.js.map +1 -1
- package/dist/components/codeDiff.d.ts +10 -15
- package/dist/components/codeDiff.d.ts.map +1 -1
- package/dist/components/codeDiff.js +89 -120
- package/dist/components/codeDiff.js.map +1 -1
- package/dist/loader.d.ts.map +1 -1
- package/dist/loader.js +1 -10
- package/dist/loader.js.map +1 -1
- package/package.json +4 -4
|
@@ -4,6 +4,8 @@ import type * as monaco from 'monaco-editor';
|
|
|
4
4
|
export declare class Code extends LitElement implements Layout {
|
|
5
5
|
#private;
|
|
6
6
|
static styles: import("lit").CSSResult;
|
|
7
|
+
get editor(): monaco.editor.IStandaloneCodeEditor;
|
|
8
|
+
get model(): monaco.editor.ITextModel;
|
|
7
9
|
get options(): monaco.editor.IStandaloneEditorConstructionOptions;
|
|
8
10
|
set options(val: monaco.editor.IStandaloneEditorConstructionOptions);
|
|
9
11
|
get content(): string;
|
|
@@ -11,22 +13,15 @@ export declare class Code extends LitElement implements Layout {
|
|
|
11
13
|
get language(): string;
|
|
12
14
|
set language(val: string);
|
|
13
15
|
get selectedContent(): string;
|
|
14
|
-
get
|
|
15
|
-
get document(): Document;
|
|
16
|
-
get head(): HTMLHeadElement;
|
|
17
|
-
get body(): HTMLElement;
|
|
18
|
-
get monaco(): typeof monaco;
|
|
19
|
-
container: HTMLDivElement;
|
|
20
|
-
get iframe(): HTMLIFrameElement;
|
|
21
|
-
get editor(): monaco.editor.IStandaloneCodeEditor;
|
|
22
|
-
get model(): monaco.editor.ITextModel;
|
|
16
|
+
get container(): HTMLDivElement;
|
|
23
17
|
get theme(): "vs" | "vs-dark";
|
|
24
18
|
getOptions: () => monaco.editor.IStandaloneEditorConstructionOptions;
|
|
19
|
+
showContainer(): void;
|
|
20
|
+
hideContainer(): void;
|
|
25
21
|
initEditor(): Promise<void>;
|
|
26
|
-
updated(): void
|
|
22
|
+
updated(): Promise<void>;
|
|
27
23
|
connectedCallback(): void;
|
|
28
24
|
disconnectedCallback(): void;
|
|
29
|
-
render: () => import("lit-html").TemplateResult<1>;
|
|
30
25
|
layout(): void;
|
|
31
26
|
dispose(): void;
|
|
32
27
|
focus(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.d.ts","sourceRoot":"","sources":["../../src/components/code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,MAAM,EAA2B,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"code.d.ts","sourceRoot":"","sources":["../../src/components/code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,MAAM,EAA2B,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAO,MAAM,KAAK,CAAC;AAGtC,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAM7C,qBACa,IAAK,SAAQ,UAAW,YAAW,MAAM;;IAErD,MAAM,CAAC,MAAM,0BAcX;IAGF,IAAI,MAAM,wCAA0B;IACpC,IAAI,KAAK,6BAAsC;IAG/C,IACI,OAAO,IACM,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAD7B;IACtC,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,oCAAoC,EAGlE;IAED,IACI,OAAO,IACM,MAAM,CADwD;IAC/E,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,EAQtB;IAGD,IACI,QAAQ,IACM,MAAM,CADgB;IACxC,IAAI,QAAQ,CAAC,GAAG,EAAE,MAAM,EAKvB;IAED,IAAI,eAAe,WAKlB;IASD,IAAI,SAAS,mBAA6E;IAC1F,IAAI,KAAK,qBAA+E;IAKxF,UAAU,QAAO,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAQhE;IAEH,aAAa;IAMb,aAAa;IAIP,UAAU;IA0CV,OAAO;IAKb,iBAAiB;IAUjB,oBAAoB;IAKpB,MAAM;IAaN,OAAO;IAQP,KAAK;CAIL"}
|
package/dist/components/code.js
CHANGED
|
@@ -15,35 +15,26 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
|
|
|
15
15
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
16
16
|
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
17
17
|
};
|
|
18
|
-
var _Code_options, _Code_language,
|
|
18
|
+
var _Code_editor, _Code_options, _Code_language, _Code_preventChangeEvent, _Code_state, _Code_content, _Code_selection, _Code_scrollPosition, _Code_container, _Code_onStyleChange;
|
|
19
19
|
import { dom, getThemeManager, events } from '@omegagrid/core';
|
|
20
|
-
import { LitElement, css
|
|
21
|
-
import { customElement,
|
|
20
|
+
import { LitElement, css } from 'lit';
|
|
21
|
+
import { customElement, property } from 'lit/decorators.js';
|
|
22
22
|
import { MonacoLoader } from '../loader';
|
|
23
23
|
import { getDefaultOptions } from '@omegagrid/core';
|
|
24
24
|
import { CodeEvent } from './shared';
|
|
25
|
-
const
|
|
26
|
-
html, body {
|
|
27
|
-
margin: 0;
|
|
28
|
-
padding: 0;
|
|
29
|
-
height: 100%;
|
|
30
|
-
overflow: hidden;
|
|
31
|
-
position: relative
|
|
32
|
-
}
|
|
33
|
-
`;
|
|
25
|
+
const VISIBILITY_THRESHOLD_SIZE = 10; // minimum width/height to show the editor
|
|
34
26
|
let Code = class Code extends LitElement {
|
|
35
27
|
constructor() {
|
|
36
28
|
super(...arguments);
|
|
29
|
+
_Code_editor.set(this, void 0);
|
|
37
30
|
_Code_options.set(this, void 0);
|
|
38
31
|
_Code_language.set(this, 'typescript');
|
|
39
|
-
_Code_iframe.set(this, void 0);
|
|
40
|
-
_Code_editor.set(this, void 0);
|
|
41
|
-
_Code_model.set(this, void 0);
|
|
42
32
|
_Code_preventChangeEvent.set(this, false);
|
|
43
|
-
|
|
33
|
+
_Code_state.set(this, 0); // 0: initial, 1: initializing, 2: initialized
|
|
44
34
|
_Code_content.set(this, void 0);
|
|
45
35
|
_Code_selection.set(this, void 0);
|
|
46
36
|
_Code_scrollPosition.set(this, void 0);
|
|
37
|
+
_Code_container.set(this, void 0);
|
|
47
38
|
_Code_onStyleChange.set(this, () => {
|
|
48
39
|
__classPrivateFieldGet(this, _Code_editor, "f").updateOptions({ theme: this.theme });
|
|
49
40
|
});
|
|
@@ -56,12 +47,9 @@ let Code = class Code extends LitElement {
|
|
|
56
47
|
// https://github.com/microsoft/monaco-editor/issues/3217#issuecomment-1511978166
|
|
57
48
|
fontLigatures: ''
|
|
58
49
|
});
|
|
59
|
-
_Code_passThroughEvent.set(this, (event) => {
|
|
60
|
-
const newEvent = new MouseEvent(event.type, event);
|
|
61
|
-
this.dispatchEvent(newEvent);
|
|
62
|
-
});
|
|
63
|
-
this.render = () => html `<div></div>`;
|
|
64
50
|
}
|
|
51
|
+
get editor() { return __classPrivateFieldGet(this, _Code_editor, "f"); }
|
|
52
|
+
get model() { return __classPrivateFieldGet(this, _Code_editor, "f")?.getModel(); }
|
|
65
53
|
get options() { return __classPrivateFieldGet(this, _Code_options, "f"); }
|
|
66
54
|
set options(val) {
|
|
67
55
|
__classPrivateFieldSet(this, _Code_options, val, "f");
|
|
@@ -69,7 +57,7 @@ let Code = class Code extends LitElement {
|
|
|
69
57
|
}
|
|
70
58
|
get content() { return __classPrivateFieldGet(this, _Code_editor, "f") ? __classPrivateFieldGet(this, _Code_editor, "f").getValue() : __classPrivateFieldGet(this, _Code_content, "f"); }
|
|
71
59
|
set content(val) {
|
|
72
|
-
if (val
|
|
60
|
+
if (val == null)
|
|
73
61
|
val = '';
|
|
74
62
|
if (__classPrivateFieldGet(this, _Code_editor, "f")) {
|
|
75
63
|
__classPrivateFieldSet(this, _Code_preventChangeEvent, true, "f");
|
|
@@ -82,50 +70,35 @@ let Code = class Code extends LitElement {
|
|
|
82
70
|
get language() { return __classPrivateFieldGet(this, _Code_language, "f"); }
|
|
83
71
|
set language(val) {
|
|
84
72
|
__classPrivateFieldSet(this, _Code_language, val, "f");
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
if (__classPrivateFieldGet(this, _Code_model, "f")) {
|
|
88
|
-
__classPrivateFieldSet(this, _Code_content, __classPrivateFieldGet(this, _Code_model, "f").getValue(), "f");
|
|
89
|
-
// this.monaco?.editor?.setModelLanguage(this.#model, val);
|
|
73
|
+
if (this.model) {
|
|
74
|
+
MonacoLoader.get().then(monaco => monaco.editor.setModelLanguage(this.model, val));
|
|
90
75
|
}
|
|
91
|
-
this.requestUpdate();
|
|
92
76
|
}
|
|
93
77
|
get selectedContent() {
|
|
94
78
|
if (!__classPrivateFieldGet(this, _Code_editor, "f"))
|
|
95
79
|
return __classPrivateFieldGet(this, _Code_content, "f");
|
|
96
|
-
const selectedCodeChunks = __classPrivateFieldGet(this, _Code_editor, "f").getSelections().map(selection =>
|
|
80
|
+
const selectedCodeChunks = __classPrivateFieldGet(this, _Code_editor, "f").getSelections().map(selection => this.model.getValueInRange(selection));
|
|
97
81
|
const selectedCode = selectedCodeChunks.join("\n").trim();
|
|
98
82
|
return selectedCode == null || selectedCode == '' ? __classPrivateFieldGet(this, _Code_editor, "f").getValue() : selectedCode;
|
|
99
83
|
}
|
|
100
|
-
get
|
|
101
|
-
get document() { return this.iframe?.contentDocument; }
|
|
102
|
-
get head() { return this.iframe?.contentDocument.head; }
|
|
103
|
-
get body() { return this.iframe?.contentDocument.body; }
|
|
104
|
-
get monaco() { return this.contentWindow?.monaco; }
|
|
105
|
-
get iframe() {
|
|
106
|
-
if (!this.container)
|
|
107
|
-
return null;
|
|
108
|
-
if (__classPrivateFieldGet(this, _Code_iframe, "f"))
|
|
109
|
-
return __classPrivateFieldGet(this, _Code_iframe, "f");
|
|
110
|
-
__classPrivateFieldSet(this, _Code_iframe, dom.createElement('iframe'), "f");
|
|
111
|
-
dom.empty(this.container);
|
|
112
|
-
this.container.appendChild(__classPrivateFieldGet(this, _Code_iframe, "f"));
|
|
113
|
-
return __classPrivateFieldGet(this, _Code_iframe, "f");
|
|
114
|
-
}
|
|
115
|
-
get editor() { return __classPrivateFieldGet(this, _Code_editor, "f"); }
|
|
116
|
-
get model() { return __classPrivateFieldGet(this, _Code_model, "f"); }
|
|
84
|
+
get container() { return __classPrivateFieldGet(this, _Code_container, "f") ?? (__classPrivateFieldSet(this, _Code_container, dom.createElement('div'), "f")); }
|
|
117
85
|
get theme() { return getThemeManager().activeTheme?.type == 'light' ? 'vs' : 'vs-dark'; }
|
|
86
|
+
showContainer() {
|
|
87
|
+
if (this.container.parentElement !== document.body) {
|
|
88
|
+
document.body.appendChild(this.container);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
hideContainer() {
|
|
92
|
+
__classPrivateFieldGet(this, _Code_container, "f")?.remove();
|
|
93
|
+
}
|
|
118
94
|
async initEditor() {
|
|
119
|
-
if (
|
|
120
|
-
return;
|
|
121
|
-
if (__classPrivateFieldGet(this, _Code_initializing, "f") || __classPrivateFieldGet(this, _Code_editor, "f"))
|
|
95
|
+
if (__classPrivateFieldGet(this, _Code_state, "f") > 0)
|
|
122
96
|
return;
|
|
123
|
-
__classPrivateFieldSet(this,
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
__classPrivateFieldGet(this, _Code_editor, "f").setModel(__classPrivateFieldGet(this, _Code_model, "f"));
|
|
97
|
+
__classPrivateFieldSet(this, _Code_state, 1, "f");
|
|
98
|
+
const monaco = await MonacoLoader.get();
|
|
99
|
+
__classPrivateFieldSet(this, _Code_editor, monaco.editor.create(this.container, this.getOptions()), "f");
|
|
100
|
+
const model = monaco.editor.createModel(__classPrivateFieldGet(this, _Code_content, "f"), __classPrivateFieldGet(this, _Code_language, "f"));
|
|
101
|
+
__classPrivateFieldGet(this, _Code_editor, "f").setModel(model);
|
|
129
102
|
if (__classPrivateFieldGet(this, _Code_selection, "f"))
|
|
130
103
|
__classPrivateFieldGet(this, _Code_editor, "f").setSelection(__classPrivateFieldGet(this, _Code_selection, "f"));
|
|
131
104
|
if (__classPrivateFieldGet(this, _Code_scrollPosition, "f"))
|
|
@@ -133,6 +106,9 @@ let Code = class Code extends LitElement {
|
|
|
133
106
|
scrollTop: __classPrivateFieldGet(this, _Code_scrollPosition, "f").top,
|
|
134
107
|
scrollLeft: __classPrivateFieldGet(this, _Code_scrollPosition, "f").left
|
|
135
108
|
});
|
|
109
|
+
__classPrivateFieldGet(this, _Code_editor, "f").onDidBlurEditorText(() => {
|
|
110
|
+
this.dispatchEvent(new CodeEvent('blur', { editor: __classPrivateFieldGet(this, _Code_editor, "f") }));
|
|
111
|
+
});
|
|
136
112
|
__classPrivateFieldGet(this, _Code_editor, "f").onDidChangeModelContent(e => {
|
|
137
113
|
if (__classPrivateFieldGet(this, _Code_preventChangeEvent, "f")) {
|
|
138
114
|
__classPrivateFieldSet(this, _Code_preventChangeEvent, false, "f");
|
|
@@ -142,62 +118,64 @@ let Code = class Code extends LitElement {
|
|
|
142
118
|
editor: __classPrivateFieldGet(this, _Code_editor, "f"),
|
|
143
119
|
changes: e.changes
|
|
144
120
|
}));
|
|
145
|
-
this.dispatchEvent(new events.ChangeEvent({ value:
|
|
121
|
+
this.dispatchEvent(new events.ChangeEvent({ value: model }));
|
|
146
122
|
});
|
|
147
123
|
__classPrivateFieldGet(this, _Code_editor, "f").onKeyDown(e => {
|
|
148
124
|
this.dispatchEvent(new CodeEvent('keydown', { editor: __classPrivateFieldGet(this, _Code_editor, "f") }, e.browserEvent));
|
|
149
125
|
});
|
|
150
126
|
__classPrivateFieldSet(this, _Code_preventChangeEvent, false, "f");
|
|
151
|
-
__classPrivateFieldSet(this,
|
|
127
|
+
__classPrivateFieldSet(this, _Code_state, 2, "f");
|
|
152
128
|
this.dispatchEvent(new CodeEvent('ready', { editor: __classPrivateFieldGet(this, _Code_editor, "f") }));
|
|
153
129
|
__classPrivateFieldGet(this, _Code_editor, "f").focus();
|
|
154
|
-
this.iframe.contentDocument.addEventListener('mousedown', __classPrivateFieldGet(this, _Code_passThroughEvent, "f"));
|
|
155
|
-
this.iframe.contentDocument.addEventListener('mouseup', __classPrivateFieldGet(this, _Code_passThroughEvent, "f"));
|
|
156
|
-
// this.iframe.contentDocument.addEventListener('mousemove', this.#passThroughEvent);
|
|
157
130
|
}
|
|
158
|
-
updated() {
|
|
159
|
-
this.initEditor();
|
|
131
|
+
async updated() {
|
|
132
|
+
await this.initEditor();
|
|
133
|
+
this.layout();
|
|
160
134
|
}
|
|
161
135
|
connectedCallback() {
|
|
162
136
|
super.connectedCallback();
|
|
163
137
|
getThemeManager().addEventListener('change', __classPrivateFieldGet(this, _Code_onStyleChange, "f"));
|
|
164
|
-
this.
|
|
138
|
+
if (this.hasUpdated) {
|
|
139
|
+
this.initEditor();
|
|
140
|
+
this.layout();
|
|
141
|
+
}
|
|
165
142
|
}
|
|
166
143
|
disconnectedCallback() {
|
|
167
|
-
__classPrivateFieldSet(this, _Code_initializing, false, "f");
|
|
168
144
|
getThemeManager().removeEventListener('change', __classPrivateFieldGet(this, _Code_onStyleChange, "f"));
|
|
169
|
-
|
|
170
|
-
__classPrivateFieldSet(this, _Code_content, __classPrivateFieldGet(this, _Code_model, "f").getValue(), "f");
|
|
171
|
-
if (__classPrivateFieldGet(this, _Code_editor, "f")) {
|
|
172
|
-
__classPrivateFieldSet(this, _Code_selection, __classPrivateFieldGet(this, _Code_editor, "f").getSelection(), "f");
|
|
173
|
-
__classPrivateFieldSet(this, _Code_scrollPosition, { top: __classPrivateFieldGet(this, _Code_editor, "f").getScrollTop(), left: __classPrivateFieldGet(this, _Code_editor, "f").getScrollLeft() }, "f");
|
|
174
|
-
}
|
|
175
|
-
__classPrivateFieldGet(this, _Code_editor, "f")?.dispose();
|
|
176
|
-
__classPrivateFieldSet(this, _Code_editor, null, "f");
|
|
145
|
+
this.hideContainer();
|
|
177
146
|
}
|
|
178
147
|
layout() {
|
|
179
|
-
|
|
148
|
+
if (!this.isConnected || this.clientWidth < VISIBILITY_THRESHOLD_SIZE || this.clientHeight < VISIBILITY_THRESHOLD_SIZE) {
|
|
149
|
+
this.hideContainer();
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
this.showContainer();
|
|
153
|
+
const offset = dom.getElementOffset(this, document.body);
|
|
154
|
+
dom.setPosition(this.container, { t: offset.top + 1, l: offset.left + 1 });
|
|
155
|
+
dom.setSize(this.container, { w: this.clientWidth - 1, h: this.clientHeight - 1 });
|
|
156
|
+
this.editor?.layout();
|
|
180
157
|
}
|
|
181
158
|
dispose() {
|
|
159
|
+
__classPrivateFieldGet(this, _Code_container, "f")?.remove();
|
|
160
|
+
__classPrivateFieldSet(this, _Code_container, null, "f");
|
|
182
161
|
__classPrivateFieldGet(this, _Code_editor, "f")?.dispose();
|
|
183
162
|
__classPrivateFieldSet(this, _Code_editor, null, "f");
|
|
163
|
+
__classPrivateFieldSet(this, _Code_state, 0, "f");
|
|
184
164
|
}
|
|
185
165
|
focus() {
|
|
186
166
|
__classPrivateFieldGet(this, _Code_editor, "f")?.focus();
|
|
187
167
|
}
|
|
188
168
|
};
|
|
169
|
+
_Code_editor = new WeakMap();
|
|
189
170
|
_Code_options = new WeakMap();
|
|
190
171
|
_Code_language = new WeakMap();
|
|
191
|
-
_Code_iframe = new WeakMap();
|
|
192
|
-
_Code_editor = new WeakMap();
|
|
193
|
-
_Code_model = new WeakMap();
|
|
194
172
|
_Code_preventChangeEvent = new WeakMap();
|
|
195
|
-
|
|
173
|
+
_Code_state = new WeakMap();
|
|
196
174
|
_Code_content = new WeakMap();
|
|
197
175
|
_Code_selection = new WeakMap();
|
|
198
176
|
_Code_scrollPosition = new WeakMap();
|
|
177
|
+
_Code_container = new WeakMap();
|
|
199
178
|
_Code_onStyleChange = new WeakMap();
|
|
200
|
-
_Code_passThroughEvent = new WeakMap();
|
|
201
179
|
Code.styles = css `
|
|
202
180
|
:host {
|
|
203
181
|
user-select: text;
|
|
@@ -222,9 +200,6 @@ __decorate([
|
|
|
222
200
|
__decorate([
|
|
223
201
|
property({ type: String, noAccessor: true })
|
|
224
202
|
], Code.prototype, "language", null);
|
|
225
|
-
__decorate([
|
|
226
|
-
query('div')
|
|
227
|
-
], Code.prototype, "container", void 0);
|
|
228
203
|
Code = __decorate([
|
|
229
204
|
customElement('og-code')
|
|
230
205
|
], Code);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.js","sourceRoot":"","sources":["../../src/components/code.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAU,eAAe,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"code.js","sourceRoot":"","sources":["../../src/components/code.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { Code } from './code';
|
|
|
4
4
|
import { CodeEvent } from './shared';
|
|
5
5
|
import { TreeAdapter, TreeEvent, TreeOptions } from '@omegagrid/tree';
|
|
6
6
|
import type * as monaco from 'monaco-editor';
|
|
7
|
+
import { CodeView } from './codeView';
|
|
7
8
|
declare class LangTreeAdapter extends TreeAdapter {
|
|
8
9
|
getTree(): Promise<{
|
|
9
10
|
k: string;
|
|
@@ -20,7 +21,9 @@ export declare class CodeBlock extends LitElement implements Layout {
|
|
|
20
21
|
minHeight: number;
|
|
21
22
|
disableToolbar: boolean;
|
|
22
23
|
editor: Code;
|
|
24
|
+
view: CodeView;
|
|
23
25
|
editorOptions: monaco.editor.IStandaloneEditorConstructionOptions;
|
|
26
|
+
editing: boolean;
|
|
24
27
|
get languageAdapter(): LangTreeAdapter;
|
|
25
28
|
get content(): string;
|
|
26
29
|
set content(value: string);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeBlock.d.ts","sourceRoot":"","sources":["../../src/components/codeBlock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAe,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAa,MAAM,KAAK,CAAC;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEtE,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"codeBlock.d.ts","sourceRoot":"","sources":["../../src/components/codeBlock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAe,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAa,MAAM,KAAK,CAAC;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEtE,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,cAAM,eAAgB,SAAQ,WAAW;IAClC,OAAO;;;;IASb,UAAU,IAAK,WAAW;CAO1B;AAED,qBACa,SAAU,SAAQ,UAAW,YAAW,MAAM;;IAE1D,MAAM,CAAC,MAAM,0BA0CX;IAGF,QAAQ,SAAgB;IAGxB,aAAa,UAAS;IAGtB,SAAS,SAAO;IAGhB,SAAS,SAAM;IAGf,cAAc,UAAS;IAGvB,MAAM,EAAE,IAAI,CAAC;IAGb,IAAI,EAAE,QAAQ,CAAC;IAGf,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAAC;IAGlE,OAAO,UAAS;IAGhB,IAAI,eAAe,oBAGlB;IAGD,IAAI,OAAO,IACQ,MAAM,CADqC;IAC9D,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,EAGxB;IAED,IAAI,YAAY,wCAAiC;IACjD,IAAI,KAAK,6BAA2C;IAEpD,YAAY;IASZ,SAAS,OAAQ,SAAS,UAExB;IAEI,UAAU,CAAC,YAAY,EAAE,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC;IAMxD,iBAAiB,MAAO,SAAS,UAMhC;IAED,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAGb;IAEH,MAAM,6CA+BJ;IAEF,MAAM;IAIN,KAAK;CAIL"}
|
|
@@ -18,7 +18,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
|
|
|
18
18
|
var _CodeBlock_languageAdapter, _CodeBlock_content;
|
|
19
19
|
import { dom, events } from '@omegagrid/core';
|
|
20
20
|
import { LitElement, css, html } from 'lit';
|
|
21
|
-
import { customElement, query, property } from 'lit/decorators.js';
|
|
21
|
+
import { customElement, query, property, state } from 'lit/decorators.js';
|
|
22
22
|
import { TreeAdapter } from '@omegagrid/tree';
|
|
23
23
|
import { getLanguages, validateLanguage } from '../utils';
|
|
24
24
|
class LangTreeAdapter extends TreeAdapter {
|
|
@@ -46,6 +46,7 @@ let CodeBlock = class CodeBlock extends LitElement {
|
|
|
46
46
|
this.maxHeight = 400;
|
|
47
47
|
this.minHeight = 25;
|
|
48
48
|
this.disableToolbar = false;
|
|
49
|
+
this.editing = false;
|
|
49
50
|
_CodeBlock_languageAdapter.set(this, void 0);
|
|
50
51
|
_CodeBlock_content.set(this, void 0);
|
|
51
52
|
this._onChange = (_e) => {
|
|
@@ -73,13 +74,26 @@ let CodeBlock = class CodeBlock extends LitElement {
|
|
|
73
74
|
</div>
|
|
74
75
|
` : ''}
|
|
75
76
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
77
|
+
${this.editing ? html `
|
|
78
|
+
<og-code
|
|
79
|
+
.content="${this.content}"
|
|
80
|
+
.language="${this.language}"
|
|
81
|
+
.options="${this.getEditorOptions()}"
|
|
82
|
+
@code.change="${this._onChange}"
|
|
83
|
+
@code.ready="${() => this.updateHeight()}"
|
|
84
|
+
@code.blur="${() => {
|
|
85
|
+
__classPrivateFieldSet(this, _CodeBlock_content, this.editor.content, "f");
|
|
86
|
+
this.editing = false;
|
|
87
|
+
}}">
|
|
88
|
+
</og-code>
|
|
89
|
+
` : html `
|
|
90
|
+
<og-code-view
|
|
91
|
+
scrollable
|
|
92
|
+
.content="${this.content}"
|
|
93
|
+
.language="${this.language}"
|
|
94
|
+
@click="${() => this.editing = true}">
|
|
95
|
+
</og-code-view>
|
|
96
|
+
`}
|
|
83
97
|
`;
|
|
84
98
|
}
|
|
85
99
|
get languageAdapter() {
|
|
@@ -144,6 +158,11 @@ CodeBlock.styles = css `
|
|
|
144
158
|
height: 100%;
|
|
145
159
|
}
|
|
146
160
|
|
|
161
|
+
og-code-view {
|
|
162
|
+
cursor: pointer;
|
|
163
|
+
height: 100%;
|
|
164
|
+
}
|
|
165
|
+
|
|
147
166
|
.toolbar {
|
|
148
167
|
flex: 0;
|
|
149
168
|
height: 28px;
|
|
@@ -175,9 +194,15 @@ __decorate([
|
|
|
175
194
|
__decorate([
|
|
176
195
|
query('og-code')
|
|
177
196
|
], CodeBlock.prototype, "editor", void 0);
|
|
197
|
+
__decorate([
|
|
198
|
+
query('og-code-view')
|
|
199
|
+
], CodeBlock.prototype, "view", void 0);
|
|
178
200
|
__decorate([
|
|
179
201
|
property({ type: Object })
|
|
180
202
|
], CodeBlock.prototype, "editorOptions", void 0);
|
|
203
|
+
__decorate([
|
|
204
|
+
state()
|
|
205
|
+
], CodeBlock.prototype, "editing", void 0);
|
|
181
206
|
CodeBlock = __decorate([
|
|
182
207
|
customElement('og-code-block')
|
|
183
208
|
], CodeBlock);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeBlock.js","sourceRoot":"","sources":["../../src/components/codeBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAU,GAAG,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"codeBlock.js","sourceRoot":"","sources":["../../src/components/codeBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,33 +3,28 @@ import { LitElement } from 'lit';
|
|
|
3
3
|
import type * as monaco from 'monaco-editor';
|
|
4
4
|
export declare class CodeDiffEditor extends LitElement implements Layout {
|
|
5
5
|
#private;
|
|
6
|
-
static monaco: typeof monaco;
|
|
7
6
|
static styles: import("lit").CSSResult;
|
|
7
|
+
get editor(): monaco.editor.IStandaloneDiffEditor;
|
|
8
|
+
get modifiedModel(): monaco.editor.ITextModel;
|
|
9
|
+
get originalModel(): monaco.editor.ITextModel;
|
|
8
10
|
get options(): monaco.editor.IStandaloneEditorConstructionOptions;
|
|
9
11
|
set options(val: monaco.editor.IStandaloneEditorConstructionOptions);
|
|
10
|
-
get language(): string;
|
|
11
|
-
set language(val: string);
|
|
12
12
|
get modifiedContent(): string;
|
|
13
13
|
set modifiedContent(val: string);
|
|
14
14
|
get originalContent(): string;
|
|
15
15
|
set originalContent(val: string);
|
|
16
|
+
get language(): string;
|
|
17
|
+
set language(val: string);
|
|
16
18
|
get selectedContent(): string;
|
|
17
|
-
get
|
|
18
|
-
get document(): Document;
|
|
19
|
-
get head(): HTMLHeadElement;
|
|
20
|
-
get body(): HTMLElement;
|
|
21
|
-
get monaco(): typeof monaco;
|
|
22
|
-
iframe: HTMLIFrameElement;
|
|
23
|
-
get editor(): monaco.editor.IStandaloneDiffEditor;
|
|
24
|
-
get modifiedModel(): monaco.editor.ITextModel;
|
|
25
|
-
get originalModel(): monaco.editor.ITextModel;
|
|
19
|
+
get container(): HTMLDivElement;
|
|
26
20
|
get theme(): "vs" | "vs-dark";
|
|
27
|
-
getOptions: () => monaco.editor.
|
|
21
|
+
getOptions: () => monaco.editor.IStandaloneEditorConstructionOptions;
|
|
22
|
+
showContainer(): void;
|
|
23
|
+
hideContainer(): void;
|
|
28
24
|
initEditor(): Promise<void>;
|
|
29
|
-
updated(): void
|
|
25
|
+
updated(): Promise<void>;
|
|
30
26
|
connectedCallback(): void;
|
|
31
27
|
disconnectedCallback(): void;
|
|
32
|
-
render: () => import("lit-html").TemplateResult<1>;
|
|
33
28
|
layout(): void;
|
|
34
29
|
dispose(): void;
|
|
35
30
|
focus(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeDiff.d.ts","sourceRoot":"","sources":["../../src/components/codeDiff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,MAAM,EAA2B,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"codeDiff.d.ts","sourceRoot":"","sources":["../../src/components/codeDiff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,MAAM,EAA2B,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAO,MAAM,KAAK,CAAC;AAGtC,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAM7C,qBACa,cAAe,SAAQ,UAAW,YAAW,MAAM;;IAE/D,MAAM,CAAC,MAAM,0BAcX;IASF,IAAI,MAAM,wCAA0B;IACpC,IAAI,aAAa,6BAA+C;IAChE,IAAI,aAAa,6BAA+C;IAGhE,IACI,OAAO,IACM,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAD7B;IACtC,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,oCAAoC,EAGlE;IAGD,IACI,eAAe,IACM,MAAM,CAD4E;IAC3G,IAAI,eAAe,CAAC,GAAG,EAAE,MAAM,EAO9B;IAGD,IACI,eAAe,IACM,MAAM,CAD4E;IAC3G,IAAI,eAAe,CAAC,GAAG,EAAE,MAAM,EAO9B;IAGD,IACI,QAAQ,IACM,MAAM,CADgB;IACxC,IAAI,QAAQ,CAAC,GAAG,EAAE,MAAM,EAQvB;IAED,IAAI,eAAe,WAMlB;IAGD,IAAI,SAAS,mBAA6E;IAC1F,IAAI,KAAK,qBAA+E;IAKxF,UAAU,QAAO,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAOhE;IAEH,aAAa;IAMb,aAAa;IAIP,UAAU;IAuCV,OAAO;IAKb,iBAAiB;IAUjB,oBAAoB;IAKpB,MAAM;IAiBN,OAAO;IAQP,KAAK;CAIL"}
|
|
@@ -15,38 +15,27 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
|
|
|
15
15
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
16
16
|
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
17
17
|
};
|
|
18
|
-
var
|
|
18
|
+
var _CodeDiffEditor_preventChangeEvent, _CodeDiffEditor_state, _CodeDiffEditor_selection, _CodeDiffEditor_container, _CodeDiffEditor_activeModel, _CodeDiffEditor_editor, _CodeDiffEditor_options, _CodeDiffEditor_modifiedContent, _CodeDiffEditor_originalContent, _CodeDiffEditor_language, _CodeDiffEditor_onStyleChange;
|
|
19
19
|
import { dom, getThemeManager, events } from '@omegagrid/core';
|
|
20
|
-
import { LitElement, css
|
|
21
|
-
import { customElement,
|
|
20
|
+
import { LitElement, css } from 'lit';
|
|
21
|
+
import { customElement, property } from 'lit/decorators.js';
|
|
22
22
|
import { MonacoLoader } from '../loader';
|
|
23
23
|
import { getDefaultOptions } from '@omegagrid/core';
|
|
24
24
|
import { CodeEvent } from './shared';
|
|
25
|
-
const
|
|
26
|
-
html, body {
|
|
27
|
-
margin: 0;
|
|
28
|
-
padding: 0;
|
|
29
|
-
height: 100%;
|
|
30
|
-
overflow: hidden;
|
|
31
|
-
position: relative
|
|
32
|
-
}
|
|
33
|
-
`;
|
|
25
|
+
const VISIBILITY_THRESHOLD_SIZE = 10; // minimum width/height to show the editor
|
|
34
26
|
let CodeDiffEditor = class CodeDiffEditor extends LitElement {
|
|
35
27
|
constructor() {
|
|
36
28
|
super(...arguments);
|
|
37
|
-
_CodeDiffEditor_options.set(this, void 0);
|
|
38
|
-
_CodeDiffEditor_language.set(this, 'typescript');
|
|
39
|
-
_CodeDiffEditor_editor.set(this, void 0);
|
|
40
|
-
_CodeDiffEditor_modifiedModel.set(this, void 0);
|
|
41
|
-
_CodeDiffEditor_originalModel.set(this, void 0);
|
|
42
29
|
_CodeDiffEditor_preventChangeEvent.set(this, false);
|
|
43
|
-
|
|
44
|
-
_CodeDiffEditor_originalContent.set(this, '');
|
|
45
|
-
_CodeDiffEditor_modifiedContent.set(this, '');
|
|
30
|
+
_CodeDiffEditor_state.set(this, 0); // 0: initial, 1: initializing, 2: initialized
|
|
46
31
|
_CodeDiffEditor_selection.set(this, void 0);
|
|
47
|
-
|
|
48
|
-
_CodeDiffEditor_modifiedScrollPosition.set(this, void 0);
|
|
32
|
+
_CodeDiffEditor_container.set(this, void 0);
|
|
49
33
|
_CodeDiffEditor_activeModel.set(this, void 0);
|
|
34
|
+
_CodeDiffEditor_editor.set(this, void 0);
|
|
35
|
+
_CodeDiffEditor_options.set(this, void 0);
|
|
36
|
+
_CodeDiffEditor_modifiedContent.set(this, '');
|
|
37
|
+
_CodeDiffEditor_originalContent.set(this, '');
|
|
38
|
+
_CodeDiffEditor_language.set(this, 'typescript');
|
|
50
39
|
_CodeDiffEditor_onStyleChange.set(this, () => {
|
|
51
40
|
this.editor.updateOptions({ theme: this.theme });
|
|
52
41
|
});
|
|
@@ -58,47 +47,45 @@ let CodeDiffEditor = class CodeDiffEditor extends LitElement {
|
|
|
58
47
|
// https://github.com/microsoft/monaco-editor/issues/3217#issuecomment-1511978166
|
|
59
48
|
fontLigatures: ''
|
|
60
49
|
});
|
|
61
|
-
_CodeDiffEditor_passThroughEvent.set(this, (event) => {
|
|
62
|
-
const newEvent = new MouseEvent(event.type, event);
|
|
63
|
-
this.dispatchEvent(newEvent);
|
|
64
|
-
});
|
|
65
|
-
this.render = () => html `
|
|
66
|
-
<iframe></iframe>
|
|
67
|
-
`;
|
|
68
50
|
}
|
|
51
|
+
get editor() { return __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f"); }
|
|
52
|
+
get modifiedModel() { return __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f")?.getModel().modified; }
|
|
53
|
+
get originalModel() { return __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f")?.getModel().original; }
|
|
69
54
|
get options() { return __classPrivateFieldGet(this, _CodeDiffEditor_options, "f"); }
|
|
70
55
|
set options(val) {
|
|
71
56
|
__classPrivateFieldSet(this, _CodeDiffEditor_options, val, "f");
|
|
72
57
|
__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f")?.updateOptions(val);
|
|
73
58
|
}
|
|
74
|
-
get
|
|
75
|
-
set language(val) {
|
|
76
|
-
__classPrivateFieldSet(this, _CodeDiffEditor_language, val, "f");
|
|
77
|
-
if (__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f")) {
|
|
78
|
-
this.monaco?.editor?.setModelLanguage(__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModel().modified, val);
|
|
79
|
-
this.monaco?.editor?.setModelLanguage(__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModel().original, val);
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
get modifiedContent() { return __classPrivateFieldGet(this, _CodeDiffEditor_modifiedModel, "f") ? __classPrivateFieldGet(this, _CodeDiffEditor_modifiedModel, "f").getValue() : __classPrivateFieldGet(this, _CodeDiffEditor_modifiedContent, "f"); }
|
|
59
|
+
get modifiedContent() { return this.modifiedModel ? this.modifiedModel.getValue() : __classPrivateFieldGet(this, _CodeDiffEditor_modifiedContent, "f"); }
|
|
83
60
|
set modifiedContent(val) {
|
|
84
|
-
if (
|
|
61
|
+
if (this.modifiedModel) {
|
|
85
62
|
__classPrivateFieldSet(this, _CodeDiffEditor_preventChangeEvent, true, "f");
|
|
86
|
-
|
|
63
|
+
this.modifiedModel.setValue(val);
|
|
87
64
|
}
|
|
88
65
|
else {
|
|
89
66
|
__classPrivateFieldSet(this, _CodeDiffEditor_modifiedContent, val, "f");
|
|
90
67
|
}
|
|
91
68
|
}
|
|
92
|
-
get originalContent() { return
|
|
69
|
+
get originalContent() { return this.originalModel ? this.originalModel.getValue() : __classPrivateFieldGet(this, _CodeDiffEditor_originalContent, "f"); }
|
|
93
70
|
set originalContent(val) {
|
|
94
|
-
if (
|
|
71
|
+
if (this.originalModel) {
|
|
95
72
|
__classPrivateFieldSet(this, _CodeDiffEditor_preventChangeEvent, true, "f");
|
|
96
|
-
|
|
73
|
+
this.originalModel.setValue(val);
|
|
97
74
|
}
|
|
98
75
|
else {
|
|
99
76
|
__classPrivateFieldSet(this, _CodeDiffEditor_originalContent, val, "f");
|
|
100
77
|
}
|
|
101
78
|
}
|
|
79
|
+
get language() { return __classPrivateFieldGet(this, _CodeDiffEditor_language, "f"); }
|
|
80
|
+
set language(val) {
|
|
81
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_language, val, "f");
|
|
82
|
+
if (__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f")) {
|
|
83
|
+
MonacoLoader.get().then(monaco => {
|
|
84
|
+
monaco.editor.setModelLanguage(__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModel().modified, val);
|
|
85
|
+
monaco.editor.setModelLanguage(__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModel().original, val);
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
}
|
|
102
89
|
get selectedContent() {
|
|
103
90
|
if (!__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f"))
|
|
104
91
|
return __classPrivateFieldGet(this, _CodeDiffEditor_originalContent, "f");
|
|
@@ -108,40 +95,28 @@ let CodeDiffEditor = class CodeDiffEditor extends LitElement {
|
|
|
108
95
|
const selectedCode = selectedCodeChunks.join("\n").trim();
|
|
109
96
|
return selectedCode == null || selectedCode == '' ? __classPrivateFieldGet(this, _CodeDiffEditor_activeModel, "f").getValue() : selectedCode;
|
|
110
97
|
}
|
|
111
|
-
get
|
|
112
|
-
get document() { return this.iframe?.contentDocument; }
|
|
113
|
-
get head() { return this.iframe?.contentDocument.head; }
|
|
114
|
-
get body() { return this.iframe?.contentDocument.body; }
|
|
115
|
-
get monaco() { return this.contentWindow?.monaco; }
|
|
116
|
-
get editor() { return __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f"); }
|
|
117
|
-
get modifiedModel() { return __classPrivateFieldGet(this, _CodeDiffEditor_modifiedModel, "f"); }
|
|
118
|
-
get originalModel() { return __classPrivateFieldGet(this, _CodeDiffEditor_originalModel, "f"); }
|
|
98
|
+
get container() { return __classPrivateFieldGet(this, _CodeDiffEditor_container, "f") ?? (__classPrivateFieldSet(this, _CodeDiffEditor_container, dom.createElement('div'), "f")); }
|
|
119
99
|
get theme() { return getThemeManager().activeTheme?.type == 'light' ? 'vs' : 'vs-dark'; }
|
|
100
|
+
showContainer() {
|
|
101
|
+
if (this.container.parentElement !== document.body) {
|
|
102
|
+
document.body.appendChild(this.container);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
hideContainer() {
|
|
106
|
+
__classPrivateFieldGet(this, _CodeDiffEditor_container, "f")?.remove();
|
|
107
|
+
}
|
|
120
108
|
async initEditor() {
|
|
121
|
-
if (
|
|
109
|
+
if (__classPrivateFieldGet(this, _CodeDiffEditor_state, "f") > 0)
|
|
122
110
|
return;
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
__classPrivateFieldSet(this,
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
__classPrivateFieldSet(this, _CodeDiffEditor_originalModel, this.monaco.editor.createModel(__classPrivateFieldGet(this, _CodeDiffEditor_originalContent, "f"), this.language), "f");
|
|
130
|
-
__classPrivateFieldSet(this, _CodeDiffEditor_modifiedModel, this.monaco.editor.createModel(__classPrivateFieldGet(this, _CodeDiffEditor_modifiedContent, "f"), this.language), "f");
|
|
131
|
-
this.editor.setModel({ original: __classPrivateFieldGet(this, _CodeDiffEditor_originalModel, "f"), modified: __classPrivateFieldGet(this, _CodeDiffEditor_modifiedModel, "f") });
|
|
111
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_state, 1, "f");
|
|
112
|
+
const monaco = await MonacoLoader.get();
|
|
113
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_editor, monaco.editor.createDiffEditor(this.container, this.getOptions()), "f");
|
|
114
|
+
const originalModel = monaco.editor.createModel(__classPrivateFieldGet(this, _CodeDiffEditor_originalContent, "f"), this.language);
|
|
115
|
+
const modifiedModel = monaco.editor.createModel(__classPrivateFieldGet(this, _CodeDiffEditor_modifiedContent, "f"), this.language);
|
|
116
|
+
this.editor.setModel({ original: originalModel, modified: modifiedModel });
|
|
132
117
|
if (__classPrivateFieldGet(this, _CodeDiffEditor_selection, "f"))
|
|
133
118
|
__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").setSelection(__classPrivateFieldGet(this, _CodeDiffEditor_selection, "f"));
|
|
134
|
-
|
|
135
|
-
__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getOriginalEditor().setScrollPosition({
|
|
136
|
-
scrollTop: __classPrivateFieldGet(this, _CodeDiffEditor_originalScrollPosition, "f").top,
|
|
137
|
-
scrollLeft: __classPrivateFieldGet(this, _CodeDiffEditor_originalScrollPosition, "f").left
|
|
138
|
-
});
|
|
139
|
-
if (__classPrivateFieldGet(this, _CodeDiffEditor_modifiedScrollPosition, "f"))
|
|
140
|
-
__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModifiedEditor().setScrollPosition({
|
|
141
|
-
scrollTop: __classPrivateFieldGet(this, _CodeDiffEditor_modifiedScrollPosition, "f").top,
|
|
142
|
-
scrollLeft: __classPrivateFieldGet(this, _CodeDiffEditor_modifiedScrollPosition, "f").left
|
|
143
|
-
});
|
|
144
|
-
__classPrivateFieldGet(this, _CodeDiffEditor_modifiedModel, "f").onDidChangeContent(e => {
|
|
119
|
+
modifiedModel.onDidChangeContent(e => {
|
|
145
120
|
if (__classPrivateFieldGet(this, _CodeDiffEditor_preventChangeEvent, "f")) {
|
|
146
121
|
__classPrivateFieldSet(this, _CodeDiffEditor_preventChangeEvent, false, "f");
|
|
147
122
|
return;
|
|
@@ -149,75 +124,72 @@ let CodeDiffEditor = class CodeDiffEditor extends LitElement {
|
|
|
149
124
|
this.dispatchEvent(new CodeEvent('change', { editor: this.editor, changes: e.changes }));
|
|
150
125
|
this.dispatchEvent(new events.ChangeEvent({ value: this.editor.getModel().modified.getValue() }));
|
|
151
126
|
});
|
|
152
|
-
__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModifiedEditor()
|
|
153
|
-
|
|
127
|
+
const modifiedEdiitor = __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModifiedEditor();
|
|
128
|
+
const originalEditor = __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getOriginalEditor();
|
|
129
|
+
modifiedEdiitor.onDidFocusEditorText(() => __classPrivateFieldSet(this, _CodeDiffEditor_activeModel, modifiedEdiitor.getModel(), "f"));
|
|
130
|
+
originalEditor.onDidFocusEditorText(() => __classPrivateFieldSet(this, _CodeDiffEditor_activeModel, originalEditor.getModel(), "f"));
|
|
131
|
+
modifiedEdiitor.onKeyDown(e => {
|
|
132
|
+
this.dispatchEvent(new CodeEvent('keydown', { editor: __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f") }, e.browserEvent));
|
|
154
133
|
});
|
|
155
|
-
|
|
156
|
-
|
|
134
|
+
originalEditor.onKeyDown(e => {
|
|
135
|
+
this.dispatchEvent(new CodeEvent('keydown', { editor: __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f") }, e.browserEvent));
|
|
157
136
|
});
|
|
158
137
|
__classPrivateFieldSet(this, _CodeDiffEditor_preventChangeEvent, false, "f");
|
|
159
|
-
__classPrivateFieldSet(this,
|
|
138
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_state, 2, "f");
|
|
160
139
|
this.dispatchEvent(new CodeEvent('ready', { editor: __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f") }));
|
|
161
140
|
__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").focus();
|
|
162
|
-
this.iframe.contentDocument.addEventListener('mousedown', __classPrivateFieldGet(this, _CodeDiffEditor_passThroughEvent, "f"));
|
|
163
|
-
this.iframe.contentDocument.addEventListener('mouseup', __classPrivateFieldGet(this, _CodeDiffEditor_passThroughEvent, "f"));
|
|
164
|
-
// this.iframe.contentDocument.addEventListener('mousemove', this.#passThroughEvent);
|
|
165
141
|
}
|
|
166
|
-
updated() {
|
|
167
|
-
this.initEditor();
|
|
142
|
+
async updated() {
|
|
143
|
+
await this.initEditor();
|
|
144
|
+
this.layout();
|
|
168
145
|
}
|
|
169
146
|
connectedCallback() {
|
|
170
147
|
super.connectedCallback();
|
|
171
148
|
getThemeManager().addEventListener('change', __classPrivateFieldGet(this, _CodeDiffEditor_onStyleChange, "f"));
|
|
172
|
-
this.
|
|
149
|
+
if (this.hasUpdated) {
|
|
150
|
+
this.initEditor();
|
|
151
|
+
this.layout();
|
|
152
|
+
}
|
|
173
153
|
}
|
|
174
154
|
disconnectedCallback() {
|
|
175
|
-
__classPrivateFieldSet(this, _CodeDiffEditor_initializing, false, "f");
|
|
176
155
|
getThemeManager().removeEventListener('change', __classPrivateFieldGet(this, _CodeDiffEditor_onStyleChange, "f"));
|
|
177
|
-
|
|
178
|
-
__classPrivateFieldSet(this, _CodeDiffEditor_originalContent, __classPrivateFieldGet(this, _CodeDiffEditor_originalModel, "f").getValue(), "f");
|
|
179
|
-
if (__classPrivateFieldGet(this, _CodeDiffEditor_modifiedModel, "f"))
|
|
180
|
-
__classPrivateFieldSet(this, _CodeDiffEditor_modifiedContent, __classPrivateFieldGet(this, _CodeDiffEditor_modifiedModel, "f").getValue(), "f");
|
|
181
|
-
if (__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f")) {
|
|
182
|
-
__classPrivateFieldSet(this, _CodeDiffEditor_selection, __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getSelection(), "f");
|
|
183
|
-
__classPrivateFieldSet(this, _CodeDiffEditor_originalScrollPosition, {
|
|
184
|
-
top: __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getOriginalEditor().getScrollTop(),
|
|
185
|
-
left: __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getOriginalEditor().getScrollLeft()
|
|
186
|
-
}, "f");
|
|
187
|
-
__classPrivateFieldSet(this, _CodeDiffEditor_modifiedScrollPosition, {
|
|
188
|
-
top: __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModifiedEditor().getScrollTop(),
|
|
189
|
-
left: __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModifiedEditor().getScrollLeft()
|
|
190
|
-
}, "f");
|
|
191
|
-
}
|
|
192
|
-
__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f")?.dispose();
|
|
193
|
-
__classPrivateFieldSet(this, _CodeDiffEditor_editor, null, "f");
|
|
156
|
+
this.hideContainer();
|
|
194
157
|
}
|
|
195
158
|
layout() {
|
|
196
|
-
this.
|
|
159
|
+
if (!this.isConnected || this.clientWidth < VISIBILITY_THRESHOLD_SIZE || this.clientHeight < VISIBILITY_THRESHOLD_SIZE) {
|
|
160
|
+
this.hideContainer();
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
163
|
+
this.showContainer();
|
|
164
|
+
const offset = dom.getElementOffset(this, document.body);
|
|
165
|
+
dom.setPosition(this.container, { t: offset.top + 1, l: offset.left + 1 });
|
|
166
|
+
const w = this.clientWidth - 1;
|
|
167
|
+
const h = this.clientHeight - 1;
|
|
168
|
+
dom.setSize(this.container, { w, h });
|
|
169
|
+
__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f")?.layout({ width: w, height: h });
|
|
197
170
|
}
|
|
198
171
|
dispose() {
|
|
172
|
+
__classPrivateFieldGet(this, _CodeDiffEditor_container, "f")?.remove();
|
|
173
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_container, null, "f");
|
|
199
174
|
__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f")?.dispose();
|
|
200
175
|
__classPrivateFieldSet(this, _CodeDiffEditor_editor, null, "f");
|
|
176
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_state, 0, "f");
|
|
201
177
|
}
|
|
202
178
|
focus() {
|
|
203
|
-
this
|
|
179
|
+
__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f")?.focus();
|
|
204
180
|
}
|
|
205
181
|
};
|
|
206
|
-
_CodeDiffEditor_options = new WeakMap();
|
|
207
|
-
_CodeDiffEditor_language = new WeakMap();
|
|
208
|
-
_CodeDiffEditor_editor = new WeakMap();
|
|
209
|
-
_CodeDiffEditor_modifiedModel = new WeakMap();
|
|
210
|
-
_CodeDiffEditor_originalModel = new WeakMap();
|
|
211
182
|
_CodeDiffEditor_preventChangeEvent = new WeakMap();
|
|
212
|
-
|
|
213
|
-
_CodeDiffEditor_originalContent = new WeakMap();
|
|
214
|
-
_CodeDiffEditor_modifiedContent = new WeakMap();
|
|
183
|
+
_CodeDiffEditor_state = new WeakMap();
|
|
215
184
|
_CodeDiffEditor_selection = new WeakMap();
|
|
216
|
-
|
|
217
|
-
_CodeDiffEditor_modifiedScrollPosition = new WeakMap();
|
|
185
|
+
_CodeDiffEditor_container = new WeakMap();
|
|
218
186
|
_CodeDiffEditor_activeModel = new WeakMap();
|
|
187
|
+
_CodeDiffEditor_editor = new WeakMap();
|
|
188
|
+
_CodeDiffEditor_options = new WeakMap();
|
|
189
|
+
_CodeDiffEditor_modifiedContent = new WeakMap();
|
|
190
|
+
_CodeDiffEditor_originalContent = new WeakMap();
|
|
191
|
+
_CodeDiffEditor_language = new WeakMap();
|
|
219
192
|
_CodeDiffEditor_onStyleChange = new WeakMap();
|
|
220
|
-
_CodeDiffEditor_passThroughEvent = new WeakMap();
|
|
221
193
|
CodeDiffEditor.styles = css `
|
|
222
194
|
:host {
|
|
223
195
|
user-select: text;
|
|
@@ -227,7 +199,7 @@ CodeDiffEditor.styles = css `
|
|
|
227
199
|
position: relative;
|
|
228
200
|
}
|
|
229
201
|
|
|
230
|
-
iframe {
|
|
202
|
+
div, iframe {
|
|
231
203
|
width: 100%;
|
|
232
204
|
height: 100%;
|
|
233
205
|
border: none;
|
|
@@ -236,9 +208,6 @@ CodeDiffEditor.styles = css `
|
|
|
236
208
|
__decorate([
|
|
237
209
|
property({ type: Object, noAccessor: true })
|
|
238
210
|
], CodeDiffEditor.prototype, "options", null);
|
|
239
|
-
__decorate([
|
|
240
|
-
property({ type: String, noAccessor: true })
|
|
241
|
-
], CodeDiffEditor.prototype, "language", null);
|
|
242
211
|
__decorate([
|
|
243
212
|
property({ type: String, noAccessor: true })
|
|
244
213
|
], CodeDiffEditor.prototype, "modifiedContent", null);
|
|
@@ -246,8 +215,8 @@ __decorate([
|
|
|
246
215
|
property({ type: String, noAccessor: true })
|
|
247
216
|
], CodeDiffEditor.prototype, "originalContent", null);
|
|
248
217
|
__decorate([
|
|
249
|
-
|
|
250
|
-
], CodeDiffEditor.prototype, "
|
|
218
|
+
property({ type: String, noAccessor: true })
|
|
219
|
+
], CodeDiffEditor.prototype, "language", null);
|
|
251
220
|
CodeDiffEditor = __decorate([
|
|
252
221
|
customElement('og-code-diff')
|
|
253
222
|
], CodeDiffEditor);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeDiff.js","sourceRoot":"","sources":["../../src/components/codeDiff.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAU,eAAe,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"codeDiff.js","sourceRoot":"","sources":["../../src/components/codeDiff.ts"],"names":[],"mappings":"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"}
|
package/dist/loader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,QAAQ,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,QAAQ,MAAM,eAAe,CAAC;AAG/C,MAAM,WAAW,OAAO;IACvB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAC/C,MAAM,EAAE,CAAC,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAC,KAAK,IAAI,CAAC;CACpD;AAED,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QAClB,MAAM,EAAE,OAAO,QAAQ,CAAC;QACxB,OAAO,EAAE,OAAO,CAAC;KACd;CACJ;AAED,qBAAa,YAAY;IAExB,MAAM,CAAC,MAAM,EAAE,OAAO,QAAQ,CAAC;IAC/B,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC;IAC3B,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC;IAE1B,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM;WAIX,GAAG;IAKhB,MAAM,CAAC,OAAO;IAId,MAAM,CAAC,IAAI;WAgBE,YAAY,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,QAAQ,CAAC;CAoB9E"}
|
package/dist/loader.js
CHANGED
|
@@ -1,15 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { AMD, ScriptLoader, dom } from '@omegagrid/core';
|
|
1
|
+
import { AMD, ScriptLoader } from '@omegagrid/core';
|
|
3
2
|
export class MonacoLoader {
|
|
4
3
|
static init(path) {
|
|
5
4
|
MonacoLoader.monacoPath = path;
|
|
6
|
-
MonacoLoader.monacoStyle = `@import "${unsafeCSS(path)}/editor/editor.main.css"`;
|
|
7
|
-
dom.appendStyle(document.head, `
|
|
8
|
-
@font-face {
|
|
9
|
-
font-family: 'codicon';
|
|
10
|
-
src: url('${path}/base/browser/ui/codicons/codicon/codicon.ttf') format('truetype');
|
|
11
|
-
}
|
|
12
|
-
`);
|
|
13
5
|
}
|
|
14
6
|
static async get() {
|
|
15
7
|
if (!this.monaco)
|
|
@@ -25,7 +17,6 @@ export class MonacoLoader {
|
|
|
25
17
|
}
|
|
26
18
|
AMD.require.config({
|
|
27
19
|
paths: { 'vs': MonacoLoader.monacoPath },
|
|
28
|
-
'vs/css': { disabled: true }
|
|
29
20
|
});
|
|
30
21
|
return new Promise((resolve) => {
|
|
31
22
|
AMD.require(['vs/editor/editor.main'], () => {
|
package/dist/loader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAcpD,MAAM,OAAO,YAAY;IAMxB,MAAM,CAAC,IAAI,CAAC,IAAY;QACvB,YAAY,CAAC,UAAU,GAAG,IAAI,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,GAAG;QACf,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAClD,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,OAAO;QACb,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,IAAI;QACV,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACjD,CAAC;QAED,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;YAClB,KAAK,EAAE,EAAC,IAAI,EAAE,YAAY,CAAC,UAAU,EAAC;SACtC,CAAC,CAAC;QAEH,OAAO,IAAI,OAAO,CAAkB,CAAC,OAAO,EAAE,EAAE;YAC/C,GAAG,CAAC,OAAO,CAAC,CAAC,uBAAuB,CAAC,EAAE,GAAG,EAAE;gBAC3C,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,MAAyB;QAClD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC;QACpC,IAAI,MAAM,CAAC,MAAM;YAAE,OAAO,MAAM,CAAC,MAAM,CAAC;QAExC,gCAAgC;QAChC,qCAAqC;QAErC,MAAM,YAAY,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,UAAU,YAAY,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;QACxF,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAC,KAAK,EAAE,EAAC,IAAI,EAAE,YAAY,CAAC,UAAU,EAAC,EAAC,CAAC,CAAC;QAChE,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACpC,MAAM,CAAC,OAAO,CAAC,CAAC,uBAAuB,CAAC,EAAE,GAAG,EAAE;gBAC9C,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;CAED"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@omegagrid/code",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.44",
|
|
4
4
|
"license": "UNLICENSED",
|
|
5
5
|
"description": "Monaco editor webcomponent",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -28,9 +28,9 @@
|
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@fortawesome/fontawesome-svg-core": "6.4.2",
|
|
31
|
-
"@omegagrid/core": "^0.6.
|
|
32
|
-
"@omegagrid/localize": "^0.6.
|
|
33
|
-
"@omegagrid/tree": "^0.6.
|
|
31
|
+
"@omegagrid/core": "^0.6.44",
|
|
32
|
+
"@omegagrid/localize": "^0.6.44",
|
|
33
|
+
"@omegagrid/tree": "^0.6.44",
|
|
34
34
|
"@riovir/wc-fontawesome": "^0.1.9",
|
|
35
35
|
"lit": "^3.1.1",
|
|
36
36
|
"monaco-editor": "0.47.0",
|