@handlewithcare/react-prosemirror 2.4.12 → 2.5.0

package/dist/cjs/viewdesc.js

@@ -36,7 +36,7 @@ _export(exports, {
 });
 const _prosemirrormodel = require("prosemirror-model");
 const _browser = require("./browser.js");
-const _selectionToDOM = require("./selection/selectionToDOM.js");
+const _dom = require("./dom.js");
 function sortViewDescs(a, b) {
     if (a instanceof TrailingHackViewDesc) return 1;
     if (b instanceof TrailingHackViewDesc) return -1;
@@ -157,7 +157,7 @@ let ViewDesc = class ViewDesc {
         // start or at the end of this view desc.
         let atEnd;
         if (dom == this.dom && this.contentDOM) {
-            atEnd = offset > (0, _selectionToDOM.domIndex)(this.contentDOM);
+            atEnd = offset > (0, _dom.domIndex)(this.contentDOM);
         } else if (this.contentDOM && this.contentDOM != this.dom && this.dom.contains(this.contentDOM)) {
             atEnd = dom.compareDocumentPosition(this.contentDOM) & 2;
         } else if (this.dom.firstChild) {
@@ -258,7 +258,7 @@ let ViewDesc = class ViewDesc {
             if (prev && side && enter && !prev.border && !prev.domAtom) return prev.domFromPos(prev.size, side);
             return {
                 node: this.contentDOM,
-                offset: prev ? (0, _selectionToDOM.domIndex)(prev.dom) + 1 : 0
+                offset: prev ? (0, _dom.domIndex)(prev.dom) + 1 : 0
             };
         } else {
             let next, enter = true;
@@ -269,7 +269,7 @@ let ViewDesc = class ViewDesc {
             if (next && enter && !next.border && !next.domAtom) return next.domFromPos(0, side);
             return {
                 node: this.contentDOM,
-                offset: next ? (0, _selectionToDOM.domIndex)(next.dom) : this.contentDOM.childNodes.length
+                offset: next ? (0, _dom.domIndex)(next.dom) : this.contentDOM.childNodes.length
             };
         }
     }
@@ -295,7 +295,7 @@ let ViewDesc = class ViewDesc {
                 for(let j = i; j > 0; j--){
                     const prev = this.children[j - 1];
                     if (prev.size && prev.dom.parentNode == this.contentDOM && !prev.emptyChildAt(1)) {
-                        fromOffset = (0, _selectionToDOM.domIndex)(prev.dom) + 1;
+                        fromOffset = (0, _dom.domIndex)(prev.dom) + 1;
                         break;
                     }
                     from -= prev.size;
@@ -307,7 +307,7 @@ let ViewDesc = class ViewDesc {
                 for(let j = i + 1; j < this.children.length; j++){
                     const next = this.children[j];
                     if (next.size && next.dom.parentNode == this.contentDOM && !next.emptyChildAt(-1)) {
-                        toOffset = (0, _selectionToDOM.domIndex)(next.dom);
+                        toOffset = (0, _dom.domIndex)(next.dom);
                         break;
                     }
                     to += next.size;
@@ -354,7 +354,6 @@ let ViewDesc = class ViewDesc {
         let anchorDOM = this.domFromPos(anchor, anchor ? -1 : 1);
         let headDOM = head == anchor ? anchorDOM : this.domFromPos(head, head ? -1 : 1);
         const domSel = view.root.getSelection();
-        // @ts-expect-error - Internal method domSelectionRange
         const selRange = view.domSelectionRange();
         let brKludge = false;
         // On Firefox, using Selection.collapse to put the cursor after a
@@ -371,7 +370,7 @@ let ViewDesc = class ViewDesc {
                         if (after = scan.nextSibling) {
                             if (after.nodeName == "BR") anchorDOM = headDOM = {
                                 node: after.parentNode,
-                                offset: (0, _selectionToDOM.domIndex)(after) + 1
+                                offset: (0, _dom.domIndex)(after) + 1
                             };
                             break;
                         }
@@ -391,7 +390,7 @@ let ViewDesc = class ViewDesc {
             const after = selRange.focusNode.childNodes[selRange.focusOffset];
             if (after && after.contentEditable == "false") force = true;
         }
-        if (!(force || brKludge && _browser.browser.safari) && (0, _selectionToDOM.isEquivalentPosition)(anchorDOM.node, anchorDOM.offset, selRange.anchorNode, selRange.anchorOffset) && (0, _selectionToDOM.isEquivalentPosition)(headDOM.node, headDOM.offset, selRange.focusNode, selRange.focusOffset)) return;
+        if (!(force || brKludge && _browser.browser.safari) && (0, _dom.isEquivalentPosition)(anchorDOM.node, anchorDOM.offset, selRange.anchorNode, selRange.anchorOffset) && (0, _dom.isEquivalentPosition)(headDOM.node, headDOM.offset, selRange.focusNode, selRange.focusOffset)) return;
         // Selection.extend can be used to create an 'inverted' selection
         // (one where the focus is before the anchor), but not all
         // browsers support it yet.
@@ -609,6 +608,7 @@ let NodeViewDesc = class NodeViewDesc extends ViewDesc {
     // If this desc must be updated to match the given node decoration,
     // do so and return true.
     update(_node, _outerDeco, _innerDeco, _view) {
+        this.dirty = NOT_DIRTY;
         return true;
     }
     get domAtom() {
@@ -631,6 +631,7 @@ let TextViewDesc = class TextViewDesc extends NodeViewDesc {
         };
     }
     update(_node, _outerDeco, _innerDeco, _view) {
+        this.dirty = NOT_DIRTY;
         return true;
     }
     inParent() {

package/dist/esm/AbstractEditorView.js

@@ -0,0 +1 @@
+export { };

package/dist/esm/ReactEditorView.js

@@ -0,0 +1,156 @@
+import { EditorView } from "prosemirror-view";
+import { EMPTY_STATE } from "./constants.js";
+function buildNodeViews(view) {
+    const result = Object.create(null);
+    function add(obj) {
+        for(const prop in obj)if (!Object.prototype.hasOwnProperty.call(result, prop)) // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        result[prop] = obj[prop];
+    }
+    view.someProp("nodeViews", add);
+    view.someProp("markViews", add);
+    return result;
+}
+function changedNodeViews(a, b) {
+    let nA = 0, nB = 0;
+    for(const prop in a){
+        if (a[prop] != b[prop]) return true;
+        nA++;
+    }
+    for(const _ in b)nB++;
+    return nA != nB;
+}
+/**
+ * Extends EditorView to make prop and state updates pure, remove the DOM
+ * Mutation Observer, and use a custom document view managed by React.
+ *
+ * @privateRemarks
+ *
+ * The implementation relies on the base class using a private member to store
+ * the committed props and having a public getter that we override to return the
+ * latest, uncommitted props. The base class can then be told to update when the
+ * React effects are commit an update, applying the pending, uncommitted props.
+ */ export class ReactEditorView extends EditorView {
+    nextProps;
+    prevState;
+    constructor(place, props){
+        // By the time the editor view mounts this should exist.
+        // We assume it is not possible to set the mount point otherwise.
+        const docView = place.mount.pmViewDesc;
+        // Prevent the base class from destroying the React-managed nodes.
+        // Restore them below after invoking the base class constructor.
+        const reactContent = [
+            ...place.mount.childNodes
+        ];
+        // Prevent the base class from mutating the React-managed attributes.
+        // Restore them below after invoking the base class constructor.
+        const reactAttrs = [
+            ...place.mount.attributes
+        ];
+        for (const attr of reactAttrs){
+            place.mount.removeAttributeNode(attr);
+        }
+        try {
+            // Call the superclass constructor with only a state and no plugins.
+            // We'll set everything else ourselves and apply props during layout.
+            super(place, {
+                state: EMPTY_STATE
+            });
+            this.domObserver.stop();
+            this.domObserver.observer = null;
+            this.domObserver.queue = [];
+        } finally{
+            place.mount.replaceChildren(...reactContent);
+            for (const attr of place.mount.attributes){
+                place.mount.removeAttributeNode(attr);
+            }
+            for (const attr of reactAttrs){
+                place.mount.setAttributeNode(attr);
+            }
+        }
+        this.prevState = EMPTY_STATE;
+        this.nextProps = props;
+        this.state = props.state;
+        this.nodeViews = buildNodeViews(this);
+        this.docView = docView;
+        this.dom.pmViewDesc = docView;
+    }
+    get props() {
+        return this.nextProps;
+    }
+    setProps(props) {
+        this.update({
+            ...this.props,
+            ...props
+        });
+    }
+    update(props) {
+        const prevProps = this.nextProps;
+        this.nextProps = props;
+        this.state = props.state;
+        if (prevProps.state.plugins !== props.state.plugins || prevProps.plugins !== props.plugins) {
+            const nodeViews = buildNodeViews(this);
+            if (changedNodeViews(this.nodeViews, nodeViews)) {
+                this.nodeViews = nodeViews;
+            }
+        }
+        this.editable = !this.someProp("editable", (value)=>value(this.state) === false);
+    }
+    updateState(state) {
+        this.setProps({
+            state
+        });
+    }
+    someProp(propName, f) {
+        if (!this.props) {
+            // The base class constructor calls this method before props are set.
+            return undefined;
+        }
+        const prop = this.props[propName];
+        if (prop) {
+            const result = f ? f(prop) : prop;
+            if (result) {
+                return result;
+            }
+        }
+        for (const plugin of this.props.plugins ?? []){
+            const prop = plugin.props[propName];
+            if (prop) {
+                const result = f ? f(prop) : prop;
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        for (const plugin of this.state.plugins){
+            const prop = plugin.props[propName];
+            if (prop) {
+                const result = f ? f(prop) : prop;
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return undefined;
+    }
+    /**
+   * Commit effects by appling the pending props and state.
+   *
+   * Ensures the DOM selection is correct and updates plugin views.
+   *
+   * @privateRemarks
+   *
+   * The correctness of this depends on the pure update function ensuring that
+   * the node view set is up to date so that it does not try to redraw.
+   */ commitPendingEffects() {
+        // This class tracks state eagerly but the base class does it lazily.
+        // Temporarily roll it back so the base class can handle the updates.
+        this.state = this.prevState;
+        // Force the base class to try to update the document. React updated it, but
+        // this ensures that the base class validates the DOM selection and invokes
+        // node view selection callbacks.
+        this.docView.markDirty(-1, -1);
+        super.update(this.nextProps);
+        // Store the new previous state.
+        this.prevState = this.state;
+    }
+}

package/dist/esm/StaticEditorView.js

@@ -0,0 +1,76 @@
+export class StaticEditorView {
+    props;
+    nodeViews;
+    constructor(props){
+        this.props = props;
+        this.nodeViews = {};
+    }
+    get composing() {
+        return false;
+    }
+    get dom() {
+        return null;
+    }
+    get editable() {
+        return false;
+    }
+    get state() {
+        return this.props.state;
+    }
+    setProps(props) {
+        return this.update({
+            ...this.props,
+            ...props
+        });
+    }
+    update(props) {
+        this.props = props;
+    }
+    updateState(state) {
+        this.setProps({
+            state
+        });
+    }
+    someProp(propName, f) {
+        const prop = this.props[propName];
+        if (prop) {
+            const result = f ? f(prop) : prop;
+            if (result) {
+                return result;
+            }
+        }
+        for (const plugin of this.props.plugins ?? []){
+            const prop = plugin.props[propName];
+            if (prop) {
+                const result = f ? f(prop) : prop;
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        for (const plugin of this.state.plugins){
+            const prop = plugin.props[propName];
+            if (prop) {
+                const result = f ? f(prop) : prop;
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return undefined;
+    }
+    destroy() {
+    // pass
+    }
+    domSelectionRange() {
+        return {
+            anchorNode: null,
+            anchorOffset: 0,
+            focusNode: null,
+            focusOffset: 0
+        };
+    }
+    domSelection() {
+        return null;
+    }
+}

package/dist/esm/components/ChildNodeViews.js

@@ -1,8 +1,7 @@
-import React, { cloneElement, createElement, memo, useContext, useRef } from "react";
+import React, { cloneElement, createElement, memo, useCallback, useContext, useRef } from "react";
 import { ChildDescriptorsContext } from "../contexts/ChildDescriptorsContext.js";
 import { EditorContext } from "../contexts/EditorContext.js";
 import { iterDeco } from "../decorations/iterDeco.js";
-// import { useEditorState } from "../hooks/useEditorState.js";
 import { useReactKeys } from "../hooks/useReactKeys.js";
 import { htmlAttrsToReactProps, mergeReactProps } from "../props.js";
 import { MarkView } from "./MarkView.js";
@@ -24,21 +23,30 @@ export function wrapInDeco(reactNode, deco) {
     return /*#__PURE__*/ cloneElement(reactNode, mergeReactProps(reactNode.props, props));
 }
 function areChildrenEqual(a, b) {
-    return a.type === b.type && a.marks.every((mark)=>mark.isInSet(b.marks)) && b.marks.every((mark)=>mark.isInSet(a.marks)) && a.key === b.key && (a.type === "node" ? a.outerDeco?.length === b.outerDeco?.length && a.outerDeco?.every((prevDeco)=>b.outerDeco?.some((nextDeco)=>prevDeco.from === nextDeco.from && prevDeco.to && nextDeco.to && prevDeco.type.eq(nextDeco.type))) && a.innerDeco.eq(b.innerDeco) : true) && a.node === b.node && a.widget === b.widget;
+    return a.type === b.type && a.marks.every((mark)=>mark.isInSet(b.marks)) && b.marks.every((mark)=>mark.isInSet(a.marks)) && a.key === b.key && (a.type === "node" ? a.outerDeco?.length === b.outerDeco?.length && a.outerDeco?.every((prevDeco)=>b.outerDeco?.some((nextDeco)=>prevDeco.from === nextDeco.from && prevDeco.to && nextDeco.to && // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            prevDeco.type.eq(nextDeco.type))) && a.innerDeco.eq(b.innerDeco) : true) && a.node === b.node && a.widget === b.widget;
 }
 const ChildView = /*#__PURE__*/ memo(function ChildView(param) {
     let { child, getInnerPos } = param;
     const { view } = useContext(EditorContext);
-    const getChildPos = useRef(()=>getInnerPos.current() + child.offset);
-    getChildPos.current = ()=>getInnerPos.current() + child.offset;
+    const childRef = useRef(child);
+    childRef.current = child;
+    const getPos = useCallback(()=>{
+        return getInnerPos() + childRef.current.offset;
+    }, [
+        getInnerPos
+    ]);
     return child.type === "widget" ? /*#__PURE__*/ React.createElement(WidgetView, {
         key: child.key,
         widget: child.widget,
-        getPos: getChildPos
+        getPos: getPos
     }) : child.type === "native-widget" ? /*#__PURE__*/ React.createElement(NativeWidgetView, {
         key: child.key,
         widget: child.widget,
-        getPos: getChildPos
+        getPos: getPos
+    }) : child.type === "hack" ? /*#__PURE__*/ React.createElement(child.component, {
+        key: child.key,
+        getPos: getPos
     }) : child.node.isText ? /*#__PURE__*/ React.createElement(ChildDescriptorsContext.Consumer, {
         key: child.key
     }, (param)=>{
@@ -46,7 +54,7 @@ const ChildView = /*#__PURE__*/ memo(function ChildView(param) {
         return /*#__PURE__*/ React.createElement(TextNodeView, {
             view: view,
             node: child.node,
-            getPos: getChildPos,
+            getPos: getPos,
             siblingsRef: siblingsRef,
             parentRef: parentRef,
             decorations: child.outerDeco
@@ -54,7 +62,7 @@ const ChildView = /*#__PURE__*/ memo(function ChildView(param) {
     }) : /*#__PURE__*/ React.createElement(NodeView, {
         key: child.key,
         node: child.node,
-        getPos: getChildPos,
+        getPos: getPos,
         outerDeco: child.outerDeco,
         innerDeco: child.innerDeco
     });
@@ -62,8 +70,13 @@ const ChildView = /*#__PURE__*/ memo(function ChildView(param) {
 const InlinePartition = /*#__PURE__*/ memo(function InlinePartition(param) {
     let { childViews, getInnerPos } = param;
     const firstChild = childViews[0];
-    const getFirstChildPos = useRef(()=>getInnerPos.current() + firstChild.offset);
-    getFirstChildPos.current = ()=>getInnerPos.current() + firstChild.offset;
+    const firstChildRef = useRef(firstChild);
+    firstChildRef.current = firstChild;
+    const getPos = useCallback(()=>{
+        return getInnerPos() + firstChildRef.current.offset;
+    }, [
+        getInnerPos
+    ]);
     const firstMark = firstChild.marks[0];
     if (!firstMark) {
         return /*#__PURE__*/ React.createElement(React.Fragment, null, childViews.map((child)=>{
@@ -75,9 +88,9 @@ const InlinePartition = /*#__PURE__*/ memo(function InlinePartition(param) {
         }));
     }
     return /*#__PURE__*/ React.createElement(MarkView, {
-        getPos: getFirstChildPos,
         key: firstChild.key,
-        mark: firstMark
+        mark: firstMark,
+        getPos: getPos
     }, /*#__PURE__*/ React.createElement(InlineView, {
         key: firstChild.key,
         getInnerPos: getInnerPos,
@@ -135,7 +148,7 @@ const InlineView = /*#__PURE__*/ memo(function InlineView(param) {
         });
     }));
 });
-function createKey(innerPos, offset, type, posToKey, widget, index) {
+function createKey(innerPos, offset, index, type, posToKey, widget) {
     const pos = innerPos + offset;
     const key = posToKey?.get(pos);
     if (type === "widget" || type === "native-widget") {
@@ -179,18 +192,23 @@ function adjustWidgetMarksBack(widgetChildren, nodeChild) {
 }
 const ChildElement = /*#__PURE__*/ memo(function ChildElement(param) {
     let { child, getInnerPos } = param;
-    const getNodePos = useRef(()=>getInnerPos.current() + child.offset);
-    getNodePos.current = ()=>getInnerPos.current() + child.offset;
+    const childRef = useRef(child);
+    childRef.current = child;
+    const getPos = useCallback(()=>{
+        return getInnerPos() + childRef.current.offset;
+    }, [
+        getInnerPos
+    ]);
     if (child.type === "node") {
         return child.marks.reduce((element, mark)=>/*#__PURE__*/ React.createElement(MarkView, {
-                getPos: getNodePos,
-                mark: mark
+                mark: mark,
+                getPos: getPos
             }, element), /*#__PURE__*/ React.createElement(NodeView, {
             key: child.key,
             outerDeco: child.outerDeco,
             node: child.node,
             innerDeco: child.innerDeco,
-            getPos: getNodePos
+            getPos: getPos
         }));
     } else {
         return /*#__PURE__*/ React.createElement(InlineView, {
@@ -224,9 +242,10 @@ function createChildElements(children, getInnerPos) {
 }
 export const ChildNodeViews = /*#__PURE__*/ memo(function ChildNodeViews(param) {
     let { getPos, node, innerDecorations } = param;
-    // const editorState = useEditorState();
     const reactKeys = useReactKeys();
-    const getInnerPos = useRef(()=>getPos.current() + 1);
+    const getInnerPos = useCallback(()=>getPos() + 1, [
+        getPos
+    ]);
     const childMap = useRef(new Map()).current;
     if (!node) return null;
     const keysSeen = new Map();
@@ -237,7 +256,7 @@ export const ChildNodeViews = /*#__PURE__*/ memo(function ChildNodeViews(param)
         const widgetMarks = widget.type.spec.marks ?? [];
         let key;
         if (isNative) {
-            key = createKey(getInnerPos.current(), offset, "native-widget", reactKeys?.posToKey, widget, index);
+            key = createKey(getInnerPos(), offset, index, "native-widget", reactKeys?.posToKey, widget);
             const child = {
                 type: "native-widget",
                 widget,
@@ -254,7 +273,7 @@ export const ChildNodeViews = /*#__PURE__*/ memo(function ChildNodeViews(param)
             }
             keysSeen.set(key, keysSeen.size);
         } else {
-            key = createKey(getInnerPos.current(), offset, "widget", reactKeys?.posToKey, widget, index);
+            key = createKey(getInnerPos(), offset, index, "widget", reactKeys?.posToKey, widget);
             const child = {
                 type: "widget",
                 widget: widget,
@@ -274,8 +293,8 @@ export const ChildNodeViews = /*#__PURE__*/ memo(function ChildNodeViews(param)
         const child = childMap.get(key);
         widgetChildren.push(child);
         adjustWidgetMarksForward(lastNodeChild, childMap.get(key));
-    }, (childNode, outerDeco, innerDeco, offset)=>{
-        const key = createKey(getInnerPos.current(), offset, "node", reactKeys?.posToKey);
+    }, (childNode, outerDeco, innerDeco, offset, index)=>{
+        const key = createKey(getInnerPos(), offset, index, "node", reactKeys?.posToKey);
         const child = {
             type: "node",
             node: childNode,
@@ -283,6 +302,7 @@ export const ChildNodeViews = /*#__PURE__*/ memo(function ChildNodeViews(param)
             innerDeco,
             outerDeco,
             offset,
+            index,
             key
         };
         const prevChild = childMap.get(key);
@@ -306,20 +326,28 @@ export const ChildNodeViews = /*#__PURE__*/ memo(function ChildNodeViews(param)
     // step
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     (a, b)=>keysSeen.get(a.key) - keysSeen.get(b.key));
-    const childElements = createChildElements(children, getInnerPos);
     if (node.isTextblock) {
         const lastChild = children[children.length - 1];
         if (!lastChild || lastChild.type !== "node" || lastChild.node.isInline && !lastChild.node.isText || // RegExp.test actually handles undefined just fine
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         /\n$/.test(lastChild.node.text)) {
-            childElements.push(/*#__PURE__*/ React.createElement(SeparatorHackView, {
-                getPos: getInnerPos,
-                key: "trailing-hack-img"
-            }), /*#__PURE__*/ React.createElement(TrailingHackView, {
-                getPos: getInnerPos,
+            children.push({
+                type: "hack",
+                component: TrailingHackView,
+                marks: [],
+                offset: lastChild?.offset ?? 0,
+                index: (lastChild?.index ?? 0) + 1,
                 key: "trailing-hack-br"
-            }));
+            }, {
+                type: "hack",
+                component: SeparatorHackView,
+                marks: [],
+                offset: lastChild?.offset ?? 0,
+                index: (lastChild?.index ?? 0) + 2,
+                key: "trailing-hack-img"
+            });
         }
     }
+    const childElements = createChildElements(children, getInnerPos);
     return /*#__PURE__*/ React.createElement(React.Fragment, null, childElements);
 });

package/dist/esm/components/CustomNodeView.js

@@ -1,4 +1,3 @@
-import { NodeSelection } from "prosemirror-state";
 import React, { cloneElement, createElement, memo, useContext, useMemo, useRef } from "react";
 import { createPortal } from "react-dom";
 import { ChildDescriptorsContext } from "../contexts/ChildDescriptorsContext.js";
@@ -10,11 +9,12 @@ import { useNodeViewDescriptor } from "../hooks/useNodeViewDescriptor.js";
 import { ChildNodeViews, wrapInDeco } from "./ChildNodeViews.js";
 export const CustomNodeView = /*#__PURE__*/ memo(function CustomNodeView(param) {
     let { customNodeView, node, getPos, innerDeco, outerDeco } = param;
-    const { view } = useContext(EditorContext);
+    const editor = useContext(EditorContext);
+    // Only ReactEditorView supports custom node views.
+    const view = editor.view;
     const domRef = useRef(null);
     const nodeDomRef = useRef(null);
     const contentDomRef = useRef(null);
-    const getPosFunc = useRef(()=>getPos.current()).current;
     const nodeRef = useRef(node);
     nodeRef.current = node;
     const outerDecoRef = useRef(outerDeco);
@@ -31,10 +31,7 @@ export const CustomNodeView = /*#__PURE__*/ memo(function CustomNodeView(param)
     // the node view when the layout effect is re-run.
     useClientLayoutEffect(()=>{
         if (!customNodeViewRef.current) {
-            customNodeViewRef.current = customNodeView(nodeRef.current, // customNodeView will only be set if view is set, and we can only reach
-            // this line if customNodeView is set
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            view, getPosFunc, outerDecoRef.current, innerDecoRef.current);
+            customNodeViewRef.current = customNodeView(nodeRef.current, view, getPos, outerDecoRef.current, innerDecoRef.current);
             if (customNodeViewRef.current.stopEvent) {
                 setStopEvent(customNodeViewRef.current.stopEvent.bind(customNodeViewRef.current));
             }
@@ -56,12 +53,6 @@ export const CustomNodeView = /*#__PURE__*/ memo(function CustomNodeView(param)
         }
         nodeDomRef.current = customNodeViewRootRef.current;
         customNodeViewRootRef.current.appendChild(dom);
-        // Layout effects can run multiple times — if this effect
-        // destroyed and recreated this node view, then we need to
-        // resync the selectNode state
-        if (view?.state.selection instanceof NodeSelection && view.state.selection.node === nodeRef.current) {
-            customNodeViewRef.current.selectNode?.();
-        }
         const nodeView = customNodeViewRef.current;
         return ()=>{
             nodeView.destroy?.();
@@ -75,7 +66,7 @@ export const CustomNodeView = /*#__PURE__*/ memo(function CustomNodeView(param)
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         customNodeView,
-        getPosFunc,
+        getPos,
         view
     ]);
     useClientLayoutEffect(()=>{
@@ -85,10 +76,7 @@ export const CustomNodeView = /*#__PURE__*/ memo(function CustomNodeView(param)
         if (updated) return;
         destroy?.call(customNodeViewRef.current);
         if (!customNodeViewRootRef.current) return;
-        customNodeViewRef.current = customNodeView(nodeRef.current, // customNodeView will only be set if view is set, and we can only reach
-        // this line if customNodeView is set
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        view, getPosFunc, outerDecoRef.current, innerDecoRef.current);
+        customNodeViewRef.current = customNodeView(nodeRef.current, view, getPos, outerDecoRef.current, innerDecoRef.current);
         const { dom } = customNodeViewRef.current;
         nodeDomRef.current = customNodeViewRootRef.current;
         customNodeViewRootRef.current.appendChild(dom);
@@ -98,10 +86,9 @@ export const CustomNodeView = /*#__PURE__*/ memo(function CustomNodeView(param)
         innerDeco,
         node,
         outerDeco,
-        getPos,
-        getPosFunc
+        getPos
     ]);
-    const { childDescriptors, nodeViewDescRef, setStopEvent, setSelectNode, setIgnoreMutation } = useNodeViewDescriptor(node, getPosFunc, domRef, nodeDomRef, innerDeco, outerDeco, undefined, contentDomRef);
+    const { childDescriptors, nodeViewDescRef, setStopEvent, setSelectNode, setIgnoreMutation } = useNodeViewDescriptor(node, getPos, domRef, nodeDomRef, innerDeco, outerDeco, contentDomRef);
     const childContextValue = useMemo(()=>({
             parentRef: nodeViewDescRef,
             siblingsRef: childDescriptors
@@ -116,10 +103,7 @@ export const CustomNodeView = /*#__PURE__*/ memo(function CustomNodeView(param)
     // results are stored in a ref but not actually appended
     // to the DOM until a client effect
     if (!customNodeViewRef.current) {
-        customNodeViewRef.current = customNodeView(nodeRef.current, // customNodeView will only be set if view is set, and we can only reach
-        // this line if customNodeView is set
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        view, ()=>getPos.current(), outerDecoRef.current, innerDecoRef.current);
+        customNodeViewRef.current = customNodeView(nodeRef.current, view, getPos, outerDecoRef.current, innerDecoRef.current);
         if (customNodeViewRef.current.stopEvent) {
             setStopEvent(customNodeViewRef.current.stopEvent.bind(customNodeViewRef.current));
         }

package/dist/esm/components/DocNodeView.js

@@ -4,18 +4,16 @@
 import { ChildDescriptorsContext } from "../contexts/ChildDescriptorsContext.js";
 import { useNodeViewDescriptor } from "../hooks/useNodeViewDescriptor.js";
 import { ChildNodeViews, wrapInDeco } from "./ChildNodeViews.js";
-const getPos = {
-    current () {
-        return -1;
-    }
-};
+function getPos() {
+    return -1;
+}
 export const DocNodeView = /*#__PURE__*/ memo(/*#__PURE__*/ forwardRef(function DocNodeView(param, ref) {
-    let { className, node, innerDeco, outerDeco, as, viewDesc, ...elementProps } = param;
+    let { className, node, innerDeco, outerDeco, as, ...elementProps } = param;
     const innerRef = useRef(null);
     useImperativeHandle(ref, ()=>{
         return innerRef.current;
     }, []);
-    const { childDescriptors, nodeViewDescRef } = useNodeViewDescriptor(node, ()=>getPos.current(), innerRef, innerRef, innerDeco, outerDeco, viewDesc);
+    const { childDescriptors, nodeViewDescRef } = useNodeViewDescriptor(node, getPos, innerRef, innerRef, innerDeco, outerDeco, innerRef);
     const childContextValue = useMemo(()=>({
             parentRef: nodeViewDescRef,
             siblingsRef: childDescriptors
@@ -42,12 +40,5 @@ export const DocNodeView = /*#__PURE__*/ memo(/*#__PURE__*/ forwardRef(function
         node: node,
         innerDecorations: innerDeco
     })));
-    if (!node) return element;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const nodeDecorations = outerDeco.filter((deco)=>!deco.inline);
-    if (!nodeDecorations.length) {
-        return element;
-    }
-    const wrapped = nodeDecorations.reduce(wrapInDeco, element);
-    return wrapped;
+    return outerDeco.reduce(wrapInDeco, element);
 }));