From a6a814aa0fc14a7154744eed03179e8f26998c13 Mon Sep 17 00:00:00 2001 From: Roman Date: Mon, 25 Oct 2021 15:30:53 +0300 Subject: [PATCH] clean up Signed-off-by: Roman --- src/renderer/components/dock/dock.scss | 2 +- src/renderer/components/dock/dock.tsx | 2 +- .../components/monaco-editor/monaco-editor.tsx | 18 +++++++----------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/renderer/components/dock/dock.scss b/src/renderer/components/dock/dock.scss index 100c776280..98034b6b2a 100644 --- a/src/renderer/components/dock/dock.scss +++ b/src/renderer/components/dock/dock.scss @@ -48,7 +48,7 @@ } } - &.isClosed { + &:not(.isOpen) { height: auto !important; .Tab { diff --git a/src/renderer/components/dock/dock.tsx b/src/renderer/components/dock/dock.tsx index 411d533eaf..2e228c3d05 100644 --- a/src/renderer/components/dock/dock.tsx +++ b/src/renderer/components/dock/dock.tsx @@ -82,7 +82,7 @@ export class Dock extends React.Component { return (
diff --git a/src/renderer/components/monaco-editor/monaco-editor.tsx b/src/renderer/components/monaco-editor/monaco-editor.tsx index 1292545d3a..8cf34c7395 100644 --- a/src/renderer/components/monaco-editor/monaco-editor.tsx +++ b/src/renderer/components/monaco-editor/monaco-editor.tsx @@ -30,7 +30,6 @@ import { cssNames, disposer, toJS } from "../../utils"; import { UserStore } from "../../../common/user-store"; import { ThemeStore } from "../../theme.store"; import debounce from "lodash/debounce"; -import logger from "../../../common/logger"; registerCustomThemes(); // setup @@ -122,8 +121,10 @@ export class MonacoEditor extends React.Component { return () => resizeObserver.unobserve(containerElem); } + // TODO: investigate why replacing console.* to common logger.* calls in a file leads for stucking UI / infinite loop. + // e.g. happens on tab change/create, maybe some other cases onModelChange = (model: editor.ITextModel, oldModel?: editor.ITextModel) => { - logger.info("[MONACO]: model change", { model, oldModel }); + console.info("[MONACO]: model change", { model, oldModel }); this.saveViewState(oldModel); this.editor.setModel(model); @@ -156,9 +157,9 @@ export class MonacoEditor extends React.Component { componentDidMount() { try { this.createEditor(); - logger.info(`[MONACO]: editor did mounted`); + console.info(`[MONACO]: editor did mount`); } catch (error) { - logger.error(`[MONACO]: mounting failed: ${error}`, this); + console.error(`[MONACO]: mounting failed: ${error}`, this); } } @@ -184,7 +185,7 @@ export class MonacoEditor extends React.Component { ...this.options, }); - logger.info(`[MONACO]: editor created for language=${language}, theme=${theme}`); + console.info(`[MONACO]: editor created for language=${language}, theme=${theme}`); this.validateLazy(); // validate initial value this.restoreViewState(); // restore previous state if any @@ -194,21 +195,17 @@ export class MonacoEditor extends React.Component { const onDidLayoutChangeDisposer = this.editor.onDidLayoutChange(layoutInfo => { this.props.onDidLayoutChange?.(layoutInfo); - logger.silly("[MONACO]: onDidLayoutChange()", layoutInfo); }); const onValueChangeDisposer = this.editor.onDidChangeModelContent(event => { const value = this.editor.getValue(); - logger.silly("[MONACO]: value changed", { value, event }); - this.props.onChange?.(value, event); this.validateLazy(value); }); const onContentSizeChangeDisposer = this.editor.onDidContentSizeChange((params) => { this.props.onDidContentSizeChange?.(params); - logger.silly("[MONACO]: onDidContentSizeChange():", params); }); this.dispose.push( @@ -234,7 +231,7 @@ export class MonacoEditor extends React.Component { @action setDimensions(width: number, height: number) { - logger.info(`[MONACO]: refreshing dimensions to width=${width} and height=${height}`); + console.info(`[MONACO]: refreshing dimensions to width=${width} and height=${height}`); this.dimensions.width = width; this.dimensions.height = height; this.editor?.layout({ width, height }); @@ -265,7 +262,6 @@ export class MonacoEditor extends React.Component { try { validate(value); } catch (error) { - logger.silly(`[MONACO]: validation error`, error); this.props.onError?.(error); // emit error outside } }