prosemirror-view 1.29.0 → 1.29.1

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.29.1 (2022-11-14)
+
+### Bug fixes
+
+Fix a problem when returning decorations from an outer editor from the `decorations` prop.
+
 ## 1.29.0 (2022-10-12)
 
 ### Bug fixes

package/README.md

@@ -19,7 +19,7 @@ This code is released under an
 [MIT license](https://github.com/prosemirror/prosemirror/tree/master/LICENSE).
 There's a [forum](http://discuss.prosemirror.net) for general
 discussion and support requests, and the
-[Github bug tracker](https://github.com/prosemirror/prosemirror/issues)
+[GitHub bug tracker](https://github.com/prosemirror/prosemirror/issues)
 is the place to report issues.
 
 We aim to be an inclusive, welcoming community. To make that explicit,

package/dist/index.cjs

@@ -4442,7 +4442,11 @@ var DecorationGroup = function () {
           return members[0];
 
         default:
-          return new DecorationGroup(members);
+          return new DecorationGroup(members.every(function (m) {
+            return m instanceof DecorationSet;
+          }) ? members : members.reduce(function (r, m) {
+            return r.concat(m instanceof DecorationSet ? m : m.members);
+          }, []));
       }
     }
   }]);

package/dist/index.js

@@ -3976,7 +3976,8 @@ class DecorationGroup {
         switch (members.length) {
             case 0: return empty;
             case 1: return members[0];
-            default: return new DecorationGroup(members);
+            default: return new DecorationGroup(members.every(m => m instanceof DecorationSet) ? members :
+                members.reduce((r, m) => r.concat(m instanceof DecorationSet ? m : m.members), []));
         }
     }
 }

package/package.json

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

package/src/decoration.ts

@@ -528,11 +528,14 @@ class DecorationGroup implements DecorationSource {
 
   // Create a group for the given array of decoration sets, or return
   // a single set when possible.
-  static from(members: readonly DecorationSet[]): DecorationSet | DecorationGroup {
+  static from(members: readonly DecorationSource[]): DecorationSource {
     switch (members.length) {
       case 0: return empty
       case 1: return members[0]
-      default: return new DecorationGroup(members)
+      default: return new DecorationGroup(
+        members.every(m => m instanceof DecorationSet) ? members as DecorationSet[] :
+          members.reduce((r, m) => r.concat(m instanceof DecorationSet ? m : (m as DecorationGroup).members),
+                         [] as DecorationSet[]))
     }
   }
 }
@@ -753,8 +756,8 @@ function insertAhead(array: Decoration[], i: number, deco: Decoration) {
 }
 
 // Get the decorations associated with the current props of a view.
-export function viewDecorations(view: EditorView): DecorationSet | DecorationGroup {
-  let found = []
+export function viewDecorations(view: EditorView): DecorationSource {
+  let found: DecorationSource[] = []
   view.someProp("decorations", f => {
     let result = f(view.state)
     if (result && result != empty) found.push(result)