prosemirror-view 1.24.0 → 1.26.0

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.26.0 (2022-06-07)
+
+### New features
+
+Export the `NodeViewConstructor` and `MarkViewConstructor` types. Include Node/MarkViewConstructor in doc template
+
+## 1.25.0 (2022-06-01)
+
+### New features
+
+Mark views can now be specified with a separate editor prop, `markViews`, to make it easier to get the types right.
+
+## 1.24.1 (2022-05-30)
+
+### Bug fixes
+
+Fix a regression that caused the key handler to crash.
+
 ## 1.24.0 (2022-05-30)
 
 ### Bug fixes

package/dist/index.cjs

@@ -1774,10 +1774,9 @@ var CustomNodeViewDesc = function (_NodeViewDesc2) {
       if (this.dirty == NODE_DIRTY) return false;
 
       if (this.spec.update) {
-        var _result = this.spec.update(node, outerDeco, innerDeco);
-
-        if (_result) this.updateInner(node, outerDeco, innerDeco, view);
-        return _result;
+        var result = this.spec.update(node, outerDeco, innerDeco);
+        if (result) this.updateInner(node, outerDeco, innerDeco, view);
+        return result;
       } else if (!this.contentDOM && !node.isLeaf) {
         return false;
       } else {
@@ -2867,13 +2866,13 @@ function captureKeyDown(view, event) {
     return stopNativeHorizontalDelete(view, 1) || skipIgnoredNodesRight(view);
   } else if (code == 13 || code == 27) {
     return true;
-  } else if (code == 37 || result.mac && code == 66 && mods == "c") {
+  } else if (code == 37 || mac && code == 66 && mods == "c") {
     return selectHorizontally(view, -1, mods) || skipIgnoredNodesLeft(view);
-  } else if (code == 39 || result.mac && code == 70 && mods == "c") {
+  } else if (code == 39 || mac && code == 70 && mods == "c") {
     return selectHorizontally(view, 1, mods) || skipIgnoredNodesRight(view);
-  } else if (code == 38 || result.mac && code == 80 && mods == "c") {
+  } else if (code == 38 || mac && code == 80 && mods == "c") {
     return selectVertically(view, -1, mods) || skipIgnoredNodesLeft(view);
-  } else if (code == 40 || result.mac && code == 78 && mods == "c") {
+  } else if (code == 40 || mac && code == 78 && mods == "c") {
     return safariDownArrowBug(view) || selectVertically(view, 1, mods) || skipIgnoredNodesRight(view);
   } else if (mods == (mac ? "m" : "c") && (code == 66 || code == 73 || code == 89 || code == 90)) {
     return true;
@@ -4331,10 +4330,9 @@ var DecorationGroup = function () {
       var found = [];
 
       for (var i = 0; i < this.members.length; i++) {
-        var _result2 = this.members[i].forChild(offset, child);
-
-        if (_result2 == empty) continue;
-        if (_result2 instanceof DecorationGroup) found = found.concat(_result2.members);else found.push(_result2);
+        var result = this.members[i].forChild(offset, child);
+        if (result == empty) continue;
+        if (result instanceof DecorationGroup) found = found.concat(result.members);else found.push(result);
       }
 
       return DecorationGroup.from(found);
@@ -4827,12 +4825,12 @@ var DOMObserver = function () {
 
       if (this.view.editable) {
         for (var i = 0; i < mutations.length; i++) {
-          var _result3 = this.registerMutation(mutations[i], added);
+          var result = this.registerMutation(mutations[i], added);
 
-          if (_result3) {
-            from = from < 0 ? _result3.from : Math.min(_result3.from, from);
-            to = to < 0 ? _result3.to : Math.max(_result3.to, to);
-            if (_result3.typeOver) typeOver = true;
+          if (result) {
+            from = from < 0 ? result.from : Math.min(result.from, from);
+            to = to < 0 ? result.to : Math.max(result.to, to);
+            if (result.typeOver) typeOver = true;
           }
         }
       }
@@ -5700,11 +5698,15 @@ function selectionContextChanged(sel1, sel2) {
 
 function buildNodeViews(view) {
   var result = Object.create(null);
-  view.someProp("nodeViews", function (obj) {
+
+  function add(obj) {
     for (var _prop3 in obj) {
       if (!Object.prototype.hasOwnProperty.call(result, _prop3)) result[_prop3] = obj[_prop3];
     }
-  });
+  }
+
+  view.someProp("nodeViews", add);
+  view.someProp("markViews", add);
   return result;
 }
 

package/dist/index.d.ts

@@ -536,7 +536,19 @@ declare class EditorView {
     */
     dispatch(tr: Transaction): void;
 }
-declare type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number | undefined, decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView;
+/**
+The type of function [provided](https://prosemirror.net/docs/ref/#view.ViewProps.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;
+/**
+The function types [used](https://prosemirror.net/docs/ref/#view.ViewProps.markViews) to create
+mark views.
+*/
+declare type MarkViewConstructor = (mark: Mark, view: EditorView, inline: boolean) => {
+    dom: HTMLElement;
+    contentDOM?: HTMLElement;
+};
 /**
 Helper type that maps event names to event object types, but
 includes events that TypeScript's HTMLElementEventMap doesn't know
@@ -676,14 +688,12 @@ interface EditorProps {
     */
     transformPasted?: (slice: Slice) => Slice;
     /**
-    Allows you to pass custom rendering and behavior logic for nodes
-    and marks. Should map node and mark names to constructor
-    functions that produce a [`NodeView`](https://prosemirror.net/docs/ref/#view.NodeView) object
-    implementing the node's display behavior. For nodes, 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. For marks, the third argument is a
-    boolean that indicates whether the mark's content is inline.
+    Allows you to pass custom rendering and behavior logic for
+    nodes. Should map node names to constructor functions that
+    produce a [`NodeView`](https://prosemirror.net/docs/ref/#view.NodeView) object implementing the
+    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.
     
     `decorations` is an array of node or inline decorations that are
     active around the node. They are automatically drawn in the
@@ -697,11 +707,25 @@ interface EditorProps {
     on the content. But if you, for example, want to create a nested
     editor with the content, it may make sense to provide it with the
     inner decorations.
+    
+    (For backwards compatibility reasons, [mark
+    views](https://prosemirror.net/docs/ref/#view.ViewProps.markViews) can also be included in this
+    object.)
     */
     nodeViews?: {
         [node: string]: NodeViewConstructor;
     };
     /**
+    Pass custom mark rendering functions. Note that these cannot
+    provide the kind of dynamic behavior that [node
+    views](https://prosemirror.net/docs/ref/#view.NodeView) can—they just provide custom rendering
+    logic. The third argument indicates whether the mark's content
+    is inline.
+    */
+    markViews?: {
+        [mark: string]: MarkViewConstructor;
+    };
+    /**
     The DOM serializer to use when putting content onto the
     clipboard. If not given, the result of
     [`DOMSerializer.fromSchema`](https://prosemirror.net/docs/ref/#model.DOMSerializer^fromSchema)
@@ -796,4 +820,4 @@ interface DirectEditorProps extends EditorProps {
     dispatchTransaction?: (tr: Transaction) => void;
 }
 
-export { DOMEventMap, Decoration, DecorationAttrs, DecorationSet, DecorationSource, DirectEditorProps, EditorProps, EditorView, NodeView };
+export { DOMEventMap, Decoration, DecorationAttrs, DecorationSet, DecorationSource, DirectEditorProps, EditorProps, EditorView, MarkViewConstructor, NodeView, NodeViewConstructor };

package/dist/index.js

@@ -2509,16 +2509,16 @@ function captureKeyDown(view, event) {
     else if (code == 13 || code == 27) { // Enter, Esc
         return true;
     }
-    else if (code == 37 || (result.mac && code == 66 && mods == "c")) { // Left arrow, Ctrl-b on Mac
+    else if (code == 37 || (mac && code == 66 && mods == "c")) { // Left arrow, Ctrl-b on Mac
         return selectHorizontally(view, -1, mods) || skipIgnoredNodesLeft(view);
     }
-    else if (code == 39 || (result.mac && code == 70 && mods == "c")) { // Right arrow, Ctrl-f on Mac
+    else if (code == 39 || (mac && code == 70 && mods == "c")) { // Right arrow, Ctrl-f on Mac
         return selectHorizontally(view, 1, mods) || skipIgnoredNodesRight(view);
     }
-    else if (code == 38 || (result.mac && code == 80 && mods == "c")) { // Up arrow, Ctrl-p on Mac
+    else if (code == 38 || (mac && code == 80 && mods == "c")) { // Up arrow, Ctrl-p on Mac
         return selectVertically(view, -1, mods) || skipIgnoredNodesLeft(view);
     }
-    else if (code == 40 || (result.mac && code == 78 && mods == "c")) { // Down arrow, Ctrl-n on Mac
+    else if (code == 40 || (mac && code == 78 && mods == "c")) { // Down arrow, Ctrl-n on Mac
         return safariDownArrowBug(view) || selectVertically(view, 1, mods) || skipIgnoredNodesRight(view);
     }
     else if (mods == (mac ? "m" : "c") &&
@@ -5226,11 +5226,13 @@ function selectionContextChanged(sel1, sel2) {
 }
 function buildNodeViews(view) {
     let result = Object.create(null);
-    view.someProp("nodeViews", obj => {
+    function add(obj) {
         for (let prop in obj)
             if (!Object.prototype.hasOwnProperty.call(result, prop))
                 result[prop] = obj[prop];
-    });
+    }
+    view.someProp("nodeViews", add);
+    view.someProp("markViews", add);
     return result;
 }
 function changedNodeViews(a, b) {

package/package.json

@@ -1,14 +1,17 @@
 {
   "name": "prosemirror-view",
-  "version": "1.24.0",
+  "version": "1.26.0",
   "description": "ProseMirror's view component",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
-    "import": "./dist/index.js",
-    "require": "./dist/index.cjs"
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    },
+    "./style/prosemirror.css": "./style/prosemirror.css"
   },
   "sideEffects": false,
   "style": "style/prosemirror.css",

package/src/README.md

@@ -10,6 +10,10 @@ this module.
 
 @EditorProps
 
+@NodeViewConstructor
+
+@MarkViewConstructor
+
 @DirectEditorProps
 
 @NodeView

package/src/capturekeys.ts

@@ -256,13 +256,13 @@ export function captureKeyDown(view: EditorView, event: KeyboardEvent) {
     return stopNativeHorizontalDelete(view, 1) || skipIgnoredNodesRight(view)
   } else if (code == 13 || code == 27) { // Enter, Esc
     return true
-  } else if (code == 37 || (result.mac && code == 66 && mods == "c")) { // Left arrow, Ctrl-b on Mac
+  } else if (code == 37 || (browser.mac && code == 66 && mods == "c")) { // Left arrow, Ctrl-b on Mac
     return selectHorizontally(view, -1, mods) || skipIgnoredNodesLeft(view)
-  } else if (code == 39 || (result.mac && code == 70 && mods == "c")) { // Right arrow, Ctrl-f on Mac
+  } else if (code == 39 || (browser.mac && code == 70 && mods == "c")) { // Right arrow, Ctrl-f on Mac
     return selectHorizontally(view, 1, mods) || skipIgnoredNodesRight(view)
-  } else if (code == 38 || (result.mac && code == 80 && mods == "c")) { // Up arrow, Ctrl-p on Mac
+  } else if (code == 38 || (browser.mac && code == 80 && mods == "c")) { // Up arrow, Ctrl-p on Mac
     return selectVertically(view, -1, mods) || skipIgnoredNodesLeft(view)
-  } else if (code == 40 || (result.mac && code == 78 && mods == "c")) { // Down arrow, Ctrl-n on Mac
+  } else if (code == 40 || (browser.mac && code == 78 && mods == "c")) { // Down arrow, Ctrl-n on Mac
     return safariDownArrowBug(view) || selectVertically(view, 1, mods) || skipIgnoredNodesRight(view)
   } else if (mods == (browser.mac ? "m" : "c") &&
              (code == 66 || code == 73 || code == 89 || code == 90)) { // Mod-[biyz]

package/src/index.ts

@@ -42,7 +42,7 @@ export class EditorView {
   /// @internal
   cursorWrapper: {dom: DOMNode, deco: Decoration} | null = null
   /// @internal
-  nodeViews: {[node: string]: NodeViewConstructor}
+  nodeViews: NodeViewSet
   /// @internal
   lastSelectedViewDesc: ViewDesc | undefined = undefined
   /// @internal
@@ -472,15 +472,17 @@ function selectionContextChanged(sel1: Selection, sel2: Selection) {
 }
 
 function buildNodeViews(view: EditorView) {
-  let result: {[node: string]: NodeViewConstructor} = Object.create(null)
-  view.someProp("nodeViews", obj => {
+  let result: NodeViewSet = Object.create(null)
+  function add(obj: NodeViewSet) {
     for (let prop in obj) if (!Object.prototype.hasOwnProperty.call(result, prop))
       result[prop] = obj[prop]
-  })
+  }
+  view.someProp("nodeViews", add)
+  view.someProp("markViews", add)
   return result
 }
 
-function changedNodeViews(a: {[node: string]: NodeViewConstructor}, b: {[node: string]: NodeViewConstructor}) {
+function changedNodeViews(a: NodeViewSet, b: NodeViewSet) {
   let nA = 0, nB = 0
   for (let prop in a) {
     if (a[prop] != b[prop]) return true
@@ -495,8 +497,16 @@ function checkStateComponent(plugin: Plugin) {
     throw new RangeError("Plugins passed directly to the view must not have a state component")
 }
 
-type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number | undefined,
-                            decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView
+/// The type of function [provided](#view.ViewProps.nodeViews) to
+/// create [node views](#view.NodeView).
+export type NodeViewConstructor = (node: Node, view: EditorView, getPos: () => number,
+                                   decorations: readonly Decoration[], innerDecorations: DecorationSource) => NodeView
+
+/// The function types [used](#view.ViewProps.markViews) to create
+/// mark views.
+export type MarkViewConstructor = (mark: Mark, view: EditorView, inline: boolean) => {dom: HTMLElement, contentDOM?: HTMLElement}
+
+type NodeViewSet = {[name: string]: NodeViewConstructor | MarkViewConstructor}
 
 /// Helper type that maps event names to event object types, but
 /// includes events that TypeScript's HTMLElementEventMap doesn't know
@@ -613,14 +623,12 @@ export interface EditorProps {
   /// the document.
   transformPasted?: (slice: Slice) => Slice
 
-  /// Allows you to pass custom rendering and behavior logic for nodes
-  /// and marks. Should map node and mark names to constructor
-  /// functions that produce a [`NodeView`](#view.NodeView) object
-  /// implementing the node's display behavior. For nodes, 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. For marks, the third argument is a
-  /// boolean that indicates whether the mark's content is inline.
+  /// Allows you to pass custom rendering and behavior logic for
+  /// nodes. Should map node names to constructor functions that
+  /// produce a [`NodeView`](#view.NodeView) object implementing the
+  /// 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.
   ///
   /// `decorations` is an array of node or inline decorations that are
   /// active around the node. They are automatically drawn in the
@@ -634,8 +642,19 @@ export interface EditorProps {
   /// on the content. But if you, for example, want to create a nested
   /// editor with the content, it may make sense to provide it with the
   /// inner decorations.
+  ///
+  /// (For backwards compatibility reasons, [mark
+  /// views](#view.ViewProps.markViews) can also be included in this
+  /// object.)
   nodeViews?: {[node: string]: NodeViewConstructor}
 
+  /// Pass custom mark rendering functions. Note that these cannot
+  /// provide the kind of dynamic behavior that [node
+  /// views](#view.NodeView) can—they just provide custom rendering
+  /// logic. The third argument indicates whether the mark's content
+  /// is inline.
+  markViews?: {[mark: string]: MarkViewConstructor}
+
   /// The DOM serializer to use when putting content onto the
   /// clipboard. If not given, the result of
   /// [`DOMSerializer.fromSchema`](#model.DOMSerializer^fromSchema)

package/src/viewdesc.ts

@@ -565,9 +565,9 @@ class MarkViewDesc extends ViewDesc {
 
   static create(parent: ViewDesc, mark: Mark, inline: boolean, view: EditorView) {
     let custom = view.nodeViews[mark.type.name]
-    let spec: NodeView = custom && (custom as any)(mark, view, inline)
+    let spec: {dom: HTMLElement, contentDOM?: HTMLElement} = custom && (custom as any)(mark, view, inline)
     if (!spec || !spec.dom)
-      spec = DOMSerializer.renderSpec(document, mark.type.spec.toDOM!(mark, inline))
+      spec = DOMSerializer.renderSpec(document, mark.type.spec.toDOM!(mark, inline)) as any
     return new MarkViewDesc(parent, mark, spec.dom, spec.contentDOM || spec.dom as HTMLElement)
   }
 
@@ -631,7 +631,7 @@ export class NodeViewDesc extends ViewDesc {
   static create(parent: ViewDesc | undefined, node: Node, outerDeco: readonly Decoration[],
                 innerDeco: DecorationSource, view: EditorView, pos: number) {
     let custom = view.nodeViews[node.type.name], descObj: ViewDesc
-    let spec = custom && custom(node, view, () => {
+    let spec: NodeView | undefined = custom && (custom as any)(node, view, () => {
       // (This is a function that allows the custom view to find its
       // own position)
       if (!descObj) return pos