@atlaskit/editor-plugin-synced-block 5.3.19 → 5.3.21

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

@@ -4,7 +4,6 @@ import { copyDomNode, toDOM } from '@atlaskit/editor-common/copy-button';
 import { DOMSerializer, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { syncedBlockPluginKey } from '../pm-plugins/main';
 import { canBeConvertedToSyncBlock, findSyncBlock, findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from '../pm-plugins/utils/utils';
 import { FLAG_ID } from '../types';
@@ -35,12 +34,6 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
       });
       return false;
     }
-
-    // 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
-    if (!fg('platform_synced_block_patch_1')) {
-      syncBlockStore.sourceManager.createBodiedSyncBlockNode(attrs, function () {});
-    }
     if (typeAheadInsert) {
       tr = typeAheadInsert(newBodiedSyncBlockNode);
     } else {
@@ -74,13 +67,6 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
       });
       return false;
     }
-
-    // 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
-    if (!fg('platform_synced_block_patch_1')) {
-      // Moved to appendTransaction
-      syncBlockStore.sourceManager.createBodiedSyncBlockNode(_attrs, function () {}, _newBodiedSyncBlockNode);
-    }
     tr.replaceWith(conversionInfo.from, conversionInfo.to, _newBodiedSyncBlockNode).scrollIntoView();
 
     // set selection to the start of the previous selection for the position taken up by the start of the new synced block
@@ -105,19 +91,17 @@ export var copySyncedBlockReferenceToClipboard = function copySyncedBlockReferen
 var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockReferenceToClipboardInternal(schema, selection, syncBlockStore, inputMethod, api) {
   var syncBlockFindResult = findSyncBlockOrBodiedSyncBlock(schema, selection);
   if (!syncBlockFindResult) {
-    if (fg('platform_synced_block_patch_1')) {
-      var _api$analytics;
-      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.fireAnalyticsEvent({
-        eventType: EVENT_TYPE.OPERATIONAL,
-        action: ACTION.ERROR,
-        actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-        actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_COPY,
-        attributes: {
-          error: 'No sync block found in selection',
-          inputMethod: inputMethod
-        }
-      });
-    }
+    var _api$analytics;
+    api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.fireAnalyticsEvent({
+      eventType: EVENT_TYPE.OPERATIONAL,
+      action: ACTION.ERROR,
+      actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
+      actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_COPY,
+      attributes: {
+        error: 'No sync block found in selection',
+        inputMethod: inputMethod
+      }
+    });
     return false;
   }
   var isBodiedSyncBlock = isBodiedSyncBlockNode(syncBlockFindResult.node, schema.nodes.bodiedSyncBlock);
@@ -130,39 +114,35 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
       resourceId: syncBlockStore.referenceManager.generateResourceIdForReference(syncBlockFindResult.node.attrs.resourceId)
     });
     if (!referenceSyncBlockNode) {
-      if (fg('platform_synced_block_patch_1')) {
-        var _api$analytics2;
-        api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.fireAnalyticsEvent({
-          eventType: EVENT_TYPE.OPERATIONAL,
-          action: ACTION.ERROR,
-          actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-          actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_COPY,
-          attributes: {
-            error: 'Failed to create reference sync block node',
-            resourceId: syncBlockFindResult.node.attrs.resourceId,
-            inputMethod: inputMethod
-          }
-        });
-      }
-      return false;
-    }
-  } else {
-    referenceSyncBlockNode = syncBlockFindResult.node;
-  }
-  if (!referenceSyncBlockNode) {
-    if (fg('platform_synced_block_patch_1')) {
-      var _api$analytics3;
-      api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || (_api$analytics3 = _api$analytics3.actions) === null || _api$analytics3 === void 0 || _api$analytics3.fireAnalyticsEvent({
+      var _api$analytics2;
+      api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.fireAnalyticsEvent({
         eventType: EVENT_TYPE.OPERATIONAL,
         action: ACTION.ERROR,
         actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
         actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_COPY,
         attributes: {
-          error: 'No reference sync block node available',
+          error: 'Failed to create reference sync block node',
+          resourceId: syncBlockFindResult.node.attrs.resourceId,
           inputMethod: inputMethod
         }
       });
+      return false;
     }
+  } else {
+    referenceSyncBlockNode = syncBlockFindResult.node;
+  }
+  if (!referenceSyncBlockNode) {
+    var _api$analytics3;
+    api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || (_api$analytics3 = _api$analytics3.actions) === null || _api$analytics3 === void 0 || _api$analytics3.fireAnalyticsEvent({
+      eventType: EVENT_TYPE.OPERATIONAL,
+      action: ACTION.ERROR,
+      actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
+      actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_COPY,
+      attributes: {
+        error: 'No reference sync block node available',
+        inputMethod: inputMethod
+      }
+    });
     return false;
   }
   var domNode = toDOM(referenceSyncBlockNode, schema);
@@ -171,20 +151,18 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
   // Use setTimeout to dispatch transaction in next tick and avoid re-entrant dispatch
   setTimeout(function () {
     api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
+      var _api$analytics4;
       var tr = _ref3.tr;
-      if (fg('platform_synced_block_patch_1')) {
-        var _api$analytics4;
-        api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 || (_api$analytics4 = _api$analytics4.actions) === null || _api$analytics4 === void 0 || _api$analytics4.fireAnalyticsEvent({
-          eventType: EVENT_TYPE.OPERATIONAL,
-          action: ACTION.COPIED,
-          actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-          actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_COPY,
-          attributes: {
-            resourceId: referenceSyncBlockNode.attrs.resourceId,
-            inputMethod: inputMethod
-          }
-        });
-      }
+      api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 || (_api$analytics4 = _api$analytics4.actions) === null || _api$analytics4 === void 0 || _api$analytics4.fireAnalyticsEvent({
+        eventType: EVENT_TYPE.OPERATIONAL,
+        action: ACTION.COPIED,
+        actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
+        actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_COPY,
+        attributes: {
+          resourceId: referenceSyncBlockNode.attrs.resourceId,
+          inputMethod: inputMethod
+        }
+      });
       return tr.setMeta(syncedBlockPluginKey, {
         activeFlag: {
           id: FLAG_ID.SYNC_BLOCK_COPIED
@@ -204,18 +182,16 @@ export var editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore
     }
     var syncBlockURL = syncBlockStore.referenceManager.getSyncBlockURL(resourceId);
     if (syncBlockURL) {
-      if (fg('platform_synced_block_patch_1')) {
-        var _api$analytics5;
-        api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 || _api$analytics5.actions.fireAnalyticsEvent({
-          eventType: EVENT_TYPE.OPERATIONAL,
-          action: ACTION.SYNCED_BLOCK_EDIT_SOURCE,
-          actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-          actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_SOURCE_URL,
-          attributes: {
-            resourceId: resourceId
-          }
-        });
-      }
+      var _api$analytics5;
+      api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 || _api$analytics5.actions.fireAnalyticsEvent({
+        eventType: EVENT_TYPE.OPERATIONAL,
+        action: ACTION.SYNCED_BLOCK_EDIT_SOURCE,
+        actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
+        actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_SOURCE_URL,
+        attributes: {
+          resourceId: resourceId
+        }
+      });
       window.open(syncBlockURL, '_blank');
     } else {
       var _api$analytics6;

package/dist/esm/nodeviews/bodiedSyncBlockNodeWithToDOMFixed.js

@@ -0,0 +1,28 @@
+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; }
+import { bodiedSyncBlock } from '@atlaskit/adf-schema';
+import { BodiedSyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
+/**
+ * Based on packages/editor/editor-plugin-synced-block/src/nodeviews/bodiedSyncedBlock.tsx
+ * Adding correct classnames and structure to the toDOM, necessary for SSR rendering
+ */
+export var bodiedSyncBlockNodeWithToDOMFixed = function bodiedSyncBlockNodeWithToDOMFixed() {
+  return _objectSpread(_objectSpread({}, bodiedSyncBlock), {}, {
+    toDOM: function toDOM(node) {
+      var _node$attrs = node.attrs,
+        localId = _node$attrs.localId,
+        resourceId = _node$attrs.resourceId;
+      var outerAttrs = {
+        class: BodiedSyncBlockSharedCssClassName.prefix,
+        'data-bodied-sync-block': '',
+        'data-local-id': localId,
+        'data-resource-id': resourceId
+      };
+      var innerAttrs = {
+        class: BodiedSyncBlockSharedCssClassName.content
+      };
+      return ['div', outerAttrs, ['div', innerAttrs, 0]];
+    }
+  });
+};

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

@@ -14,7 +14,6 @@ import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
 import { convertPMNodesToSyncBlockNodes, rebaseTransaction } from '@atlaskit/editor-synced-block-provider';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { lazyBodiedSyncBlockView } from '../nodeviews/bodiedLazySyncedBlock';
 import { SyncBlock as SyncBlockView } from '../nodeviews/syncedBlock';
 import { FLAG_ID } from '../types';
@@ -134,11 +133,8 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         if (!tr.selection.eq(oldEditorState.selection)) {
           newDecorationSet = calculateDecorations(tr.doc, tr.selection, tr.doc.type.schema);
         }
-        var newRetryCreationPosMap = retryCreationPosMap;
-        if (fg('platform_synced_block_patch_1')) {
-          var newPosEntry = meta === null || meta === void 0 ? void 0 : meta.retryCreationPos;
-          newRetryCreationPosMap = mapRetryCreationPosMap(retryCreationPosMap, newPosEntry, tr.mapping.map.bind(tr.mapping));
-        }
+        var newPosEntry = meta === null || meta === void 0 ? void 0 : meta.retryCreationPos;
+        var newRetryCreationPosMap = mapRetryCreationPosMap(retryCreationPosMap, newPosEntry, tr.mapping.map.bind(tr.mapping));
         return {
           activeFlag: (_meta$activeFlag = meta === null || meta === void 0 ? void 0 : meta.activeFlag) !== null && _meta$activeFlag !== void 0 ? _meta$activeFlag : activeFlag,
           selectionDecorationSet: newDecorationSet,
@@ -194,7 +190,7 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
               class: SyncBlockStateCssClassName.viewModeClassName
             }));
           }
-          if (node.type.name === 'bodiedSyncBlock' && syncBlockStore.sourceManager.isPendingCreation(node.attrs.resourceId) && fg('platform_synced_block_patch_1')) {
+          if (node.type.name === 'bodiedSyncBlock' && syncBlockStore.sourceManager.isPendingCreation(node.attrs.resourceId)) {
             loadingDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
               class: SyncBlockStateCssClassName.creationLoadingClassName
             }));
@@ -261,12 +257,6 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
       var _api$connectivity2;
       var isOffline = isOfflineMode(api === null || api === void 0 || (_api$connectivity2 = api.connectivity) === null || _api$connectivity2 === void 0 || (_api$connectivity2 = _api$connectivity2.sharedState.currentState()) === null || _api$connectivity2 === void 0 ? void 0 : _api$connectivity2.mode);
       var isConfirmedSyncBlockDeletion = Boolean(tr.getMeta('isConfirmedSyncBlockDeletion'));
-      var hasNoPendingRequest = fg('platform_synced_block_patch_1') ? false :
-      // requireConfirmationBeforeDelete is always true, so this evaluates to false and hence redundant
-      !(syncBlockStore !== null && syncBlockStore !== void 0 && syncBlockStore.sourceManager.requireConfirmationBeforeDelete()) && !syncBlockStore.sourceManager.hasPendingCreation();
-      var isCommitsCreation = fg('platform_synced_block_patch_1') ? false :
-      // For patch 1, we don't intercept the insert transaction, hence it's redundant
-      Boolean(tr.getMeta('isCommitSyncBlockCreation'));
 
       // Track newly added reference sync blocks before processing the transaction
       if (tr.docChanged && !tr.getMeta('isRemote')) {
@@ -287,7 +277,7 @@ 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 || hasNoPendingRequest || Boolean(tr.getMeta('isRemote')) || isCommitsCreation || !isOffline && isConfirmedSyncBlockDeletion) {
+      if (!tr.docChanged || Boolean(tr.getMeta('isRemote')) || !isOffline && isConfirmedSyncBlockDeletion) {
         return true;
       }
       var _trackSyncBlocks2 = trackSyncBlocks(syncBlockStore.sourceManager.isSourceBlock, tr, state),
@@ -336,22 +326,8 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
             // After true is returned here and the node is created, we delete the node in the filterTransaction immediately, which cancels out the creation
             return true;
           }
-          if (fg('platform_synced_block_patch_1')) {
-            handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api);
-            return true;
-          } else {
-            // 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.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);
-              });
-              api === null || api === void 0 || api.core.actions.focus();
-            });
-            return false;
-          }
+          handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api);
+          return true;
         }
       } else {
         var _trackSyncBlocks4 = trackSyncBlocks(function (node) {

package/dist/esm/pm-plugins/menu-and-toolbar-experiences.js

@@ -4,7 +4,6 @@ import { ACTION, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { Experience, EXPERIENCE_ID, ExperienceCheckDomMutation, ExperienceCheckTimeout, getNodeQuery, getPopupContainerFromEditorView, popupWithNestedElement } from '@atlaskit/editor-common/experiences';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SYNCED_BLOCK_BUTTON_TEST_ID } from '../types';
 var TIMEOUT_DURATION = 30000;
 var pluginKey = new PluginKey('syncedBlockMenuAndToolbarExperience');
@@ -54,44 +53,38 @@ export var getMenuAndToolbarExperiencesPlugin = function getMenuAndToolbarExperi
       durationMs: TIMEOUT_DURATION
     }), referenceSyncBlockRemovedFromDomCheck(refs)]
   });
-  var unsyncReferenceSyncedBlockExperience;
-  var unsyncSourceSyncedBlockExperience;
-  var deleteSourceSyncedBlockExperience;
-  var syncedLocationsExperience;
-  if (fg('platform_synced_block_patch_1')) {
-    unsyncReferenceSyncedBlockExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
-      action: ACTION.REFERENCE_SYNCED_BLOCK_UNSYNC,
-      actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_TOOLBAR,
-      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-      checks: [new ExperienceCheckTimeout({
-        durationMs: TIMEOUT_DURATION
-      }), referenceSyncBlockRemovedFromDomCheck(refs)]
-    });
-    unsyncSourceSyncedBlockExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
-      action: ACTION.SYNCED_BLOCK_UNSYNC,
-      actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_TOOLBAR,
-      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-      checks: [new ExperienceCheckTimeout({
-        durationMs: TIMEOUT_DURATION
-      }), syncBlockDeleteConfirmationModalAddedCheck(refs)]
-    });
-    deleteSourceSyncedBlockExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
-      action: ACTION.SYNCED_BLOCK_DELETE,
-      actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_TOOLBAR,
-      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-      checks: [new ExperienceCheckTimeout({
-        durationMs: TIMEOUT_DURATION
-      }), syncBlockDeleteConfirmationModalAddedCheck(refs)]
-    });
-    syncedLocationsExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
-      action: ACTION.SYNCED_BLOCK_VIEW_SYNCED_LOCATIONS,
-      actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_TOOLBAR,
-      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-      checks: [new ExperienceCheckTimeout({
-        durationMs: TIMEOUT_DURATION
-      }), syncedLocationsDropdownOpenedCheck(refs)]
-    });
-  }
+  var unsyncReferenceSyncedBlockExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
+    action: ACTION.REFERENCE_SYNCED_BLOCK_UNSYNC,
+    actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_TOOLBAR,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    checks: [new ExperienceCheckTimeout({
+      durationMs: TIMEOUT_DURATION
+    }), referenceSyncBlockRemovedFromDomCheck(refs)]
+  });
+  var unsyncSourceSyncedBlockExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
+    action: ACTION.SYNCED_BLOCK_UNSYNC,
+    actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_TOOLBAR,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    checks: [new ExperienceCheckTimeout({
+      durationMs: TIMEOUT_DURATION
+    }), syncBlockDeleteConfirmationModalAddedCheck(refs)]
+  });
+  var deleteSourceSyncedBlockExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
+    action: ACTION.SYNCED_BLOCK_DELETE,
+    actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_TOOLBAR,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    checks: [new ExperienceCheckTimeout({
+      durationMs: TIMEOUT_DURATION
+    }), syncBlockDeleteConfirmationModalAddedCheck(refs)]
+  });
+  var syncedLocationsExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
+    action: ACTION.SYNCED_BLOCK_VIEW_SYNCED_LOCATIONS,
+    actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_TOOLBAR,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    checks: [new ExperienceCheckTimeout({
+      durationMs: TIMEOUT_DURATION
+    }), syncedLocationsDropdownOpenedCheck(refs)]
+  });
   var unbindClickListener = bind(document, {
     type: 'click',
     listener: function listener(event) {
@@ -155,7 +148,6 @@ export var getMenuAndToolbarExperiencesPlugin = function getMenuAndToolbarExperi
       editorViewEl = editorView.dom;
       return {
         destroy: function destroy() {
-          var _deleteSourceSyncedBl, _unsyncReferenceSynce, _unsyncSourceSyncedBl, _syncedLocationsExper;
           createSourcePrimaryToolbarExperience.abort({
             reason: 'editorDestroyed'
           });
@@ -168,16 +160,16 @@ export var getMenuAndToolbarExperiencesPlugin = function getMenuAndToolbarExperi
           deleteReferenceSyncedBlockExperience.abort({
             reason: 'editorDestroyed'
           });
-          (_deleteSourceSyncedBl = deleteSourceSyncedBlockExperience) === null || _deleteSourceSyncedBl === void 0 || _deleteSourceSyncedBl.abort({
+          deleteSourceSyncedBlockExperience === null || deleteSourceSyncedBlockExperience === void 0 || deleteSourceSyncedBlockExperience.abort({
             reason: 'editorDestroyed'
           });
-          (_unsyncReferenceSynce = unsyncReferenceSyncedBlockExperience) === null || _unsyncReferenceSynce === void 0 || _unsyncReferenceSynce.abort({
+          unsyncReferenceSyncedBlockExperience === null || unsyncReferenceSyncedBlockExperience === void 0 || unsyncReferenceSyncedBlockExperience.abort({
             reason: 'editorDestroyed'
           });
-          (_unsyncSourceSyncedBl = unsyncSourceSyncedBlockExperience) === null || _unsyncSourceSyncedBl === void 0 || _unsyncSourceSyncedBl.abort({
+          unsyncSourceSyncedBlockExperience === null || unsyncSourceSyncedBlockExperience === void 0 || unsyncSourceSyncedBlockExperience.abort({
             reason: 'editorDestroyed'
           });
-          (_syncedLocationsExper = syncedLocationsExperience) === null || _syncedLocationsExper === void 0 || _syncedLocationsExper.abort({
+          syncedLocationsExperience === null || syncedLocationsExperience === void 0 || syncedLocationsExperience.abort({
             reason: 'editorDestroyed'
           });
           unbindClickListener();

package/dist/esm/syncedBlockPlugin.js

@@ -1,8 +1,10 @@
 import React from 'react';
 import { bodiedSyncBlock, syncBlock } from '@atlaskit/adf-schema';
 import { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { flushBodiedSyncBlocks as _flushBodiedSyncBlocks, flushSyncBlocks } from './editor-actions';
 import { copySyncedBlockReferenceToClipboardEditorCommand, createSyncedBlock } from './editor-commands';
+import { bodiedSyncBlockNodeWithToDOMFixed } from './nodeviews/bodiedSyncBlockNodeWithToDOMFixed';
 import { createPlugin, syncedBlockPluginKey } from './pm-plugins/main';
 import { getMenuAndToolbarExperiencesPlugin } from './pm-plugins/menu-and-toolbar-experiences';
 import { getBlockMenuComponents } from './ui/block-menu-components';
@@ -29,7 +31,7 @@ export var syncedBlockPlugin = function syncedBlockPlugin(_ref) {
         node: syncBlock
       }, {
         name: 'bodiedSyncBlock',
-        node: bodiedSyncBlock
+        node: fg('platform_synced_block_patch_3') ? bodiedSyncBlockNodeWithToDOMFixed() : bodiedSyncBlock
       }];
     },
     pmPlugins: function pmPlugins() {

package/dist/esm/ui/SyncedLocationDropdown.js

@@ -25,7 +25,6 @@ import QuotationMarkIcon from '@atlaskit/icon/core/quotation-mark';
 import StatusErrorIcon from '@atlaskit/icon/core/status-error';
 import { ConfluenceIcon, JiraIcon, AtlassianIcon } from '@atlaskit/logo';
 import Lozenge from '@atlaskit/lozenge';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Text, Inline, Anchor, Stack } from '@atlaskit/primitives/compiled';
 import Spinner from '@atlaskit/spinner';
 import Tooltip from '@atlaskit/tooltip';
@@ -175,14 +174,14 @@ export var SyncedLocationDropdown = function SyncedLocationDropdown(_ref4) {
       var isOpen = _ref5.isOpen;
       return setIsOpen(isOpen);
     },
-    testId: fg('platform_synced_block_patch_1') ? 'synced-block-synced-locations-dropdown' : undefined,
+    testId: "synced-block-synced-locations-dropdown",
     trigger: function trigger(_ref6) {
       var triggerRef = _ref6.triggerRef,
         triggerProps = _objectWithoutProperties(_ref6, _excluded);
       return /*#__PURE__*/React.createElement(Button, _extends({
         ref: triggerRef,
         areAnyNewToolbarFlagsEnabled: true,
-        selected: fg('platform_synced_block_patch_1') ? isOpen : undefined,
+        selected: isOpen,
         iconAfter: /*#__PURE__*/React.createElement(ChevronDownIcon, {
           color: "currentColor",
           spacing: "spacious",
@@ -251,18 +250,16 @@ var DropdownContent = function DropdownContent(_ref7) {
     getReferenceData();
   }, [syncBlockStore, intl, isSource, localId, resourceId]);
   var handleLocationClick = function handleLocationClick() {
-    if (fg('platform_synced_block_patch_1')) {
-      var _api$analytics;
-      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.fireAnalyticsEvent({
-        eventType: EVENT_TYPE.OPERATIONAL,
-        action: ACTION.CLICKED,
-        actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-        actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_CLICK_SYNCED_LOCATION,
-        attributes: {
-          resourceId: resourceId
-        }
-      });
-    }
+    var _api$analytics;
+    api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.fireAnalyticsEvent({
+      eventType: EVENT_TYPE.OPERATIONAL,
+      action: ACTION.CLICKED,
+      actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
+      actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_CLICK_SYNCED_LOCATION,
+      attributes: {
+        resourceId: resourceId
+      }
+    });
   };
   var content = function content() {
     switch (fetchStatus) {
@@ -324,7 +321,7 @@ var ErrorScreen = function ErrorScreen(_ref9) {
   var formatMessage = _ref9.formatMessage;
   return /*#__PURE__*/React.createElement(Box, {
     xcss: styles.errorContainer,
-    testId: fg('platform_synced_block_patch_1') ? 'synced-locations-dropdown-content-error' : undefined
+    testId: "synced-locations-dropdown-content-error"
   }, /*#__PURE__*/React.createElement(Box, {
     xcss: styles.errorIcon
   }, /*#__PURE__*/React.createElement(StatusErrorIcon, {
@@ -342,7 +339,7 @@ var NoResultScreen = function NoResultScreen(_ref0) {
   return /*#__PURE__*/React.createElement(Stack, {
     xcss: styles.noResultsContainer,
     space: "space.100",
-    testId: fg('platform_synced_block_patch_1') ? 'synced-locations-dropdown-content-no-results' : undefined
+    testId: "synced-locations-dropdown-content-no-results"
   }, /*#__PURE__*/React.createElement(Text, {
     as: "p"
   }, formatMessage(messages.syncedLocationDropdownNoResults)), /*#__PURE__*/React.createElement(Text, {

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

@@ -12,7 +12,6 @@ import CopyIcon from '@atlaskit/icon/core/copy';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import EditIcon from '@atlaskit/icon/core/edit';
 import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { copySyncedBlockReferenceToClipboard, editSyncedBlockSource, removeSyncedBlock, unsync } from '../editor-commands';
 import { findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from '../pm-plugins/utils/utils';
 import { SYNCED_BLOCK_BUTTON_TEST_ID } from '../types';
@@ -23,7 +22,7 @@ export var getToolbarConfig = function getToolbarConfig(state, intl, api, syncBl
   if (!syncBlockObject) {
     return;
   }
-  if (syncBlockStore.sourceManager.isPendingCreation(syncBlockObject.node.attrs.resourceId) && fg('platform_synced_block_patch_1')) {
+  if (syncBlockStore.sourceManager.isPendingCreation(syncBlockObject.node.attrs.resourceId)) {
     return;
   }
   var syncBlockInstance = syncBlockStore.referenceManager.getFromCache(syncBlockObject.node.attrs.resourceId);
@@ -84,7 +83,7 @@ export var getToolbarConfig = function getToolbarConfig(state, intl, api, syncBl
             onClick: function onClick() {
               return unsync(syncBlockStore, isBodiedSyncBlock, view);
             },
-            testId: fg('platform_synced_block_patch_1') ? isBodiedSyncBlock ? SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarSourceUnsync : SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarReferenceUnsync : undefined
+            testId: isBodiedSyncBlock ? SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarSourceUnsync : SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarReferenceUnsync
           });
         }
       };
@@ -129,7 +128,7 @@ export var getToolbarConfig = function getToolbarConfig(state, intl, api, syncBl
         icon: /*#__PURE__*/React.createElement(DeleteIcon, {
           label: ""
         }),
-        testId: fg('platform_synced_block_patch_1') ? isBodiedSyncBlock ? SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarSourceDelete : SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarReferenceDelete : undefined
+        testId: isBodiedSyncBlock ? SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarSourceDelete : SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarReferenceDelete
       }, hoverDecorationProps(nodeType))]
     }];
     items.push.apply(items, overflowMenuConfig);

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

@@ -0,0 +1,6 @@
+import type { NodeSpec } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Based on packages/editor/editor-plugin-synced-block/src/nodeviews/bodiedSyncedBlock.tsx
+ * Adding correct classnames and structure to the toDOM, necessary for SSR rendering
+ */
+export declare const bodiedSyncBlockNodeWithToDOMFixed: () => NodeSpec;

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

@@ -0,0 +1,6 @@
+import type { NodeSpec } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Based on packages/editor/editor-plugin-synced-block/src/nodeviews/bodiedSyncedBlock.tsx
+ * Adding correct classnames and structure to the toDOM, necessary for SSR rendering
+ */
+export declare const bodiedSyncBlockNodeWithToDOMFixed: () => NodeSpec;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "5.3.19",
+	"version": "5.3.21",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -40,7 +40,7 @@
 		"@atlaskit/editor-plugin-selection": "^7.0.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
-		"@atlaskit/editor-synced-block-provider": "^3.28.0",
+		"@atlaskit/editor-synced-block-provider": "^3.29.0",
 		"@atlaskit/editor-toolbar": "^0.19.0",
 		"@atlaskit/flag": "^17.8.0",
 		"@atlaskit/icon": "31.0.0",
@@ -61,7 +61,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.12.0",
+		"@atlaskit/editor-common": "^111.13.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -104,10 +104,10 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_synced_block_patch_1": {
+		"platform_synced_block_patch_2": {
 			"type": "boolean"
 		},
-		"platform_synced_block_patch_2": {
+		"platform_synced_block_patch_3": {
 			"type": "boolean"
 		}
 	}