Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Used ViewPort Events to Resize the DiffEditor #335

Merged
merged 5 commits into from
Oct 16, 2024
Merged

Used ViewPort Events to Resize the DiffEditor #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca4aa33
added event listener to resize the diffediotor
Priyansh61 Jun 16, 2023
8bcf04e
Added function to get DiffEditor
Priyansh61 Jun 16, 2023
2c582fa
Added debounceTimer to avoid conficts due to async events
Priyansh61 Jun 23, 2023
dae1cff
removed unused instances of .layout()
Priyansh61 Jun 30, 2023
b11588a
Merge branch 'v2.x/staging' into v2.x/event-listener-diffEditor
DivergentEuropeans Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 30 additions & 13 deletions webClient/src/app/editor/code-editor/monaco/monaco.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { EditorKeybindingService } from '../../../shared/editor-keybinding.servi
import { KeyCode } from '../../../shared/keycode-enum';
import { SnackBarService } from '../../../shared/snack-bar.service';
import { MessageDuration } from "../../../shared/message-duration";
import { debounceTime } from 'rxjs/operators';
const ReconnectingWebSocket = require('reconnecting-websocket');

@Component({
Expand Down Expand Up @@ -61,6 +62,7 @@ export class MonacoComponent implements OnInit, OnChanges {
private showEditor: boolean;
private showDiffViewer: boolean;
private keyBindingSub: Subscription = new Subscription();
private diffEditor: monaco.editor.IStandaloneDiffEditor | null ;

constructor(
private monacoService: MonacoService,
Expand All @@ -82,7 +84,7 @@ export class MonacoComponent implements OnInit, OnChanges {
this.monacoConfig = new MonacoConfig();
let options = this._options ? Object.assign({}, this._options) : {};
const hasModel = !!options.model;

if (hasModel) {
const model = monaco.editor.getModel(options.model.uri || '');
if(model) {
Expand All @@ -92,7 +94,7 @@ export class MonacoComponent implements OnInit, OnChanges {
options.model = monaco.editor.createModel(options.model.value, options.model.language, options.model.uri);
}
}
this.log.debug("New editor with options=",options);
this.log.debug("New editor with options=", options);
let editor = monaco.editor.create(this.monacoEditorRef.nativeElement, options);
if (options.theme) {
this.editorControl._setDefaultTheme(options.theme);
Expand All @@ -112,13 +114,12 @@ export class MonacoComponent implements OnInit, OnChanges {
this.toggleDiffViewer();
});

this.editorControl.enableDiffViewer.subscribe(() =>{
this.editorControl.enableDiffViewer.subscribe(() => {
this.showEditor = !this.monacoService.spawnDiffViewer();
this.showDiffViewer = !this.showEditor;
});

this.editorControl.refreshLayout.subscribe(() =>{
setTimeout(() => this.editor.layout(), 1);
if (this.showDiffViewer) {
this.diffEditor = this.monacoService.getDiffEditor();
}
});

this.editor.onContextMenu((e: any) => {
Expand All @@ -137,12 +138,17 @@ export class MonacoComponent implements OnInit, OnChanges {
});
}


handleDiffEditorResize() {
if (this.showDiffViewer && this.diffEditor) {
this.diffEditor.layout();
}
}

focus(e: any) {
this.editor.focus();
}
layout(e: any) {
this.editor.layout();
}


ngOnChanges(changes: SimpleChanges) {
for (const input in changes) {
Expand All @@ -152,11 +158,13 @@ export class MonacoComponent implements OnInit, OnChanges {
changes[input].currentValue['reload'],
changes[input].currentValue['line']);
//TODO: This is a workaround to instruct the editor to remeasure its container when switching from diff-viewer to code-editor
if(this.showDiffViewer) {
if (this.showDiffViewer) {
console.log("ngOnChanges: refreshing layout")
setTimeout(() => this.editor.layout(), 1);
}
this.showEditor = true;
this.showDiffViewer = false;
this.diffEditor = null;
}
}
}
Expand All @@ -165,8 +173,13 @@ export class MonacoComponent implements OnInit, OnChanges {
onMonacoInit(editor) {
this.editorControl.editor.next(editor);
this.keyBinds(editor);
this.viewportEvents.resized.subscribe(()=> {
editor.layout()
this.viewportEvents.resized
.pipe(debounceTime(100))
.subscribe(()=> {
if (!this.showDiffViewer) {
editor.layout()
}
this.handleDiffEditorResize();
});
/* disable for now...
this.editorControl.connToLS.subscribe((lang) => {
Expand Down Expand Up @@ -386,10 +399,14 @@ export class MonacoComponent implements OnInit, OnChanges {
if (this.showDiffViewer) {
this.showDiffViewer = false;
this.showEditor = true;
this.diffEditor.dispose();
}
else {
this.showEditor = !this.monacoService.spawnDiffViewer();
this.showDiffViewer = !this.showEditor;
if (this.showDiffViewer) {
this.diffEditor = this.monacoService.getDiffEditor();
}
}
}

Expand Down
4 changes: 4 additions & 0 deletions webClient/src/app/editor/code-editor/monaco/monaco.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,10 @@ export class MonacoService implements OnDestroy {
return true;
}

getDiffEditor(): monaco.editor.IStandaloneDiffEditor {
return this.diffEditor;
}

closeFile(fileNode: ProjectContext) {
const editorCore = this.editorControl.editorCore.getValue();
if (!editorCore) {
Expand Down
Loading