prosemirror-view 1.20.3 → 1.21.0

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.21.0 (2021-10-29)
+
+### Bug fixes
+
+Fix issue where recent Mobile Safari versions weren't treated as Mac platforms.
+
+### New features
+
+Multiple `style` properties provided through the `attributes` prop are now merged. Adjust mac detection for recent changes to navigator.platform on iOS
+
 ## 1.20.3 (2021-10-13)
 
 ### Bug fixes

package/dist/index.es.js

@@ -9,7 +9,6 @@ if (typeof navigator != "undefined" && typeof document != "undefined") {
   var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
   var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent);
 
-  result.mac = /Mac/.test(navigator.platform);
   var ie = result.ie = !!(ie_upto10 || ie_11up || ie_edge);
   result.ie_version = ie_upto10 ? document.documentMode || 6 : ie_11up ? +ie_11up[1] : ie_edge ? +ie_edge[1] : null;
   result.gecko = !ie && /gecko\/(\d+)/i.test(navigator.userAgent);
@@ -20,6 +19,7 @@ if (typeof navigator != "undefined" && typeof document != "undefined") {
   // Is true for both iOS and iPadOS for convenience
   result.safari = !ie && /Apple Computer/.test(navigator.vendor);
   result.ios = result.safari && (/Mobile\/\w+/.test(navigator.userAgent) || navigator.maxTouchPoints > 2);
+  result.mac = result.ios || /Mac/.test(navigator.platform);
   result.android = /Android \d/.test(navigator.userAgent);
   result.webkit = "webkitFontSmoothing" in document.documentElement.style;
   result.webkit_version = result.webkit && +(/\bAppleWebKit\/(\d+)/.exec(navigator.userAgent) || [0, 0])[1];
@@ -5185,6 +5185,9 @@ function computeDocDeco(view) {
     if (value) { for (var attr in value) {
       if (attr == "class")
         { attrs.class += " " + value[attr]; }
+      if (attr == "style") {
+        attrs.style = (attrs.style ? attrs.style + ";" : "") + value[attr];
+      }
       else if (!attrs[attr] && attr != "contenteditable" && attr != "nodeName")
         { attrs[attr] = String(value[attr]); }
     } }