From ac1bbc086ecf219d0639093d43ba27630fb49ede Mon Sep 17 00:00:00 2001
From: GretaD <gretadoci@gmail.com>
Date: Fri, 12 Jun 2020 15:08:30 +0200
Subject: [PATCH] fixup! fixup! fix import file

Signed-off-by: GretaD <gretadoci@gmail.com>
---
 .../SettingsInputText/SettingsInputText.vue   | 103 +++++++++++++-----
 src/components/SettingsInputText/index.js     |   1 -
 2 files changed, 76 insertions(+), 28 deletions(-)

diff --git a/src/components/SettingsInputText/SettingsInputText.vue b/src/components/SettingsInputText/SettingsInputText.vue
index 3f23c48416..44db904e40 100644
--- a/src/components/SettingsInputText/SettingsInputText.vue
+++ b/src/components/SettingsInputText/SettingsInputText.vue
@@ -21,14 +21,19 @@
   -->
 
 <template>
-	<form>
+	<form ref="form"
+		:disabled="disabled"
+		@submit.prevent="onSubmit">
 		<div class="input-wrapper">
-			<label :for="id">{{ label }}>
-				<input :id="id" type="text" :value="inputVal"
-					:disabled="disabled" @input="$emit('input', $event.target.value)">
-				<input type="submit" class="icon-confirm" value=""
-					@click="$emit('update', inputVal)">
-			</label>
+			<label :for="id" class="action-input__label">{{ label }}</label>
+			<input :id="id"
+				type="text"
+				:value="value"
+				:disabled="disabled"
+				@input="onInput"
+				@change="onChange">
+			<input :id="idSubmit" type="submit" class="action-input__submit">
+			<label v-show="!disabled" :for="idSubmit" class="action-input__label" />
 			<p v-if="hint" class="hint">
 				{{ hint }}
 			</p>
@@ -46,7 +51,7 @@ export default {
 		 */
 		label: {
 			type: String,
-			required: true
+			required: true,
 		},
 
 		/**
@@ -54,7 +59,7 @@ export default {
 		*/
 		hint: {
 			type: String,
-			default: ''
+			default: '',
 		},
 
 		/**
@@ -62,7 +67,7 @@ export default {
 		 */
 		value: {
 			type: String,
-			default: ''
+			default: '',
 		},
 
 		/**
@@ -70,7 +75,7 @@ export default {
 		 */
 		disabled: {
 			type: Boolean,
-			default: false
+			default: false,
 		},
 
 		/**
@@ -79,22 +84,48 @@ export default {
 		id: {
 			type: String,
 			default: () => 'settings-input-text-' + GenRandomId(),
-			validator: id => id.trim() !== ''
-		}
-	},
-	data() {
-		return {
-			inputVal: this.value
-		}
+			validator: id => id.trim() !== '',
+		},
 	},
 	computed: {
 		/**
-		* @returns {string}
-		*/
-		GenRandomId() {
-			return 'settings-input-text-' + this.GenRandomId
-		}
-	}
+		 * @returns {string}
+		 */
+		idSubmit() {
+			return this.id + '-submit'
+		},
+	},
+	methods: {
+		onInput(event) {
+			this.$emit('input', event)
+			/**
+			 * Emitted when the inputs value changes
+			 * @type {string}
+			 */
+			this.$emit('update:value', event.target.value)
+		},
+		onSubmit(event) {
+			event.preventDefault()
+			event.stopPropagation()
+			if (!this.disabled) {
+				/**
+				 * Emitted on submit of the input field
+				 * @type {Event}
+				 */
+				this.$emit('submit', event)
+			} else {
+				// ignore submit
+				return false
+			}
+		},
+		onChange(event) {
+			/**
+			 * Emitted on change of the input field
+			 * @type {Event}
+			 */
+			this.$emit('change', event)
+		},
+	},
 }
 </script>
 
@@ -108,6 +139,23 @@ export default {
 		flex-wrap: wrap;
 		width: 100%;
 		max-width: 400px;
+		&__form {
+			display: flex;
+			align-items: center;
+			flex: 1 1 auto;
+
+			margin: $input-margin 0;
+			padding-right: $icon-margin;
+		}
+
+		&__submit {
+			position: absolute;
+			left: -10000px;
+			top: auto;
+			width: 1px;
+			height: 1px;
+			overflow: hidden;
+		}
 
 		&__label {
 			display: flex;
@@ -143,10 +191,11 @@ export default {
 		&:disabled {
 			cursor: default;
 		}
-	}
 
-	.hint {
-		color: var(--color-text-lighter);
+			.hint {
+				color: var(--color-text-lighter);
+			}
+		}
 	}
 
 </style>
diff --git a/src/components/SettingsInputText/index.js b/src/components/SettingsInputText/index.js
index 8b65b14379..9593ea37e0 100644
--- a/src/components/SettingsInputText/index.js
+++ b/src/components/SettingsInputText/index.js
@@ -22,4 +22,3 @@
 import SettingsInputText from './SettingsInputText'
 
 export default SettingsInputText
-export { SettingsInputText }