@handlewithcare/react-prosemirror 2.4.12 → 2.5.0

package/dist/cjs/AbstractEditorView.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});

package/dist/cjs/ReactEditorView.js

@@ -0,0 +1,156 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "ReactEditorView", {
+    enumerable: true,
+    get: function() {
+        return ReactEditorView;
+    }
+});
+const _prosemirrorview = require("prosemirror-view");
+const _constants = require("./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;
+}
+let ReactEditorView = class ReactEditorView extends _prosemirrorview.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: _constants.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 = _constants.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/cjs/StaticEditorView.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "StaticEditorView", {
+    enumerable: true,
+    get: function() {
+        return StaticEditorView;
+    }
+});
+let StaticEditorView = 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/cjs/components/ChildNodeViews.js

@@ -82,21 +82,30 @@ function wrapInDeco(reactNode, deco) {
     return /*#__PURE__*/ (0, _react.cloneElement)(reactNode, (0, _props.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__*/ (0, _react.memo)(function ChildView(param) {
     let { child, getInnerPos } = param;
     const { view } = (0, _react.useContext)(_EditorContext.EditorContext);
-    const getChildPos = (0, _react.useRef)(()=>getInnerPos.current() + child.offset);
-    getChildPos.current = ()=>getInnerPos.current() + child.offset;
+    const childRef = (0, _react.useRef)(child);
+    childRef.current = child;
+    const getPos = (0, _react.useCallback)(()=>{
+        return getInnerPos() + childRef.current.offset;
+    }, [
+        getInnerPos
+    ]);
     return child.type === "widget" ? /*#__PURE__*/ _react.default.createElement(_WidgetView.WidgetView, {
         key: child.key,
         widget: child.widget,
-        getPos: getChildPos
+        getPos: getPos
     }) : child.type === "native-widget" ? /*#__PURE__*/ _react.default.createElement(_NativeWidgetView.NativeWidgetView, {
         key: child.key,
         widget: child.widget,
-        getPos: getChildPos
+        getPos: getPos
+    }) : child.type === "hack" ? /*#__PURE__*/ _react.default.createElement(child.component, {
+        key: child.key,
+        getPos: getPos
     }) : child.node.isText ? /*#__PURE__*/ _react.default.createElement(_ChildDescriptorsContext.ChildDescriptorsContext.Consumer, {
         key: child.key
     }, (param)=>{
@@ -104,7 +113,7 @@ const ChildView = /*#__PURE__*/ (0, _react.memo)(function ChildView(param) {
         return /*#__PURE__*/ _react.default.createElement(_TextNodeView.TextNodeView, {
             view: view,
             node: child.node,
-            getPos: getChildPos,
+            getPos: getPos,
             siblingsRef: siblingsRef,
             parentRef: parentRef,
             decorations: child.outerDeco
@@ -112,7 +121,7 @@ const ChildView = /*#__PURE__*/ (0, _react.memo)(function ChildView(param) {
     }) : /*#__PURE__*/ _react.default.createElement(_NodeView.NodeView, {
         key: child.key,
         node: child.node,
-        getPos: getChildPos,
+        getPos: getPos,
         outerDeco: child.outerDeco,
         innerDeco: child.innerDeco
     });
@@ -120,8 +129,13 @@ const ChildView = /*#__PURE__*/ (0, _react.memo)(function ChildView(param) {
 const InlinePartition = /*#__PURE__*/ (0, _react.memo)(function InlinePartition(param) {
     let { childViews, getInnerPos } = param;
     const firstChild = childViews[0];
-    const getFirstChildPos = (0, _react.useRef)(()=>getInnerPos.current() + firstChild.offset);
-    getFirstChildPos.current = ()=>getInnerPos.current() + firstChild.offset;
+    const firstChildRef = (0, _react.useRef)(firstChild);
+    firstChildRef.current = firstChild;
+    const getPos = (0, _react.useCallback)(()=>{
+        return getInnerPos() + firstChildRef.current.offset;
+    }, [
+        getInnerPos
+    ]);
     const firstMark = firstChild.marks[0];
     if (!firstMark) {
         return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, childViews.map((child)=>{
@@ -133,9 +147,9 @@ const InlinePartition = /*#__PURE__*/ (0, _react.memo)(function InlinePartition(
         }));
     }
     return /*#__PURE__*/ _react.default.createElement(_MarkView.MarkView, {
-        getPos: getFirstChildPos,
         key: firstChild.key,
-        mark: firstMark
+        mark: firstMark,
+        getPos: getPos
     }, /*#__PURE__*/ _react.default.createElement(InlineView, {
         key: firstChild.key,
         getInnerPos: getInnerPos,
@@ -193,7 +207,7 @@ const InlineView = /*#__PURE__*/ (0, _react.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") {
@@ -237,18 +251,23 @@ function adjustWidgetMarksBack(widgetChildren, nodeChild) {
 }
 const ChildElement = /*#__PURE__*/ (0, _react.memo)(function ChildElement(param) {
     let { child, getInnerPos } = param;
-    const getNodePos = (0, _react.useRef)(()=>getInnerPos.current() + child.offset);
-    getNodePos.current = ()=>getInnerPos.current() + child.offset;
+    const childRef = (0, _react.useRef)(child);
+    childRef.current = child;
+    const getPos = (0, _react.useCallback)(()=>{
+        return getInnerPos() + childRef.current.offset;
+    }, [
+        getInnerPos
+    ]);
     if (child.type === "node") {
         return child.marks.reduce((element, mark)=>/*#__PURE__*/ _react.default.createElement(_MarkView.MarkView, {
-                getPos: getNodePos,
-                mark: mark
+                mark: mark,
+                getPos: getPos
             }, element), /*#__PURE__*/ _react.default.createElement(_NodeView.NodeView, {
             key: child.key,
             outerDeco: child.outerDeco,
             node: child.node,
             innerDeco: child.innerDeco,
-            getPos: getNodePos
+            getPos: getPos
         }));
     } else {
         return /*#__PURE__*/ _react.default.createElement(InlineView, {
@@ -282,9 +301,10 @@ function createChildElements(children, getInnerPos) {
 }
 const ChildNodeViews = /*#__PURE__*/ (0, _react.memo)(function ChildNodeViews(param) {
     let { getPos, node, innerDecorations } = param;
-    // const editorState = useEditorState();
     const reactKeys = (0, _useReactKeys.useReactKeys)();
-    const getInnerPos = (0, _react.useRef)(()=>getPos.current() + 1);
+    const getInnerPos = (0, _react.useCallback)(()=>getPos() + 1, [
+        getPos
+    ]);
     const childMap = (0, _react.useRef)(new Map()).current;
     if (!node) return null;
     const keysSeen = new Map();
@@ -295,7 +315,7 @@ const ChildNodeViews = /*#__PURE__*/ (0, _react.memo)(function ChildNodeViews(pa
         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,
@@ -312,7 +332,7 @@ const ChildNodeViews = /*#__PURE__*/ (0, _react.memo)(function ChildNodeViews(pa
             }
             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,
@@ -332,8 +352,8 @@ const ChildNodeViews = /*#__PURE__*/ (0, _react.memo)(function ChildNodeViews(pa
         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,
@@ -341,6 +361,7 @@ const ChildNodeViews = /*#__PURE__*/ (0, _react.memo)(function ChildNodeViews(pa
             innerDeco,
             outerDeco,
             offset,
+            index,
             key
         };
         const prevChild = childMap.get(key);
@@ -364,20 +385,28 @@ const ChildNodeViews = /*#__PURE__*/ (0, _react.memo)(function ChildNodeViews(pa
     // 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.default.createElement(_SeparatorHackView.SeparatorHackView, {
-                getPos: getInnerPos,
-                key: "trailing-hack-img"
-            }), /*#__PURE__*/ _react.default.createElement(_TrailingHackView.TrailingHackView, {
-                getPos: getInnerPos,
+            children.push({
+                type: "hack",
+                component: _TrailingHackView.TrailingHackView,
+                marks: [],
+                offset: lastChild?.offset ?? 0,
+                index: (lastChild?.index ?? 0) + 1,
                 key: "trailing-hack-br"
-            }));
+            }, {
+                type: "hack",
+                component: _SeparatorHackView.SeparatorHackView,
+                marks: [],
+                offset: lastChild?.offset ?? 0,
+                index: (lastChild?.index ?? 0) + 2,
+                key: "trailing-hack-img"
+            });
         }
     }
+    const childElements = createChildElements(children, getInnerPos);
     return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, childElements);
 });

package/dist/cjs/components/CustomNodeView.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "CustomNodeView", {
         return CustomNodeView;
     }
 });
-const _prosemirrorstate = require("prosemirror-state");
 const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 const _reactdom = require("react-dom");
 const _ChildDescriptorsContext = require("../contexts/ChildDescriptorsContext.js");
@@ -61,11 +60,12 @@ function _interop_require_wildcard(obj, nodeInterop) {
 }
 const CustomNodeView = /*#__PURE__*/ (0, _react.memo)(function CustomNodeView(param) {
     let { customNodeView, node, getPos, innerDeco, outerDeco } = param;
-    const { view } = (0, _react.useContext)(_EditorContext.EditorContext);
+    const editor = (0, _react.useContext)(_EditorContext.EditorContext);
+    // Only ReactEditorView supports custom node views.
+    const view = editor.view;
     const domRef = (0, _react.useRef)(null);
     const nodeDomRef = (0, _react.useRef)(null);
     const contentDomRef = (0, _react.useRef)(null);
-    const getPosFunc = (0, _react.useRef)(()=>getPos.current()).current;
     const nodeRef = (0, _react.useRef)(node);
     nodeRef.current = node;
     const outerDecoRef = (0, _react.useRef)(outerDeco);
@@ -82,10 +82,7 @@ const CustomNodeView = /*#__PURE__*/ (0, _react.memo)(function CustomNodeView(pa
     // the node view when the layout effect is re-run.
     (0, _useClientLayoutEffect.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));
             }
@@ -107,12 +104,6 @@ const CustomNodeView = /*#__PURE__*/ (0, _react.memo)(function CustomNodeView(pa
         }
         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 _prosemirrorstate.NodeSelection && view.state.selection.node === nodeRef.current) {
-            customNodeViewRef.current.selectNode?.();
-        }
         const nodeView = customNodeViewRef.current;
         return ()=>{
             nodeView.destroy?.();
@@ -126,7 +117,7 @@ const CustomNodeView = /*#__PURE__*/ (0, _react.memo)(function CustomNodeView(pa
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         customNodeView,
-        getPosFunc,
+        getPos,
         view
     ]);
     (0, _useClientLayoutEffect.useClientLayoutEffect)(()=>{
@@ -136,10 +127,7 @@ const CustomNodeView = /*#__PURE__*/ (0, _react.memo)(function CustomNodeView(pa
         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);
@@ -149,10 +137,9 @@ const CustomNodeView = /*#__PURE__*/ (0, _react.memo)(function CustomNodeView(pa
         innerDeco,
         node,
         outerDeco,
-        getPos,
-        getPosFunc
+        getPos
     ]);
-    const { childDescriptors, nodeViewDescRef, setStopEvent, setSelectNode, setIgnoreMutation } = (0, _useNodeViewDescriptor.useNodeViewDescriptor)(node, getPosFunc, domRef, nodeDomRef, innerDeco, outerDeco, undefined, contentDomRef);
+    const { childDescriptors, nodeViewDescRef, setStopEvent, setSelectNode, setIgnoreMutation } = (0, _useNodeViewDescriptor.useNodeViewDescriptor)(node, getPos, domRef, nodeDomRef, innerDeco, outerDeco, contentDomRef);
     const childContextValue = (0, _react.useMemo)(()=>({
             parentRef: nodeViewDescRef,
             siblingsRef: childDescriptors
@@ -167,10 +154,7 @@ const CustomNodeView = /*#__PURE__*/ (0, _react.memo)(function CustomNodeView(pa
     // 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/cjs/components/DocNodeView.js

@@ -55,18 +55,16 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-const getPos = {
-    current () {
-        return -1;
-    }
-};
+function getPos() {
+    return -1;
+}
 const DocNodeView = /*#__PURE__*/ (0, _react.memo)(/*#__PURE__*/ (0, _react.forwardRef)(function DocNodeView(param, ref) {
-    let { className, node, innerDeco, outerDeco, as, viewDesc, ...elementProps } = param;
+    let { className, node, innerDeco, outerDeco, as, ...elementProps } = param;
     const innerRef = (0, _react.useRef)(null);
     (0, _react.useImperativeHandle)(ref, ()=>{
         return innerRef.current;
     }, []);
-    const { childDescriptors, nodeViewDescRef } = (0, _useNodeViewDescriptor.useNodeViewDescriptor)(node, ()=>getPos.current(), innerRef, innerRef, innerDeco, outerDeco, viewDesc);
+    const { childDescriptors, nodeViewDescRef } = (0, _useNodeViewDescriptor.useNodeViewDescriptor)(node, getPos, innerRef, innerRef, innerDeco, outerDeco, innerRef);
     const childContextValue = (0, _react.useMemo)(()=>({
             parentRef: nodeViewDescRef,
             siblingsRef: childDescriptors
@@ -93,12 +91,5 @@ const DocNodeView = /*#__PURE__*/ (0, _react.memo)(/*#__PURE__*/ (0, _react.forw
         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(_ChildNodeViews.wrapInDeco, element);
-    return wrapped;
+    return outerDeco.reduce(_ChildNodeViews.wrapInDeco, element);
 }));

package/dist/cjs/components/MarkView.js

@@ -83,7 +83,7 @@ const MarkView = /*#__PURE__*/ (0, _react.memo)(/*#__PURE__*/ (0, _react.forward
         if (!domRef.current) return;
         const firstChildDesc = childDescriptors.current[0];
         if (!viewDescRef.current) {
-            viewDescRef.current = new _viewdesc.MarkViewDesc(parentRef.current, childDescriptors.current, ()=>getPos.current(), mark, domRef.current, firstChildDesc?.dom.parentElement ?? domRef.current, {
+            viewDescRef.current = new _viewdesc.MarkViewDesc(parentRef.current, childDescriptors.current, getPos, mark, domRef.current, firstChildDesc?.dom.parentElement ?? domRef.current, {
                 dom: domRef.current,
                 contentDOM: firstChildDesc?.dom.parentElement ?? domRef.current
             });
@@ -93,7 +93,6 @@ const MarkView = /*#__PURE__*/ (0, _react.memo)(/*#__PURE__*/ (0, _react.forward
             viewDescRef.current.children = childDescriptors.current;
             viewDescRef.current.spec.contentDOM = viewDescRef.current.contentDOM = firstChildDesc?.dom.parentElement ?? domRef.current;
             viewDescRef.current.mark = mark;
-            viewDescRef.current.getPos = ()=>getPos.current();
         }
         if (!siblingsRef.current.includes(viewDescRef.current)) {
             siblingsRef.current.push(viewDescRef.current);

package/dist/cjs/components/NativeWidgetView.js

@@ -75,7 +75,7 @@ function NativeWidgetView(param) {
         if (!rootDomRef.current) return;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const toDOM = widget.type.toDOM;
-        let dom = typeof toDOM === "function" ? toDOM(view, ()=>getPos.current()) : toDOM;
+        let dom = typeof toDOM === "function" ? toDOM(view, getPos) : toDOM;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         if (!widget.type.spec.raw) {
             if (dom.nodeType != 1) {
@@ -92,11 +92,10 @@ function NativeWidgetView(param) {
     (0, _useClientLayoutEffect.useClientLayoutEffect)(()=>{
         if (!rootDomRef.current) return;
         if (!viewDescRef.current) {
-            viewDescRef.current = new _viewdesc.WidgetViewDesc(parentRef.current, ()=>getPos.current(), widget, rootDomRef.current);
+            viewDescRef.current = new _viewdesc.WidgetViewDesc(parentRef.current, getPos, widget, rootDomRef.current);
         } else {
             viewDescRef.current.parent = parentRef.current;
             viewDescRef.current.widget = widget;
-            viewDescRef.current.getPos = ()=>getPos.current();
             viewDescRef.current.dom = rootDomRef.current;
         }
         if (!siblingsRef.current.includes(viewDescRef.current)) {

package/dist/cjs/components/NodeView.js

@@ -56,7 +56,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
 const NodeView = /*#__PURE__*/ (0, _react.memo)(function NodeView(param) {
     let { outerDeco, getPos, node, innerDeco, ...props } = param;
     const { view } = (0, _react.useContext)(_EditorContext.EditorContext);
-    const customNodeView = view?.someProp("nodeViews", (nodeViews)=>nodeViews?.[node.type.name]);
+    const customNodeView = view.nodeViews[node.type.name];
     if (customNodeView) {
         return /*#__PURE__*/ _react.default.createElement(_CustomNodeView.CustomNodeView, {
             customNodeView: customNodeView,