mirror/tiptap
1
0
Fork 0
mirror of https://github.com/ueberdosis/tiptap.git synced 2024-12-15 11:09:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use internal variable for commands to determine if search should update

Browse Source 
Prior to this if search was closed (searching: false) the commands won't do anything.
This commit is contained in:
Chrissi2812 2019-05-29 12:46:36 +02:00
parent a42d0113e0
commit 016ea8f86b
No known key found for this signature in database
GPG Key ID: B4B82C7E618271DA
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/tiptap-extensions/src/extensions/Search.js
View File

@ -8,6 +8,7 @@ export default class Search extends Extension {
this.results = [] this.results = []
this.searchTerm = null this.searchTerm = null
this._updating = false
} }
get name() { get name() {
@ -104,22 +105,27 @@ export default class Search extends Extension {
} }
find(searchTerm) { find(searchTerm) {
return ({ tr }, dispatch) => { return (state, dispatch) => {
this.options.searching = true
this.searchTerm = (this.options.disableRegex) ? searchTerm.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&') : searchTerm this.searchTerm = (this.options.disableRegex) ? searchTerm.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&') : searchTerm
dispatch(tr) this.updateView(state, dispatch)
} }
} }
clear() { clear() {
return ({ tr }, dispatch) => { return (state, dispatch) => {
this.searchTerm = null this.searchTerm = null
dispatch(tr) this.updateView(state, dispatch)
} }
} }
updateView({ tr }, dispatch) {
this._updating = true
dispatch(tr)
this._updating = false
}
createDeco(doc) { createDeco(doc) {
this._search(doc) this._search(doc)
return this.decorations ? DecorationSet.create(doc, this.decorations) : [] return this.decorations ? DecorationSet.create(doc, this.decorations) : []
@ -131,7 +137,9 @@ export default class Search extends Extension {
state: { state: {
init() { return DecorationSet.empty }, init() { return DecorationSet.empty },
apply: (tr, old) => { apply: (tr, old) => {
if (this.options.searching || (tr.docChanged && this.options.alwaysSearch)) { if (this._updating
|| this.options.searching
|| (tr.docChanged && this.options.alwaysSearch)) {
return this.createDeco(tr.doc) return this.createDeco(tr.doc)
} }
if (tr.docChanged) { if (tr.docChanged) {