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

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 5.4.6
+
+### Patch Changes
+
+- [`2e6129d5b39bc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2e6129d5b39bc) -
+  EDITOR-5529 clean up platform_synced_block_patch_3 and platform_synced_block_patch_4
+- [`b853527230a60`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b853527230a60) -
+  [EDITOR-5520] Fix reference sync block shows old page data when transitioning between live pages
+- Updated dependencies
+
+## 5.4.5
+
+### Patch Changes
+
+- [`1a05924d64777`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1a05924d64777) -
+  [EDITOR-5528] Fix bodiedSyncBlock mutation
+- Updated dependencies
+
 ## 5.4.4
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -44,15 +44,24 @@
 		{
 			"path": "../../editor-plugin-connectivity/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-content-format/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-decorations/afm-cc/tsconfig.json"
 		},
 		{
 			"path": "../../editor-plugin-floating-toolbar/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-focus/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-selection/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-user-intent/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-prosemirror/afm-cc/tsconfig.json"
 		},
@@ -92,6 +101,9 @@
 		{
 			"path": "../../../design-system/spinner/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../tmp-editor-statsig/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/tokens/afm-cc/tsconfig.json"
 		},

package/afm-jira/tsconfig.json

@@ -44,15 +44,24 @@
 		{
 			"path": "../../editor-plugin-connectivity/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-content-format/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-decorations/afm-jira/tsconfig.json"
 		},
 		{
 			"path": "../../editor-plugin-floating-toolbar/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-focus/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-selection/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-user-intent/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../editor-prosemirror/afm-jira/tsconfig.json"
 		},
@@ -92,6 +101,9 @@
 		{
 			"path": "../../../design-system/spinner/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../tmp-editor-statsig/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/tokens/afm-jira/tsconfig.json"
 		},

package/afm-products/tsconfig.json

@@ -44,15 +44,24 @@
 		{
 			"path": "../../editor-plugin-connectivity/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-content-format/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-decorations/afm-products/tsconfig.json"
 		},
 		{
 			"path": "../../editor-plugin-floating-toolbar/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-focus/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-selection/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-user-intent/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../editor-prosemirror/afm-products/tsconfig.json"
 		},
@@ -92,6 +101,9 @@
 		{
 			"path": "../../../design-system/spinner/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../tmp-editor-statsig/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/tokens/afm-products/tsconfig.json"
 		},

package/dist/cjs/nodeviews/bodiedLazySyncedBlock.js

@@ -8,6 +8,7 @@ exports.lazyBodiedSyncBlockView = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+// Delete this file when cleaning up platform_synced_block_patch_5
 var lazyBodiedSyncBlockView = exports.lazyBodiedSyncBlockView = function lazyBodiedSyncBlockView(props) {
   return (0, _lazyNodeView.withLazyLoading)({
     nodeName: 'bodiedSyncBlock',

package/dist/cjs/nodeviews/bodiedSyncedBlock.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.bodiedSyncBlockNodeView = exports.BodiedSyncBlock = void 0;
+exports.bodiedSyncBlockNodeViewOld = exports.bodiedSyncBlockNodeView = exports.BodiedSyncBlock = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -19,27 +19,28 @@ var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _BodiedSyncBlockWrapper = require("../ui/BodiedSyncBlockWrapper");
+var _SyncBlockLabel = require("../ui/SyncBlockLabel");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-var toDOM = function toDOM() {
+var toDOMOld = function toDOMOld() {
   return ['div', {
     class: _syncBlock.BodiedSyncBlockSharedCssClassName.content,
     contenteditable: true
   }, 0];
 };
-var BodiedSyncBlock = exports.BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
-  function BodiedSyncBlock(props) {
+var BodiedSyncBlockOld = /*#__PURE__*/function (_ReactNodeView) {
+  function BodiedSyncBlockOld(props) {
     var _this;
-    (0, _classCallCheck2.default)(this, BodiedSyncBlock);
-    _this = _callSuper(this, BodiedSyncBlock, [props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props]);
+    (0, _classCallCheck2.default)(this, BodiedSyncBlockOld);
+    _this = _callSuper(this, BodiedSyncBlockOld, [props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props]);
     _this.api = props.api;
     _this.syncBlockStore = props.syncBlockStore;
     _this.handleConnectivityModeChange();
     _this.handleViewModeChange();
     return _this;
   }
-  (0, _inherits2.default)(BodiedSyncBlock, _ReactNodeView);
-  return (0, _createClass2.default)(BodiedSyncBlock, [{
+  (0, _inherits2.default)(BodiedSyncBlockOld, _ReactNodeView);
+  return (0, _createClass2.default)(BodiedSyncBlockOld, [{
     key: "updateContentEditable",
     value: function updateContentEditable(_ref) {
       var _this$api, _this$api2;
@@ -112,7 +113,7 @@ var BodiedSyncBlock = exports.BodiedSyncBlock = /*#__PURE__*/function (_ReactNod
   }, {
     key: "getContentDOM",
     value: function getContentDOM() {
-      var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, toDOM()),
+      var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, toDOMOld()),
         dom = _DOMSerializer$render.dom,
         contentDOM = _DOMSerializer$render.contentDOM;
       // In SSR, the first check won't work, so fallback to nodeType check
@@ -140,7 +141,7 @@ var BodiedSyncBlock = exports.BodiedSyncBlock = /*#__PURE__*/function (_ReactNod
     }
   }]);
 }(_reactNodeView.default);
-var bodiedSyncBlockNodeView = exports.bodiedSyncBlockNodeView = function bodiedSyncBlockNodeView(_ref4) {
+var bodiedSyncBlockNodeViewOld = exports.bodiedSyncBlockNodeViewOld = function bodiedSyncBlockNodeViewOld(_ref4) {
   var pluginOptions = _ref4.pluginOptions,
     pmPluginFactoryParams = _ref4.pmPluginFactoryParams,
     api = _ref4.api,
@@ -148,7 +149,7 @@ var bodiedSyncBlockNodeView = exports.bodiedSyncBlockNodeView = function bodiedS
   return function (node, view, getPos) {
     var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
       eventDispatcher = pmPluginFactoryParams.eventDispatcher;
-    return new BodiedSyncBlock({
+    return new BodiedSyncBlockOld({
       api: api,
       pluginOptions: pluginOptions,
       node: node,
@@ -159,4 +160,129 @@ var bodiedSyncBlockNodeView = exports.bodiedSyncBlockNodeView = function bodiedS
       syncBlockStore: syncBlockStore
     }).init();
   };
+};
+var toDOM = function toDOM(node) {
+  return ['div', {
+    class: "".concat(_syncBlock.BodiedSyncBlockSharedCssClassName.prefix, " bodiedSyncBlockView-content-wrap"),
+    localid: node.attrs.localId,
+    resourceid: node.attrs.resourceId
+  }, ['div', {
+    class: _syncBlock.BodiedSyncBlockSharedCssClassName.content,
+    contenteditable: 'true'
+  }, 0]];
+};
+var BodiedSyncBlock = exports.BodiedSyncBlock = /*#__PURE__*/function () {
+  function BodiedSyncBlock(node, view, getPos, api, nodeViewPortalProviderAPI, syncBlockStore) {
+    var _this4 = this;
+    (0, _classCallCheck2.default)(this, BodiedSyncBlock);
+    this.node = node;
+    this.view = view;
+    this.getPos = getPos;
+    this.api = api;
+    this.syncBlockStore = syncBlockStore;
+    this.nodeViewPortalProviderAPI = nodeViewPortalProviderAPI;
+    var _DOMSerializer$render2 = _model.DOMSerializer.renderSpec(document, toDOM(this.node)),
+      dom = _DOMSerializer$render2.dom,
+      contentDOM = _DOMSerializer$render2.contentDOM;
+    // 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(function () {
+      var _this4$api;
+      return /*#__PURE__*/_react.default.createElement(_errorBoundary.ErrorBoundary, {
+        component: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
+        componentId: _analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_LABEL,
+        dispatchAnalyticsEvent: (_this4$api = _this4.api) === null || _this4$api === void 0 || (_this4$api = _this4$api.analytics) === null || _this4$api === void 0 ? void 0 : _this4$api.actions.fireAnalyticsEvent,
+        fallbackComponent: null
+      }, /*#__PURE__*/_react.default.createElement(_SyncBlockLabel.SyncBlockLabel, {
+        isSource: true,
+        localId: node.attrs.localId
+      }));
+    }, this.dom, this.labelKey);
+    this.updateContentEditable({});
+    this.handleConnectivityModeChange();
+    this.handleViewModeChange();
+  }
+  return (0, _createClass2.default)(BodiedSyncBlock, [{
+    key: "updateContentEditable",
+    value: function updateContentEditable(_ref5) {
+      var _this$api7, _this$api8;
+      var nextConnectivityMode = _ref5.nextConnectivityMode,
+        nextViewMode = _ref5.nextViewMode;
+      var connectivityMode = nextConnectivityMode !== null && nextConnectivityMode !== void 0 ? nextConnectivityMode : (_this$api7 = this.api) === null || _this$api7 === void 0 || (_this$api7 = _this$api7.connectivity) === null || _this$api7 === void 0 || (_this$api7 = _this$api7.sharedState) === null || _this$api7 === void 0 || (_this$api7 = _this$api7.currentState()) === null || _this$api7 === void 0 ? void 0 : _this$api7.mode;
+      var viewMode = nextViewMode !== null && nextViewMode !== void 0 ? nextViewMode : (_this$api8 = this.api) === null || _this$api8 === void 0 || (_this$api8 = _this$api8.editorViewMode) === null || _this$api8 === void 0 || (_this$api8 = _this$api8.sharedState) === null || _this$api8 === void 0 || (_this$api8 = _this$api8.currentState()) === null || _this$api8 === void 0 ? void 0 : _this$api8.mode;
+      var isOnline = !(0, _editorPluginConnectivity.isOfflineMode)(connectivityMode);
+      var isEditMode = viewMode !== 'view';
+      var shouldBeEditable = isOnline && isEditMode;
+      this.contentDOM.setAttribute('contenteditable', shouldBeEditable ? 'true' : 'false');
+    }
+  }, {
+    key: "handleConnectivityModeChange",
+    value: function handleConnectivityModeChange() {
+      var _this$api9,
+        _this5 = this;
+      if ((_this$api9 = this.api) !== null && _this$api9 !== void 0 && _this$api9.connectivity) {
+        this.cleanupConnectivityModeListener = this.api.connectivity.sharedState.onChange(function (_ref6) {
+          var nextSharedState = _ref6.nextSharedState;
+          _this5.updateContentEditable({
+            nextConnectivityMode: nextSharedState.mode
+          });
+        });
+      }
+    }
+  }, {
+    key: "handleViewModeChange",
+    value: function handleViewModeChange() {
+      var _this$api0,
+        _this6 = this;
+      if ((_this$api0 = this.api) !== null && _this$api0 !== void 0 && _this$api0.editorViewMode) {
+        this.cleanupViewModeListener = this.api.editorViewMode.sharedState.onChange(function (_ref7) {
+          var nextSharedState = _ref7.nextSharedState;
+          _this6.updateContentEditable({
+            nextViewMode: nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.mode
+          });
+        });
+      }
+    }
+  }, {
+    key: "update",
+    value: function update(node) {
+      if (this.node.type !== node.type) {
+        return false;
+      }
+      if (node !== this.node) {
+        var _this$api$syncedBlock2, _this$api1;
+        var syncBlockStore = (_this$api$syncedBlock2 = (_this$api1 = this.api) === null || _this$api1 === void 0 || (_this$api1 = _this$api1.syncedBlock.sharedState) === null || _this$api1 === void 0 || (_this$api1 = _this$api1.currentState()) === null || _this$api1 === void 0 ? void 0 : _this$api1.syncBlockStore) !== null && _this$api$syncedBlock2 !== void 0 ? _this$api$syncedBlock2 : this.syncBlockStore;
+        syncBlockStore === null || syncBlockStore === void 0 || syncBlockStore.sourceManager.updateSyncBlockData(node);
+      }
+      this.node = node;
+      return true;
+    }
+  }, {
+    key: "ignoreMutation",
+    value: function ignoreMutation(mutation) {
+      if (mutation.type === 'selection') {
+        return false;
+      }
+      return true;
+    }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      var _this$cleanupConnecti, _this$cleanupViewMode;
+      (_this$cleanupConnecti = this.cleanupConnectivityModeListener) === null || _this$cleanupConnecti === void 0 || _this$cleanupConnecti.call(this);
+      (_this$cleanupViewMode = this.cleanupViewModeListener) === null || _this$cleanupViewMode === void 0 || _this$cleanupViewMode.call(this);
+      this.nodeViewPortalProviderAPI.remove(this.labelKey);
+    }
+  }]);
+}();
+var bodiedSyncBlockNodeView = exports.bodiedSyncBlockNodeView = function bodiedSyncBlockNodeView(props) {
+  var api = props.api,
+    syncBlockStore = props.syncBlockStore,
+    nodeViewPortalProviderAPI = props.pmPluginFactoryParams.nodeViewPortalProviderAPI;
+  return function (node, view, getPos) {
+    return new BodiedSyncBlock(node, view, getPos, api, nodeViewPortalProviderAPI, syncBlockStore);
+  };
 };

package/dist/cjs/nodeviews/syncedBlock.js

@@ -17,6 +17,7 @@ var _errorBoundary = require("@atlaskit/editor-common/error-boundary");
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("../editor-commands");
 var _SyncBlockRendererWrapper = require("../ui/SyncBlockRendererWrapper");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -40,6 +41,20 @@ var SyncBlock = exports.SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       domRef.classList.add(_syncBlock.SyncBlockSharedCssClassName.prefix);
       return domRef;
     }
+  }, {
+    key: "validUpdate",
+    value: function 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;
+    }
+  }, {
+    key: "update",
+    value: function update(node, decorations, innerDecorations) {
+      return _superPropGet(SyncBlock, "update", this, 3)([node, decorations, innerDecorations, (0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
+        exposure: true
+      }) ? this.validUpdate : undefined]);
+    }
   }, {
     key: "render",
     value: function render(_ref) {

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

@@ -19,6 +19,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _bodiedLazySyncedBlock = require("../nodeviews/bodiedLazySyncedBlock");
 var _bodiedSyncedBlock = require("../nodeviews/bodiedSyncedBlock");
 var _syncedBlock = require("../nodeviews/syncedBlock");
@@ -82,9 +83,6 @@ var showCopiedFlag = function showCopiedFlag(api) {
 };
 var showInlineExtensionInSyncBlockWarningIfNeeded = function showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown) {
   var _api$connectivity;
-  if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-    return;
-  }
   if (!tr.docChanged || tr.getMeta('isRemote') || Boolean(tr.getMeta(_utils.pmHistoryPluginKey)) || (0, _editorPluginConnectivity.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode)) {
     return;
   }
@@ -139,31 +137,17 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     });
   });
   syncBlockAdded.forEach(function (syncBlock) {
-    if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-      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({
-        action: _analytics.ACTION.INSERTED,
-        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK,
-        attributes: {
-          resourceId: syncBlock.attrs.resourceId,
-          blockInstanceId: syncBlock.attrs.localId
-        },
-        eventType: _analytics.EVENT_TYPE.TRACK
-      });
-    } else {
-      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({
-        action: _analytics.ACTION.INSERTED,
-        actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-        attributes: {
-          resourceId: syncBlock.attrs.resourceId,
-          blockInstanceId: syncBlock.attrs.localId
-        },
-        eventType: _analytics.EVENT_TYPE.OPERATIONAL
-      });
-    }
+    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({
+      action: _analytics.ACTION.INSERTED,
+      actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK,
+      attributes: {
+        resourceId: syncBlock.attrs.resourceId,
+        blockInstanceId: syncBlock.attrs.localId
+      },
+      eventType: _analytics.EVENT_TYPE.TRACK
+    });
   });
   if (bodiedSyncBlockRemoved.length > 0) {
     // eslint-disable-next-line no-param-reassign
@@ -353,7 +337,14 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
             }).init()
           );
         },
-        bodiedSyncBlock: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5') ? (0, _bodiedSyncedBlock.bodiedSyncBlockNodeView)({
+        bodiedSyncBlock: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5') ? (0, _experiments.editorExperiment)('platform_synced_block_use_new_source_nodeview', true, {
+          exposure: true
+        }) ? (0, _bodiedSyncedBlock.bodiedSyncBlockNodeView)({
+          pluginOptions: options,
+          pmPluginFactoryParams: pmPluginFactoryParams,
+          api: api,
+          syncBlockStore: syncBlockStore
+        }) : (0, _bodiedSyncedBlock.bodiedSyncBlockNodeViewOld)({
           pluginOptions: options,
           pmPluginFactoryParams: pmPluginFactoryParams,
           api: api,
@@ -365,7 +356,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         })
       },
       decorations: function decorations(state) {
-        var _currentPluginState$s, _api$connectivity2, _api$editorViewMode, _api$userIntent;
+        var _currentPluginState$s, _api$connectivity2, _api$editorViewMode, _api$userIntent, _api$focus;
         var currentPluginState = syncedBlockPluginKey.getState(state);
         var selectionDecorationSet = (_currentPluginState$s = currentPluginState === null || currentPluginState === void 0 ? void 0 : currentPluginState.selectionDecorationSet) !== null && _currentPluginState$s !== void 0 ? _currentPluginState$s : _view.DecorationSet.empty;
         var syncBlockStore = currentPluginState === null || currentPluginState === void 0 ? void 0 : currentPluginState.syncBlockStore;
@@ -401,7 +392,14 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
             }));
           }
         });
-        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 = _api$focus.sharedState) !== null && _api$focus !== void 0 && (_api$focus = _api$focus.currentState()) !== null && _api$focus !== void 0 && _api$focus.hasFocus || !(0, _experiments.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 _view.DecorationSet.empty.add(doc, offlineDecorations).add(doc, viewModeDecorations).add(doc, loadingDecorations).add(doc, dragDecorations);
+        }
       },
       handleClickOn: (0, _selection.createSelectionClickHandler)(['bodiedSyncBlock'], function (target) {
         return !!target.closest(".".concat(_syncBlock.BodiedSyncBlockSharedCssClassName.prefix));
@@ -514,8 +512,8 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           _syncBlockRemoved = _trackSyncBlocks5.removed,
           _syncBlockAdded = _trackSyncBlocks5.added;
         _syncBlockRemoved.forEach(function (syncBlock) {
-          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({
+          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({
             action: _analytics.ACTION.DELETED,
             actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
             actionSubjectId: _analytics.ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_DELETE,
@@ -527,31 +525,17 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           });
         });
         _syncBlockAdded.forEach(function (syncBlock) {
-          if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-            var _api$analytics5;
-            api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 || (_api$analytics5 = _api$analytics5.actions) === null || _api$analytics5 === void 0 || _api$analytics5.fireAnalyticsEvent({
-              action: _analytics.ACTION.INSERTED,
-              actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK,
-              attributes: {
-                resourceId: syncBlock.attrs.resourceId,
-                blockInstanceId: syncBlock.attrs.localId
-              },
-              eventType: _analytics.EVENT_TYPE.TRACK
-            });
-          } else {
-            var _api$analytics6;
-            api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 || (_api$analytics6 = _api$analytics6.actions) === null || _api$analytics6 === void 0 || _api$analytics6.fireAnalyticsEvent({
-              action: _analytics.ACTION.INSERTED,
-              actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
-              actionSubjectId: _analytics.ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-              attributes: {
-                resourceId: syncBlock.attrs.resourceId,
-                blockInstanceId: syncBlock.attrs.localId
-              },
-              eventType: _analytics.EVENT_TYPE.OPERATIONAL
-            });
-          }
+          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({
+            action: _analytics.ACTION.INSERTED,
+            actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+            actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK,
+            attributes: {
+              resourceId: syncBlock.attrs.resourceId,
+              blockInstanceId: syncBlock.attrs.localId
+            },
+            eventType: _analytics.EVENT_TYPE.TRACK
+          });
         });
         if (bodiedSyncBlockRemoved.length > 0) {
           confirmationTransactionRef.current = tr;

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

@@ -6,10 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.trackSyncBlocks = exports.hasEditInSyncBlock = void 0;
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var trackSyncBlocks = exports.trackSyncBlocks = function trackSyncBlocks(predicate, tr, state) {
   var removed = {};
   var added = {};
@@ -26,10 +22,10 @@ var trackSyncBlocks = exports.trackSyncBlocks = function trackSyncBlocks(predica
   });
 
   // this is a quick check to see if any insertion/deletion of bodiedSyncBlock happened
-  var hasBodiedSyncBlockChanges = replaceSteps.some(function (step, idx) {
+  var hasBodiedSyncBlockChanges = replaceSteps.some(function (step) {
     var from = step.from,
       to = step.to;
-    var docAtStep = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? tr.docs[tr.steps.indexOf(step)] : tr.docs[idx];
+    var docAtStep = tr.docs[tr.steps.indexOf(step)];
     var hasChange = false;
     if (from !== to) {
       step.getMap().forEach(function (oldStart, oldEnd) {
@@ -109,70 +105,32 @@ var trackSyncBlocks = exports.trackSyncBlocks = function trackSyncBlocks(predica
  */
 var hasEditInSyncBlock = exports.hasEditInSyncBlock = function hasEditInSyncBlock(tr, state) {
   var bodiedSyncBlock = state.schema.nodes.bodiedSyncBlock;
-  if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-    for (var i = 0; i < tr.steps.length; i++) {
-      var _tr$docs;
-      var step = tr.steps[i];
-      var map = step.getMap();
-      var docAfterStep = (_tr$docs = tr.docs[i + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc;
-      var positions = [];
+  for (var i = 0; i < tr.steps.length; i++) {
+    var _tr$docs;
+    var step = tr.steps[i];
+    var map = step.getMap();
+    var docAfterStep = (_tr$docs = tr.docs[i + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc;
+    var 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') {
-        var _ref = step,
-          from = _ref.from,
-          to = _ref.to;
-        positions.push(from, to);
-      } else if ('pos' in step && typeof step.pos === 'number') {
-        var _ref2 = step,
-          pos = _ref2.pos;
-        positions.push(pos);
-      }
-      for (var _i = 0, _positions = positions; _i < _positions.length; _i++) {
-        var _pos = _positions[_i];
-        var newPos = map.map(_pos);
-        if (newPos >= 0 && newPos <= docAfterStep.content.size) {
-          if ((0, _utils.findParentNodeOfTypeClosestToPos)(docAfterStep.resolve(newPos), bodiedSyncBlock)) {
-            return true;
-          }
-        }
-      }
+    // Extract positions from steps dynamically based on applicable properties
+    if ('from' in step && typeof step.from === 'number' && 'to' in step && typeof step.to === 'number') {
+      var _ref = step,
+        from = _ref.from,
+        to = _ref.to;
+      positions.push(from, to);
+    } else if ('pos' in step && typeof step.pos === 'number') {
+      var _ref2 = step,
+        pos = _ref2.pos;
+      positions.push(pos);
     }
-  } else {
-    var _iterator = _createForOfIteratorHelper(tr.steps),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _step2 = _step.value;
-        var _map = _step2.getMap();
-        var doc = tr.doc;
-        var _positions2 = [];
-
-        // Extract positions from steps dynamically based on applicable properties
-        if ('from' in _step2 && typeof _step2.from === 'number' && 'to' in _step2 && typeof _step2.to === 'number') {
-          var _ref3 = _step2,
-            _from = _ref3.from,
-            _to = _ref3.to;
-          _positions2.push(_from, _to);
-        } else if ('pos' in _step2 && typeof _step2.pos === 'number') {
-          var _ref4 = _step2,
-            _pos2 = _ref4.pos;
-          _positions2.push(_pos2);
-        }
-        for (var _i2 = 0, _positions3 = _positions2; _i2 < _positions3.length; _i2++) {
-          var _pos3 = _positions3[_i2];
-          var _newPos = _map.map(_pos3);
-          if (_newPos >= 0 && _newPos <= doc.content.size) {
-            if ((0, _utils.findParentNodeOfTypeClosestToPos)(doc.resolve(_newPos), bodiedSyncBlock)) {
-              return true;
-            }
-          }
+    for (var _i = 0, _positions = positions; _i < _positions.length; _i++) {
+      var _pos = _positions[_i];
+      var newPos = map.map(_pos);
+      if (newPos >= 0 && newPos <= docAfterStep.content.size) {
+        if ((0, _utils.findParentNodeOfTypeClosestToPos)(docAfterStep.resolve(newPos), bodiedSyncBlock)) {
+          return true;
         }
       }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
     }
   }
   return false;