fix: Content moves out of editor with max-height #1681

quasarframework · Mar 2, 2018 · fc681f8 · fc681f8
1 parent 68dcf5a
commit fc681f8
Showing 1 changed file with 20 additions and 7 deletions.
diff --git a/src/components/editor/QEditor.js b/src/components/editor/QEditor.js
@@ -195,6 +195,24 @@ export default {
         })
       })
       return k
+    },
+    innerStyle () {
+      return this.inFullscreen
+        ? this.contentStyle
+        : [
+          {
+            minHeight: this.minHeight,
+            height: this.height,
+            maxHeight: this.maxHeight
+          },
+          this.contentStyle
+        ]
+    },
+    innerClass () {
+      return [
+        this.contentClass,
+        { col: this.inFullscreen, 'overflow-auto': this.inFullscreen || this.maxHeight }
+      ]
     }
   },
   data () {
@@ -310,13 +328,8 @@ export default {
           {
             ref: 'content',
             staticClass: `q-editor-content`,
-            style: this.inFullscreen
-              ? this.contentStyle
-              : [{ minHeight: this.minHeight, height: this.height, maxHeight: this.maxHeight }, this.contentStyle],
-            class: [
-              this.contentClass,
-              { col: this.inFullscreen, 'overflow-auto': this.inFullscreen }
-            ],
+            style: this.innerStyle,
+            class: this.innerClass,
             attrs: { contenteditable: this.editable },
             on: {
               input: this.onInput,