@atlaskit/editor-synced-block-provider 6.6.5 → 6.6.6

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-synced-block-provider
 
+## 6.6.6
+
+### Patch Changes
+
+- [`33333417b0969`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/33333417b0969) -
+  Strip inline comment annotation marks from synced block content before syncing references behind
+  platform_synced_block_patch_12.
+- Updated dependencies
+
 ## 6.6.5
 
 ### Patch Changes

package/dist/cjs/store-manager/referenceSyncBlockStoreManager.js

@@ -13,6 +13,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../common/types");
 var _errorHandling = require("../utils/errorHandling");
 var _experienceTracking = require("../utils/experienceTracking");
@@ -210,10 +211,27 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       var syncBlockNode = (0, _utils.createSyncBlockNode)('', resourceId);
       var providerData = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 || (_this$dataProvider2 = _this$dataProvider2.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.data;
       if (providerData) {
-        return providerData;
+        return this.stripAnnotationMarksFromReferenceData(providerData);
       }
       return this.getFromSessionCache(resourceId);
     }
+  }, {
+    key: "stripAnnotationMarksFromReferenceData",
+    value: function stripAnnotationMarksFromReferenceData(syncBlock) {
+      var _syncBlock$data;
+      if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_12') || !((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.content)) {
+        return syncBlock;
+      }
+      var content = (0, _utils.stripAnnotationMarksFromJSONContent)(syncBlock.data.content);
+      if (content === syncBlock.data.content) {
+        return syncBlock;
+      }
+      return _objectSpread(_objectSpread({}, syncBlock), {}, {
+        data: _objectSpread(_objectSpread({}, syncBlock.data), {}, {
+          content: content
+        })
+      });
+    }
   }, {
     key: "updateSessionCache",
     value: function updateSessionCache(resourceId) {
@@ -230,7 +248,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         if (!raw) {
           return undefined;
         }
-        return JSON.parse(raw);
+        return this.stripAnnotationMarksFromReferenceData(JSON.parse(raw));
       } catch (error) {
         (0, _monitoring.logException)(error, {
           location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getFromSessionCache'
@@ -601,14 +619,15 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "updateCache",
     value: function updateCache(syncBlock) {
-      var resourceId = syncBlock.resourceId;
+      var sanitizedSyncBlock = this.stripAnnotationMarksFromReferenceData(syncBlock);
+      var resourceId = sanitizedSyncBlock.resourceId;
       if (resourceId) {
         var _this$dataProvider3;
-        (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 || _this$dataProvider3.updateCache((0, _defineProperty2.default)({}, resourceId, syncBlock), {
+        (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 || _this$dataProvider3.updateCache((0, _defineProperty2.default)({}, resourceId, sanitizedSyncBlock), {
           strategy: 'merge',
           source: 'network'
         });
-        this._subscriptionManager.notifySubscriptionCallbacks(resourceId, syncBlock);
+        this._subscriptionManager.notifySubscriptionCallbacks(resourceId, sanitizedSyncBlock);
         this.updateSessionCache(resourceId);
       }
     }
@@ -685,12 +704,12 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "getSyncBlockURL",
     value: function getSyncBlockURL(resourceId) {
-      var _syncBlock$data;
+      var _syncBlock$data2;
       var syncBlock = this.getFromCache(resourceId);
       if (!syncBlock) {
         return undefined;
       }
-      return (_syncBlock$data = syncBlock.data) === null || _syncBlock$data === void 0 ? void 0 : _syncBlock$data.sourceURL;
+      return (_syncBlock$data2 = syncBlock.data) === null || _syncBlock$data2 === void 0 ? void 0 : _syncBlock$data2.sourceURL;
     }
   }, {
     key: "getProviderFactory",

package/dist/cjs/utils/utils.js

@@ -1,15 +1,60 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSourceProductFromResourceIdSafe = exports.getContentIdAndProductFromResourceId = exports.createSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodesToSyncBlockNodes = exports.convertPMNodeToSyncBlockNode = exports.convertContentUpdatedAt = void 0;
-/* eslint-disable require-unicode-regexp  */
-
+exports.stripAnnotationMarksFromJSONContent = exports.getSourceProductFromResourceIdSafe = exports.getContentIdAndProductFromResourceId = exports.createSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodesToSyncBlockNodes = exports.convertPMNodeToSyncBlockNode = exports.convertContentUpdatedAt = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable require-unicode-regexp  */
+var _stripAnnotationMarksFromJSONContent = exports.stripAnnotationMarksFromJSONContent = function stripAnnotationMarksFromJSONContent(content) {
+  var strippedContent;
+  content.forEach(function (contentNode, index) {
+    var _contentNode$marks;
+    if (!contentNode) {
+      var _strippedContent;
+      (_strippedContent = strippedContent) === null || _strippedContent === void 0 || _strippedContent.push(contentNode);
+      return;
+    }
+    var hasAnnotationMark = (_contentNode$marks = contentNode.marks) === null || _contentNode$marks === void 0 ? void 0 : _contentNode$marks.some(function (mark) {
+      return mark.type === 'annotation';
+    });
+    var childContent = contentNode.content ? _stripAnnotationMarksFromJSONContent(contentNode.content) : undefined;
+    var hasContentChanged = childContent !== undefined && childContent !== contentNode.content;
+    if (!hasAnnotationMark && !hasContentChanged) {
+      var _strippedContent2;
+      (_strippedContent2 = strippedContent) === null || _strippedContent2 === void 0 || _strippedContent2.push(contentNode);
+      return;
+    }
+    if (!strippedContent) {
+      strippedContent = content.slice(0, index);
+    }
+    var strippedNode = _objectSpread({}, contentNode);
+    if (hasAnnotationMark) {
+      var _contentNode$marks2;
+      var marks = (_contentNode$marks2 = contentNode.marks) === null || _contentNode$marks2 === void 0 ? void 0 : _contentNode$marks2.filter(function (mark) {
+        return mark.type !== 'annotation';
+      });
+      if (marks && marks.length > 0) {
+        strippedNode.marks = marks;
+      } else {
+        delete strippedNode.marks;
+      }
+    }
+    if (hasContentChanged && childContent) {
+      strippedNode.content = childContent;
+    }
+    strippedContent.push(strippedNode);
+  });
+  return strippedContent !== null && strippedContent !== void 0 ? strippedContent : content;
+};
 var convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockPMNodeToSyncBlockData = function convertSyncBlockPMNodeToSyncBlockData(node) {
+  var content = node.content.toJSON();
   return {
     blockInstanceId: node.attrs.localId,
-    content: node.content.toJSON(),
+    content: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_12') ? _stripAnnotationMarksFromJSONContent(content) : content,
     resourceId: node.attrs.resourceId
   };
 };

package/dist/es2019/store-manager/referenceSyncBlockStoreManager.js

@@ -1,11 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import isEqual from 'lodash/isEqual';
 import { logException } from '@atlaskit/editor-common/monitoring';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SyncBlockError } from '../common/types';
 import { fetchErrorPayload, fetchSuccessPayload, getSourceInfoErrorPayload, updateReferenceErrorPayload } from '../utils/errorHandling';
 import { getFetchExperience, getFetchSourceInfoExperience, getSaveReferenceExperience } from '../utils/experienceTracking';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
-import { createSyncBlockNode, getSourceProductFromResourceIdSafe } from '../utils/utils';
+import { createSyncBlockNode, getSourceProductFromResourceIdSafe, stripAnnotationMarksFromJSONContent } from '../utils/utils';
 import { SyncBlockBatchFetcher } from './syncBlockBatchFetcher';
 import { syncBlockInMemorySessionCache } from './syncBlockInMemorySessionCache';
 import { SyncBlockProviderFactoryManager } from './syncBlockProviderFactoryManager';
@@ -141,10 +142,27 @@ export class ReferenceSyncBlockStoreManager {
     const syncBlockNode = createSyncBlockNode('', resourceId);
     const providerData = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 ? void 0 : (_this$dataProvider2$g = _this$dataProvider2.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider2$g === void 0 ? void 0 : _this$dataProvider2$g.data;
     if (providerData) {
-      return providerData;
+      return this.stripAnnotationMarksFromReferenceData(providerData);
     }
     return this.getFromSessionCache(resourceId);
   }
+  stripAnnotationMarksFromReferenceData(syncBlock) {
+    var _syncBlock$data;
+    if (!fg('platform_synced_block_patch_12') || !((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.content)) {
+      return syncBlock;
+    }
+    const content = stripAnnotationMarksFromJSONContent(syncBlock.data.content);
+    if (content === syncBlock.data.content) {
+      return syncBlock;
+    }
+    return {
+      ...syncBlock,
+      data: {
+        ...syncBlock.data,
+        content
+      }
+    };
+  }
   updateSessionCache(resourceId) {
     const latestData = this.getFromCache(resourceId);
     if (latestData) {
@@ -157,7 +175,7 @@ export class ReferenceSyncBlockStoreManager {
       if (!raw) {
         return undefined;
       }
-      return JSON.parse(raw);
+      return this.stripAnnotationMarksFromReferenceData(JSON.parse(raw));
     } catch (error) {
       logException(error, {
         location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getFromSessionCache'
@@ -470,18 +488,19 @@ export class ReferenceSyncBlockStoreManager {
     }
   }
   updateCache(syncBlock) {
+    const sanitizedSyncBlock = this.stripAnnotationMarksFromReferenceData(syncBlock);
     const {
       resourceId
-    } = syncBlock;
+    } = sanitizedSyncBlock;
     if (resourceId) {
       var _this$dataProvider3;
       (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 ? void 0 : _this$dataProvider3.updateCache({
-        [resourceId]: syncBlock
+        [resourceId]: sanitizedSyncBlock
       }, {
         strategy: 'merge',
         source: 'network'
       });
-      this._subscriptionManager.notifySubscriptionCallbacks(resourceId, syncBlock);
+      this._subscriptionManager.notifySubscriptionCallbacks(resourceId, sanitizedSyncBlock);
       this.updateSessionCache(resourceId);
     }
   }
@@ -542,12 +561,12 @@ export class ReferenceSyncBlockStoreManager {
    * @returns
    */
   getSyncBlockURL(resourceId) {
-    var _syncBlock$data;
+    var _syncBlock$data2;
     const syncBlock = this.getFromCache(resourceId);
     if (!syncBlock) {
       return undefined;
     }
-    return (_syncBlock$data = syncBlock.data) === null || _syncBlock$data === void 0 ? void 0 : _syncBlock$data.sourceURL;
+    return (_syncBlock$data2 = syncBlock.data) === null || _syncBlock$data2 === void 0 ? void 0 : _syncBlock$data2.sourceURL;
   }
   getProviderFactory(resourceId) {
     return this._providerFactoryManager.getProviderFactory(resourceId);

package/dist/es2019/utils/utils.js

@@ -1,9 +1,51 @@
 /* eslint-disable require-unicode-regexp  */
 
+import { fg } from '@atlaskit/platform-feature-flags';
+export const stripAnnotationMarksFromJSONContent = content => {
+  var _strippedContent3;
+  let strippedContent;
+  content.forEach((contentNode, index) => {
+    var _contentNode$marks;
+    if (!contentNode) {
+      var _strippedContent;
+      (_strippedContent = strippedContent) === null || _strippedContent === void 0 ? void 0 : _strippedContent.push(contentNode);
+      return;
+    }
+    const hasAnnotationMark = (_contentNode$marks = contentNode.marks) === null || _contentNode$marks === void 0 ? void 0 : _contentNode$marks.some(mark => mark.type === 'annotation');
+    const childContent = contentNode.content ? stripAnnotationMarksFromJSONContent(contentNode.content) : undefined;
+    const hasContentChanged = childContent !== undefined && childContent !== contentNode.content;
+    if (!hasAnnotationMark && !hasContentChanged) {
+      var _strippedContent2;
+      (_strippedContent2 = strippedContent) === null || _strippedContent2 === void 0 ? void 0 : _strippedContent2.push(contentNode);
+      return;
+    }
+    if (!strippedContent) {
+      strippedContent = content.slice(0, index);
+    }
+    const strippedNode = {
+      ...contentNode
+    };
+    if (hasAnnotationMark) {
+      var _contentNode$marks2;
+      const marks = (_contentNode$marks2 = contentNode.marks) === null || _contentNode$marks2 === void 0 ? void 0 : _contentNode$marks2.filter(mark => mark.type !== 'annotation');
+      if (marks && marks.length > 0) {
+        strippedNode.marks = marks;
+      } else {
+        delete strippedNode.marks;
+      }
+    }
+    if (hasContentChanged && childContent) {
+      strippedNode.content = childContent;
+    }
+    strippedContent.push(strippedNode);
+  });
+  return (_strippedContent3 = strippedContent) !== null && _strippedContent3 !== void 0 ? _strippedContent3 : content;
+};
 export const convertSyncBlockPMNodeToSyncBlockData = node => {
+  const content = node.content.toJSON();
   return {
     blockInstanceId: node.attrs.localId,
-    content: node.content.toJSON(),
+    content: fg('platform_synced_block_patch_12') ? stripAnnotationMarksFromJSONContent(content) : content,
     resourceId: node.attrs.resourceId
   };
 };

package/dist/esm/store-manager/referenceSyncBlockStoreManager.js

@@ -6,16 +6,17 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import isEqual from 'lodash/isEqual';
 import { logException } from '@atlaskit/editor-common/monitoring';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SyncBlockError } from '../common/types';
 import { fetchErrorPayload, fetchSuccessPayload, getSourceInfoErrorPayload, updateReferenceErrorPayload } from '../utils/errorHandling';
 import { getFetchExperience, getFetchSourceInfoExperience, getSaveReferenceExperience } from '../utils/experienceTracking';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
-import { createSyncBlockNode, getSourceProductFromResourceIdSafe } from '../utils/utils';
+import { createSyncBlockNode, getSourceProductFromResourceIdSafe, stripAnnotationMarksFromJSONContent } from '../utils/utils';
 import { SyncBlockBatchFetcher } from './syncBlockBatchFetcher';
 import { syncBlockInMemorySessionCache } from './syncBlockInMemorySessionCache';
 import { SyncBlockProviderFactoryManager } from './syncBlockProviderFactoryManager';
@@ -203,10 +204,27 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       var syncBlockNode = createSyncBlockNode('', resourceId);
       var providerData = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 || (_this$dataProvider2 = _this$dataProvider2.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.data;
       if (providerData) {
-        return providerData;
+        return this.stripAnnotationMarksFromReferenceData(providerData);
       }
       return this.getFromSessionCache(resourceId);
     }
+  }, {
+    key: "stripAnnotationMarksFromReferenceData",
+    value: function stripAnnotationMarksFromReferenceData(syncBlock) {
+      var _syncBlock$data;
+      if (!fg('platform_synced_block_patch_12') || !((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.content)) {
+        return syncBlock;
+      }
+      var content = stripAnnotationMarksFromJSONContent(syncBlock.data.content);
+      if (content === syncBlock.data.content) {
+        return syncBlock;
+      }
+      return _objectSpread(_objectSpread({}, syncBlock), {}, {
+        data: _objectSpread(_objectSpread({}, syncBlock.data), {}, {
+          content: content
+        })
+      });
+    }
   }, {
     key: "updateSessionCache",
     value: function updateSessionCache(resourceId) {
@@ -223,7 +241,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         if (!raw) {
           return undefined;
         }
-        return JSON.parse(raw);
+        return this.stripAnnotationMarksFromReferenceData(JSON.parse(raw));
       } catch (error) {
         logException(error, {
           location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getFromSessionCache'
@@ -594,14 +612,15 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "updateCache",
     value: function updateCache(syncBlock) {
-      var resourceId = syncBlock.resourceId;
+      var sanitizedSyncBlock = this.stripAnnotationMarksFromReferenceData(syncBlock);
+      var resourceId = sanitizedSyncBlock.resourceId;
       if (resourceId) {
         var _this$dataProvider3;
-        (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 || _this$dataProvider3.updateCache(_defineProperty({}, resourceId, syncBlock), {
+        (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 || _this$dataProvider3.updateCache(_defineProperty({}, resourceId, sanitizedSyncBlock), {
           strategy: 'merge',
           source: 'network'
         });
-        this._subscriptionManager.notifySubscriptionCallbacks(resourceId, syncBlock);
+        this._subscriptionManager.notifySubscriptionCallbacks(resourceId, sanitizedSyncBlock);
         this.updateSessionCache(resourceId);
       }
     }
@@ -678,12 +697,12 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "getSyncBlockURL",
     value: function getSyncBlockURL(resourceId) {
-      var _syncBlock$data;
+      var _syncBlock$data2;
       var syncBlock = this.getFromCache(resourceId);
       if (!syncBlock) {
         return undefined;
       }
-      return (_syncBlock$data = syncBlock.data) === null || _syncBlock$data === void 0 ? void 0 : _syncBlock$data.sourceURL;
+      return (_syncBlock$data2 = syncBlock.data) === null || _syncBlock$data2 === void 0 ? void 0 : _syncBlock$data2.sourceURL;
     }
   }, {
     key: "getProviderFactory",

package/dist/esm/utils/utils.js

@@ -1,9 +1,56 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /* eslint-disable require-unicode-regexp  */
 
+import { fg } from '@atlaskit/platform-feature-flags';
+var _stripAnnotationMarksFromJSONContent = function stripAnnotationMarksFromJSONContent(content) {
+  var strippedContent;
+  content.forEach(function (contentNode, index) {
+    var _contentNode$marks;
+    if (!contentNode) {
+      var _strippedContent;
+      (_strippedContent = strippedContent) === null || _strippedContent === void 0 || _strippedContent.push(contentNode);
+      return;
+    }
+    var hasAnnotationMark = (_contentNode$marks = contentNode.marks) === null || _contentNode$marks === void 0 ? void 0 : _contentNode$marks.some(function (mark) {
+      return mark.type === 'annotation';
+    });
+    var childContent = contentNode.content ? _stripAnnotationMarksFromJSONContent(contentNode.content) : undefined;
+    var hasContentChanged = childContent !== undefined && childContent !== contentNode.content;
+    if (!hasAnnotationMark && !hasContentChanged) {
+      var _strippedContent2;
+      (_strippedContent2 = strippedContent) === null || _strippedContent2 === void 0 || _strippedContent2.push(contentNode);
+      return;
+    }
+    if (!strippedContent) {
+      strippedContent = content.slice(0, index);
+    }
+    var strippedNode = _objectSpread({}, contentNode);
+    if (hasAnnotationMark) {
+      var _contentNode$marks2;
+      var marks = (_contentNode$marks2 = contentNode.marks) === null || _contentNode$marks2 === void 0 ? void 0 : _contentNode$marks2.filter(function (mark) {
+        return mark.type !== 'annotation';
+      });
+      if (marks && marks.length > 0) {
+        strippedNode.marks = marks;
+      } else {
+        delete strippedNode.marks;
+      }
+    }
+    if (hasContentChanged && childContent) {
+      strippedNode.content = childContent;
+    }
+    strippedContent.push(strippedNode);
+  });
+  return strippedContent !== null && strippedContent !== void 0 ? strippedContent : content;
+};
+export { _stripAnnotationMarksFromJSONContent as stripAnnotationMarksFromJSONContent };
 export var convertSyncBlockPMNodeToSyncBlockData = function convertSyncBlockPMNodeToSyncBlockData(node) {
+  var content = node.content.toJSON();
   return {
     blockInstanceId: node.attrs.localId,
-    content: node.content.toJSON(),
+    content: fg('platform_synced_block_patch_12') ? _stripAnnotationMarksFromJSONContent(content) : content,
     resourceId: node.attrs.resourceId
   };
 };

package/dist/types/store-manager/referenceSyncBlockStoreManager.d.ts

@@ -65,6 +65,7 @@ export declare class ReferenceSyncBlockStoreManager {
     generateResourceIdForReference(sourceId: ResourceId): ResourceId;
     updateFireAnalyticsEvent(fireAnalyticsEvent?: (payload: RendererSyncBlockEventPayload) => void): void;
     getInitialSyncBlockData(resourceId: ResourceId): SyncBlockInstance | undefined;
+    private stripAnnotationMarksFromReferenceData;
     private updateSessionCache;
     private getFromSessionCache;
     fetchSyncBlockSourceInfoBySourceAri(sourceAri: string, hasAccess?: boolean): Promise<SyncBlockSourceInfo | undefined>;

package/dist/types/utils/utils.d.ts

@@ -1,6 +1,7 @@
-import type { JSONNode } from '@atlaskit/editor-json-transformer';
+import type { JSONNode } from '@atlaskit/editor-json-transformer/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { SyncBlockData, BlockInstanceId, ResourceId, SyncBlockNode, SyncBlockProduct } from '../common/types';
+export declare const stripAnnotationMarksFromJSONContent: <T extends JSONNode | undefined>(content: T[]) => T[];
 export declare const convertSyncBlockPMNodeToSyncBlockData: (node: PMNode) => SyncBlockData;
 export declare const createSyncBlockNode: (localId: BlockInstanceId, resourceId: ResourceId) => SyncBlockNode;
 export declare const convertSyncBlockJSONNodeToSyncBlockNode: (node: JSONNode) => SyncBlockNode | undefined;

package/dist/types-ts4.5/store-manager/referenceSyncBlockStoreManager.d.ts

@@ -65,6 +65,7 @@ export declare class ReferenceSyncBlockStoreManager {
     generateResourceIdForReference(sourceId: ResourceId): ResourceId;
     updateFireAnalyticsEvent(fireAnalyticsEvent?: (payload: RendererSyncBlockEventPayload) => void): void;
     getInitialSyncBlockData(resourceId: ResourceId): SyncBlockInstance | undefined;
+    private stripAnnotationMarksFromReferenceData;
     private updateSessionCache;
     private getFromSessionCache;
     fetchSyncBlockSourceInfoBySourceAri(sourceAri: string, hasAccess?: boolean): Promise<SyncBlockSourceInfo | undefined>;

package/dist/types-ts4.5/utils/utils.d.ts

@@ -1,6 +1,7 @@
-import type { JSONNode } from '@atlaskit/editor-json-transformer';
+import type { JSONNode } from '@atlaskit/editor-json-transformer/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { SyncBlockData, BlockInstanceId, ResourceId, SyncBlockNode, SyncBlockProduct } from '../common/types';
+export declare const stripAnnotationMarksFromJSONContent: <T extends JSONNode | undefined>(content: T[]) => T[];
 export declare const convertSyncBlockPMNodeToSyncBlockData: (node: PMNode) => SyncBlockData;
 export declare const createSyncBlockNode: (localId: BlockInstanceId, resourceId: ResourceId) => SyncBlockNode;
 export declare const convertSyncBlockJSONNodeToSyncBlockNode: (node: JSONNode) => SyncBlockNode | undefined;

package/package.json

@@ -38,7 +38,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.36.0",
+		"@atlaskit/editor-common": "^114.37.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -81,7 +81,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "6.6.5",
+	"version": "6.6.6",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",