@atlaskit/renderer 108.3.0 → 108.3.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/renderer
 
+## 108.3.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 108.3.1
+
+### Patch Changes
+
+- [`5e15dddfbe2`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5e15dddfbe2) - skip border mark if it is not a child of mediaSingle
+
 ## 108.3.0
 
 ### Minor Changes

package/dist/cjs/react/index.js

@@ -76,11 +76,17 @@ var ReactSerializer = /*#__PURE__*/function () {
       _this.startPos = pos + node.nodeSize;
       var marks = node.marks ? (0, _toConsumableArray2.default)(node.marks) : [];
       var isMedia = node.type.name === 'media';
-      var shouldSkipMark = function shouldSkipMark(mark) {
+      var shouldSkipBorderMark = function shouldSkipBorderMark(mark) {
+        return currentPath.some(function (n) {
+          var _n$type;
+          return ((_n$type = n.type) === null || _n$type === void 0 ? void 0 : _n$type.name) !== 'mediaSingle';
+        }) && isMedia && mark.type.name === 'border';
+      };
+      var shouldSkipLinkMark = function shouldSkipLinkMark(mark) {
         return _this.allowMediaLinking !== true && isMedia && mark.type.name === 'link';
       };
       return marks.reverse().reduce(function (content, mark) {
-        if (shouldSkipMark(mark)) {
+        if (shouldSkipLinkMark(mark) || shouldSkipBorderMark(mark)) {
           return content;
         }
         return _this.renderMark((0, _marks.toReact)(mark), _this.withMediaMarkProps(node, mark, _this.getMarkProps(mark, [], node)), "".concat(mark.type.name, "-").concat(index), content);
@@ -390,11 +396,15 @@ var ReactSerializer = /*#__PURE__*/function () {
       var _node$type$schema$mar = node.type.schema.marks,
         link = _node$type$schema$mar.link,
         border = _node$type$schema$mar.border;
+      var isChildOfMediaSingle = path.some(function (n) {
+        var _n$type2;
+        return ((_n$type2 = n.type) === null || _n$type2 === void 0 ? void 0 : _n$type2.name) === 'mediaSingle';
+      });
       var isLinkMark = function isLinkMark(mark) {
         return mark.type === link;
       };
       var isBorderMark = function isBorderMark(mark) {
-        return mark.type === border;
+        return isChildOfMediaSingle && mark.type === border;
       };
       return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
         marks: node.marks.filter(function (m) {

package/dist/cjs/ui/Renderer/index.js

@@ -55,7 +55,7 @@ exports.NORMAL_SEVERITY_THRESHOLD = NORMAL_SEVERITY_THRESHOLD;
 var DEGRADED_SEVERITY_THRESHOLD = 3000;
 exports.DEGRADED_SEVERITY_THRESHOLD = DEGRADED_SEVERITY_THRESHOLD;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "108.3.0";
+var packageVersion = "108.3.2";
 var Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "108.3.0",
+	"version": "108.3.2",
 	"sideEffects": false
 }

package/dist/es2019/react/index.js

@@ -61,9 +61,13 @@ export default class ReactSerializer {
       this.startPos = pos + node.nodeSize;
       const marks = node.marks ? [...node.marks] : [];
       const isMedia = node.type.name === 'media';
-      const shouldSkipMark = mark => this.allowMediaLinking !== true && isMedia && mark.type.name === 'link';
+      const shouldSkipBorderMark = mark => currentPath.some(n => {
+        var _n$type;
+        return ((_n$type = n.type) === null || _n$type === void 0 ? void 0 : _n$type.name) !== 'mediaSingle';
+      }) && isMedia && mark.type.name === 'border';
+      const shouldSkipLinkMark = mark => this.allowMediaLinking !== true && isMedia && mark.type.name === 'link';
       return marks.reverse().reduce((content, mark) => {
-        if (shouldSkipMark(mark)) {
+        if (shouldSkipLinkMark(mark) || shouldSkipBorderMark(mark)) {
           return content;
         }
         return this.renderMark(markToReact(mark), this.withMediaMarkProps(node, mark, this.getMarkProps(mark, [], node)), `${mark.type.name}-${index}`, content);
@@ -341,8 +345,12 @@ export default class ReactSerializer {
         border
       }
     } = node.type.schema;
+    const isChildOfMediaSingle = path.some(n => {
+      var _n$type2;
+      return ((_n$type2 = n.type) === null || _n$type2 === void 0 ? void 0 : _n$type2.name) === 'mediaSingle';
+    });
     const isLinkMark = mark => mark.type === link;
-    const isBorderMark = mark => mark.type === border;
+    const isBorderMark = mark => isChildOfMediaSingle && mark.type === border;
     return {
       ...this.getProps(node),
       marks: node.marks.filter(m => !isLinkMark(m) || this.allowMediaLinking === true),

package/dist/es2019/ui/Renderer/index.js

@@ -35,7 +35,7 @@ import { RenderTracking } from '../../react/utils/performance/RenderTracking';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "108.3.0";
+const packageVersion = "108.3.2";
 export class Renderer extends PureComponent {
   constructor(props) {
     super(props);

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "108.3.0",
+	"version": "108.3.2",
 	"sideEffects": false
 }

package/dist/esm/react/index.js

@@ -69,11 +69,17 @@ var ReactSerializer = /*#__PURE__*/function () {
       _this.startPos = pos + node.nodeSize;
       var marks = node.marks ? _toConsumableArray(node.marks) : [];
       var isMedia = node.type.name === 'media';
-      var shouldSkipMark = function shouldSkipMark(mark) {
+      var shouldSkipBorderMark = function shouldSkipBorderMark(mark) {
+        return currentPath.some(function (n) {
+          var _n$type;
+          return ((_n$type = n.type) === null || _n$type === void 0 ? void 0 : _n$type.name) !== 'mediaSingle';
+        }) && isMedia && mark.type.name === 'border';
+      };
+      var shouldSkipLinkMark = function shouldSkipLinkMark(mark) {
         return _this.allowMediaLinking !== true && isMedia && mark.type.name === 'link';
       };
       return marks.reverse().reduce(function (content, mark) {
-        if (shouldSkipMark(mark)) {
+        if (shouldSkipLinkMark(mark) || shouldSkipBorderMark(mark)) {
           return content;
         }
         return _this.renderMark(markToReact(mark), _this.withMediaMarkProps(node, mark, _this.getMarkProps(mark, [], node)), "".concat(mark.type.name, "-").concat(index), content);
@@ -383,11 +389,15 @@ var ReactSerializer = /*#__PURE__*/function () {
       var _node$type$schema$mar = node.type.schema.marks,
         link = _node$type$schema$mar.link,
         border = _node$type$schema$mar.border;
+      var isChildOfMediaSingle = path.some(function (n) {
+        var _n$type2;
+        return ((_n$type2 = n.type) === null || _n$type2 === void 0 ? void 0 : _n$type2.name) === 'mediaSingle';
+      });
       var isLinkMark = function isLinkMark(mark) {
         return mark.type === link;
       };
       var isBorderMark = function isBorderMark(mark) {
-        return mark.type === border;
+        return isChildOfMediaSingle && mark.type === border;
       };
       return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
         marks: node.marks.filter(function (m) {

package/dist/esm/ui/Renderer/index.js

@@ -45,7 +45,7 @@ import { RenderTracking } from '../../react/utils/performance/RenderTracking';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "108.3.0";
+var packageVersion = "108.3.2";
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "108.3.0",
+	"version": "108.3.2",
 	"sideEffects": false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "108.3.0",
+  "version": "108.3.2",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -45,7 +45,7 @@
     "@atlaskit/editor-shared-styles": "^2.4.0",
     "@atlaskit/emoji": "^67.4.0",
     "@atlaskit/icon": "^21.12.0",
-    "@atlaskit/link-datasource": "^0.24.0",
+    "@atlaskit/link-datasource": "^0.25.0",
     "@atlaskit/media-card": "^76.0.0",
     "@atlaskit/media-client": "^23.1.0",
     "@atlaskit/media-common": "^7.0.0",
@@ -85,7 +85,7 @@
     "@atlaskit/editor-test-helpers": "^18.7.0",
     "@atlaskit/inline-edit": "^12.3.3",
     "@atlaskit/link-provider": "^1.6.0",
-    "@atlaskit/link-test-helpers": "^4.0.0",
+    "@atlaskit/link-test-helpers": "^4.1.0",
     "@atlaskit/logo": "^13.14.0",
     "@atlaskit/media-core": "^34.1.0",
     "@atlaskit/media-integration-test-helpers": "^3.0.0",