-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(vue-3): reapply performance updates (#5373)
--------- Co-authored-by: relchapt <reynald.lechapt@getmayday.co> Co-authored-by: Rirax <rlechapt@student.42.fr> Co-authored-by: Segev Finer <segev@swimm.io>
- Loading branch information
4 people
authored
Jul 22, 2024
1 parent
a64cbf8
commit ab8389a
Showing
7 changed files
with
87 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@tiptap/vue-3": patch | ||
| --- | ||
|
|
||
| VueNodeViewRenderer should return `null` for `contentDOM` for a non-leaf node with no `NodeViewContent` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,87 @@ | ||
| import { Editor } from '@tiptap/core' | ||
| import { Component, markRaw, reactive } from 'vue' | ||
| import { | ||
| Component, DefineComponent, h, markRaw, reactive, render, | ||
| } from 'vue' | ||
|
|
||
| import { Editor as ExtendedEditor } from './Editor.js' | ||
|
|
||
| export interface VueRendererOptions { | ||
| editor: Editor, | ||
| props?: Record<string, any>, | ||
| editor: Editor; | ||
| props?: Record<string, any>; | ||
| } | ||
|
|
||
| type ExtendedVNode = ReturnType<typeof h> | null; | ||
|
|
||
| interface RenderedComponent { | ||
| vNode: ExtendedVNode; | ||
| destroy: () => void; | ||
| el: Element | null; | ||
| } | ||
|
|
||
| /** | ||
| * This class is used to render Vue components inside the editor. | ||
| */ | ||
| export class VueRenderer { | ||
| id: string | ||
| renderedComponent!: RenderedComponent | ||
|
|
||
| editor: ExtendedEditor | ||
|
|
||
| component: Component | ||
|
|
||
| teleportElement: Element | ||
|
|
||
| element: Element | ||
| el: Element | null | ||
|
|
||
| props: Record<string, any> | ||
|
|
||
| constructor(component: Component, { props = {}, editor }: VueRendererOptions) { | ||
| this.id = Math.floor(Math.random() * 0xFFFFFFFF).toString() | ||
| this.editor = editor as ExtendedEditor | ||
| this.component = markRaw(component) | ||
| this.teleportElement = document.createElement('div') | ||
| this.element = this.teleportElement | ||
| this.el = document.createElement('div') | ||
| this.props = reactive(props) | ||
| this.editor.vueRenderers.set(this.id, this) | ||
|
|
||
| if (this.editor.contentComponent) { | ||
| this.editor.contentComponent.update() | ||
| this.renderedComponent = this.renderComponent() | ||
| } | ||
|
|
||
| if (this.teleportElement.children.length !== 1) { | ||
| throw Error('VueRenderer doesn’t support multiple child elements.') | ||
| } | ||
| get element(): Element | null { | ||
| return this.renderedComponent.el | ||
| } | ||
|
|
||
| this.element = this.teleportElement.firstElementChild as Element | ||
| get ref(): any { | ||
| // Composition API | ||
| if (this.renderedComponent.vNode?.component?.exposed) { | ||
| return this.renderedComponent.vNode.component.exposed | ||
| } | ||
| // Option API | ||
| return this.renderedComponent.vNode?.component?.proxy | ||
| } | ||
|
|
||
| get ref(): any { | ||
| return this.editor.contentComponent?.refs[this.id] | ||
| renderComponent() { | ||
| let vNode: ExtendedVNode = h(this.component as DefineComponent, this.props) | ||
|
|
||
| if (this.editor.appContext) { | ||
| vNode.appContext = this.editor.appContext | ||
| } | ||
| if (typeof document !== 'undefined' && this.el) { | ||
| render(vNode, this.el) | ||
| } | ||
|
|
||
| const destroy = () => { | ||
| if (this.el) { | ||
| render(null, this.el) | ||
| } | ||
| this.el = null | ||
| vNode = null | ||
| } | ||
|
|
||
| return { vNode, destroy, el: this.el ? this.el.firstElementChild : null } | ||
| } | ||
|
|
||
| updateProps(props: Record<string, any> = {}): void { | ||
| Object | ||
| .entries(props) | ||
| .forEach(([key, value]) => { | ||
| this.props[key] = value | ||
| }) | ||
| Object.entries(props).forEach(([key, value]) => { | ||
| this.props[key] = value | ||
| }) | ||
| this.renderComponent() | ||
| } | ||
|
|
||
| destroy(): void { | ||
| this.editor.vueRenderers.delete(this.id) | ||
| this.renderedComponent.destroy() | ||
| } | ||
| } |