hendrik/lens
1
0 Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

fix: app-crash with multiple usages of monaco-editor component (#5479)

Browse Source 
how to reproduce: open one pod on monaco editor (ie edit), and then try to open another pod details (or try to edit it as well)
This commit is contained in:
Roman authored and Sebastian Malton committed 2022-05-30 11:04:54 -04:00
1 parent b2ab925949
commit 9f00813ecd
1 file changed
+10 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/monaco-editor/monaco-editor.tsx
+10 -5
View File
@@ -14,7 +14,6 @@ import { debounce, merge } from "lodash";
import { autoBind, cssNames, disposer } from "../../utils";
import { UserStore } from "../../../common/user-store";
import { ThemeStore } from "../../theme.store";
import logger from "../../../main/logger";
export type MonacoEditorId = string;
@@ -60,6 +59,12 @@ export class MonacoEditor extends React.Component<MonacoEditorProps> {
@observable readonly dimensions: { width?: number; height?: number } = {};
@observable private unmounting = false;
// TODO: investigate how to replace with "common/logger"
// currently leads for stucking UI forever & infinite loop.
// e.g. happens on tab change/create, maybe some other cases too.
private logger = console;
constructor(props: MonacoEditorProps) {
super(props);
makeObservable(this);
@@ -119,7 +124,7 @@ export class MonacoEditor extends React.Component<MonacoEditorProps> {
}
protected onModelChange(model: editor.ITextModel, oldModel?: editor.ITextModel) {
logger.info("[MONACO]: model change", { model, oldModel }, this.logMetadata);
this.logger.info("[MONACO]: model change", { model, oldModel }, this.logMetadata);
if (oldModel) {
this.saveViewState(oldModel);
@@ -152,9 +157,9 @@ export class MonacoEditor extends React.Component<MonacoEditorProps> {
componentDidMount() {
try {
this.createEditor();
logger.info(`[MONACO]: editor did mount`, this.logMetadata);
this.logger.info(`[MONACO]: editor did mount`, this.logMetadata);
} catch (error) {
logger.error(`[MONACO]: mounting failed: ${error}`, this.logMetadata);
this.logger.error(`[MONACO]: mounting failed: ${error}`, this.logMetadata);
}
}
@@ -180,7 +185,7 @@ export class MonacoEditor extends React.Component<MonacoEditorProps> {
...this.options,
});
logger.info(`[MONACO]: editor created for language=${language}, theme=${theme}`, this.logMetadata);
this.logger.info(`[MONACO]: editor created for language=${language}, theme=${theme}`, this.logMetadata);
this.validateLazy(); // validate initial value
this.restoreViewState(this.model); // restore previous state if any