prosemirror-view 1.30.1 → 1.30.2

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.30.2 (2023-03-13)
+
+### Bug fixes
+
+Fix an issue where `posAtCoords` could incorrectly return positions outside of a table when querying a coordinate inside it.
+
+Update the type of the `getPos` callback to include undefined in its return type. Update broken link (ViewProps -> EditorProps) Also detect iOS enter when the new block type is a less common node
+
+Fix an issue where Enter on iOS would sometimes not be handled by the library.
+
 ## 1.30.1 (2023-02-04)
 
 ### Bug fixes

package/dist/index.cjs

@@ -388,15 +388,16 @@ function posFromElement(view, elt, coords) {
 function posFromCaret(view, node, offset, coords) {
   var outsideBlock = -1;
 
-  for (var cur = node;;) {
+  for (var cur = node, sawBlock = false;;) {
     if (cur == view.dom) break;
     var desc = view.docView.nearestDesc(cur, true);
     if (!desc) return null;
 
-    if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent || !desc.contentDOM)) {
+    if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent && !sawBlock || !desc.contentDOM)) {
       var rect = desc.dom.getBoundingClientRect();
 
-      if (desc.node.isBlock && desc.parent) {
+      if (desc.node.isBlock && desc.parent && !sawBlock) {
+        sawBlock = true;
         if (rect.left > coords.left || rect.top > coords.top) outsideBlock = desc.posBefore;else if (rect.right < coords.left || rect.bottom < coords.top) outsideBlock = desc.posAfter;
       }
 
@@ -5169,6 +5170,8 @@ function ruleFromNode(dom) {
   return null;
 }
 
+var isInline = /^(a|abbr|acronym|b|bd[io]|big|br|button|cite|code|data(list)?|del|dfn|em|i|ins|kbd|label|map|mark|meter|output|q|ruby|s|samp|small|span|strong|su[bp]|time|u|tt|var)$/i;
+
 function readDOMChange(view, from, to, typeOver, addedNodes) {
   if (from < 0) {
     var origin = view.input.lastSelectionTime > Date.now() - 50 ? view.input.lastSelectionOrigin : null;
@@ -5210,7 +5213,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
   var change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide);
 
   if ((ios && view.input.lastIOSEnter > Date.now() - 225 || android) && addedNodes.some(function (n) {
-    return n.nodeName == "DIV" || n.nodeName == "P" || n.nodeName == "LI";
+    return n.nodeType == 1 && !isInline.test(n.nodeName);
   }) && (!change || change.endA >= change.endB) && view.someProp("handleKeyDown", function (f) {
     return f(view, keyEvent(13, "Enter"));
   })) {

package/dist/index.d.ts

@@ -601,12 +601,12 @@ declare class EditorView {
     dispatch(tr: Transaction): void;
 }
 /**
-The type of function [provided](https://prosemirror.net/docs/ref/#view.ViewProps.nodeViews) to
+The type of function [provided](https://prosemirror.net/docs/ref/#view.EditorProps.nodeViews) to
 create [node views](https://prosemirror.net/docs/ref/#view.NodeView).
 */
-declare type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number, decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView;
+declare type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number | undefined, decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView;
 /**
-The function types [used](https://prosemirror.net/docs/ref/#view.ViewProps.markViews) to create
+The function types [used](https://prosemirror.net/docs/ref/#view.EditorProps.markViews) to create
 mark views.
 */
 declare type MarkViewConstructor = (mark: Mark, view: EditorView, inline: boolean) => {
@@ -767,6 +767,8 @@ interface EditorProps<P = any> {
     node's display behavior. The third argument `getPos` is a
     function that can be called to get the node's current position,
     which can be useful when creating transactions to update it.
+    Note that if the node is not in the document, the position
+    returned by this function will be `undefined`.
     
     `decorations` is an array of node or inline decorations that are
     active around the node. They are automatically drawn in the
@@ -782,7 +784,7 @@ interface EditorProps<P = any> {
     inner decorations.
     
     (For backwards compatibility reasons, [mark
-    views](https://prosemirror.net/docs/ref/#view.ViewProps.markViews) can also be included in this
+    views](https://prosemirror.net/docs/ref/#view.EditorProps.markViews) can also be included in this
     object.)
     */
     nodeViews?: {

package/dist/index.js

@@ -315,15 +315,16 @@ function posFromCaret(view, node, offset, coords) {
     // fall outside of. If so, we take the position before/after that
     // block. If not, we call `posFromDOM` on the raw node/offset.
     let outsideBlock = -1;
-    for (let cur = node;;) {
+    for (let cur = node, sawBlock = false;;) {
         if (cur == view.dom)
             break;
         let desc = view.docView.nearestDesc(cur, true);
         if (!desc)
             return null;
-        if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent || !desc.contentDOM)) {
+        if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent && !sawBlock || !desc.contentDOM)) {
             let rect = desc.dom.getBoundingClientRect();
-            if (desc.node.isBlock && desc.parent) {
+            if (desc.node.isBlock && desc.parent && !sawBlock) {
+                sawBlock = true;
                 if (rect.left > coords.left || rect.top > coords.top)
                     outsideBlock = desc.posBefore;
                 else if (rect.right < coords.left || rect.bottom < coords.top)
@@ -4574,6 +4575,7 @@ function ruleFromNode(dom) {
     }
     return null;
 }
+const isInline = /^(a|abbr|acronym|b|bd[io]|big|br|button|cite|code|data(list)?|del|dfn|em|i|ins|kbd|label|map|mark|meter|output|q|ruby|s|samp|small|span|strong|su[bp]|time|u|tt|var)$/i;
 function readDOMChange(view, from, to, typeOver, addedNodes) {
     if (from < 0) {
         let origin = view.input.lastSelectionTime > Date.now() - 50 ? view.input.lastSelectionOrigin : null;
@@ -4612,7 +4614,7 @@ function readDOMChange(view, from, to, typeOver, addedNodes) {
     view.input.lastKeyCode = null;
     let change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide);
     if ((ios && view.input.lastIOSEnter > Date.now() - 225 || android) &&
-        addedNodes.some(n => n.nodeName == "DIV" || n.nodeName == "P" || n.nodeName == "LI") &&
+        addedNodes.some(n => n.nodeType == 1 && !isInline.test(n.nodeName)) &&
         (!change || change.endA >= change.endB) &&
         view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {
         view.input.lastIOSEnter = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-view",
-  "version": "1.30.1",
+  "version": "1.30.2",
   "description": "ProseMirror's view component",
   "type": "module",
   "main": "dist/index.cjs",

package/src/domchange.ts

@@ -76,6 +76,8 @@ function ruleFromNode(dom: DOMNode): ParseRule | null {
   return null
 }
 
+const isInline = /^(a|abbr|acronym|b|bd[io]|big|br|button|cite|code|data(list)?|del|dfn|em|i|ins|kbd|label|map|mark|meter|output|q|ruby|s|samp|small|span|strong|su[bp]|time|u|tt|var)$/i
+
 export function readDOMChange(view: EditorView, from: number, to: number, typeOver: boolean, addedNodes: readonly DOMNode[]) {
   if (from < 0) {
     let origin = view.input.lastSelectionTime > Date.now() - 50 ? view.input.lastSelectionOrigin : null
@@ -115,7 +117,7 @@ export function readDOMChange(view: EditorView, from: number, to: number, typeOv
 
   let change = findDiff(compare.content, parse.doc.content, parse.from, preferredPos, preferredSide)
   if ((browser.ios && view.input.lastIOSEnter > Date.now() - 225 || browser.android) &&
-      addedNodes.some(n => n.nodeName == "DIV" || n.nodeName == "P" || n.nodeName == "LI") &&
+      addedNodes.some(n => n.nodeType == 1 && !isInline.test(n.nodeName)) &&
       (!change || change.endA >= change.endB) &&
       view.someProp("handleKeyDown", f => f(view, keyEvent(13, "Enter")))) {
     view.input.lastIOSEnter = 0

package/src/domcoords.ts

@@ -211,13 +211,14 @@ function posFromCaret(view: EditorView, node: Node, offset: number, coords: {top
   // fall outside of. If so, we take the position before/after that
   // block. If not, we call `posFromDOM` on the raw node/offset.
   let outsideBlock = -1
-  for (let cur = node;;) {
+  for (let cur = node, sawBlock = false;;) {
     if (cur == view.dom) break
     let desc = view.docView.nearestDesc(cur, true)
     if (!desc) return null
-    if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent || !desc.contentDOM)) {
+    if (desc.dom.nodeType == 1 && (desc.node.isBlock && desc.parent && !sawBlock || !desc.contentDOM)) {
       let rect = (desc.dom as HTMLElement).getBoundingClientRect()
-      if (desc.node.isBlock && desc.parent) {
+      if (desc.node.isBlock && desc.parent && !sawBlock) {
+        sawBlock = true
         if (rect.left > coords.left || rect.top > coords.top) outsideBlock = desc.posBefore
         else if (rect.right < coords.left || rect.bottom < coords.top) outsideBlock = desc.posAfter
       }

package/src/index.ts

@@ -544,12 +544,12 @@ function checkStateComponent(plugin: Plugin) {
     throw new RangeError("Plugins passed directly to the view must not have a state component")
 }
 
-/// The type of function [provided](#view.ViewProps.nodeViews) to
+/// The type of function [provided](#view.EditorProps.nodeViews) to
 /// create [node views](#view.NodeView).
-export type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number,
+export type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number | undefined,
                                    decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView
 
-/// The function types [used](#view.ViewProps.markViews) to create
+/// The function types [used](#view.EditorProps.markViews) to create
 /// mark views.
 export type MarkViewConstructor = (mark: Mark, view: EditorView, inline: boolean) => {dom: HTMLElement, contentDOM?: HTMLElement}
 
@@ -684,6 +684,8 @@ export interface EditorProps<P = any> {
   /// node's display behavior. The third argument `getPos` is a
   /// function that can be called to get the node's current position,
   /// which can be useful when creating transactions to update it.
+  /// Note that if the node is not in the document, the position
+  /// returned by this function will be `undefined`.
   ///
   /// `decorations` is an array of node or inline decorations that are
   /// active around the node. They are automatically drawn in the
@@ -699,7 +701,7 @@ export interface EditorProps<P = any> {
   /// inner decorations.
   ///
   /// (For backwards compatibility reasons, [mark
-  /// views](#view.ViewProps.markViews) can also be included in this
+  /// views](#view.EditorProps.markViews) can also be included in this
   /// object.)
   nodeViews?: {[node: string]: NodeViewConstructor}