ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/vue-node-views

Browse Source
This commit is contained in:
Philipp Kühn
2020-11-25 10:00:13 +01:00
parent d938979584 12a2e6e677
commit da45af3a51
58 changed files with 483 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/core/src/utils/getSchema.ts
View File

@@ -6,7 +6,6 @@ import getRenderedAttributes from './getRenderedAttributes'
import isEmptyObject from './isEmptyObject'
import injectExtensionAttributesToParseRule from './injectExtensionAttributesToParseRule'
import callOrReturn from './callOrReturn'
import mergeAttributes from './mergeAttributes'
function cleanUpSchemaItem<T>(data: T) {
return Object.fromEntries(Object.entries(data).filter(([key, value]) => {
@@ -51,10 +50,7 @@ export default function getSchema(extensions: Extensions): Schema {
if (extension.config.renderHTML) {
schema.toDOM = node => (extension.config.renderHTML as Function)?.bind(context)({
node,
HTMLAttributes: mergeAttributes(
extension.options.HTMLAttributes,
getRenderedAttributes(node, extensionAttributes),
),
HTMLAttributes: getRenderedAttributes(node, extensionAttributes),
})
}
@@ -83,10 +79,7 @@ export default function getSchema(extensions: Extensions): Schema {
if (extension.config.renderHTML) {
schema.toDOM = mark => (extension.config.renderHTML as Function)?.bind(context)({
mark,
HTMLAttributes: mergeAttributes(
extension.options.HTMLAttributes,
getRenderedAttributes(mark, extensionAttributes),
),
HTMLAttributes: getRenderedAttributes(mark, extensionAttributes),
})
}