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

fix: fix extension option merging

Browse Source
This commit is contained in:
Philipp Kühn
2021-04-17 21:25:29 +02:00
parent b1aa7863e8
commit aa002a012b
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/core/src/Extension.ts
View File

@@ -243,12 +243,11 @@ export class Extension<Options = any> {
extension.name = extendedConfig.name extension.name = extendedConfig.name
? extendedConfig.name ? extendedConfig.name
: this.name : extension.parent.name
extension.options = { extension.options = extendedConfig.defaultOptions
...extension.parent.options, ? extendedConfig.defaultOptions
...extension.options, : extension.parent.options
}
return extension return extension
} }

9
packages/core/src/Mark.ts
View File

@@ -337,12 +337,11 @@ export class Mark<Options = any> {
extension.name = extendedConfig.name extension.name = extendedConfig.name
? extendedConfig.name ? extendedConfig.name
: this.name : extension.parent.name
extension.options = { extension.options = extendedConfig.defaultOptions
...extension.parent.options, ? extendedConfig.defaultOptions
...extension.options, : extension.parent.options
}
return extension return extension
} }

9
packages/core/src/Node.ts
View File

@@ -410,12 +410,11 @@ export class Node<Options = any> {
extension.name = extendedConfig.name extension.name = extendedConfig.name
? extendedConfig.name ? extendedConfig.name
: this.name : extension.parent.name
extension.options = { extension.options = extendedConfig.defaultOptions
...extension.parent.options, ? extendedConfig.defaultOptions
...extension.options, : extension.parent.options
}
return extension return extension
} }