Skip to content

Commit

Permalink
fix: fix updating editorProps via setOptions (#1540), fix #1518
Browse files Browse the repository at this point in the history
  • Loading branch information
robertvanhoesel authored Aug 9, 2021
1 parent 916852f commit e6f67ca
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 0 deletions.
9 changes: 9 additions & 0 deletions packages/core/src/Editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@ export class Editor extends EventEmitter {
*/
public setOptions(options: Partial<EditorOptions> = {}): void {
this.options = { ...this.options, ...options }

// Update editorProps directly on the view and store reference to configured props
if (this.view) {
if (options.editorProps) this.view.setProps(options.editorProps)
this.options.editorProps = this.view.props
}
}

/**
Expand Down Expand Up @@ -251,6 +257,9 @@ export class Editor extends EventEmitter {
// So we’ll have access to it for tests.
const dom = this.view.dom as HTMLElement
dom.editor = this

// Reference the resulting view props in our options
this.options.editorProps = this.view.props
}

/**
Expand Down
55 changes: 55 additions & 0 deletions tests/cypress/integration/core/editorProps.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/// <reference types="cypress" />

import { Editor } from '@tiptap/core'
import Document from '@tiptap/extension-document'
import Paragraph from '@tiptap/extension-paragraph'
import Text from '@tiptap/extension-text'

describe('editorProps', () => {
it('editorProps can be set while constructing Editor', () => {
function transformPastedHTML(html: string) {
return html
}

const editor = new Editor({
extensions: [Document, Paragraph, Text],
editorProps: { transformPastedHTML },
})

expect(transformPastedHTML)
.to.eq(editor.options.editorProps.transformPastedHTML)
.and.to.eq(editor.options.editorProps.transformPastedHTML)
})

it('editorProps can be set through setOptions', () => {
function transformPastedHTML(html: string) {
return html
}

const editor = new Editor({
extensions: [Document, Paragraph, Text],
})

editor.setOptions({ editorProps: { transformPastedHTML } })

expect(transformPastedHTML)
.to.eq(editor.options.editorProps.transformPastedHTML)
.and.to.eq(editor.options.editorProps.transformPastedHTML)
})

it('editorProps can be set directly through options', () => {
function transformPastedHTML(html: string) {
return html
}

const editor = new Editor({
extensions: [Document, Paragraph, Text],
})

editor.options.editorProps.transformPastedHTML = transformPastedHTML

expect(transformPastedHTML)
.to.eq(editor.options.editorProps.transformPastedHTML)
.and.to.eq(editor.options.editorProps.transformPastedHTML)
})
})

0 comments on commit e6f67ca

Please sign in to comment.