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

clean up

Browse Source 
Signed-off-by: Roman <ixrock@gmail.com>
This commit is contained in:
Roman 2021-10-25 15:30:53 +03:00
parent 8f2dfd0d34
commit a6a814aa0f
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/components/dock/dock.scss
View File

@ -48,7 +48,7 @@
} }
} }
&.isClosed { &:not(.isOpen) {
height: auto !important; height: auto !important;
.Tab { .Tab {

2
src/renderer/components/dock/dock.tsx
View File

@ -82,7 +82,7 @@ export class Dock extends React.Component<Props> {
return ( return (
<div <div
className={cssNames("Dock", className, { isOpen, isClosed: !isOpen, fullSize })} className={cssNames("Dock", className, { isOpen, fullSize })}
ref={this.element} ref={this.element}
tabIndex={-1} tabIndex={-1}
> >

18
src/renderer/components/monaco-editor/monaco-editor.tsx
View File

@ -30,7 +30,6 @@ import { cssNames, disposer, toJS } from "../../utils";
import { UserStore } from "../../../common/user-store"; import { UserStore } from "../../../common/user-store";
import { ThemeStore } from "../../theme.store"; import { ThemeStore } from "../../theme.store";
import debounce from "lodash/debounce"; import debounce from "lodash/debounce";
import logger from "../../../common/logger";
registerCustomThemes(); // setup registerCustomThemes(); // setup
@ -122,8 +121,10 @@ export class MonacoEditor extends React.Component<MonacoEditorProps> {
return () => resizeObserver.unobserve(containerElem); 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) => { 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.saveViewState(oldModel);
this.editor.setModel(model); this.editor.setModel(model);
@ -156,9 +157,9 @@ export class MonacoEditor extends React.Component<MonacoEditorProps> {
componentDidMount() { componentDidMount() {
try { try {
this.createEditor(); this.createEditor();
logger.info(`[MONACO]: editor did mounted`); console.info(`[MONACO]: editor did mount`);
} catch (error) { } 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<MonacoEditorProps> {
...this.options, ...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.validateLazy(); // validate initial value
this.restoreViewState(); // restore previous state if any this.restoreViewState(); // restore previous state if any
@ -194,21 +195,17 @@ export class MonacoEditor extends React.Component<MonacoEditorProps> {
const onDidLayoutChangeDisposer = this.editor.onDidLayoutChange(layoutInfo => { const onDidLayoutChangeDisposer = this.editor.onDidLayoutChange(layoutInfo => {
this.props.onDidLayoutChange?.(layoutInfo); this.props.onDidLayoutChange?.(layoutInfo);
logger.silly("[MONACO]: onDidLayoutChange()", layoutInfo);
}); });
const onValueChangeDisposer = this.editor.onDidChangeModelContent(event => { const onValueChangeDisposer = this.editor.onDidChangeModelContent(event => {
const value = this.editor.getValue(); const value = this.editor.getValue();
logger.silly("[MONACO]: value changed", { value, event });
this.props.onChange?.(value, event); this.props.onChange?.(value, event);
this.validateLazy(value); this.validateLazy(value);
}); });
const onContentSizeChangeDisposer = this.editor.onDidContentSizeChange((params) => { const onContentSizeChangeDisposer = this.editor.onDidContentSizeChange((params) => {
this.props.onDidContentSizeChange?.(params); this.props.onDidContentSizeChange?.(params);
logger.silly("[MONACO]: onDidContentSizeChange():", params);
}); });
this.dispose.push( this.dispose.push(
@ -234,7 +231,7 @@ export class MonacoEditor extends React.Component<MonacoEditorProps> {
@action @action
setDimensions(width: number, height: number) { 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.width = width;
this.dimensions.height = height; this.dimensions.height = height;
this.editor?.layout({ width, height }); this.editor?.layout({ width, height });
@ -265,7 +262,6 @@ export class MonacoEditor extends React.Component<MonacoEditorProps> {
try { try {
validate(value); validate(value);
} catch (error) { } catch (error) {
logger.silly(`[MONACO]: validation error`, error);
this.props.onError?.(error); // emit error outside this.props.onError?.(error); // emit error outside
} }
} }