@atlaskit/editor-plugin-synced-block 4.2.13 → 4.2.15

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 4.2.15
+
+### Patch Changes
+
+- [`a9159bf9608a8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a9159bf9608a8) -
+  [ux] Fix edit link disabled on reference sync block by setting syncBlockStore in nodeview from
+  plugin state
+
+## 4.2.14
+
+### Patch Changes
+
+- [`964b980644f9d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/964b980644f9d) -
+  EDITOR-3348 Refactor Synced Block Store Manager
+- Updated dependencies
+
 ## 4.2.13
 
 ### Patch Changes

package/dist/cjs/editor-actions/index.js

@@ -5,5 +5,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.flushBodiedSyncBlocks = void 0;
 var flushBodiedSyncBlocks = exports.flushBodiedSyncBlocks = function flushBodiedSyncBlocks(syncBlockStore) {
-  return syncBlockStore.flushBodiedSyncBlocks();
+  return syncBlockStore.sourceManager.flush();
 };

package/dist/cjs/editor-commands/index.js

@@ -19,7 +19,7 @@ var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_
 
   // If the selection is empty, we want to insert the sync block on a new line
   if (tr.selection.empty) {
-    var attrs = syncBlockStore.generateBodiedSyncBlockAttrs();
+    var attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
     var paragraphNode = paragraph.createAndFill({});
     var newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(attrs, paragraphNode ? [paragraphNode] : []);
     if (!newBodiedSyncBlockNode) {
@@ -28,7 +28,7 @@ var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_
 
     // Save the new node with empty content to backend
     // This is so that the node can be copied and referenced without the source being saved/published
-    syncBlockStore.createBodiedSyncBlockNode(attrs);
+    syncBlockStore.sourceManager.createBodiedSyncBlockNode(attrs);
     if (typeAheadInsert) {
       tr = typeAheadInsert(newBodiedSyncBlockNode);
     } else {
@@ -40,7 +40,7 @@ var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_
       // TODO: EDITOR-1665 - Raise an error analytics event
       return false;
     }
-    var _attrs = syncBlockStore.generateBodiedSyncBlockAttrs();
+    var _attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
     var _newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(_attrs, conversionInfo.contentToInclude);
     if (!_newBodiedSyncBlockNode) {
       return false;
@@ -48,7 +48,7 @@ var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_
 
     // Save the new node with empty content to backend
     // This is so that the node can be copied and referenced without the source being saved/published
-    syncBlockStore.createBodiedSyncBlockNode(_attrs);
+    syncBlockStore.sourceManager.createBodiedSyncBlockNode(_attrs);
     tr.replaceWith(conversionInfo.from > 0 ? conversionInfo.from - 1 : 0, conversionInfo.to, _newBodiedSyncBlockNode).scrollIntoView();
 
     // set selection to the end of the previous selection + 1 for the position taken up by the start of the new synced block
@@ -104,7 +104,7 @@ var editSyncedBlockSource = exports.editSyncedBlockSource = function editSyncedB
     if (!resourceId) {
       return false;
     }
-    var syncBlockURL = syncBlockStore.getSyncBlockURL(resourceId);
+    var syncBlockURL = syncBlockStore.referenceManager.getSyncBlockURL(resourceId);
     if (syncBlockURL) {
       window.open(syncBlockURL, '_blank');
     } else {

package/dist/cjs/nodeviews/bodiedSyncedBlock.js

@@ -28,7 +28,6 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
     var _this;
     (0, _classCallCheck2.default)(this, BodiedSyncBlock);
     _this = _callSuper(this, BodiedSyncBlock, [props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props]);
-    _this.syncBlockStore = props.syncBlockStore;
     _this.api = props.api;
     _this.handleConnectivityModeChange();
     _this.handleViewModeChange();
@@ -89,9 +88,14 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "render",
     value: function render(_props, forwardRef) {
+      var _this$api5;
+      var syncBlockStore = (_this$api5 = this.api) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.syncedBlock.sharedState) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.currentState()) === null || _this$api5 === void 0 ? void 0 : _this$api5.syncBlockStore;
+      if (!syncBlockStore) {
+        return null;
+      }
       return /*#__PURE__*/_react.default.createElement(_BodiedSyncBlockWrapper.BodiedSyncBlockWrapper, {
         ref: forwardRef,
-        syncBlockStore: this.syncBlockStore,
+        syncBlockStore: syncBlockStore,
         node: this.node
       });
     }
@@ -127,8 +131,7 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
 var bodiedSyncBlockNodeView = exports.bodiedSyncBlockNodeView = function bodiedSyncBlockNodeView(_ref4) {
   var pluginOptions = _ref4.pluginOptions,
     pmPluginFactoryParams = _ref4.pmPluginFactoryParams,
-    api = _ref4.api,
-    syncBlockStore = _ref4.syncBlockStore;
+    api = _ref4.api;
   return function (node, view, getPos) {
     var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
       eventDispatcher = pmPluginFactoryParams.eventDispatcher;
@@ -139,8 +142,7 @@ var bodiedSyncBlockNodeView = exports.bodiedSyncBlockNodeView = function bodiedS
       view: view,
       getPos: getPos,
       portalProviderAPI: portalProviderAPI,
-      eventDispatcher: eventDispatcher,
-      syncBlockStore: syncBlockStore
+      eventDispatcher: eventDispatcher
     }).init();
   };
 };

package/dist/cjs/nodeviews/syncedBlock.js

@@ -25,7 +25,7 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
     (0, _classCallCheck2.default)(this, SyncBlock);
     _this = _callSuper(this, SyncBlock, [props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props]);
     _this.options = props.options;
-    _this.syncBlockStore = props.syncBlockStore;
+    _this.api = props.api;
     return _this;
   }
   (0, _inherits2.default)(SyncBlock, _ReactNodeView);
@@ -40,6 +40,7 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
     key: "render",
     value: function render() {
       var _this$options,
+        _this$api,
         _this$options2,
         _this2 = this;
       if (!((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.syncedBlockRenderer)) {
@@ -51,16 +52,20 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       if (!resourceId || !localId) {
         return null;
       }
+      var syncBlockStore = (_this$api = this.api) === null || _this$api === void 0 || (_this$api = _this$api.syncedBlock) === null || _this$api === void 0 || (_this$api = _this$api.sharedState.currentState()) === null || _this$api === void 0 ? void 0 : _this$api.syncBlockStore;
+      if (!syncBlockStore) {
+        return null;
+      }
 
       // get document node from data provider
       return /*#__PURE__*/_react.default.createElement(_SyncBlockRendererWrapper.SyncBlockRendererWrapper, {
         localId: this.node.attrs.localId,
         syncedBlockRenderer: (_this$options2 = this.options) === null || _this$options2 === void 0 ? void 0 : _this$options2.syncedBlockRenderer,
         useFetchSyncBlockTitle: function useFetchSyncBlockTitle() {
-          return (0, _editorSyncedBlockProvider.useFetchSyncBlockTitle)(_this2.syncBlockStore, _this2.node);
+          return (0, _editorSyncedBlockProvider.useFetchSyncBlockTitle)(syncBlockStore, _this2.node);
         },
         useFetchSyncBlockData: function useFetchSyncBlockData() {
-          return (0, _editorSyncedBlockProvider.useFetchSyncBlockData)(_this2.syncBlockStore, resourceId, localId);
+          return (0, _editorSyncedBlockProvider.useFetchSyncBlockData)(syncBlockStore, resourceId, localId);
         }
       });
     }
@@ -76,8 +81,7 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
 var syncBlockNodeView = exports.syncBlockNodeView = function syncBlockNodeView(_ref) {
   var options = _ref.options,
     pmPluginFactoryParams = _ref.pmPluginFactoryParams,
-    api = _ref.api,
-    syncBlockStore = _ref.syncBlockStore;
+    api = _ref.api;
   return function (node, view, getPos) {
     var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
       eventDispatcher = pmPluginFactoryParams.eventDispatcher;
@@ -88,8 +92,7 @@ var syncBlockNodeView = exports.syncBlockNodeView = function syncBlockNodeView(_
       view: view,
       getPos: getPos,
       portalProviderAPI: portalProviderAPI,
-      eventDispatcher: eventDispatcher,
-      syncBlockStore: syncBlockStore
+      eventDispatcher: eventDispatcher
     }).init();
   };
 };

package/dist/cjs/pm-plugins/main.js

@@ -9,6 +9,7 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
 var _bodiedLazySyncedBlock = require("../nodeviews/bodiedLazySyncedBlock");
 var _lazySyncedBlock = require("../nodeviews/lazySyncedBlock");
 var _types = require("../types");
@@ -27,10 +28,11 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         var syncBlockNodes = instance.doc.children.filter(function (node) {
           return node.type.name === 'syncBlock';
         });
-        syncBlockStore.fetchSyncBlocksData(syncBlockNodes);
+        syncBlockStore.referenceManager.fetchSyncBlocksData((0, _editorSyncedBlockProvider.convertPMNodesToSyncBlockNodes)(syncBlockNodes));
         return {
           selectionDecorationSet: (0, _selectionDecorations.calculateDecorations)(instance.doc, instance.selection, instance.schema),
-          showFlag: false
+          showFlag: false,
+          syncBlockStore: syncBlockStore
         };
       },
       apply: function apply(tr, currentPluginState, oldEditorState) {
@@ -44,7 +46,8 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         }
         return {
           showFlag: (_meta$showFlag = meta === null || meta === void 0 ? void 0 : meta.showFlag) !== null && _meta$showFlag !== void 0 ? _meta$showFlag : showFlag,
-          selectionDecorationSet: newDecorationSet
+          selectionDecorationSet: newDecorationSet,
+          syncBlockStore: syncBlockStore
         };
       }
     },
@@ -53,14 +56,12 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         syncBlock: (0, _lazySyncedBlock.lazySyncBlockView)({
           options: options,
           pmPluginFactoryParams: pmPluginFactoryParams,
-          api: api,
-          syncBlockStore: syncBlockStore
+          api: api
         }),
         bodiedSyncBlock: (0, _bodiedLazySyncedBlock.lazyBodiedSyncBlockView)({
           pluginOptions: options,
           pmPluginFactoryParams: pmPluginFactoryParams,
-          api: api,
-          syncBlockStore: syncBlockStore
+          api: api
         })
       },
       decorations: function decorations(state) {
@@ -100,10 +101,10 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
       }
     },
     view: function view(editorView) {
-      syncBlockStore.setEditorView(editorView);
+      syncBlockStore.sourceManager.setEditorView(editorView);
       return {
         destroy: function destroy() {
-          syncBlockStore.setEditorView(undefined);
+          syncBlockStore.sourceManager.setEditorView(undefined);
         }
       };
     },
@@ -115,10 +116,10 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
       // or are from remote (collab) or already confirmed sync block deletion
       // We only care about local changes that change the document
       // and are not yet confirmed for sync block deletion
-      if (!tr.docChanged || !(syncBlockStore !== null && syncBlockStore !== void 0 && syncBlockStore.requireConfirmationBeforeDelete()) && !syncBlockStore.hasPendingCreation() || Boolean(tr.getMeta('isRemote')) || Boolean(tr.getMeta('isCommitSyncBlockCreation')) || !isOffline && isConfirmedSyncBlockDeletion) {
+      if (!tr.docChanged || !(syncBlockStore !== null && syncBlockStore !== void 0 && syncBlockStore.sourceManager.requireConfirmationBeforeDelete()) && !syncBlockStore.sourceManager.hasPendingCreation() || Boolean(tr.getMeta('isRemote')) || Boolean(tr.getMeta('isCommitSyncBlockCreation')) || !isOffline && isConfirmedSyncBlockDeletion) {
         return true;
       }
-      var _trackSyncBlocks = (0, _trackSyncBlocks3.trackSyncBlocks)(syncBlockStore.isSourceBlock, tr, state),
+      var _trackSyncBlocks = (0, _trackSyncBlocks3.trackSyncBlocks)(syncBlockStore.sourceManager.isSourceBlock, tr, state),
         bodiedSyncBlockRemoved = _trackSyncBlocks.removed,
         bodiedSyncBlockAdded = _trackSyncBlocks.added;
       if (!isOffline) {
@@ -127,14 +128,14 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           // we block the transaction here, and wait for user confirmation to proceed with deletion.
           // See editor-common/src/sync-block/sync-block-store-manager.ts for how we handle user confirmation and
           // proceed with deletion.
-          syncBlockStore.deleteSyncBlocksWithConfirmation(tr, bodiedSyncBlockRemoved);
+          syncBlockStore.sourceManager.deleteSyncBlocksWithConfirmation(tr, bodiedSyncBlockRemoved);
           return false;
         }
         if (bodiedSyncBlockAdded.length > 0) {
           // If there is bodiedSyncBlock node addition and it's waiting for the result of saving the node to backend (syncBlockStore.hasPendingCreation()),
           // we need to intercept the transaction and save it in insert callback so that we only insert it to the document when backend call if backend call is successful
           // The callback will be evoked by in SourceSyncBlockStoreManager.commitPendingCreation
-          syncBlockStore.registerCreationCallback(function () {
+          syncBlockStore.sourceManager.registerCreationCallback(function () {
             var _api$core;
             api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function () {
               return tr.setMeta('isCommitSyncBlockCreation', true);
@@ -177,7 +178,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
       trs.filter(function (tr) {
         return tr.docChanged;
       }).forEach(function (tr) {
-        syncBlockStore === null || syncBlockStore === void 0 || syncBlockStore.rebaseTransaction(tr, newState);
+        syncBlockStore === null || syncBlockStore === void 0 || syncBlockStore.sourceManager.rebaseTransaction(tr, newState);
       });
       return null;
     }

package/dist/cjs/syncedBlockPlugin.js

@@ -113,9 +113,11 @@ var syncedBlockPlugin = exports.syncedBlockPlugin = function syncedBlockPlugin(_
         return;
       }
       var _syncedBlockPluginKey = _main.syncedBlockPluginKey.getState(editorState),
-        showFlag = _syncedBlockPluginKey.showFlag;
+        showFlag = _syncedBlockPluginKey.showFlag,
+        currentSyncBlockStore = _syncedBlockPluginKey.syncBlockStore;
       return {
-        showFlag: showFlag
+        showFlag: showFlag,
+        syncBlockStore: currentSyncBlockStore
       };
     }
   };

package/dist/cjs/ui/DeleteConfirmationModal.js

@@ -54,7 +54,7 @@ var DeleteConfirmationModal = exports.DeleteConfirmationModal = function DeleteC
     return confirmedPromise;
   }, []);
   (0, _react.useEffect)(function () {
-    var unregister = syncBlockStoreManager.registerConfirmationCallback(confirmationCallback);
+    var unregister = syncBlockStoreManager.sourceManager.registerConfirmationCallback(confirmationCallback);
     return function () {
       unregister();
     };

package/dist/cjs/ui/SyncBlockRefresher.js

@@ -27,7 +27,7 @@ var SyncBlockRefresher = exports.SyncBlockRefresher = function SyncBlockRefreshe
         var _document;
         // check if document is visible to avoid unnecessary refreshes
         if (((_document = document) === null || _document === void 0 ? void 0 : _document.visibilityState) === 'visible') {
-          syncBlockStoreManager.refreshSubscriptions();
+          syncBlockStoreManager.referenceManager.refreshSubscriptions();
         }
       }, SYNC_BLOCK_FETCH_INTERVAL);
     } else if (interval !== -1) {

package/dist/cjs/ui/floating-toolbar.js

@@ -50,7 +50,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(stat
     onClick: _editorCommands.copySyncedBlockReferenceToClipboard
   }, hoverDecorationProps(nodeType, _consts.akEditorSelectedNodeClassName));
   items.push(copyButton);
-  var disabled = !syncBlockStore.getSyncBlockURL(syncBlockObject.node.attrs.resourceId);
+  var disabled = !syncBlockStore.referenceManager.getSyncBlockURL(syncBlockObject.node.attrs.resourceId);
   if (!isBodiedSyncBlock) {
     var editSourceButton = _objectSpread({
       id: 'editor.syncedBlock.editSource',

package/dist/es2019/editor-actions/index.js

@@ -1,3 +1,3 @@
 export const flushBodiedSyncBlocks = syncBlockStore => {
-  return syncBlockStore.flushBodiedSyncBlocks();
+  return syncBlockStore.sourceManager.flush();
 };

package/dist/es2019/editor-commands/index.js

@@ -19,7 +19,7 @@ export const createSyncedBlock = ({
 
   // If the selection is empty, we want to insert the sync block on a new line
   if (tr.selection.empty) {
-    const attrs = syncBlockStore.generateBodiedSyncBlockAttrs();
+    const attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
     const paragraphNode = paragraph.createAndFill({});
     const newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(attrs, paragraphNode ? [paragraphNode] : []);
     if (!newBodiedSyncBlockNode) {
@@ -28,7 +28,7 @@ export const createSyncedBlock = ({
 
     // Save the new node with empty content to backend
     // This is so that the node can be copied and referenced without the source being saved/published
-    syncBlockStore.createBodiedSyncBlockNode(attrs);
+    syncBlockStore.sourceManager.createBodiedSyncBlockNode(attrs);
     if (typeAheadInsert) {
       tr = typeAheadInsert(newBodiedSyncBlockNode);
     } else {
@@ -40,7 +40,7 @@ export const createSyncedBlock = ({
       // TODO: EDITOR-1665 - Raise an error analytics event
       return false;
     }
-    const attrs = syncBlockStore.generateBodiedSyncBlockAttrs();
+    const attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
     const newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(attrs, conversionInfo.contentToInclude);
     if (!newBodiedSyncBlockNode) {
       return false;
@@ -48,7 +48,7 @@ export const createSyncedBlock = ({
 
     // Save the new node with empty content to backend
     // This is so that the node can be copied and referenced without the source being saved/published
-    syncBlockStore.createBodiedSyncBlockNode(attrs);
+    syncBlockStore.sourceManager.createBodiedSyncBlockNode(attrs);
     tr.replaceWith(conversionInfo.from > 0 ? conversionInfo.from - 1 : 0, conversionInfo.to, newBodiedSyncBlockNode).scrollIntoView();
 
     // set selection to the end of the previous selection + 1 for the position taken up by the start of the new synced block
@@ -108,7 +108,7 @@ export const editSyncedBlockSource = (syncBlockStore, api) => (state, dispatch,
   if (!resourceId) {
     return false;
   }
-  const syncBlockURL = syncBlockStore.getSyncBlockURL(resourceId);
+  const syncBlockURL = syncBlockStore.referenceManager.getSyncBlockURL(resourceId);
   if (syncBlockURL) {
     window.open(syncBlockURL, '_blank');
   } else {

package/dist/es2019/nodeviews/bodiedSyncedBlock.js

@@ -10,7 +10,6 @@ const toDOM = () => ['div', {
 class BodiedSyncBlock extends ReactNodeView {
   constructor(props) {
     super(props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props);
-    this.syncBlockStore = props.syncBlockStore;
     this.api = props.api;
     this.handleConnectivityModeChange();
     this.handleViewModeChange();
@@ -60,9 +59,14 @@ class BodiedSyncBlock extends ReactNodeView {
     return domRef;
   }
   render(_props, forwardRef) {
+    var _this$api5, _this$api5$syncedBloc, _this$api5$syncedBloc2;
+    const syncBlockStore = (_this$api5 = this.api) === null || _this$api5 === void 0 ? void 0 : (_this$api5$syncedBloc = _this$api5.syncedBlock.sharedState) === null || _this$api5$syncedBloc === void 0 ? void 0 : (_this$api5$syncedBloc2 = _this$api5$syncedBloc.currentState()) === null || _this$api5$syncedBloc2 === void 0 ? void 0 : _this$api5$syncedBloc2.syncBlockStore;
+    if (!syncBlockStore) {
+      return null;
+    }
     return /*#__PURE__*/React.createElement(BodiedSyncBlockWrapper, {
       ref: forwardRef,
-      syncBlockStore: this.syncBlockStore,
+      syncBlockStore: syncBlockStore,
       node: this.node
     });
   }
@@ -94,8 +98,7 @@ class BodiedSyncBlock extends ReactNodeView {
 export const bodiedSyncBlockNodeView = ({
   pluginOptions,
   pmPluginFactoryParams,
-  api,
-  syncBlockStore
+  api
 }) => (node, view, getPos) => {
   const {
     portalProviderAPI,
@@ -108,7 +111,6 @@ export const bodiedSyncBlockNodeView = ({
     view,
     getPos,
     portalProviderAPI,
-    eventDispatcher,
-    syncBlockStore
+    eventDispatcher
   }).init();
 };

package/dist/es2019/nodeviews/syncedBlock.js

@@ -7,7 +7,7 @@ class SyncBlock extends ReactNodeView {
   constructor(props) {
     super(props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props);
     this.options = props.options;
-    this.syncBlockStore = props.syncBlockStore;
+    this.api = props.api;
   }
   createDomRef() {
     const domRef = document.createElement('div');
@@ -15,7 +15,7 @@ class SyncBlock extends ReactNodeView {
     return domRef;
   }
   render() {
-    var _this$options, _this$options2;
+    var _this$options, _this$api, _this$api$syncedBlock, _this$api$syncedBlock2, _this$options2;
     if (!((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.syncedBlockRenderer)) {
       return null;
     }
@@ -26,13 +26,17 @@ class SyncBlock extends ReactNodeView {
     if (!resourceId || !localId) {
       return null;
     }
+    const syncBlockStore = (_this$api = this.api) === null || _this$api === void 0 ? void 0 : (_this$api$syncedBlock = _this$api.syncedBlock) === null || _this$api$syncedBlock === void 0 ? void 0 : (_this$api$syncedBlock2 = _this$api$syncedBlock.sharedState.currentState()) === null || _this$api$syncedBlock2 === void 0 ? void 0 : _this$api$syncedBlock2.syncBlockStore;
+    if (!syncBlockStore) {
+      return null;
+    }
 
     // get document node from data provider
     return /*#__PURE__*/React.createElement(SyncBlockRendererWrapper, {
       localId: this.node.attrs.localId,
       syncedBlockRenderer: (_this$options2 = this.options) === null || _this$options2 === void 0 ? void 0 : _this$options2.syncedBlockRenderer,
-      useFetchSyncBlockTitle: () => useFetchSyncBlockTitle(this.syncBlockStore, this.node),
-      useFetchSyncBlockData: () => useFetchSyncBlockData(this.syncBlockStore, resourceId, localId)
+      useFetchSyncBlockTitle: () => useFetchSyncBlockTitle(syncBlockStore, this.node),
+      useFetchSyncBlockData: () => useFetchSyncBlockData(syncBlockStore, resourceId, localId)
     });
   }
   destroy() {
@@ -44,8 +48,7 @@ class SyncBlock extends ReactNodeView {
 export const syncBlockNodeView = ({
   options,
   pmPluginFactoryParams,
-  api,
-  syncBlockStore
+  api
 }) => (node, view, getPos) => {
   const {
     portalProviderAPI,
@@ -58,7 +61,6 @@ export const syncBlockNodeView = ({
     view,
     getPos,
     portalProviderAPI,
-    eventDispatcher,
-    syncBlockStore
+    eventDispatcher
   }).init();
 };

package/dist/es2019/pm-plugins/main.js

@@ -3,6 +3,7 @@ import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { BodiedSyncBlockSharedCssClassName, SyncBlockStateCssClassName } from '@atlaskit/editor-common/sync-block';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
+import { convertPMNodesToSyncBlockNodes } from '@atlaskit/editor-synced-block-provider';
 import { lazyBodiedSyncBlockView } from '../nodeviews/bodiedLazySyncedBlock';
 import { lazySyncBlockView } from '../nodeviews/lazySyncedBlock';
 import { FLAG_ID } from '../types';
@@ -19,10 +20,11 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
     state: {
       init(_, instance) {
         const syncBlockNodes = instance.doc.children.filter(node => node.type.name === 'syncBlock');
-        syncBlockStore.fetchSyncBlocksData(syncBlockNodes);
+        syncBlockStore.referenceManager.fetchSyncBlocksData(convertPMNodesToSyncBlockNodes(syncBlockNodes));
         return {
           selectionDecorationSet: calculateDecorations(instance.doc, instance.selection, instance.schema),
-          showFlag: false
+          showFlag: false,
+          syncBlockStore: syncBlockStore
         };
       },
       apply: (tr, currentPluginState, oldEditorState) => {
@@ -38,7 +40,8 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         }
         return {
           showFlag: (_meta$showFlag = meta === null || meta === void 0 ? void 0 : meta.showFlag) !== null && _meta$showFlag !== void 0 ? _meta$showFlag : showFlag,
-          selectionDecorationSet: newDecorationSet
+          selectionDecorationSet: newDecorationSet,
+          syncBlockStore: syncBlockStore
         };
       }
     },
@@ -47,14 +50,12 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         syncBlock: lazySyncBlockView({
           options,
           pmPluginFactoryParams,
-          api,
-          syncBlockStore
+          api
         }),
         bodiedSyncBlock: lazyBodiedSyncBlockView({
           pluginOptions: options,
           pmPluginFactoryParams,
-          api,
-          syncBlockStore
+          api
         })
       },
       decorations: state => {
@@ -94,10 +95,10 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
       }
     },
     view: editorView => {
-      syncBlockStore.setEditorView(editorView);
+      syncBlockStore.sourceManager.setEditorView(editorView);
       return {
         destroy() {
-          syncBlockStore.setEditorView(undefined);
+          syncBlockStore.sourceManager.setEditorView(undefined);
         }
       };
     },
@@ -109,27 +110,27 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
       // or are from remote (collab) or already confirmed sync block deletion
       // We only care about local changes that change the document
       // and are not yet confirmed for sync block deletion
-      if (!tr.docChanged || !(syncBlockStore !== null && syncBlockStore !== void 0 && syncBlockStore.requireConfirmationBeforeDelete()) && !syncBlockStore.hasPendingCreation() || Boolean(tr.getMeta('isRemote')) || Boolean(tr.getMeta('isCommitSyncBlockCreation')) || !isOffline && isConfirmedSyncBlockDeletion) {
+      if (!tr.docChanged || !(syncBlockStore !== null && syncBlockStore !== void 0 && syncBlockStore.sourceManager.requireConfirmationBeforeDelete()) && !syncBlockStore.sourceManager.hasPendingCreation() || Boolean(tr.getMeta('isRemote')) || Boolean(tr.getMeta('isCommitSyncBlockCreation')) || !isOffline && isConfirmedSyncBlockDeletion) {
         return true;
       }
       const {
         removed: bodiedSyncBlockRemoved,
         added: bodiedSyncBlockAdded
-      } = trackSyncBlocks(syncBlockStore.isSourceBlock, tr, state);
+      } = trackSyncBlocks(syncBlockStore.sourceManager.isSourceBlock, tr, state);
       if (!isOffline) {
         if (bodiedSyncBlockRemoved.length > 0) {
           // If there are source sync blocks being removed, and we need to confirm with user before deleting,
           // we block the transaction here, and wait for user confirmation to proceed with deletion.
           // See editor-common/src/sync-block/sync-block-store-manager.ts for how we handle user confirmation and
           // proceed with deletion.
-          syncBlockStore.deleteSyncBlocksWithConfirmation(tr, bodiedSyncBlockRemoved);
+          syncBlockStore.sourceManager.deleteSyncBlocksWithConfirmation(tr, bodiedSyncBlockRemoved);
           return false;
         }
         if (bodiedSyncBlockAdded.length > 0) {
           // If there is bodiedSyncBlock node addition and it's waiting for the result of saving the node to backend (syncBlockStore.hasPendingCreation()),
           // we need to intercept the transaction and save it in insert callback so that we only insert it to the document when backend call if backend call is successful
           // The callback will be evoked by in SourceSyncBlockStoreManager.commitPendingCreation
-          syncBlockStore.registerCreationCallback(() => {
+          syncBlockStore.sourceManager.registerCreationCallback(() => {
             var _api$core;
             api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(() => {
               return tr.setMeta('isCommitSyncBlockCreation', true);
@@ -170,7 +171,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
     },
     appendTransaction: (trs, _oldState, newState) => {
       trs.filter(tr => tr.docChanged).forEach(tr => {
-        syncBlockStore === null || syncBlockStore === void 0 ? void 0 : syncBlockStore.rebaseTransaction(tr, newState);
+        syncBlockStore === null || syncBlockStore === void 0 ? void 0 : syncBlockStore.sourceManager.rebaseTransaction(tr, newState);
       });
       return null;
     }

package/dist/es2019/syncedBlockPlugin.js

@@ -95,10 +95,12 @@ export const syncedBlockPlugin = ({
         return;
       }
       const {
-        showFlag
+        showFlag,
+        syncBlockStore: currentSyncBlockStore
       } = syncedBlockPluginKey.getState(editorState);
       return {
-        showFlag
+        showFlag,
+        syncBlockStore: currentSyncBlockStore
       };
     }
   };

package/dist/es2019/ui/DeleteConfirmationModal.js

@@ -39,7 +39,7 @@ export const DeleteConfirmationModal = ({
     return confirmedPromise;
   }, []);
   useEffect(() => {
-    const unregister = syncBlockStoreManager.registerConfirmationCallback(confirmationCallback);
+    const unregister = syncBlockStoreManager.sourceManager.registerConfirmationCallback(confirmationCallback);
     return () => {
       unregister();
     };

package/dist/es2019/ui/SyncBlockRefresher.js

@@ -23,7 +23,7 @@ export const SyncBlockRefresher = ({
         var _document;
         // check if document is visible to avoid unnecessary refreshes
         if (((_document = document) === null || _document === void 0 ? void 0 : _document.visibilityState) === 'visible') {
-          syncBlockStoreManager.refreshSubscriptions();
+          syncBlockStoreManager.referenceManager.refreshSubscriptions();
         }
       }, SYNC_BLOCK_FETCH_INTERVAL);
     } else if (interval !== -1) {

package/dist/es2019/ui/floating-toolbar.js

@@ -45,7 +45,7 @@ export const getToolbarConfig = (state, intl, api, syncBlockStore) => {
     ...hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)
   };
   items.push(copyButton);
-  const disabled = !syncBlockStore.getSyncBlockURL(syncBlockObject.node.attrs.resourceId);
+  const disabled = !syncBlockStore.referenceManager.getSyncBlockURL(syncBlockObject.node.attrs.resourceId);
   if (!isBodiedSyncBlock) {
     const editSourceButton = {
       id: 'editor.syncedBlock.editSource',

package/dist/esm/editor-actions/index.js

@@ -1,3 +1,3 @@
 export var flushBodiedSyncBlocks = function flushBodiedSyncBlocks(syncBlockStore) {
-  return syncBlockStore.flushBodiedSyncBlocks();
+  return syncBlockStore.sourceManager.flush();
 };

package/dist/esm/editor-commands/index.js

@@ -13,7 +13,7 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
 
   // If the selection is empty, we want to insert the sync block on a new line
   if (tr.selection.empty) {
-    var attrs = syncBlockStore.generateBodiedSyncBlockAttrs();
+    var attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
     var paragraphNode = paragraph.createAndFill({});
     var newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(attrs, paragraphNode ? [paragraphNode] : []);
     if (!newBodiedSyncBlockNode) {
@@ -22,7 +22,7 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
 
     // Save the new node with empty content to backend
     // This is so that the node can be copied and referenced without the source being saved/published
-    syncBlockStore.createBodiedSyncBlockNode(attrs);
+    syncBlockStore.sourceManager.createBodiedSyncBlockNode(attrs);
     if (typeAheadInsert) {
       tr = typeAheadInsert(newBodiedSyncBlockNode);
     } else {
@@ -34,7 +34,7 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
       // TODO: EDITOR-1665 - Raise an error analytics event
       return false;
     }
-    var _attrs = syncBlockStore.generateBodiedSyncBlockAttrs();
+    var _attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
     var _newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(_attrs, conversionInfo.contentToInclude);
     if (!_newBodiedSyncBlockNode) {
       return false;
@@ -42,7 +42,7 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
 
     // Save the new node with empty content to backend
     // This is so that the node can be copied and referenced without the source being saved/published
-    syncBlockStore.createBodiedSyncBlockNode(_attrs);
+    syncBlockStore.sourceManager.createBodiedSyncBlockNode(_attrs);
     tr.replaceWith(conversionInfo.from > 0 ? conversionInfo.from - 1 : 0, conversionInfo.to, _newBodiedSyncBlockNode).scrollIntoView();
 
     // set selection to the end of the previous selection + 1 for the position taken up by the start of the new synced block
@@ -98,7 +98,7 @@ export var editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore
     if (!resourceId) {
       return false;
     }
-    var syncBlockURL = syncBlockStore.getSyncBlockURL(resourceId);
+    var syncBlockURL = syncBlockStore.referenceManager.getSyncBlockURL(resourceId);
     if (syncBlockURL) {
       window.open(syncBlockURL, '_blank');
     } else {

package/dist/esm/nodeviews/bodiedSyncedBlock.js

@@ -21,7 +21,6 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
     var _this;
     _classCallCheck(this, BodiedSyncBlock);
     _this = _callSuper(this, BodiedSyncBlock, [props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props]);
-    _this.syncBlockStore = props.syncBlockStore;
     _this.api = props.api;
     _this.handleConnectivityModeChange();
     _this.handleViewModeChange();
@@ -82,9 +81,14 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "render",
     value: function render(_props, forwardRef) {
+      var _this$api5;
+      var syncBlockStore = (_this$api5 = this.api) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.syncedBlock.sharedState) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.currentState()) === null || _this$api5 === void 0 ? void 0 : _this$api5.syncBlockStore;
+      if (!syncBlockStore) {
+        return null;
+      }
       return /*#__PURE__*/React.createElement(BodiedSyncBlockWrapper, {
         ref: forwardRef,
-        syncBlockStore: this.syncBlockStore,
+        syncBlockStore: syncBlockStore,
         node: this.node
       });
     }
@@ -120,8 +124,7 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
 export var bodiedSyncBlockNodeView = function bodiedSyncBlockNodeView(_ref4) {
   var pluginOptions = _ref4.pluginOptions,
     pmPluginFactoryParams = _ref4.pmPluginFactoryParams,
-    api = _ref4.api,
-    syncBlockStore = _ref4.syncBlockStore;
+    api = _ref4.api;
   return function (node, view, getPos) {
     var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
       eventDispatcher = pmPluginFactoryParams.eventDispatcher;
@@ -132,8 +135,7 @@ export var bodiedSyncBlockNodeView = function bodiedSyncBlockNodeView(_ref4) {
       view: view,
       getPos: getPos,
       portalProviderAPI: portalProviderAPI,
-      eventDispatcher: eventDispatcher,
-      syncBlockStore: syncBlockStore
+      eventDispatcher: eventDispatcher
     }).init();
   };
 };

package/dist/esm/nodeviews/syncedBlock.js

@@ -18,7 +18,7 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
     _classCallCheck(this, SyncBlock);
     _this = _callSuper(this, SyncBlock, [props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props]);
     _this.options = props.options;
-    _this.syncBlockStore = props.syncBlockStore;
+    _this.api = props.api;
     return _this;
   }
   _inherits(SyncBlock, _ReactNodeView);
@@ -33,6 +33,7 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
     key: "render",
     value: function render() {
       var _this$options,
+        _this$api,
         _this$options2,
         _this2 = this;
       if (!((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.syncedBlockRenderer)) {
@@ -44,16 +45,20 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       if (!resourceId || !localId) {
         return null;
       }
+      var syncBlockStore = (_this$api = this.api) === null || _this$api === void 0 || (_this$api = _this$api.syncedBlock) === null || _this$api === void 0 || (_this$api = _this$api.sharedState.currentState()) === null || _this$api === void 0 ? void 0 : _this$api.syncBlockStore;
+      if (!syncBlockStore) {
+        return null;
+      }
 
       // get document node from data provider
       return /*#__PURE__*/React.createElement(SyncBlockRendererWrapper, {
         localId: this.node.attrs.localId,
         syncedBlockRenderer: (_this$options2 = this.options) === null || _this$options2 === void 0 ? void 0 : _this$options2.syncedBlockRenderer,
         useFetchSyncBlockTitle: function useFetchSyncBlockTitle() {
-          return _useFetchSyncBlockTitle(_this2.syncBlockStore, _this2.node);
+          return _useFetchSyncBlockTitle(syncBlockStore, _this2.node);
         },
         useFetchSyncBlockData: function useFetchSyncBlockData() {
-          return _useFetchSyncBlockData(_this2.syncBlockStore, resourceId, localId);
+          return _useFetchSyncBlockData(syncBlockStore, resourceId, localId);
         }
       });
     }
@@ -69,8 +74,7 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
 export var syncBlockNodeView = function syncBlockNodeView(_ref) {
   var options = _ref.options,
     pmPluginFactoryParams = _ref.pmPluginFactoryParams,
-    api = _ref.api,
-    syncBlockStore = _ref.syncBlockStore;
+    api = _ref.api;
   return function (node, view, getPos) {
     var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
       eventDispatcher = pmPluginFactoryParams.eventDispatcher;
@@ -81,8 +85,7 @@ export var syncBlockNodeView = function syncBlockNodeView(_ref) {
       view: view,
       getPos: getPos,
       portalProviderAPI: portalProviderAPI,
-      eventDispatcher: eventDispatcher,
-      syncBlockStore: syncBlockStore
+      eventDispatcher: eventDispatcher
     }).init();
   };
 };

package/dist/esm/pm-plugins/main.js

@@ -3,6 +3,7 @@ import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { BodiedSyncBlockSharedCssClassName, SyncBlockStateCssClassName } from '@atlaskit/editor-common/sync-block';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
+import { convertPMNodesToSyncBlockNodes } from '@atlaskit/editor-synced-block-provider';
 import { lazyBodiedSyncBlockView } from '../nodeviews/bodiedLazySyncedBlock';
 import { lazySyncBlockView } from '../nodeviews/lazySyncedBlock';
 import { FLAG_ID } from '../types';
@@ -21,10 +22,11 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         var syncBlockNodes = instance.doc.children.filter(function (node) {
           return node.type.name === 'syncBlock';
         });
-        syncBlockStore.fetchSyncBlocksData(syncBlockNodes);
+        syncBlockStore.referenceManager.fetchSyncBlocksData(convertPMNodesToSyncBlockNodes(syncBlockNodes));
         return {
           selectionDecorationSet: calculateDecorations(instance.doc, instance.selection, instance.schema),
-          showFlag: false
+          showFlag: false,
+          syncBlockStore: syncBlockStore
         };
       },
       apply: function apply(tr, currentPluginState, oldEditorState) {
@@ -38,7 +40,8 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         }
         return {
           showFlag: (_meta$showFlag = meta === null || meta === void 0 ? void 0 : meta.showFlag) !== null && _meta$showFlag !== void 0 ? _meta$showFlag : showFlag,
-          selectionDecorationSet: newDecorationSet
+          selectionDecorationSet: newDecorationSet,
+          syncBlockStore: syncBlockStore
         };
       }
     },
@@ -47,14 +50,12 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         syncBlock: lazySyncBlockView({
           options: options,
           pmPluginFactoryParams: pmPluginFactoryParams,
-          api: api,
-          syncBlockStore: syncBlockStore
+          api: api
         }),
         bodiedSyncBlock: lazyBodiedSyncBlockView({
           pluginOptions: options,
           pmPluginFactoryParams: pmPluginFactoryParams,
-          api: api,
-          syncBlockStore: syncBlockStore
+          api: api
         })
       },
       decorations: function decorations(state) {
@@ -94,10 +95,10 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
       }
     },
     view: function view(editorView) {
-      syncBlockStore.setEditorView(editorView);
+      syncBlockStore.sourceManager.setEditorView(editorView);
       return {
         destroy: function destroy() {
-          syncBlockStore.setEditorView(undefined);
+          syncBlockStore.sourceManager.setEditorView(undefined);
         }
       };
     },
@@ -109,10 +110,10 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
       // or are from remote (collab) or already confirmed sync block deletion
       // We only care about local changes that change the document
       // and are not yet confirmed for sync block deletion
-      if (!tr.docChanged || !(syncBlockStore !== null && syncBlockStore !== void 0 && syncBlockStore.requireConfirmationBeforeDelete()) && !syncBlockStore.hasPendingCreation() || Boolean(tr.getMeta('isRemote')) || Boolean(tr.getMeta('isCommitSyncBlockCreation')) || !isOffline && isConfirmedSyncBlockDeletion) {
+      if (!tr.docChanged || !(syncBlockStore !== null && syncBlockStore !== void 0 && syncBlockStore.sourceManager.requireConfirmationBeforeDelete()) && !syncBlockStore.sourceManager.hasPendingCreation() || Boolean(tr.getMeta('isRemote')) || Boolean(tr.getMeta('isCommitSyncBlockCreation')) || !isOffline && isConfirmedSyncBlockDeletion) {
         return true;
       }
-      var _trackSyncBlocks = trackSyncBlocks(syncBlockStore.isSourceBlock, tr, state),
+      var _trackSyncBlocks = trackSyncBlocks(syncBlockStore.sourceManager.isSourceBlock, tr, state),
         bodiedSyncBlockRemoved = _trackSyncBlocks.removed,
         bodiedSyncBlockAdded = _trackSyncBlocks.added;
       if (!isOffline) {
@@ -121,14 +122,14 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           // we block the transaction here, and wait for user confirmation to proceed with deletion.
           // See editor-common/src/sync-block/sync-block-store-manager.ts for how we handle user confirmation and
           // proceed with deletion.
-          syncBlockStore.deleteSyncBlocksWithConfirmation(tr, bodiedSyncBlockRemoved);
+          syncBlockStore.sourceManager.deleteSyncBlocksWithConfirmation(tr, bodiedSyncBlockRemoved);
           return false;
         }
         if (bodiedSyncBlockAdded.length > 0) {
           // If there is bodiedSyncBlock node addition and it's waiting for the result of saving the node to backend (syncBlockStore.hasPendingCreation()),
           // we need to intercept the transaction and save it in insert callback so that we only insert it to the document when backend call if backend call is successful
           // The callback will be evoked by in SourceSyncBlockStoreManager.commitPendingCreation
-          syncBlockStore.registerCreationCallback(function () {
+          syncBlockStore.sourceManager.registerCreationCallback(function () {
             var _api$core;
             api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function () {
               return tr.setMeta('isCommitSyncBlockCreation', true);
@@ -171,7 +172,7 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
       trs.filter(function (tr) {
         return tr.docChanged;
       }).forEach(function (tr) {
-        syncBlockStore === null || syncBlockStore === void 0 || syncBlockStore.rebaseTransaction(tr, newState);
+        syncBlockStore === null || syncBlockStore === void 0 || syncBlockStore.sourceManager.rebaseTransaction(tr, newState);
       });
       return null;
     }

package/dist/esm/syncedBlockPlugin.js

@@ -106,9 +106,11 @@ export var syncedBlockPlugin = function syncedBlockPlugin(_ref) {
         return;
       }
       var _syncedBlockPluginKey = syncedBlockPluginKey.getState(editorState),
-        showFlag = _syncedBlockPluginKey.showFlag;
+        showFlag = _syncedBlockPluginKey.showFlag,
+        currentSyncBlockStore = _syncedBlockPluginKey.syncBlockStore;
       return {
-        showFlag: showFlag
+        showFlag: showFlag,
+        syncBlockStore: currentSyncBlockStore
       };
     }
   };

package/dist/esm/ui/DeleteConfirmationModal.js

@@ -45,7 +45,7 @@ export var DeleteConfirmationModal = function DeleteConfirmationModal(_ref) {
     return confirmedPromise;
   }, []);
   useEffect(function () {
-    var unregister = syncBlockStoreManager.registerConfirmationCallback(confirmationCallback);
+    var unregister = syncBlockStoreManager.sourceManager.registerConfirmationCallback(confirmationCallback);
     return function () {
       unregister();
     };

package/dist/esm/ui/SyncBlockRefresher.js

@@ -21,7 +21,7 @@ export var SyncBlockRefresher = function SyncBlockRefresher(_ref) {
         var _document;
         // check if document is visible to avoid unnecessary refreshes
         if (((_document = document) === null || _document === void 0 ? void 0 : _document.visibilityState) === 'visible') {
-          syncBlockStoreManager.refreshSubscriptions();
+          syncBlockStoreManager.referenceManager.refreshSubscriptions();
         }
       }, SYNC_BLOCK_FETCH_INTERVAL);
     } else if (interval !== -1) {

package/dist/esm/ui/floating-toolbar.js

@@ -41,7 +41,7 @@ export var getToolbarConfig = function getToolbarConfig(state, intl, api, syncBl
     onClick: copySyncedBlockReferenceToClipboard
   }, hoverDecorationProps(nodeType, akEditorSelectedNodeClassName));
   items.push(copyButton);
-  var disabled = !syncBlockStore.getSyncBlockURL(syncBlockObject.node.attrs.resourceId);
+  var disabled = !syncBlockStore.referenceManager.getSyncBlockURL(syncBlockObject.node.attrs.resourceId);
   if (!isBodiedSyncBlock) {
     var editSourceButton = _objectSpread({
       id: 'editor.syncedBlock.editSource',

package/dist/types/nodeviews/bodiedSyncedBlock.d.ts

@@ -5,7 +5,6 @@ import ReactNodeView, { type getPosHandler } from '@atlaskit/editor-common/react
 import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockPlugin, SyncedBlockPluginOptions } from '../syncedBlockPluginType';
 export interface BodiedSyncBlockNodeViewProps extends ReactComponentProps {
     api?: ExtractInjectionAPI<SyncedBlockPlugin>;
@@ -14,13 +13,11 @@ export interface BodiedSyncBlockNodeViewProps extends ReactComponentProps {
     node: PMNode;
     pluginOptions: SyncedBlockPluginOptions | undefined;
     portalProviderAPI: PortalProviderAPI;
-    syncBlockStore: SyncBlockStoreManager;
     view: EditorView;
 }
 export interface BodiedSyncBlockNodeViewProperties {
     api?: ExtractInjectionAPI<SyncedBlockPlugin>;
     pluginOptions: SyncedBlockPluginOptions | undefined;
     pmPluginFactoryParams: PMPluginFactoryParams;
-    syncBlockStore: SyncBlockStoreManager;
 }
 export declare const bodiedSyncBlockNodeView: (props: BodiedSyncBlockNodeViewProperties) => (node: PMNode, view: EditorView, getPos: getPosHandler) => ReactNodeView<BodiedSyncBlockNodeViewProps>;

package/dist/types/nodeviews/syncedBlock.d.ts

@@ -5,7 +5,6 @@ import type { ReactComponentProps } from '@atlaskit/editor-common/react-node-vie
 import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockPlugin, SyncedBlockPluginOptions } from '../syncedBlockPluginType';
 export interface SyncBlockNodeViewProps extends ReactComponentProps {
     api?: ExtractInjectionAPI<SyncedBlockPlugin>;
@@ -15,13 +14,11 @@ export interface SyncBlockNodeViewProps extends ReactComponentProps {
     node: PMNode;
     options: SyncedBlockPluginOptions | undefined;
     portalProviderAPI: PortalProviderAPI;
-    syncBlockStore: SyncBlockStoreManager;
     view: EditorView;
 }
 export interface SyncBlockNodeViewProperties {
     api?: ExtractInjectionAPI<SyncedBlockPlugin>;
     options: SyncedBlockPluginOptions | undefined;
     pmPluginFactoryParams: PMPluginFactoryParams;
-    syncBlockStore: SyncBlockStoreManager;
 }
 export declare const syncBlockNodeView: (props: SyncBlockNodeViewProperties) => (node: PMNode, view: EditorView, getPos: getPosHandler) => ReactNodeView<SyncBlockNodeViewProps>;

package/dist/types/pm-plugins/main.d.ts

@@ -2,13 +2,14 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
+import { type SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockPlugin, SyncedBlockPluginOptions } from '../syncedBlockPluginType';
 import { FLAG_ID } from '../types';
 export declare const syncedBlockPluginKey: PluginKey<any>;
 type SyncedBlockPluginState = {
     selectionDecorationSet: DecorationSet;
     showFlag: FLAG_ID | false;
+    syncBlockStore: SyncBlockStoreManager;
 };
 export declare const createPlugin: (options: SyncedBlockPluginOptions | undefined, pmPluginFactoryParams: PMPluginFactoryParams, syncBlockStore: SyncBlockStoreManager, api?: ExtractInjectionAPI<SyncedBlockPlugin>) => SafePlugin<SyncedBlockPluginState>;
 export {};

package/dist/types/types/index.d.ts

@@ -1,3 +1,4 @@
+import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 export declare enum FLAG_ID {
     CANNOT_DELETE_WHEN_OFFLINE = "cannot-delete-when-offline",
     CANNOT_EDIT_WHEN_OFFLINE = "cannot-edit-when-offline",
@@ -8,4 +9,8 @@ export type SyncedBlockSharedState = {
      * Whether to show a flag (usually for errors, e.g. fail to delete)
      */
     showFlag: FLAG_ID | false;
+    /**
+     * The current sync block store manager, used to manage fetching and updating sync block data
+     */
+    syncBlockStore: SyncBlockStoreManager;
 };

package/dist/types-ts4.5/nodeviews/bodiedSyncedBlock.d.ts

@@ -5,7 +5,6 @@ import ReactNodeView, { type getPosHandler } from '@atlaskit/editor-common/react
 import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockPlugin, SyncedBlockPluginOptions } from '../syncedBlockPluginType';
 export interface BodiedSyncBlockNodeViewProps extends ReactComponentProps {
     api?: ExtractInjectionAPI<SyncedBlockPlugin>;
@@ -14,13 +13,11 @@ export interface BodiedSyncBlockNodeViewProps extends ReactComponentProps {
     node: PMNode;
     pluginOptions: SyncedBlockPluginOptions | undefined;
     portalProviderAPI: PortalProviderAPI;
-    syncBlockStore: SyncBlockStoreManager;
     view: EditorView;
 }
 export interface BodiedSyncBlockNodeViewProperties {
     api?: ExtractInjectionAPI<SyncedBlockPlugin>;
     pluginOptions: SyncedBlockPluginOptions | undefined;
     pmPluginFactoryParams: PMPluginFactoryParams;
-    syncBlockStore: SyncBlockStoreManager;
 }
 export declare const bodiedSyncBlockNodeView: (props: BodiedSyncBlockNodeViewProperties) => (node: PMNode, view: EditorView, getPos: getPosHandler) => ReactNodeView<BodiedSyncBlockNodeViewProps>;

package/dist/types-ts4.5/nodeviews/syncedBlock.d.ts

@@ -5,7 +5,6 @@ import type { ReactComponentProps } from '@atlaskit/editor-common/react-node-vie
 import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockPlugin, SyncedBlockPluginOptions } from '../syncedBlockPluginType';
 export interface SyncBlockNodeViewProps extends ReactComponentProps {
     api?: ExtractInjectionAPI<SyncedBlockPlugin>;
@@ -15,13 +14,11 @@ export interface SyncBlockNodeViewProps extends ReactComponentProps {
     node: PMNode;
     options: SyncedBlockPluginOptions | undefined;
     portalProviderAPI: PortalProviderAPI;
-    syncBlockStore: SyncBlockStoreManager;
     view: EditorView;
 }
 export interface SyncBlockNodeViewProperties {
     api?: ExtractInjectionAPI<SyncedBlockPlugin>;
     options: SyncedBlockPluginOptions | undefined;
     pmPluginFactoryParams: PMPluginFactoryParams;
-    syncBlockStore: SyncBlockStoreManager;
 }
 export declare const syncBlockNodeView: (props: SyncBlockNodeViewProperties) => (node: PMNode, view: EditorView, getPos: getPosHandler) => ReactNodeView<SyncBlockNodeViewProps>;

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -2,13 +2,14 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
+import { type SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockPlugin, SyncedBlockPluginOptions } from '../syncedBlockPluginType';
 import { FLAG_ID } from '../types';
 export declare const syncedBlockPluginKey: PluginKey<any>;
 type SyncedBlockPluginState = {
     selectionDecorationSet: DecorationSet;
     showFlag: FLAG_ID | false;
+    syncBlockStore: SyncBlockStoreManager;
 };
 export declare const createPlugin: (options: SyncedBlockPluginOptions | undefined, pmPluginFactoryParams: PMPluginFactoryParams, syncBlockStore: SyncBlockStoreManager, api?: ExtractInjectionAPI<SyncedBlockPlugin>) => SafePlugin<SyncedBlockPluginState>;
 export {};

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

@@ -1,3 +1,4 @@
+import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 export declare enum FLAG_ID {
     CANNOT_DELETE_WHEN_OFFLINE = "cannot-delete-when-offline",
     CANNOT_EDIT_WHEN_OFFLINE = "cannot-edit-when-offline",
@@ -8,4 +9,8 @@ export type SyncedBlockSharedState = {
      * Whether to show a flag (usually for errors, e.g. fail to delete)
      */
     showFlag: FLAG_ID | false;
+    /**
+     * The current sync block store manager, used to manage fetching and updating sync block data
+     */
+    syncBlockStore: SyncBlockStoreManager;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "4.2.13",
+	"version": "4.2.15",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -56,7 +56,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.32.0",
+		"@atlaskit/editor-common": "^110.33.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {