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

revert some magic

Browse Source
This commit is contained in:
Philipp Kühn
2020-04-13 12:27:29 +02:00
parent e03d108423
commit ca16a31e75
5 changed files with 80 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@ export default abstract class Extension {
return [] return []
} }
keys(): string | { [key: string]: Function } { keys(): { [key: string]: Function } {
return {} return {}
} }

12
packages/core/src/ExtensionManager.ts
View File

@@ -79,17 +79,7 @@ export default class ExtensionManager {
get keymaps() { get keymaps() {
return collect(this.extensions) return collect(this.extensions)
.map(extension => { .map(extension => extension.keys())
const keys = extension.keys()
if (typeof keys === 'string') {
return {
[keys]: () => this.editor.command(extension.name)
}
}
return keys
})
.filter(keys => !!Object.keys(keys).length) .filter(keys => !!Object.keys(keys).length)
.map(keys => keymap(keys)) .map(keys => keymap(keys))
.toArray() .toArray()

52
packages/extension-bold/index.ts
View File

@@ -42,41 +42,41 @@ export default class Bold extends Mark {
} }
keys() { keys() {
return 'Mod-b' return {
'Mod-b': () => this.editor.bold()
}
} }
inputRules() { inputRules() {
return ['**', '__'].map(character => { return ['**', '__'].map(character => {
return markInputRule( const regex = VerEx()
VerEx() .add('(?:^|\\s)')
.add('(?:^|\\s)') .beginCapture()
.beginCapture() .find(character)
.find(character) .beginCapture()
.beginCapture() .somethingBut(character)
.somethingBut(character) .endCapture()
.endCapture() .find(character)
.find(character) .endCapture()
.endCapture() .endOfLine()
.endOfLine(),
this.type, return markInputRule(regex, this.type)
)
}) })
} }
pasteRules() { pasteRules() {
return ['**', '__'].map(character => { return ['**', '__'].map(character => {
return markPasteRule( const regex = VerEx()
VerEx() .add('(?:^|\\s)')
.add('(?:^|\\s)') .beginCapture()
.beginCapture() .find(character)
.find(character) .beginCapture()
.beginCapture() .somethingBut(character)
.somethingBut(character) .endCapture()
.endCapture() .find(character)
.find(character) .endCapture()
.endCapture(),
this.type, return markPasteRule(regex, this.type)
)
}) })
} }

52
packages/extension-code/index.ts
View File

@@ -33,38 +33,38 @@ export default class Code extends Mark {
} }
keys() { keys() {
return 'Mod-`' return {
'Mod-`': () => this.editor.code()
}
} }
inputRules() { inputRules() {
return markInputRule( const regex = VerEx()
VerEx() .add('(?:^|\\s)')
.add('(?:^|\\s)') .beginCapture()
.beginCapture() .find('`')
.find('`') .beginCapture()
.beginCapture() .somethingBut('`')
.somethingBut('`') .endCapture()
.endCapture() .find('`')
.find('`') .endCapture()
.endCapture() .endOfLine()
.endOfLine(),
this.type, return markInputRule(regex, this.type)
)
} }
pasteRules() { pasteRules() {
return markPasteRule( const regex = VerEx()
VerEx() .add('(?:^|\\s)')
.add('(?:^|\\s)') .beginCapture()
.beginCapture() .find('`')
.find('`') .beginCapture()
.beginCapture() .somethingBut('`')
.somethingBut('`') .endCapture()
.endCapture() .find('`')
.find('`') .endCapture()
.endCapture(),
this.type, return markPasteRule(regex, this.type)
)
} }
} }

52
packages/extension-italic/index.ts
View File

@@ -34,41 +34,41 @@ export default class Italic extends Mark {
} }
keys() { keys() {
return 'Mod-i' return {
'Mod-i': () => this.editor.italic()
}
} }
inputRules() { inputRules() {
return ['*', '_'].map(character => { return ['*', '_'].map(character => {
return markInputRule( const regex = VerEx()
VerEx() .add('(?:^|\\s)')
.add('(?:^|\\s)') .beginCapture()
.beginCapture() .find(character)
.find(character) .beginCapture()
.beginCapture() .somethingBut(character)
.somethingBut(character) .endCapture()
.endCapture() .find(character)
.find(character) .endCapture()
.endCapture() .endOfLine()
.endOfLine(),
this.type, return markInputRule(regex, this.type)
)
}) })
} }
pasteRules() { pasteRules() {
return ['*', '_'].map(character => { return ['*', '_'].map(character => {
return markPasteRule( const regex = VerEx()
VerEx() .add('(?:^|\\s)')
.add('(?:^|\\s)') .beginCapture()
.beginCapture() .find(character)
.find(character) .beginCapture()
.beginCapture() .somethingBut(character)
.somethingBut(character) .endCapture()
.endCapture() .find(character)
.find(character) .endCapture()
.endCapture(),
this.type, return markPasteRule(regex, this.type)
)
}) })
} }