Skip to content

Commit

Permalink
Merge branch 'master' of github.com:iliyaZelenko/tiptap-vuetify
Browse files Browse the repository at this point in the history
  • Loading branch information
iliyaZelenko committed Nov 8, 2019
2 parents e6280a8 + 525347c commit 5b37bb8
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
18 changes: 17 additions & 1 deletion src/components/TiptapVuetify.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@

<slot name="toolbar-after" />

<div class="tiptap-vuetify-editor__content">
<div
class="tiptap-vuetify-editor__content"
:style="contentDynamicStyles"
>
<editor-content
:editor="editor"
/>
Expand Down Expand Up @@ -112,6 +115,12 @@ export default class TiptapVuetify extends Vue {
})
readonly [PROPS.TYPE]: EDITOR_TYPES_ENUM
@Prop({ type: Number })
readonly [PROPS.MIN_HEIGHT]: number
@Prop({ type: Number })
readonly [PROPS.MAX_HEIGHT]: number
PROPS = PROPS
EDITOR_TYPES_ENUM = EDITOR_TYPES_ENUM
editor: Editor | null = null
Expand All @@ -132,6 +141,13 @@ export default class TiptapVuetify extends Vue {
return this[PROPS.EXTENSIONS].filter(i => i.renderIn)
}
get contentDynamicStyles () {
let dynamicStylesToReturn = {}
if (this[PROPS.MIN_HEIGHT]) Object.assign(dynamicStylesToReturn, { minHeight: `${this[PROPS.MIN_HEIGHT]}px` })
if (this[PROPS.MAX_HEIGHT]) Object.assign(dynamicStylesToReturn, { maxHeight: `${this[PROPS.MAX_HEIGHT]}px` })
return dynamicStylesToReturn
}
@Watch('value')
onValueChange (val) {
if (this.emitAfterOnUpdate) {
Expand Down
4 changes: 3 additions & 1 deletion src/const.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ export const PROPS = {
PLACEHOLDER: 'placeholder' as const,
CARD_PROPS: 'cardProps' as const,
OUTPUT_FORMAT: 'outputFormat' as const,
TYPE: 'type' as const
TYPE: 'type' as const,
MIN_HEIGHT: 'minHeight' as const,
MAX_HEIGHT: 'maxHeight' as const
}

export enum EDITOR_TYPES_ENUM {
Expand Down

0 comments on commit 5b37bb8

Please sign in to comment.