prosemirror-view 1.33.2 → 1.33.4

package/src/viewdesc.ts

@@ -1,7 +1,7 @@
-import {DOMSerializer, Fragment, Mark, Node, ParseRule} from "prosemirror-model"
+import {DOMSerializer, Fragment, Mark, Node, TagParseRule} from "prosemirror-model"
 import {TextSelection} from "prosemirror-state"
 
-import {domIndex, isEquivalentPosition, DOMNode, textNodeBefore, textNodeAfter} from "./dom"
+import {domIndex, isEquivalentPosition, DOMNode} from "./dom"
 import * as browser from "./browser"
 import {Decoration, DecorationSource, WidgetConstructor, WidgetType, NodeType} from "./decoration"
 import {EditorView} from "./index"
@@ -124,7 +124,7 @@ export class ViewDesc {
   // When parsing in-editor content (in domchange.js), we allow
   // descriptions to determine the parse rules that should be used to
   // parse them.
-  parseRule(): ParseRule | null { return null }
+  parseRule(): Omit<TagParseRule, "tag"> | null { return null }
 
   // Used by the editor's event handler to ignore events that come
   // from certain descs.
@@ -485,6 +485,8 @@ export class ViewDesc {
   get domAtom() { return false }
 
   get ignoreForCoords() { return false }
+
+  isText(text: string) { return false }
 }
 
 // A widget desc represents a widget decoration, which is a DOM node
@@ -574,7 +576,7 @@ class MarkViewDesc extends ViewDesc {
     return new MarkViewDesc(parent, mark, spec.dom, spec.contentDOM || spec.dom as HTMLElement)
   }
 
-  parseRule(): ParseRule | null {
+  parseRule() {
     if ((this.dirty & NODE_DIRTY) || this.mark.type.spec.reparseInView) return null
     return {mark: this.mark.type.name, attrs: this.mark.attrs, contentElement: this.contentDOM!}
   }
@@ -664,14 +666,14 @@ export class NodeViewDesc extends ViewDesc {
       return new NodeViewDesc(parent, node, outerDeco, innerDeco, dom, contentDOM || null, nodeDOM, view, pos + 1)
   }
 
-  parseRule(): ParseRule | null {
+  parseRule() {
     // Experimental kludge to allow opt-in re-parsing of nodes
     if (this.node.type.spec.reparseInView) return null
     // FIXME the assumption that this can always return the current
     // attrs means that if the user somehow manages to change the
     // attrs in the dom, that won't be picked up. Not entirely sure
     // whether this is a problem
-    let rule: ParseRule = {node: this.node.type.name, attrs: this.node.attrs}
+    let rule: Omit<TagParseRule, "tag"> = {node: this.node.type.name, attrs: this.node.attrs}
     if (this.node.type.whitespace == "pre") rule.preserveWhitespace = "full"
     if (!this.contentDOM) {
       rule.getContent = () => this.node.content
@@ -759,15 +761,7 @@ export class NodeViewDesc extends ViewDesc {
     // are inside of this node
     let {from, to} = view.state.selection
     if (!(view.state.selection instanceof TextSelection) || from < pos || to > pos + this.node.content.size) return null
-    let sel = view.domSelectionRange()
-    let textBefore = textNodeBefore(sel.focusNode!, sel.focusOffset)
-    let textAfter = textNodeAfter(sel.focusNode!, sel.focusOffset)
-    let textNode = textBefore || textAfter
-    if (textBefore && textAfter && textBefore != textAfter) {
-      let descAfter = textAfter.pmViewDesc
-      if (!descAfter || descAfter instanceof TextViewDesc && descAfter.node.text != textAfter.nodeValue)
-        textNode = textAfter
-    }
+    let textNode = view.input.compositionNode
     if (!textNode || !this.dom.contains(textNode.parentNode)) return null
 
     if (this.node.inlineContent) {
@@ -863,7 +857,7 @@ class TextViewDesc extends NodeViewDesc {
     super(parent, node, outerDeco, innerDeco, dom, null, nodeDOM, view, 0)
   }
 
-  parseRule(): ParseRule {
+  parseRule() {
     let skip = this.nodeDOM.parentNode
     while (skip && skip != this.dom && !(skip as any).pmIsDeco) skip = skip.parentNode
     return {skip: (skip || true) as any}
@@ -913,6 +907,8 @@ class TextViewDesc extends NodeViewDesc {
   }
 
   get domAtom() { return false }
+
+  isText(text: string) { return this.node.text == text }
 }
 
 // A dummy desc used to tag trailing BR or IMG nodes created to work