fix(editor): editorProps, scroll

donotebase · May 5, 2020 · 36adc66 · 36adc66
1 parent 10a60d6
commit 36adc66
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/quasar.conf.js b/quasar.conf.js
@@ -60,6 +60,7 @@ module.exports = function (ctx) {
         'QItemSection',
         'QItemLabel',
         'QScrollArea',
+        'QScrollObserver',
         'QSeparator',
         'QMenu',
         'QAvatar',

diff --git a/src/components/QuasarTiptap.vue b/src/components/QuasarTiptap.vue
@@ -14,6 +14,7 @@
     <o-editor-menu-bubble :editor="editor" :toolbar="editorMenuBubble" :selected-cell-size="selectedCellSize" v-if="editable && showBubble" />
 
     <q-scroll-area ref="editorScroll" class="editor-scroll-area" :class="`view-${pageView}`" v-if="scrollable">
+      <q-scroll-observer @scroll="onScroll" />
       <editor-content class="editor__content o--note-preview note-step-side-editor" :editor="editor" />
     </q-scroll-area>
     <div v-else>
@@ -119,6 +120,13 @@ export default {
       type: Boolean,
       default: false
     },
+    editorProps: {
+      type: Object,
+      default: function () {
+        return {
+        }
+      }
+    },
     extensions: {
       type: Array,
       default: function () {
@@ -184,6 +192,7 @@ export default {
       ]
 
       this.editor = new Editor({
+        editorProps: this.editorProps,
         extensions: extensions,
         autoFocus: true,
         editable: this.editable,
@@ -276,6 +285,9 @@ export default {
       this.editor.clearContent(false)
       this.editor.focus()
     },
+    onScroll (scroll) {
+      this.$emit('scroll', scroll)
+    },
     showSidePanel () {},
     onSlideShow () {}
   },