From ca49e3fd7a9d01d00d39c663fd2cde2369e13a50 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Fri, 12 Jun 2020 10:55:04 -0400
Subject: [PATCH] Fix type mismatches + set min height and width of code

---
 src/interfaces/code/code.vue    |  6 +++---
 src/shims.d.ts                  | 12 ++++++++----
 src/styles/lib/_codemirror.scss |  4 +++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/interfaces/code/code.vue b/src/interfaces/code/code.vue
index a8e4c42dc2..f538769490 100644
--- a/src/interfaces/code/code.vue
+++ b/src/interfaces/code/code.vue
@@ -72,7 +72,7 @@ export default defineComponent({
 
 				await getImports(cmOptions.value);
 				codemirror.value = CodeMirror.fromTextArea(codemirrorElVal, cmOptions.value);
-				codemirror.value.setValue(stringValue.value || props.template);
+				codemirror.value.setValue(stringValue.value || props.template || '');
 				await setLanguage();
 				codemirror.value.on('change', (cm) => {
 					const content = cm.getValue();
@@ -152,7 +152,7 @@ export default defineComponent({
 					}
 					await import(`codemirror/mode/${lang}/${lang}.js`);
 					await import(`codemirror/addon/lint/${linter}-lint.js`);
-					codemirror.value.setOption('lint', CodeMirror.lint[linter]);
+					codemirror.value.setOption('lint', (CodeMirror as any).lint[linter]);
 				} else {
 					await import(`codemirror/mode/${lang}/${lang}.js`);
 					codemirror.value.setOption('mode', { name: lang });
@@ -278,8 +278,8 @@ export default defineComponent({
 .interface-code {
 	position: relative;
 	width: 100%;
-	max-width: 620px;
 	font-size: 12px;
+
 	&:focus {
 		border-color: var(--primary-125);
 	}
diff --git a/src/shims.d.ts b/src/shims.d.ts
index 0cee042a8b..26772be5a4 100644
--- a/src/shims.d.ts
+++ b/src/shims.d.ts
@@ -19,17 +19,21 @@ declare module 'vuedraggable' {
 }
 
 declare module 'jsonlint-mod' {
-	export default any;
+	const x: any;
+	export default x;
 }
 
 declare module 'jshint' {
-	export default any;
+	const x: any;
+	export default x;
 }
 
 declare module 'csslint' {
-	export default any;
+	const x: any;
+	export default x;
 }
 
 declare module 'js-yaml' {
-	export default any;
+	const x: any;
+	export default x;
 }
diff --git a/src/styles/lib/_codemirror.scss b/src/styles/lib/_codemirror.scss
index f117fc8c64..ae19696140 100644
--- a/src/styles/lib/_codemirror.scss
+++ b/src/styles/lib/_codemirror.scss
@@ -185,7 +185,9 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
 
 .CodeMirror-scroll {
 	position: relative;
-	height: 100%; margin-right: -50px;
+	height: 100%;
+	min-height: var(--input-height-tall);
+	margin-right: -50px;
 
 	/* 50px is the magic margin used to hide the element's real scrollbars */