From 25985e76bf29a2929479827fc7c91c5b9e040258 Mon Sep 17 00:00:00 2001 From: claire bontempo <68122737+hellobontempo@users.noreply.github.com> Date: Wed, 27 Sep 2023 16:21:25 -0700 Subject: [PATCH] U: preparation for HDS adoption to replace (#23353) * add autoRefresh to codemirror * fix codemirror arg * move scroll to body to accommodate hds mdoals --- ui/app/styles/core/element-styling.scss | 4 ++-- ui/lib/core/addon/components/json-editor.hbs | 2 ++ ui/lib/core/addon/components/json-editor.js | 4 ++++ ui/lib/core/addon/modifiers/code-mirror.js | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ui/app/styles/core/element-styling.scss b/ui/app/styles/core/element-styling.scss index a5cc37cec2..b589069b90 100644 --- a/ui/app/styles/core/element-styling.scss +++ b/ui/app/styles/core/element-styling.scss @@ -84,8 +84,6 @@ html { -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; min-width: 300px; - overflow-x: hidden; - overflow-y: scroll; text-rendering: optimizeLegibility; text-size-adjust: 100%; } @@ -124,6 +122,8 @@ pre code { body { font-size: $size-6; line-height: 1.5; + overflow-x: hidden; + overflow-y: scroll; } a { diff --git a/ui/lib/core/addon/components/json-editor.hbs b/ui/lib/core/addon/components/json-editor.hbs index 329fb79038..83cddee653 100644 --- a/ui/lib/core/addon/components/json-editor.hbs +++ b/ui/lib/core/addon/components/json-editor.hbs @@ -29,6 +29,7 @@ {{/if}}
and sets autoRefresh=true so JsonEditor renders content (without this property @value only renders if editor is focused) + * @param {string} [container] - Selector string or element object of containing element, set the focused element as the container value. This is for the Hds::Copy::Button and to set autoRefresh=true so content renders https://hds-website-hashicorp.vercel.app/components/copy/button?tab=code + * */ export default class JsonEditorComponent extends Component { diff --git a/ui/lib/core/addon/modifiers/code-mirror.js b/ui/lib/core/addon/modifiers/code-mirror.js index 7aa2e86427..2860684abe 100644 --- a/ui/lib/core/addon/modifiers/code-mirror.js +++ b/ui/lib/core/addon/modifiers/code-mirror.js @@ -10,6 +10,7 @@ import Modifier from 'ember-modifier'; import 'codemirror/addon/edit/matchbrackets'; import 'codemirror/addon/selection/active-line'; +import 'codemirror/addon/display/autorefresh'; import 'codemirror/addon/lint/lint.js'; import 'codemirror/addon/lint/json-lint.js'; // right now we only use the ruby and javascript, if you use another mode you'll need to import it. @@ -62,6 +63,7 @@ export default class CodeMirrorModifier extends Modifier { theme: namedArgs.theme || 'hashi', value: namedArgs.content || '', viewportMargin: namedArgs.viewportMargin || '', + autoRefresh: namedArgs.autoRefresh, }); editor.on('change', bind(this, this._onChange, namedArgs));