@atlaskit/editor-plugin-synced-block 5.4.4 → 5.4.6

package/dist/cjs/syncedBlockPlugin.js

@@ -9,6 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorActions = require("./editor-actions");
 var _editorCommands = require("./editor-commands");
 var _bodiedSyncBlockNodeWithToDOMFixed = require("./nodeviews/bodiedSyncBlockNodeWithToDOMFixed");
@@ -38,7 +39,11 @@ var syncedBlockPlugin = exports.syncedBlockPlugin = function syncedBlockPlugin(_
         node: _adfSchema.syncBlock
       }, {
         name: 'bodiedSyncBlock',
-        node: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? (0, _bodiedSyncBlockNodeWithToDOMFixed.bodiedSyncBlockNodeWithToDOMFixed)() : _adfSchema.bodiedSyncBlock
+        node: !(0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
+          exposure: true
+        }) ?
+        // delete bodiedSyncBlockNodeWithToDOMFixed when cleaning up platform_synced_block_patch_6
+        (0, _bodiedSyncBlockNodeWithToDOMFixed.bodiedSyncBlockNodeWithToDOMFixed)() : _adfSchema.bodiedSyncBlock
       }];
     },
     pmPlugins: function pmPlugins() {

package/dist/cjs/ui/BodiedSyncBlockWrapper.js

@@ -8,6 +8,7 @@ exports.BodiedSyncBlockWrapper = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
 var _SyncBlockLabel = require("./SyncBlockLabel");
+// Delete this file when cleaning up platform_synced_block_use_new_source_nodeview
 var BodiedSyncBlockWrapper = exports.BodiedSyncBlockWrapper = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var node = _ref.node,
     syncBlockStore = _ref.syncBlockStore;

package/dist/cjs/ui/DeleteConfirmationModal.js

@@ -1,4 +1,4 @@
-/* DeleteConfirmationModal.tsx generated by @compiled/babel-plugin v0.38.1 */
+/* DeleteConfirmationModal.tsx generated by @compiled/babel-plugin v0.39.1 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

package/dist/cjs/ui/SyncBlockLabel.js

@@ -13,6 +13,7 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _blockSynced = _interopRequireDefault(require("@atlaskit/icon-lab/core/block-synced"));
 var _compiled = require("@atlaskit/primitives/compiled");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _visuallyHidden = _interopRequireDefault(require("@atlaskit/visually-hidden"));
 var _time = require("./utils/time");
@@ -79,7 +80,9 @@ var SyncBlockLabelComponent = function SyncBlockLabelComponent(_ref) {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
     ,
     className: _syncBlock.SyncBlockLabelSharedCssClassName.labelClassName,
-    "aria-describedby": ariaDescribedById
+    "aria-describedby": (isSource || isUnsyncedBlock) && (0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
+      exposure: true
+    }) ? undefined : ariaDescribedById
   }, /*#__PURE__*/_react.default.createElement(_blockSynced.default, {
     color: "var(--ds-icon-subtle, #505258)",
     size: "small",

package/dist/cjs/ui/SyncedLocationDropdown.js

@@ -1,4 +1,4 @@
-/* SyncedLocationDropdown.tsx generated by @compiled/babel-plugin v0.38.1 */
+/* SyncedLocationDropdown.tsx generated by @compiled/babel-plugin v0.39.1 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -31,7 +31,6 @@ var _quotationMark = _interopRequireDefault(require("@atlaskit/icon/core/quotati
 var _statusError = _interopRequireDefault(require("@atlaskit/icon/core/status-error"));
 var _logo = require("@atlaskit/logo");
 var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
@@ -89,31 +88,23 @@ var productIconMap = {
   'jira-work-item': _logo.JiraIcon
 };
 var subTypeIconMap = {
-  live: _pageLiveDoc.default,
-  page: _page.default,
-  blogpost: _quotationMark.default
-};
-var subTypeIconMapNew = {
   live: _pageLiveDoc.default,
   page: _page.default
 };
 var getConfluenceSubTypeIcon = function getConfluenceSubTypeIcon(sourceAri, subType) {
-  if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-    try {
-      var _getPageIdAndTypeFrom = (0, _editorSyncedBlockProvider.getPageIdAndTypeFromConfluencePageAri)({
-          ari: sourceAri
-        }),
-        pageType = _getPageIdAndTypeFrom.type;
-      if (pageType === 'blogpost') {
-        return _quotationMark.default;
-      } else {
-        return subType && subType in subTypeIconMapNew ? subTypeIconMapNew[subType] : _page.default;
-      }
-    } catch (_unused) {
-      return _page.default;
+  try {
+    var _getPageIdAndTypeFrom = (0, _editorSyncedBlockProvider.getPageIdAndTypeFromConfluencePageAri)({
+        ari: sourceAri
+      }),
+      pageType = _getPageIdAndTypeFrom.type;
+    if (pageType === 'blogpost') {
+      return _quotationMark.default;
+    } else {
+      return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : _page.default;
     }
+  } catch (_unused) {
+    return _page.default;
   }
-  return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : _page.default;
 };
 var ProductIcon = function ProductIcon(_ref2) {
   var _productIconMap$produ;

package/dist/cjs/ui/quick-insert.js

@@ -1,4 +1,4 @@
-/* quick-insert.tsx generated by @compiled/babel-plugin v0.38.1 */
+/* quick-insert.tsx generated by @compiled/babel-plugin v0.39.1 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

package/dist/es2019/nodeviews/bodiedLazySyncedBlock.js

@@ -1,4 +1,5 @@
 import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
+// Delete this file when cleaning up platform_synced_block_patch_5
 export const lazyBodiedSyncBlockView = props => {
   return withLazyLoading({
     nodeName: 'bodiedSyncBlock',

package/dist/es2019/nodeviews/bodiedSyncedBlock.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
+import { ACTION_SUBJECT, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { BodiedSyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
@@ -7,11 +7,12 @@ import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { BodiedSyncBlockWrapper } from '../ui/BodiedSyncBlockWrapper';
-const toDOM = () => ['div', {
+import { SyncBlockLabel } from '../ui/SyncBlockLabel';
+const toDOMOld = () => ['div', {
   class: BodiedSyncBlockSharedCssClassName.content,
   contenteditable: true
 }, 0];
-export class BodiedSyncBlock extends ReactNodeView {
+class BodiedSyncBlockOld extends ReactNodeView {
   constructor(props) {
     super(props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props);
     this.api = props.api;
@@ -84,7 +85,7 @@ export class BodiedSyncBlock extends ReactNodeView {
     const {
       dom,
       contentDOM
-    } = DOMSerializer.renderSpec(document, toDOM());
+    } = DOMSerializer.renderSpec(document, toDOMOld());
     // In SSR, the first check won't work, so fallback to nodeType check
     if (dom instanceof HTMLElement || dom.nodeType === 1 && fg('platform_synced_block_patch_5')) {
       this.updateContentEditable({
@@ -107,7 +108,7 @@ export class BodiedSyncBlock extends ReactNodeView {
     }
   }
 }
-export const bodiedSyncBlockNodeView = ({
+export const bodiedSyncBlockNodeViewOld = ({
   pluginOptions,
   pmPluginFactoryParams,
   api,
@@ -117,7 +118,7 @@ export const bodiedSyncBlockNodeView = ({
     portalProviderAPI,
     eventDispatcher
   } = pmPluginFactoryParams;
-  return new BodiedSyncBlock({
+  return new BodiedSyncBlockOld({
     api,
     pluginOptions,
     node,
@@ -127,4 +128,118 @@ export const bodiedSyncBlockNodeView = ({
     eventDispatcher,
     syncBlockStore
   }).init();
+};
+const toDOM = node => ['div', {
+  class: `${BodiedSyncBlockSharedCssClassName.prefix} bodiedSyncBlockView-content-wrap`,
+  localid: node.attrs.localId,
+  resourceid: node.attrs.resourceId
+}, ['div', {
+  class: BodiedSyncBlockSharedCssClassName.content,
+  contenteditable: 'true'
+}, 0]];
+export class BodiedSyncBlock {
+  constructor(node, view, getPos, api, nodeViewPortalProviderAPI, syncBlockStore) {
+    this.node = node;
+    this.view = view;
+    this.getPos = getPos;
+    this.api = api;
+    this.syncBlockStore = syncBlockStore;
+    this.nodeViewPortalProviderAPI = nodeViewPortalProviderAPI;
+    const {
+      dom,
+      contentDOM
+    } = DOMSerializer.renderSpec(document, toDOM(this.node));
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
+    this.dom = dom;
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
+    this.contentDOM = contentDOM;
+    this.labelKey = crypto.randomUUID();
+    this.nodeViewPortalProviderAPI.render(() => {
+      var _this$api7, _this$api7$analytics;
+      return /*#__PURE__*/React.createElement(ErrorBoundary, {
+        component: ACTION_SUBJECT.SYNCED_BLOCK,
+        componentId: ACTION_SUBJECT_ID.SYNCED_BLOCK_LABEL,
+        dispatchAnalyticsEvent: (_this$api7 = this.api) === null || _this$api7 === void 0 ? void 0 : (_this$api7$analytics = _this$api7.analytics) === null || _this$api7$analytics === void 0 ? void 0 : _this$api7$analytics.actions.fireAnalyticsEvent,
+        fallbackComponent: null
+      }, /*#__PURE__*/React.createElement(SyncBlockLabel, {
+        isSource: true,
+        localId: node.attrs.localId
+      }));
+    }, this.dom, this.labelKey);
+    this.updateContentEditable({});
+    this.handleConnectivityModeChange();
+    this.handleViewModeChange();
+  }
+  updateContentEditable({
+    nextConnectivityMode,
+    nextViewMode
+  }) {
+    var _this$api8, _this$api8$connectivi, _this$api8$connectivi2, _this$api8$connectivi3, _this$api9, _this$api9$editorView, _this$api9$editorView2, _this$api9$editorView3;
+    const connectivityMode = nextConnectivityMode !== null && nextConnectivityMode !== void 0 ? nextConnectivityMode : (_this$api8 = this.api) === null || _this$api8 === void 0 ? void 0 : (_this$api8$connectivi = _this$api8.connectivity) === null || _this$api8$connectivi === void 0 ? void 0 : (_this$api8$connectivi2 = _this$api8$connectivi.sharedState) === null || _this$api8$connectivi2 === void 0 ? void 0 : (_this$api8$connectivi3 = _this$api8$connectivi2.currentState()) === null || _this$api8$connectivi3 === void 0 ? void 0 : _this$api8$connectivi3.mode;
+    const viewMode = nextViewMode !== null && nextViewMode !== void 0 ? nextViewMode : (_this$api9 = this.api) === null || _this$api9 === void 0 ? void 0 : (_this$api9$editorView = _this$api9.editorViewMode) === null || _this$api9$editorView === void 0 ? void 0 : (_this$api9$editorView2 = _this$api9$editorView.sharedState) === null || _this$api9$editorView2 === void 0 ? void 0 : (_this$api9$editorView3 = _this$api9$editorView2.currentState()) === null || _this$api9$editorView3 === void 0 ? void 0 : _this$api9$editorView3.mode;
+    const isOnline = !isOfflineMode(connectivityMode);
+    const isEditMode = viewMode !== 'view';
+    const shouldBeEditable = isOnline && isEditMode;
+    this.contentDOM.setAttribute('contenteditable', shouldBeEditable ? 'true' : 'false');
+  }
+  handleConnectivityModeChange() {
+    var _this$api0;
+    if ((_this$api0 = this.api) !== null && _this$api0 !== void 0 && _this$api0.connectivity) {
+      this.cleanupConnectivityModeListener = this.api.connectivity.sharedState.onChange(({
+        nextSharedState
+      }) => {
+        this.updateContentEditable({
+          nextConnectivityMode: nextSharedState.mode
+        });
+      });
+    }
+  }
+  handleViewModeChange() {
+    var _this$api1;
+    if ((_this$api1 = this.api) !== null && _this$api1 !== void 0 && _this$api1.editorViewMode) {
+      this.cleanupViewModeListener = this.api.editorViewMode.sharedState.onChange(({
+        nextSharedState
+      }) => {
+        this.updateContentEditable({
+          nextViewMode: nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.mode
+        });
+      });
+    }
+  }
+  update(node) {
+    if (this.node.type !== node.type) {
+      return false;
+    }
+    if (node !== this.node) {
+      var _this$api$syncedBlock2, _this$api10, _this$api10$syncedBlo, _this$api10$syncedBlo2;
+      const syncBlockStore = (_this$api$syncedBlock2 = (_this$api10 = this.api) === null || _this$api10 === void 0 ? void 0 : (_this$api10$syncedBlo = _this$api10.syncedBlock.sharedState) === null || _this$api10$syncedBlo === void 0 ? void 0 : (_this$api10$syncedBlo2 = _this$api10$syncedBlo.currentState()) === null || _this$api10$syncedBlo2 === void 0 ? void 0 : _this$api10$syncedBlo2.syncBlockStore) !== null && _this$api$syncedBlock2 !== void 0 ? _this$api$syncedBlock2 : this.syncBlockStore;
+      syncBlockStore === null || syncBlockStore === void 0 ? void 0 : syncBlockStore.sourceManager.updateSyncBlockData(node);
+    }
+    this.node = node;
+    return true;
+  }
+  ignoreMutation(mutation) {
+    if (mutation.type === 'selection') {
+      return false;
+    }
+    return true;
+  }
+  destroy() {
+    var _this$cleanupConnecti, _this$cleanupViewMode;
+    (_this$cleanupConnecti = this.cleanupConnectivityModeListener) === null || _this$cleanupConnecti === void 0 ? void 0 : _this$cleanupConnecti.call(this);
+    (_this$cleanupViewMode = this.cleanupViewModeListener) === null || _this$cleanupViewMode === void 0 ? void 0 : _this$cleanupViewMode.call(this);
+    this.nodeViewPortalProviderAPI.remove(this.labelKey);
+  }
+}
+export const bodiedSyncBlockNodeView = props => {
+  const {
+    api,
+    syncBlockStore,
+    pmPluginFactoryParams: {
+      nodeViewPortalProviderAPI
+    }
+  } = props;
+  return (node, view, getPos) => {
+    return new BodiedSyncBlock(node, view, getPos, api, nodeViewPortalProviderAPI, syncBlockStore);
+  };
 };

package/dist/es2019/nodeviews/syncedBlock.js

@@ -4,6 +4,7 @@ import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { SyncBlockSharedCssClassName, SyncBlockActionsProvider } from '@atlaskit/editor-common/sync-block';
 import { useFetchSyncBlockData, useFetchSyncBlockTitle } from '@atlaskit/editor-synced-block-provider';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { removeSyncedBlockAtPos } from '../editor-commands';
 import { SyncBlockRendererWrapper } from '../ui/SyncBlockRendererWrapper';
 export class SyncBlock extends ReactNodeView {
@@ -18,6 +19,16 @@ export class SyncBlock extends ReactNodeView {
     domRef.classList.add(SyncBlockSharedCssClassName.prefix);
     return domRef;
   }
+  validUpdate(currentNode, newNode) {
+    // Only consider as the valid update if the localId and resourceId are the same
+    // This prevents PM reusing the same node view for different sync block node in live page transition
+    return currentNode.attrs.localId === newNode.attrs.localId && currentNode.attrs.resourceId === newNode.attrs.resourceId;
+  }
+  update(node, decorations, innerDecorations) {
+    return super.update(node, decorations, innerDecorations, editorExperiment('platform_synced_block_patch_6', true, {
+      exposure: true
+    }) ? this.validUpdate : undefined);
+  }
   render({
     getPos
   }) {

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

@@ -9,8 +9,9 @@ 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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { lazyBodiedSyncBlockView } from '../nodeviews/bodiedLazySyncedBlock';
-import { bodiedSyncBlockNodeView } from '../nodeviews/bodiedSyncedBlock';
+import { bodiedSyncBlockNodeView, bodiedSyncBlockNodeViewOld } from '../nodeviews/bodiedSyncedBlock';
 import { SyncBlock as SyncBlockView } from '../nodeviews/syncedBlock';
 import { FLAG_ID } from '../types';
 import { handleBodiedSyncBlockCreation } from './utils/handle-bodied-sync-block-creation';
@@ -57,9 +58,6 @@ const showCopiedFlag = api => {
 };
 const showInlineExtensionInSyncBlockWarningIfNeeded = (tr, state, api, inlineExtensionFlagShown) => {
   var _api$connectivity, _api$connectivity$sha;
-  if (!fg('platform_synced_block_patch_3')) {
-    return;
-  }
   if (!tr.docChanged || tr.getMeta('isRemote') || Boolean(tr.getMeta(pmHistoryPluginKey)) || isOfflineMode(api === null || api === void 0 ? void 0 : (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 ? void 0 : (_api$connectivity$sha = _api$connectivity.sharedState.currentState()) === null || _api$connectivity$sha === void 0 ? void 0 : _api$connectivity$sha.mode)) {
     return;
   }
@@ -113,31 +111,17 @@ const filterTransactionOnline = ({
     });
   });
   syncBlockAdded.forEach(syncBlock => {
-    if (fg('platform_synced_block_patch_3')) {
-      var _api$analytics2, _api$analytics2$actio;
-      api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : (_api$analytics2$actio = _api$analytics2.actions) === null || _api$analytics2$actio === void 0 ? void 0 : _api$analytics2$actio.fireAnalyticsEvent({
-        action: ACTION.INSERTED,
-        actionSubject: ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK,
-        attributes: {
-          resourceId: syncBlock.attrs.resourceId,
-          blockInstanceId: syncBlock.attrs.localId
-        },
-        eventType: EVENT_TYPE.TRACK
-      });
-    } else {
-      var _api$analytics3, _api$analytics3$actio;
-      api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : (_api$analytics3$actio = _api$analytics3.actions) === null || _api$analytics3$actio === void 0 ? void 0 : _api$analytics3$actio.fireAnalyticsEvent({
-        action: ACTION.INSERTED,
-        actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-        actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-        attributes: {
-          resourceId: syncBlock.attrs.resourceId,
-          blockInstanceId: syncBlock.attrs.localId
-        },
-        eventType: EVENT_TYPE.OPERATIONAL
-      });
-    }
+    var _api$analytics2, _api$analytics2$actio;
+    api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : (_api$analytics2$actio = _api$analytics2.actions) === null || _api$analytics2$actio === void 0 ? void 0 : _api$analytics2$actio.fireAnalyticsEvent({
+      action: ACTION.INSERTED,
+      actionSubject: ACTION_SUBJECT.DOCUMENT,
+      actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK,
+      attributes: {
+        resourceId: syncBlock.attrs.resourceId,
+        blockInstanceId: syncBlock.attrs.localId
+      },
+      eventType: EVENT_TYPE.TRACK
+    });
   });
   if (bodiedSyncBlockRemoved.length > 0) {
     // eslint-disable-next-line no-param-reassign
@@ -314,7 +298,14 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           eventDispatcher: pmPluginFactoryParams.eventDispatcher,
           syncBlockStore: syncBlockStore
         }).init(),
-        bodiedSyncBlock: fg('platform_synced_block_patch_5') ? bodiedSyncBlockNodeView({
+        bodiedSyncBlock: fg('platform_synced_block_patch_5') ? editorExperiment('platform_synced_block_use_new_source_nodeview', true, {
+          exposure: true
+        }) ? bodiedSyncBlockNodeView({
+          pluginOptions: options,
+          pmPluginFactoryParams,
+          api,
+          syncBlockStore
+        }) : bodiedSyncBlockNodeViewOld({
           pluginOptions: options,
           pmPluginFactoryParams,
           api,
@@ -326,7 +317,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         })
       },
       decorations: state => {
-        var _currentPluginState$s, _api$connectivity2, _api$connectivity2$sh, _api$editorViewMode, _api$editorViewMode$s, _api$userIntent, _api$userIntent$share;
+        var _currentPluginState$s, _api$connectivity2, _api$connectivity2$sh, _api$editorViewMode, _api$editorViewMode$s, _api$userIntent, _api$userIntent$share, _api$focus, _api$focus$sharedStat, _api$focus$sharedStat2;
         const currentPluginState = syncedBlockPluginKey.getState(state);
         const selectionDecorationSet = (_currentPluginState$s = currentPluginState === null || currentPluginState === void 0 ? void 0 : currentPluginState.selectionDecorationSet) !== null && _currentPluginState$s !== void 0 ? _currentPluginState$s : DecorationSet.empty;
         const syncBlockStore = currentPluginState === null || currentPluginState === void 0 ? void 0 : currentPluginState.syncBlockStore;
@@ -364,7 +355,14 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
             }));
           }
         });
-        return selectionDecorationSet.add(doc, offlineDecorations).add(doc, viewModeDecorations).add(doc, loadingDecorations).add(doc, dragDecorations);
+        if (api !== null && api !== void 0 && (_api$focus = api.focus) !== null && _api$focus !== void 0 && (_api$focus$sharedStat = _api$focus.sharedState) !== null && _api$focus$sharedStat !== void 0 && (_api$focus$sharedStat2 = _api$focus$sharedStat.currentState()) !== null && _api$focus$sharedStat2 !== void 0 && _api$focus$sharedStat2.hasFocus || !editorExperiment('platform_synced_block_patch_6', true, {
+          exposure: true
+        })) {
+          // Don't show decorations if the editor is not focused
+          return selectionDecorationSet.add(doc, offlineDecorations).add(doc, viewModeDecorations).add(doc, loadingDecorations).add(doc, dragDecorations);
+        } else {
+          return DecorationSet.empty.add(doc, offlineDecorations).add(doc, viewModeDecorations).add(doc, loadingDecorations).add(doc, dragDecorations);
+        }
       },
       handleClickOn: createSelectionClickHandler(['bodiedSyncBlock'], target => !!target.closest(`.${BodiedSyncBlockSharedCssClassName.prefix}`), {
         useLongPressSelection
@@ -478,8 +476,8 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           added: syncBlockAdded
         } = trackSyncBlocks(node => node.type.name === 'syncBlock', tr, state);
         syncBlockRemoved.forEach(syncBlock => {
-          var _api$analytics4, _api$analytics4$actio;
-          api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : (_api$analytics4$actio = _api$analytics4.actions) === null || _api$analytics4$actio === void 0 ? void 0 : _api$analytics4$actio.fireAnalyticsEvent({
+          var _api$analytics3, _api$analytics3$actio;
+          api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : (_api$analytics3$actio = _api$analytics3.actions) === null || _api$analytics3$actio === void 0 ? void 0 : _api$analytics3$actio.fireAnalyticsEvent({
             action: ACTION.DELETED,
             actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
             actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_DELETE,
@@ -491,31 +489,17 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           });
         });
         syncBlockAdded.forEach(syncBlock => {
-          if (fg('platform_synced_block_patch_3')) {
-            var _api$analytics5, _api$analytics5$actio;
-            api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : (_api$analytics5$actio = _api$analytics5.actions) === null || _api$analytics5$actio === void 0 ? void 0 : _api$analytics5$actio.fireAnalyticsEvent({
-              action: ACTION.INSERTED,
-              actionSubject: ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK,
-              attributes: {
-                resourceId: syncBlock.attrs.resourceId,
-                blockInstanceId: syncBlock.attrs.localId
-              },
-              eventType: EVENT_TYPE.TRACK
-            });
-          } else {
-            var _api$analytics6, _api$analytics6$actio;
-            api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : (_api$analytics6$actio = _api$analytics6.actions) === null || _api$analytics6$actio === void 0 ? void 0 : _api$analytics6$actio.fireAnalyticsEvent({
-              action: ACTION.INSERTED,
-              actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-              actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-              attributes: {
-                resourceId: syncBlock.attrs.resourceId,
-                blockInstanceId: syncBlock.attrs.localId
-              },
-              eventType: EVENT_TYPE.OPERATIONAL
-            });
-          }
+          var _api$analytics4, _api$analytics4$actio;
+          api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : (_api$analytics4$actio = _api$analytics4.actions) === null || _api$analytics4$actio === void 0 ? void 0 : _api$analytics4$actio.fireAnalyticsEvent({
+            action: ACTION.INSERTED,
+            actionSubject: ACTION_SUBJECT.DOCUMENT,
+            actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK,
+            attributes: {
+              resourceId: syncBlock.attrs.resourceId,
+              blockInstanceId: syncBlock.attrs.localId
+            },
+            eventType: EVENT_TYPE.TRACK
+          });
         });
         if (bodiedSyncBlockRemoved.length > 0) {
           confirmationTransactionRef.current = tr;

package/dist/es2019/pm-plugins/utils/track-sync-blocks.js

@@ -1,6 +1,5 @@
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 export const trackSyncBlocks = (predicate, tr, state) => {
   const removed = {};
   const added = {};
@@ -15,12 +14,12 @@ export const trackSyncBlocks = (predicate, tr, state) => {
   const replaceSteps = tr.steps.filter(step => step instanceof ReplaceStep || step instanceof ReplaceAroundStep);
 
   // this is a quick check to see if any insertion/deletion of bodiedSyncBlock happened
-  const hasBodiedSyncBlockChanges = replaceSteps.some((step, idx) => {
+  const hasBodiedSyncBlockChanges = replaceSteps.some(step => {
     const {
       from,
       to
     } = step;
-    const docAtStep = fg('platform_synced_block_patch_3') ? tr.docs[tr.steps.indexOf(step)] : tr.docs[idx];
+    const docAtStep = tr.docs[tr.steps.indexOf(step)];
     let hasChange = false;
     if (from !== to) {
       step.getMap().forEach((oldStart, oldEnd) => {
@@ -102,63 +101,31 @@ export const hasEditInSyncBlock = (tr, state) => {
   const {
     bodiedSyncBlock
   } = state.schema.nodes;
-  if (fg('platform_synced_block_patch_3')) {
-    for (let i = 0; i < tr.steps.length; i++) {
-      var _tr$docs;
-      const step = tr.steps[i];
-      const map = step.getMap();
-      const docAfterStep = (_tr$docs = tr.docs[i + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc;
-      const positions = [];
+  for (let i = 0; i < tr.steps.length; i++) {
+    var _tr$docs;
+    const step = tr.steps[i];
+    const map = step.getMap();
+    const docAfterStep = (_tr$docs = tr.docs[i + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc;
+    const positions = [];
 
-      // Extract positions from steps dynamically based on applicable properties
-      if ('from' in step && typeof step.from === 'number' && 'to' in step && typeof step.to === 'number') {
-        const {
-          from,
-          to
-        } = step;
-        positions.push(from, to);
-      } else if ('pos' in step && typeof step.pos === 'number') {
-        const {
-          pos
-        } = step;
-        positions.push(pos);
-      }
-      for (const pos of positions) {
-        const newPos = map.map(pos);
-        if (newPos >= 0 && newPos <= docAfterStep.content.size) {
-          if (findParentNodeOfTypeClosestToPos(docAfterStep.resolve(newPos), bodiedSyncBlock)) {
-            return true;
-          }
-        }
-      }
-    }
-  } else {
-    for (const step of tr.steps) {
-      const map = step.getMap();
+    // Extract positions from steps dynamically based on applicable properties
+    if ('from' in step && typeof step.from === 'number' && 'to' in step && typeof step.to === 'number') {
       const {
-        doc
-      } = tr;
-      const positions = [];
-
-      // Extract positions from steps dynamically based on applicable properties
-      if ('from' in step && typeof step.from === 'number' && 'to' in step && typeof step.to === 'number') {
-        const {
-          from,
-          to
-        } = step;
-        positions.push(from, to);
-      } else if ('pos' in step && typeof step.pos === 'number') {
-        const {
-          pos
-        } = step;
-        positions.push(pos);
-      }
-      for (const pos of positions) {
-        const newPos = map.map(pos);
-        if (newPos >= 0 && newPos <= doc.content.size) {
-          if (findParentNodeOfTypeClosestToPos(doc.resolve(newPos), bodiedSyncBlock)) {
-            return true;
-          }
+        from,
+        to
+      } = step;
+      positions.push(from, to);
+    } else if ('pos' in step && typeof step.pos === 'number') {
+      const {
+        pos
+      } = step;
+      positions.push(pos);
+    }
+    for (const pos of positions) {
+      const newPos = map.map(pos);
+      if (newPos >= 0 && newPos <= docAfterStep.content.size) {
+        if (findParentNodeOfTypeClosestToPos(docAfterStep.resolve(newPos), bodiedSyncBlock)) {
+          return true;
         }
       }
     }

package/dist/es2019/syncedBlockPlugin.js

@@ -1,7 +1,8 @@
 import React from 'react';
-import { bodiedSyncBlock, syncBlock } from '@atlaskit/adf-schema';
+import { syncBlock, bodiedSyncBlock } from '@atlaskit/adf-schema';
 import { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { flushBodiedSyncBlocks, flushSyncBlocks } from './editor-actions';
 import { copySyncedBlockReferenceToClipboardEditorCommand, createSyncedBlock } from './editor-commands';
 import { bodiedSyncBlockNodeWithToDOMFixed } from './nodeviews/bodiedSyncBlockNodeWithToDOMFixed';
@@ -32,7 +33,11 @@ export const syncedBlockPlugin = ({
         node: syncBlock
       }, {
         name: 'bodiedSyncBlock',
-        node: fg('platform_synced_block_patch_3') ? bodiedSyncBlockNodeWithToDOMFixed() : bodiedSyncBlock
+        node: !editorExperiment('platform_synced_block_patch_6', true, {
+          exposure: true
+        }) ?
+        // delete bodiedSyncBlockNodeWithToDOMFixed when cleaning up platform_synced_block_patch_6
+        bodiedSyncBlockNodeWithToDOMFixed() : bodiedSyncBlock
       }];
     },
     pmPlugins() {

package/dist/es2019/ui/BodiedSyncBlockWrapper.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { useHandleContentChanges } from '@atlaskit/editor-synced-block-provider';
 import { SyncBlockLabel } from './SyncBlockLabel';
+// Delete this file when cleaning up platform_synced_block_use_new_source_nodeview
 export const BodiedSyncBlockWrapper = /*#__PURE__*/React.forwardRef(({
   node,
   syncBlockStore

package/dist/es2019/ui/DeleteConfirmationModal.js

@@ -1,4 +1,4 @@
-/* DeleteConfirmationModal.tsx generated by @compiled/babel-plugin v0.38.1 */
+/* DeleteConfirmationModal.tsx generated by @compiled/babel-plugin v0.39.1 */
 import "./DeleteConfirmationModal.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useEffect, useState } from 'react';