@atlaskit/editor-synced-block-provider 8.0.2 → 8.1.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-synced-block-provider
 
+## 8.1.0
+
+### Minor Changes
+
+- [`100d833307949`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/100d833307949) -
+  Allow panel_c1 inside bodied sync blocks
+
 ## 8.0.2
 
 ### Patch Changes

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

@@ -237,19 +237,19 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       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) {
         // Initial provider cache data can come from SSR/prefetch and bypass updateCache(),
-        // so strip annotations here before references render existing synced block payloads.
-        return this.stripAnnotationMarksFromReferenceData(providerData);
+        // so normalize legacy reference payloads here before rendering.
+        return this.normalizeReferenceData(providerData);
       }
       return this.getFromSessionCache(resourceId);
     }
   }, {
-    key: "stripAnnotationMarksFromReferenceData",
-    value: function stripAnnotationMarksFromReferenceData(syncBlock) {
+    key: "normalizeReferenceData",
+    value: function normalizeReferenceData(syncBlock) {
       var _syncBlock$data;
-      if (!((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.content)) {
+      if (!((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && (_syncBlock$data = _syncBlock$data.content) !== null && _syncBlock$data !== void 0 && _syncBlock$data.length)) {
         return syncBlock;
       }
-      var content = (0, _utils.stripAnnotationMarksFromJSONContent)(syncBlock.data.content);
+      var content = (0, _utils.normalizeSyncBlockJSONContent)(syncBlock.data.content);
       if (content === syncBlock.data.content) {
         return syncBlock;
       }
@@ -276,8 +276,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
           return undefined;
         }
         // Session cache entries written before this sanitizer existed may still include
-        // source annotation marks, so keep this read-time safety net for legacy data.
-        return this.stripAnnotationMarksFromReferenceData(JSON.parse(raw));
+        // annotation marks or panel_c1 nodes, so keep this read-time safety net for legacy data.
+        return this.normalizeReferenceData(JSON.parse(raw));
       } catch (error) {
         (0, _monitoring.logException)(error, {
           location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getFromSessionCache'
@@ -687,7 +687,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "updateCache",
     value: function updateCache(syncBlock) {
-      var sanitizedSyncBlock = this.stripAnnotationMarksFromReferenceData(syncBlock);
+      var sanitizedSyncBlock = this.normalizeReferenceData(syncBlock);
       var resourceId = sanitizedSyncBlock.resourceId;
       if (resourceId) {
         var _this$dataProvider3;

package/dist/cjs/utils/utils.js

@@ -4,58 +4,72 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.stripAnnotationMarksFromJSONContent = exports.getSourceProductFromResourceIdSafe = exports.getContentIdAndProductFromResourceId = exports.createSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodesToSyncBlockNodes = exports.convertPMNodeToSyncBlockNode = exports.convertContentUpdatedAt = void 0;
+exports.stripAnnotationMarksFromJSONContent = exports.normalizeSyncBlockJSONContent = 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"));
 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;
+var _normalizeSyncBlockJSONContentInternal = function normalizeSyncBlockJSONContentInternal(content, options) {
+  var normalizedContent;
   content.forEach(function (contentNode, index) {
     var _contentNode$marks;
     if (!contentNode) {
-      var _strippedContent;
-      (_strippedContent = strippedContent) === null || _strippedContent === void 0 || _strippedContent.push(contentNode);
+      var _normalizedContent;
+      (_normalizedContent = normalizedContent) === null || _normalizedContent === void 0 || _normalizedContent.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 shouldConvertPanelC1 = options.convertPanelC1ToPanel && contentNode.type === 'panel_c1';
+    var childContent = contentNode.content ? _normalizeSyncBlockJSONContentInternal(contentNode.content, options) : undefined;
     var hasContentChanged = childContent !== undefined && childContent !== contentNode.content;
-    if (!hasAnnotationMark && !hasContentChanged) {
-      var _strippedContent2;
-      (_strippedContent2 = strippedContent) === null || _strippedContent2 === void 0 || _strippedContent2.push(contentNode);
+    if (!hasAnnotationMark && !shouldConvertPanelC1 && !hasContentChanged) {
+      var _normalizedContent2;
+      (_normalizedContent2 = normalizedContent) === null || _normalizedContent2 === void 0 || _normalizedContent2.push(contentNode);
       return;
     }
-    if (!strippedContent) {
-      strippedContent = content.slice(0, index);
+    if (!normalizedContent) {
+      normalizedContent = content.slice(0, index);
+    }
+    var normalizedNode = _objectSpread({}, contentNode);
+    if (shouldConvertPanelC1) {
+      normalizedNode.type = 'panel';
     }
-    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;
+        normalizedNode.marks = marks;
       } else {
-        delete strippedNode.marks;
+        delete normalizedNode.marks;
       }
     }
     if (hasContentChanged && childContent) {
-      strippedNode.content = childContent;
+      normalizedNode.content = childContent;
     }
-    strippedContent.push(strippedNode);
+    normalizedContent.push(normalizedNode);
+  });
+  return normalizedContent !== null && normalizedContent !== void 0 ? normalizedContent : content;
+};
+var stripAnnotationMarksFromJSONContent = exports.stripAnnotationMarksFromJSONContent = function stripAnnotationMarksFromJSONContent(content) {
+  return _normalizeSyncBlockJSONContentInternal(content, {
+    convertPanelC1ToPanel: false
+  });
+};
+var normalizeSyncBlockJSONContent = exports.normalizeSyncBlockJSONContent = function normalizeSyncBlockJSONContent(content) {
+  return _normalizeSyncBlockJSONContentInternal(content, {
+    convertPanelC1ToPanel: true
   });
-  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: content ? _stripAnnotationMarksFromJSONContent(content) : content,
+    content: content ? normalizeSyncBlockJSONContent(content) : content,
     resourceId: node.attrs.resourceId
   };
 };

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

@@ -6,7 +6,7 @@ import { SyncBlockError } from '../common/types';
 import { cacheDeletionForcedPayload, fetchErrorPayload, fetchSuccessPayload, getSourceInfoErrorPayload, sourceInfoOrphanedPayload, updateReferenceErrorPayload } from '../utils/errorHandling';
 import { getFetchExperience, getFetchSourceInfoExperience, getSaveReferenceExperience } from '../utils/experienceTracking';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
-import { createSyncBlockNode, getSourceProductFromResourceIdSafe, stripAnnotationMarksFromJSONContent } from '../utils/utils';
+import { createSyncBlockNode, getSourceProductFromResourceIdSafe, normalizeSyncBlockJSONContent } from '../utils/utils';
 import { SyncBlockBatchFetcher } from './syncBlockBatchFetcher';
 import { syncBlockInMemorySessionCache } from './syncBlockInMemorySessionCache';
 import { SyncBlockProviderFactoryManager } from './syncBlockProviderFactoryManager';
@@ -164,17 +164,17 @@ export class ReferenceSyncBlockStoreManager {
     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) {
       // Initial provider cache data can come from SSR/prefetch and bypass updateCache(),
-      // so strip annotations here before references render existing synced block payloads.
-      return this.stripAnnotationMarksFromReferenceData(providerData);
+      // so normalize legacy reference payloads here before rendering.
+      return this.normalizeReferenceData(providerData);
     }
     return this.getFromSessionCache(resourceId);
   }
-  stripAnnotationMarksFromReferenceData(syncBlock) {
-    var _syncBlock$data;
-    if (!((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.content)) {
+  normalizeReferenceData(syncBlock) {
+    var _syncBlock$data, _syncBlock$data$conte;
+    if (!((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && (_syncBlock$data$conte = _syncBlock$data.content) !== null && _syncBlock$data$conte !== void 0 && _syncBlock$data$conte.length)) {
       return syncBlock;
     }
-    const content = stripAnnotationMarksFromJSONContent(syncBlock.data.content);
+    const content = normalizeSyncBlockJSONContent(syncBlock.data.content);
     if (content === syncBlock.data.content) {
       return syncBlock;
     }
@@ -199,8 +199,8 @@ export class ReferenceSyncBlockStoreManager {
         return undefined;
       }
       // Session cache entries written before this sanitizer existed may still include
-      // source annotation marks, so keep this read-time safety net for legacy data.
-      return this.stripAnnotationMarksFromReferenceData(JSON.parse(raw));
+      // annotation marks or panel_c1 nodes, so keep this read-time safety net for legacy data.
+      return this.normalizeReferenceData(JSON.parse(raw));
     } catch (error) {
       logException(error, {
         location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getFromSessionCache'
@@ -552,7 +552,7 @@ export class ReferenceSyncBlockStoreManager {
     }
   }
   updateCache(syncBlock) {
-    const sanitizedSyncBlock = this.stripAnnotationMarksFromReferenceData(syncBlock);
+    const sanitizedSyncBlock = this.normalizeReferenceData(syncBlock);
     const {
       resourceId
     } = sanitizedSyncBlock;

package/dist/es2019/utils/utils.js

@@ -1,50 +1,64 @@
 /* eslint-disable require-unicode-regexp  */
 
-export const stripAnnotationMarksFromJSONContent = content => {
-  var _strippedContent3;
-  let strippedContent;
+const normalizeSyncBlockJSONContentInternal = (content, options) => {
+  var _normalizedContent3;
+  let normalizedContent;
   content.forEach((contentNode, index) => {
     var _contentNode$marks;
     if (!contentNode) {
-      var _strippedContent;
-      (_strippedContent = strippedContent) === null || _strippedContent === void 0 ? void 0 : _strippedContent.push(contentNode);
+      var _normalizedContent;
+      (_normalizedContent = normalizedContent) === null || _normalizedContent === void 0 ? void 0 : _normalizedContent.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 shouldConvertPanelC1 = options.convertPanelC1ToPanel && contentNode.type === 'panel_c1';
+    const childContent = contentNode.content ? normalizeSyncBlockJSONContentInternal(contentNode.content, options) : undefined;
     const hasContentChanged = childContent !== undefined && childContent !== contentNode.content;
-    if (!hasAnnotationMark && !hasContentChanged) {
-      var _strippedContent2;
-      (_strippedContent2 = strippedContent) === null || _strippedContent2 === void 0 ? void 0 : _strippedContent2.push(contentNode);
+    if (!hasAnnotationMark && !shouldConvertPanelC1 && !hasContentChanged) {
+      var _normalizedContent2;
+      (_normalizedContent2 = normalizedContent) === null || _normalizedContent2 === void 0 ? void 0 : _normalizedContent2.push(contentNode);
       return;
     }
-    if (!strippedContent) {
-      strippedContent = content.slice(0, index);
+    if (!normalizedContent) {
+      normalizedContent = content.slice(0, index);
     }
-    const strippedNode = {
+    const normalizedNode = {
       ...contentNode
     };
+    if (shouldConvertPanelC1) {
+      normalizedNode.type = 'panel';
+    }
     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;
+        normalizedNode.marks = marks;
       } else {
-        delete strippedNode.marks;
+        delete normalizedNode.marks;
       }
     }
     if (hasContentChanged && childContent) {
-      strippedNode.content = childContent;
+      normalizedNode.content = childContent;
     }
-    strippedContent.push(strippedNode);
+    normalizedContent.push(normalizedNode);
+  });
+  return (_normalizedContent3 = normalizedContent) !== null && _normalizedContent3 !== void 0 ? _normalizedContent3 : content;
+};
+export const stripAnnotationMarksFromJSONContent = content => {
+  return normalizeSyncBlockJSONContentInternal(content, {
+    convertPanelC1ToPanel: false
+  });
+};
+export const normalizeSyncBlockJSONContent = content => {
+  return normalizeSyncBlockJSONContentInternal(content, {
+    convertPanelC1ToPanel: true
   });
-  return (_strippedContent3 = strippedContent) !== null && _strippedContent3 !== void 0 ? _strippedContent3 : content;
 };
 export const convertSyncBlockPMNodeToSyncBlockData = node => {
   const content = node.content.toJSON();
   return {
     blockInstanceId: node.attrs.localId,
-    content: content ? stripAnnotationMarksFromJSONContent(content) : content,
+    content: content ? normalizeSyncBlockJSONContent(content) : content,
     resourceId: node.attrs.resourceId
   };
 };

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

@@ -16,7 +16,7 @@ import { SyncBlockError } from '../common/types';
 import { cacheDeletionForcedPayload, fetchErrorPayload, fetchSuccessPayload, getSourceInfoErrorPayload, sourceInfoOrphanedPayload, updateReferenceErrorPayload } from '../utils/errorHandling';
 import { getFetchExperience, getFetchSourceInfoExperience, getSaveReferenceExperience } from '../utils/experienceTracking';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
-import { createSyncBlockNode, getSourceProductFromResourceIdSafe, stripAnnotationMarksFromJSONContent } from '../utils/utils';
+import { createSyncBlockNode, getSourceProductFromResourceIdSafe, normalizeSyncBlockJSONContent } from '../utils/utils';
 import { SyncBlockBatchFetcher } from './syncBlockBatchFetcher';
 import { syncBlockInMemorySessionCache } from './syncBlockInMemorySessionCache';
 import { SyncBlockProviderFactoryManager } from './syncBlockProviderFactoryManager';
@@ -230,19 +230,19 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       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) {
         // Initial provider cache data can come from SSR/prefetch and bypass updateCache(),
-        // so strip annotations here before references render existing synced block payloads.
-        return this.stripAnnotationMarksFromReferenceData(providerData);
+        // so normalize legacy reference payloads here before rendering.
+        return this.normalizeReferenceData(providerData);
       }
       return this.getFromSessionCache(resourceId);
     }
   }, {
-    key: "stripAnnotationMarksFromReferenceData",
-    value: function stripAnnotationMarksFromReferenceData(syncBlock) {
+    key: "normalizeReferenceData",
+    value: function normalizeReferenceData(syncBlock) {
       var _syncBlock$data;
-      if (!((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.content)) {
+      if (!((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && (_syncBlock$data = _syncBlock$data.content) !== null && _syncBlock$data !== void 0 && _syncBlock$data.length)) {
         return syncBlock;
       }
-      var content = stripAnnotationMarksFromJSONContent(syncBlock.data.content);
+      var content = normalizeSyncBlockJSONContent(syncBlock.data.content);
       if (content === syncBlock.data.content) {
         return syncBlock;
       }
@@ -269,8 +269,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
           return undefined;
         }
         // Session cache entries written before this sanitizer existed may still include
-        // source annotation marks, so keep this read-time safety net for legacy data.
-        return this.stripAnnotationMarksFromReferenceData(JSON.parse(raw));
+        // annotation marks or panel_c1 nodes, so keep this read-time safety net for legacy data.
+        return this.normalizeReferenceData(JSON.parse(raw));
       } catch (error) {
         logException(error, {
           location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getFromSessionCache'
@@ -680,7 +680,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "updateCache",
     value: function updateCache(syncBlock) {
-      var sanitizedSyncBlock = this.stripAnnotationMarksFromReferenceData(syncBlock);
+      var sanitizedSyncBlock = this.normalizeReferenceData(syncBlock);
       var resourceId = sanitizedSyncBlock.resourceId;
       if (resourceId) {
         var _this$dataProvider3;

package/dist/esm/utils/utils.js

@@ -3,53 +3,66 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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  */
 
-var _stripAnnotationMarksFromJSONContent = function stripAnnotationMarksFromJSONContent(content) {
-  var strippedContent;
+var _normalizeSyncBlockJSONContentInternal = function normalizeSyncBlockJSONContentInternal(content, options) {
+  var normalizedContent;
   content.forEach(function (contentNode, index) {
     var _contentNode$marks;
     if (!contentNode) {
-      var _strippedContent;
-      (_strippedContent = strippedContent) === null || _strippedContent === void 0 || _strippedContent.push(contentNode);
+      var _normalizedContent;
+      (_normalizedContent = normalizedContent) === null || _normalizedContent === void 0 || _normalizedContent.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 shouldConvertPanelC1 = options.convertPanelC1ToPanel && contentNode.type === 'panel_c1';
+    var childContent = contentNode.content ? _normalizeSyncBlockJSONContentInternal(contentNode.content, options) : undefined;
     var hasContentChanged = childContent !== undefined && childContent !== contentNode.content;
-    if (!hasAnnotationMark && !hasContentChanged) {
-      var _strippedContent2;
-      (_strippedContent2 = strippedContent) === null || _strippedContent2 === void 0 || _strippedContent2.push(contentNode);
+    if (!hasAnnotationMark && !shouldConvertPanelC1 && !hasContentChanged) {
+      var _normalizedContent2;
+      (_normalizedContent2 = normalizedContent) === null || _normalizedContent2 === void 0 || _normalizedContent2.push(contentNode);
       return;
     }
-    if (!strippedContent) {
-      strippedContent = content.slice(0, index);
+    if (!normalizedContent) {
+      normalizedContent = content.slice(0, index);
+    }
+    var normalizedNode = _objectSpread({}, contentNode);
+    if (shouldConvertPanelC1) {
+      normalizedNode.type = 'panel';
     }
-    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;
+        normalizedNode.marks = marks;
       } else {
-        delete strippedNode.marks;
+        delete normalizedNode.marks;
       }
     }
     if (hasContentChanged && childContent) {
-      strippedNode.content = childContent;
+      normalizedNode.content = childContent;
     }
-    strippedContent.push(strippedNode);
+    normalizedContent.push(normalizedNode);
+  });
+  return normalizedContent !== null && normalizedContent !== void 0 ? normalizedContent : content;
+};
+export var stripAnnotationMarksFromJSONContent = function stripAnnotationMarksFromJSONContent(content) {
+  return _normalizeSyncBlockJSONContentInternal(content, {
+    convertPanelC1ToPanel: false
+  });
+};
+export var normalizeSyncBlockJSONContent = function normalizeSyncBlockJSONContent(content) {
+  return _normalizeSyncBlockJSONContentInternal(content, {
+    convertPanelC1ToPanel: true
   });
-  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: content ? _stripAnnotationMarksFromJSONContent(content) : content,
+    content: content ? normalizeSyncBlockJSONContent(content) : content,
     resourceId: node.attrs.resourceId
   };
 };

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

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

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

@@ -2,6 +2,7 @@ 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 normalizeSyncBlockJSONContent: <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

@@ -74,7 +74,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "8.0.2",
+	"version": "8.1.0",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",