quasar 1.16.2 → 1.17.2

package/src/components/popup-edit/QPopupEdit.js

@@ -49,7 +49,8 @@ export default Vue.extend({
 
   data () {
     return {
-      initialValue: ''
+      modelChanged: false,
+      model: null
     }
   },
 
@@ -59,15 +60,30 @@ export default Vue.extend({
         (this.contentClass !== void 0 ? ` ${this.contentClass}` : '')
     },
 
+    modelValue () {
+      return this.modelChanged === true ? this.model : this.value
+    },
+
+    initialValue () {
+      return this.modelChanged !== true ? this.model : this.value
+    },
+
     defaultSlotScope () {
-      return {
+      const acc = {
         initialValue: this.initialValue,
-        value: this.value,
-        emitValue: this.__emitValue,
+        updatePosition: this.__reposition,
+        emitValue: this.__changeModel,
         validate: this.validate,
         set: this.set,
         cancel: this.cancel
       }
+
+      Object.defineProperty(acc, 'value', {
+        get: () => this.modelValue,
+        set: this.__changeModel
+      })
+
+      return acc
     },
 
     menuProps () {
@@ -81,19 +97,20 @@ export default Vue.extend({
 
   methods: {
     set () {
-      if (this.validate(this.value) !== true) {
+      if (this.validate(this.modelValue) !== true) {
         return
       }
       if (this.__hasChanged() === true) {
-        this.$emit('save', this.value, this.initialValue)
+        this.$emit('save', this.modelValue, this.initialValue)
+        this.modelChanged === true && this.$emit('input', this.modelValue)
       }
       this.__close()
     },
 
     cancel () {
       if (this.__hasChanged() === true) {
-        this.$emit('input', this.initialValue)
-        this.$emit('cancel', this.value, this.initialValue)
+        this.$emit('cancel', this.modelValue, this.initialValue)
+        this.modelChanged !== true && this.$emit('input', this.initialValue)
       }
       this.__close()
     },
@@ -107,12 +124,13 @@ export default Vue.extend({
     },
 
     __hasChanged () {
-      return isDeepEqual(this.value, this.initialValue) === false
+      return isDeepEqual(this.modelValue, this.initialValue) === false
     },
 
-    __emitValue (val) {
+    __changeModel (val) {
       if (this.disable !== true) {
-        this.$emit('input', val)
+        this.model = val
+        this.modelChanged = true
       }
     },
 
@@ -172,32 +190,39 @@ export default Vue.extend({
       on: cache(this, 'menu', {
         'before-show': () => {
           this.validated = false
-          this.initialValue = clone(this.value)
+          this.modelChanged = false
+          this.model = clone(this.value)
           this.watcher = this.$watch('value', this.__reposition)
           this.$emit('before-show')
         },
+
         show: () => {
           this.$emit('show')
         },
+
         'escape-key': this.cancel,
+
         'before-hide': () => {
           this.watcher()
 
           if (this.validated === false && this.__hasChanged() === true) {
-            if (this.autoSave === true && this.validate(this.value) === true) {
-              this.$emit('save', this.value, this.initialValue)
+            if (this.autoSave === true && this.validate(this.model) === true) {
+              this.$emit('save', this.modelValue, this.initialValue)
+              this.modelChanged === true && this.$emit('input', this.modelValue)
             }
             else {
-              this.$emit('cancel', this.value, this.initialValue)
-              this.$emit('input', this.initialValue)
+              this.$emit('cancel', this.modelValue, this.initialValue)
+              this.modelChanged !== true && this.$emit('input', this.initialValue)
             }
           }
 
           this.$emit('before-hide')
         },
+
         hide: () => {
           this.$emit('hide')
         },
+
         keyup: e => {
           isKeyCode(e, 13) === true && this.set()
         }

package/src/components/popup-edit/QPopupEdit.json

@@ -11,13 +11,6 @@
       "category": "model"
     },
 
-    "auto-save": {
-      "type": "Boolean",
-      "desc": "Automatically save the model (if changed) when user clicks/taps outside of the popup; It does not apply to ESC key",
-      "category": "behavior",
-      "addedIn": "v1.9.0"
-    },
-
     "title": {
       "type": "String",
       "desc": "Optional title (unless 'title' slot is used)",
@@ -45,6 +38,13 @@
       "category": "content"
     },
 
+    "auto-save": {
+      "type": "Boolean",
+      "desc": "Automatically save the model (if changed) when user clicks/taps outside of the popup; It does not apply to ESC key",
+      "category": "behavior",
+      "addedIn": "v1.9.0"
+    },
+
     "content-class": {
       "type": "String",
       "desc": "Class definitions to be attributed to the content",
@@ -182,7 +182,7 @@
 
   "scopedSlots": {
     "default": {
-      "desc": "Used for injecting the form component",
+      "desc": "Used for injecting the form component; Do NOT destructure it",
       "scope": {
         "initialValue": {
           "type": "Any",
@@ -232,6 +232,13 @@
           "desc": "Function that cancels the editing and reverts the value to the initialValue",
           "params": null,
           "returns": null
+        },
+        "updatePosition": {
+          "type": "Function",
+          "desc": "There are some custom scenarios for which Quasar cannot automatically reposition the component without significant performance drawbacks so the optimal solution is for you to call this method when you need it",
+          "params": null,
+          "returns": null,
+          "addedIn": "v1.17"
         }
       }
     }