From c367c1e523a31b134bc515d41d7e5141bc979180 Mon Sep 17 00:00:00 2001 From: Stanislav Romanov Date: Mon, 17 Oct 2022 11:53:27 +0300 Subject: [PATCH] Fix scroll events and add minHeight and maxHeight to monaco componet --- app/components/monaco-editor.js | 9 +++++++-- app/templates/admin/indexes/item/documents/index.hbs | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/components/monaco-editor.js b/app/components/monaco-editor.js index b5b5fe3..8aafbd5 100644 --- a/app/components/monaco-editor.js +++ b/app/components/monaco-editor.js @@ -60,6 +60,9 @@ export default class MonacoEditorComponent extends Component { minimap: { enabled: false, }, + scrollbar: { + alwaysConsumeMouseWheel: false, + }, }; if (this.args.uri) { @@ -75,12 +78,14 @@ export default class MonacoEditorComponent extends Component { this.editor = editor.create(el, options); + const minHeight = this.args.minHeight ?? 160; + const maxHeight = this.args.maxHeight ?? 420; // Autoresize height of element const onDidContentSizeChangeHandler = this.editor.onDidContentSizeChange( () => { const contentHeight = Math.min( - Math.max(this.editor.getContentHeight(), 160), - 420 + Math.max(this.editor.getContentHeight(), minHeight), + maxHeight ); el.style.height = `${contentHeight + 1}px`; diff --git a/app/templates/admin/indexes/item/documents/index.hbs b/app/templates/admin/indexes/item/documents/index.hbs index ccf3945..791383f 100644 --- a/app/templates/admin/indexes/item/documents/index.hbs +++ b/app/templates/admin/indexes/item/documents/index.hbs @@ -153,6 +153,7 @@ @value={{json-stringify item}} @language='json' @readOnly={{true}} + @minHeight={{0}} class='mb-4' /> {{/each}}