fixes

yariksav · Jun 16, 2020 · 4655cf4 · 4655cf4
1 parent a9dd8b7
commit 4655cf4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vuetify-dialog",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Dialog helper for vuetify.js",
   "scripts": {
     "build": "npm run build:umd & npm run build:es & npm run build:unpkg",
@@ -69,7 +69,7 @@
     "vue-asyncable": "^0.2.0",
     "vue-jest": "^3.0.4",
     "vue-template-compiler": "^2.5.22",
-    "vuedl": "^0.3.7",
+    "vuedl": "^0.3.8",
     "vuetify": "^2.2.4"
   },
   "jest": {

diff --git a/src/components/DialogCard.vue b/src/components/DialogCard.vue
@@ -46,7 +46,7 @@ export default {
     title: String,
     flat: Boolean,
     innerScroll: Boolean,
-    titleClass: String,
+    titleClass: [String, Object],
     actions: [Array, Object, Function],
     handle: Function
   },

diff --git a/src/components/Prompt.vue b/src/components/Prompt.vue
@@ -4,18 +4,17 @@
       :title="title"
       :actions="actions"
       :handle="handleClick"
+      :title-class="titleClass"
       ref="card"
     >
-      <v-form ref="form">
-        <v-text-field
-          ref="input"
-          v-model="editedValue"
-          :rules="rules"
-          :label="text"
-          v-bind="textField"
-          @keypress.enter="$emit('submit', editedValue)"
-        />
-      </v-form>
+      <v-text-field
+        ref="input"
+        v-model="editedValue"
+        :rules="rules"
+        :label="text"
+        v-bind="textField"
+        @keyup.enter.stop="onEnter"
+      />
     </DialogCard>
   </div>
 </template>
@@ -24,20 +23,20 @@
 
 import Confirmable from 'vuedl/src/mixins/confirmable'
 import DialogCard from './DialogCard.vue'
-import { VTextField, VForm } from 'vuetify/lib'
+import { VTextField } from 'vuetify/lib'
 
 export default {
   components: {
     DialogCard,
-    VTextField,
-    VForm
+    VTextField
   },
   layout: 'default',
   mixins: [Confirmable],
   props: {
     value: String,
     rules: Array,
     textField: Object,
+    titleClass: [String, Object],
     autofocus: {
       type: Boolean,
       default: true
@@ -56,11 +55,14 @@ export default {
     }
   },
   methods: {
+    onEnter () {
+      this.$refs.card.$refs.actions.trigger(true)
+    },
     handleClick (res, action) {
       if (!action.key) {
         this.$emit('submit', action.key)
       }
-      const valid = this.rules ? this.$refs.form.validate() : true
+      const valid = this.rules ? this.$refs.input.validate() : true
       if (!valid) {
         this.$refs.input.focus()
         return false