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

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 5.3.23
+
+### Patch Changes
+
+- [`e4b932a41725c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e4b932a41725c) -
+  [ux] EDITOR-5459 fix merging logic for subtype in resolve sync block instance
+- Updated dependencies
+
+## 5.3.22
+
+### Patch Changes
+
+- [`8806992b3642c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8806992b3642c) -
+  EDITOR-5454 update synced block insert success event to use document inserted event
+- [`2b9f36bb91309`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2b9f36bb91309) -
+  Improve robustness
+- [`0f351c68adbac`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0f351c68adbac) -
+  Improve robustness
+- [`bf779fa373faa`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bf779fa373faa) -
+  [ux] EDITOR-5016 fix synced locations dropdown showing blogpost instead of page
+- Updated dependencies
+
 ## 5.3.21
 
 ### Patch Changes

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

@@ -16,6 +16,7 @@ var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 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 _bodiedLazySyncedBlock = require("../nodeviews/bodiedLazySyncedBlock");
 var _syncedBlock = require("../nodeviews/syncedBlock");
 var _types = require("../types");
@@ -310,17 +311,31 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           });
         });
         syncBlockAdded.forEach(function (syncBlock) {
-          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.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
-          });
+          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
+            });
+          }
         });
         if (bodiedSyncBlockRemoved.length > 0) {
           confirmationTransactionRef.current = tr;

package/dist/cjs/pm-plugins/utils/handle-bodied-sync-block-creation.js

@@ -136,6 +136,6 @@ var handleBodiedSyncBlockCreation = exports.handleBodiedSyncBlockCreation = func
           });
         });
       }
-    }, node.node);
+    });
   });
 };

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

@@ -6,6 +6,7 @@ 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; }
@@ -28,7 +29,7 @@ var trackSyncBlocks = exports.trackSyncBlocks = function trackSyncBlocks(predica
   var hasBodiedSyncBlockChanges = replaceSteps.some(function (step, idx) {
     var from = step.from,
       to = step.to;
-    var docAtStep = tr.docs[idx];
+    var docAtStep = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? tr.docs[tr.steps.indexOf(step)] : tr.docs[idx];
     var hasChange = false;
     if (from !== to) {
       step.getMap().forEach(function (oldStart, oldEnd) {
@@ -108,13 +109,12 @@ var trackSyncBlocks = exports.trackSyncBlocks = function trackSyncBlocks(predica
  */
 var hasEditInSyncBlock = exports.hasEditInSyncBlock = function hasEditInSyncBlock(tr, state) {
   var bodiedSyncBlock = state.schema.nodes.bodiedSyncBlock;
-  var _iterator = _createForOfIteratorHelper(tr.steps),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var step = _step.value;
+  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 doc = tr.doc;
+      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
@@ -131,17 +131,49 @@ var hasEditInSyncBlock = exports.hasEditInSyncBlock = function hasEditInSyncBloc
       for (var _i = 0, _positions = positions; _i < _positions.length; _i++) {
         var _pos = _positions[_i];
         var newPos = map.map(_pos);
-        if (newPos >= 0 && newPos <= doc.content.size) {
-          if ((0, _utils.findParentNodeOfTypeClosestToPos)(doc.resolve(newPos), bodiedSyncBlock)) {
+        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();
+  } 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;
+            }
+          }
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
   }
   return false;
 };

package/dist/cjs/ui/SyncedLocationDropdown.js

@@ -21,6 +21,7 @@ var _dropdownMenu = _interopRequireWildcard(require("@atlaskit/dropdown-menu"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _ui = require("@atlaskit/editor-common/ui");
+var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
 var _icon = require("@atlaskit/icon");
 var _pageLiveDoc = _interopRequireDefault(require("@atlaskit/icon-lab/core/page-live-doc"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-down"));
@@ -29,6 +30,7 @@ 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"));
@@ -90,7 +92,26 @@ var subTypeIconMap = {
   page: _page.default,
   blogpost: _quotationMark.default
 };
-var getConfluenceSubTypeIcon = function getConfluenceSubTypeIcon(subType) {
+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;
+    }
+  }
   return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : _page.default;
 };
 var ProductIcon = function ProductIcon(_ref2) {
@@ -108,10 +129,11 @@ var ItemIcon = function ItemIcon(_ref3) {
   var reference = _ref3.reference;
   var hasAccess = reference.hasAccess,
     subType = reference.subType,
-    productType = reference.productType;
+    productType = reference.productType,
+    sourceAri = reference.sourceAri;
   if (productType === 'confluence-page' && hasAccess) {
     return /*#__PURE__*/React.createElement(_icon.IconTile, {
-      icon: getConfluenceSubTypeIcon(subType),
+      icon: getConfluenceSubTypeIcon(sourceAri, subType),
       label: "",
       appearance: 'gray',
       size: "xsmall"

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

@@ -7,6 +7,7 @@ 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';
@@ -290,17 +291,31 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           });
         });
         syncBlockAdded.forEach(syncBlock => {
-          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.SYNCED_BLOCK,
-            actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-            attributes: {
-              resourceId: syncBlock.attrs.resourceId,
-              blockInstanceId: syncBlock.attrs.localId
-            },
-            eventType: EVENT_TYPE.OPERATIONAL
-          });
+          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
+            });
+          }
         });
         if (bodiedSyncBlockRemoved.length > 0) {
           confirmationTransactionRef.current = tr;

package/dist/es2019/pm-plugins/utils/handle-bodied-sync-block-creation.js

@@ -129,6 +129,6 @@ export const handleBodiedSyncBlockCreation = (bodiedSyncBlockAdded, editorState,
           });
         });
       }
-    }, node.node);
+    });
   });
 };

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

@@ -1,5 +1,6 @@
 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 = {};
@@ -19,7 +20,7 @@ export const trackSyncBlocks = (predicate, tr, state) => {
       from,
       to
     } = step;
-    const docAtStep = tr.docs[idx];
+    const docAtStep = fg('platform_synced_block_patch_3') ? tr.docs[tr.steps.indexOf(step)] : tr.docs[idx];
     let hasChange = false;
     if (from !== to) {
       step.getMap().forEach((oldStart, oldEnd) => {
@@ -101,31 +102,63 @@ export const hasEditInSyncBlock = (tr, state) => {
   const {
     bodiedSyncBlock
   } = state.schema.nodes;
-  for (const step of tr.steps) {
-    const map = step.getMap();
-    const {
-      doc
-    } = tr;
-    const positions = [];
+  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 = [];
 
-    // 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);
+      // 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;
+          }
+        }
+      }
     }
-    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;
+  } else {
+    for (const step of tr.steps) {
+      const map = step.getMap();
+      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;
+          }
         }
       }
     }

package/dist/es2019/ui/SyncedLocationDropdown.js

@@ -9,6 +9,7 @@ import DropdownMenu, { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdow
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
+import { getPageIdAndTypeFromConfluencePageAri } from '@atlaskit/editor-synced-block-provider';
 import { IconTile } from '@atlaskit/icon';
 import PageLiveDocIcon from '@atlaskit/icon-lab/core/page-live-doc';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
@@ -17,6 +18,7 @@ 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';
@@ -74,7 +76,27 @@ const subTypeIconMap = {
   page: PageIcon,
   blogpost: QuotationMarkIcon
 };
-const getConfluenceSubTypeIcon = subType => {
+const subTypeIconMapNew = {
+  live: PageLiveDocIcon,
+  page: PageIcon
+};
+const getConfluenceSubTypeIcon = (sourceAri, subType) => {
+  if (fg('platform_synced_block_patch_3')) {
+    try {
+      const {
+        type: pageType
+      } = getPageIdAndTypeFromConfluencePageAri({
+        ari: sourceAri
+      });
+      if (pageType === 'blogpost') {
+        return QuotationMarkIcon;
+      } else {
+        return subType && subType in subTypeIconMapNew ? subTypeIconMapNew[subType] : PageIcon;
+      }
+    } catch {
+      return PageIcon;
+    }
+  }
   return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : PageIcon;
 };
 const ProductIcon = ({
@@ -95,11 +117,12 @@ const ItemIcon = ({
   const {
     hasAccess,
     subType,
-    productType
+    productType,
+    sourceAri
   } = reference;
   if (productType === 'confluence-page' && hasAccess) {
     return /*#__PURE__*/React.createElement(IconTile, {
-      icon: getConfluenceSubTypeIcon(subType),
+      icon: getConfluenceSubTypeIcon(sourceAri, subType),
       label: "",
       appearance: 'gray',
       size: "xsmall"

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

@@ -14,6 +14,7 @@ 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';
@@ -303,17 +304,31 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           });
         });
         syncBlockAdded.forEach(function (syncBlock) {
-          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: 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
-          });
+          if (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: 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 === 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: 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
+            });
+          }
         });
         if (bodiedSyncBlockRemoved.length > 0) {
           confirmationTransactionRef.current = tr;

package/dist/esm/pm-plugins/utils/handle-bodied-sync-block-creation.js

@@ -129,6 +129,6 @@ export var handleBodiedSyncBlockCreation = function handleBodiedSyncBlockCreatio
           });
         });
       }
-    }, node.node);
+    });
   });
 };

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

@@ -3,6 +3,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 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; }
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 export var trackSyncBlocks = function trackSyncBlocks(predicate, tr, state) {
   var removed = {};
   var added = {};
@@ -22,7 +23,7 @@ export var trackSyncBlocks = function trackSyncBlocks(predicate, tr, state) {
   var hasBodiedSyncBlockChanges = replaceSteps.some(function (step, idx) {
     var from = step.from,
       to = step.to;
-    var docAtStep = tr.docs[idx];
+    var docAtStep = fg('platform_synced_block_patch_3') ? tr.docs[tr.steps.indexOf(step)] : tr.docs[idx];
     var hasChange = false;
     if (from !== to) {
       step.getMap().forEach(function (oldStart, oldEnd) {
@@ -102,13 +103,12 @@ export var trackSyncBlocks = function trackSyncBlocks(predicate, tr, state) {
  */
 export var hasEditInSyncBlock = function hasEditInSyncBlock(tr, state) {
   var bodiedSyncBlock = state.schema.nodes.bodiedSyncBlock;
-  var _iterator = _createForOfIteratorHelper(tr.steps),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var step = _step.value;
+  if (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 doc = tr.doc;
+      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
@@ -125,17 +125,49 @@ export var hasEditInSyncBlock = function hasEditInSyncBlock(tr, state) {
       for (var _i = 0, _positions = positions; _i < _positions.length; _i++) {
         var _pos = _positions[_i];
         var newPos = map.map(_pos);
-        if (newPos >= 0 && newPos <= doc.content.size) {
-          if (findParentNodeOfTypeClosestToPos(doc.resolve(newPos), bodiedSyncBlock)) {
+        if (newPos >= 0 && newPos <= docAfterStep.content.size) {
+          if (findParentNodeOfTypeClosestToPos(docAfterStep.resolve(newPos), bodiedSyncBlock)) {
             return true;
           }
         }
       }
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+  } 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 (findParentNodeOfTypeClosestToPos(doc.resolve(_newPos), bodiedSyncBlock)) {
+              return true;
+            }
+          }
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
   }
   return false;
 };

package/dist/esm/ui/SyncedLocationDropdown.js

@@ -17,6 +17,7 @@ import DropdownMenu, { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdow
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
+import { getPageIdAndTypeFromConfluencePageAri } from '@atlaskit/editor-synced-block-provider';
 import { IconTile } from '@atlaskit/icon';
 import PageLiveDocIcon from '@atlaskit/icon-lab/core/page-live-doc';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
@@ -25,6 +26,7 @@ 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';
@@ -81,7 +83,26 @@ var subTypeIconMap = {
   page: PageIcon,
   blogpost: QuotationMarkIcon
 };
-var getConfluenceSubTypeIcon = function getConfluenceSubTypeIcon(subType) {
+var subTypeIconMapNew = {
+  live: PageLiveDocIcon,
+  page: PageIcon
+};
+var getConfluenceSubTypeIcon = function getConfluenceSubTypeIcon(sourceAri, subType) {
+  if (fg('platform_synced_block_patch_3')) {
+    try {
+      var _getPageIdAndTypeFrom = getPageIdAndTypeFromConfluencePageAri({
+          ari: sourceAri
+        }),
+        pageType = _getPageIdAndTypeFrom.type;
+      if (pageType === 'blogpost') {
+        return QuotationMarkIcon;
+      } else {
+        return subType && subType in subTypeIconMapNew ? subTypeIconMapNew[subType] : PageIcon;
+      }
+    } catch (_unused) {
+      return PageIcon;
+    }
+  }
   return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : PageIcon;
 };
 var ProductIcon = function ProductIcon(_ref2) {
@@ -99,10 +120,11 @@ var ItemIcon = function ItemIcon(_ref3) {
   var reference = _ref3.reference;
   var hasAccess = reference.hasAccess,
     subType = reference.subType,
-    productType = reference.productType;
+    productType = reference.productType,
+    sourceAri = reference.sourceAri;
   if (productType === 'confluence-page' && hasAccess) {
     return /*#__PURE__*/React.createElement(IconTile, {
-      icon: getConfluenceSubTypeIcon(subType),
+      icon: getConfluenceSubTypeIcon(sourceAri, subType),
       label: "",
       appearance: 'gray',
       size: "xsmall"

package/dist/types/syncedBlockPluginType.d.ts

@@ -12,7 +12,7 @@ import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-too
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { SyncBlockDataProvider, UseFetchSyncBlockDataResult } from '@atlaskit/editor-synced-block-provider';
+import type { SyncBlockDataProviderInterface, UseFetchSyncBlockDataResult } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockSharedState } from './types';
 export type SyncedBlockEditorProps = {
     defaultDocument: JSONDocNode;
@@ -42,7 +42,7 @@ export type SyncedBlockRendererProps = {
 };
 export interface SyncedBlockPluginOptions extends LongPressSelectionPluginOptions {
     enableSourceCreation?: boolean;
-    syncBlockDataProvider: SyncBlockDataProvider;
+    syncBlockDataProvider: SyncBlockDataProviderInterface;
     syncedBlockRenderer: (props: SyncedBlockRendererProps) => React.JSX.Element;
 }
 export type SyncedBlockPlugin = NextEditorPlugin<'syncedBlock', {

package/dist/types/ui/SyncedLocationDropdown.d.ts

@@ -1,6 +1,6 @@
 import { type IntlShape } from 'react-intl-next';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { SyncBlockSourceInfo, SyncBlockStoreManager, ReferencesSourceInfo } from '@atlaskit/editor-synced-block-provider';
+import { type SyncBlockSourceInfo, type SyncBlockStoreManager, type ReferencesSourceInfo } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockPlugin } from '../syncedBlockPluginType';
 interface Props {
     api?: ExtractInjectionAPI<SyncedBlockPlugin>;

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

@@ -12,7 +12,7 @@ import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-too
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { SyncBlockDataProvider, UseFetchSyncBlockDataResult } from '@atlaskit/editor-synced-block-provider';
+import type { SyncBlockDataProviderInterface, UseFetchSyncBlockDataResult } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockSharedState } from './types';
 export type SyncedBlockEditorProps = {
     defaultDocument: JSONDocNode;
@@ -42,7 +42,7 @@ export type SyncedBlockRendererProps = {
 };
 export interface SyncedBlockPluginOptions extends LongPressSelectionPluginOptions {
     enableSourceCreation?: boolean;
-    syncBlockDataProvider: SyncBlockDataProvider;
+    syncBlockDataProvider: SyncBlockDataProviderInterface;
     syncedBlockRenderer: (props: SyncedBlockRendererProps) => React.JSX.Element;
 }
 export type SyncedBlockPlugin = NextEditorPlugin<'syncedBlock', {

package/dist/types-ts4.5/ui/SyncedLocationDropdown.d.ts

@@ -1,6 +1,6 @@
 import { type IntlShape } from 'react-intl-next';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { SyncBlockSourceInfo, SyncBlockStoreManager, ReferencesSourceInfo } from '@atlaskit/editor-synced-block-provider';
+import { type SyncBlockSourceInfo, type SyncBlockStoreManager, type ReferencesSourceInfo } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockPlugin } from '../syncedBlockPluginType';
 interface Props {
     api?: ExtractInjectionAPI<SyncedBlockPlugin>;

package/package.json

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

package/tsconfig.json

@@ -3,6 +3,5 @@
 	"include": [
 		"src/**/*.ts",
 		"src/**/*.tsx"
-	],
-	"compilerOptions": {}
+	]
 }