@atlaskit/editor-plugin-extension 5.3.0 → 5.3.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-extension
 
+## 5.3.2
+
+### Patch Changes
+
+- [#148176](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/148176)
+  [`ff3d1fcb8f797`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ff3d1fcb8f797) -
+  Clean-up platform_editor_legacy_content_macro feature gate
+- Updated dependencies
+
+## 5.3.1
+
+### Patch Changes
+
+- [#147400](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/147400)
+  [`800ff50276ed7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/800ff50276ed7) -
+  Clean up experiment platform_editor_nested_non_bodied_macros
+- Updated dependencies
+
 ## 5.3.0
 
 ### Minor Changes

package/dist/cjs/extensionPlugin.js

@@ -8,7 +8,6 @@ exports.extensionPlugin = void 0;
 var _adfSchema = require("@atlaskit/adf-schema");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _actions = require("./editor-actions/actions");
 var _commands = require("./editor-commands/commands");
 var _extensionApi = require("./pm-plugins/extension-api");
@@ -25,7 +24,7 @@ var _useConfigPanelPluginHook = require("./ui/useConfigPanelPluginHook");
 // Remove below line when cleaning up platform_editor_ai_object_sidebar_injection feature flag
 
 var extensionPlugin = exports.extensionPlugin = function extensionPlugin(_ref) {
-  var _api$featureFlags, _api$contextPanel, _api$analytics2, _api$analytics3, _api$contextPanel4, _api$decorations, _api$contextPanel5, _api$analytics4;
+  var _api$featureFlags, _api$contextPanel, _api$analytics2, _api$analytics3, _api$contextPanel4;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     _api = _ref.api;
@@ -174,15 +173,9 @@ var extensionPlugin = exports.extensionPlugin = function extensionPlugin(_ref) {
       forceAutoSave: _commands.forceAutoSave
     },
     pluginsOptions: {
-      floatingToolbar: (0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro') ? (0, _toolbar.getToolbarConfig)({
+      floatingToolbar: (0, _toolbar.getToolbarConfig)({
         breakoutEnabled: options.breakoutEnabled,
         extensionApi: _api
-      }) : (0, _toolbar.getToolbarConfig)({
-        breakoutEnabled: options.breakoutEnabled,
-        hoverDecoration: _api === null || _api === void 0 || (_api$decorations = _api.decorations) === null || _api$decorations === void 0 ? void 0 : _api$decorations.actions.hoverDecoration,
-        applyChangeToContextPanel: _api === null || _api === void 0 || (_api$contextPanel5 = _api.contextPanel) === null || _api$contextPanel5 === void 0 ? void 0 : _api$contextPanel5.actions.applyChange,
-        editorAnalyticsAPI: _api === null || _api === void 0 || (_api$analytics4 = _api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions,
-        extensionApi: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') || (0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true) ? _api : undefined
       }),
       contextPanel:
       // if showContextPanel action is not available, or platform_editor_ai_object_sidebar_injection feature flag is off

package/dist/cjs/pm-plugins/extension-api.js

@@ -14,7 +14,6 @@ var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../editor-commands/commands");
 var _actions = require("./macro/actions");
 var _pluginKey = require("./macro/plugin-key");
@@ -260,7 +259,7 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
       if (typeof (opts === null || opts === void 0 ? void 0 : opts.addToHistory) === 'boolean') {
         tr.setMeta('addToHistory', opts.addToHistory);
       }
-      if (typeof (opts === null || opts === void 0 ? void 0 : opts.scrollIntoView) === 'boolean' && (0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro')) {
+      if (typeof (opts === null || opts === void 0 ? void 0 : opts.scrollIntoView) === 'boolean') {
         tr.setMeta('scrollIntoView', opts.scrollIntoView);
       }
       dispatch(tr);

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

@@ -12,7 +12,6 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _selection2 = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../editor-commands/commands");
 var _lazyExtension = require("../nodeviews/lazyExtension");
 var _pluginFactory = require("./plugin-factory");
@@ -310,7 +309,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
         return null;
       },
       handleClickOn: (0, _selection2.createSelectionClickHandler)(['extension', 'bodiedExtension', 'multiBodiedExtension'], function (target) {
-        return (0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro') ? !target.closest('.extension-non-editable-area') && (!target.closest('.extension-content') || !!target.closest('.extension-container')) : !target.closest('.extension-content');
+        return !target.closest('.extension-non-editable-area') && (!target.closest('.extension-content') || !!target.closest('.extension-container'));
       },
       // It's to enable nested extensions selection
       {

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

@@ -37,9 +37,6 @@ var isNestedNBM = function isNestedNBM(state, selectedExtNode) {
     blockquote = _state$schema$nodes.blockquote,
     listItem = _state$schema$nodes.listItem,
     selection = state.selection;
-  if (!(0, _experiments.editorExperiment)('platform_editor_nested_non_bodied_macros', 'test')) {
-    return false;
-  }
   if (!selectedExtNode) {
     return false;
   }
@@ -232,23 +229,17 @@ var calculateToolbarPosition = function calculateToolbarPosition(editorView, nex
   // We only want to use calculated position in case of a bodiedExtension present inside an MBE node
   var isBodiedExtensionInsideMBE = possibleMbeParent && (extensionNode === null || extensionNode === void 0 ? void 0 : extensionNode.node.type.name) === 'bodiedExtension';
   var scrollWrapper = editorView.dom.closest('.fabric-editor-popup-scroll-parent') || document.body;
-  if ((0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro')) {
-    if (!extensionNode) {
-      return nextPos;
-    }
-    var isInsideEditableExtensionArea = !!editorView.dom.closest('.extension-editable-area');
-    if (!isBodiedExtensionInsideMBE && !isInsideEditableExtensionArea) {
-      return nextPos;
-    }
-    if (isInsideEditableExtensionArea && scrollWrapper.parentElement) {
-      // The editable extension area may have its own scroll wrapper, so we want to keep searching up the tree for the page level scroll wrapper.
+  if (!extensionNode) {
+    return nextPos;
+  }
+  var isInsideEditableExtensionArea = !!editorView.dom.closest('.extension-editable-area');
+  if (!isBodiedExtensionInsideMBE && !isInsideEditableExtensionArea) {
+    return nextPos;
+  }
+  if (isInsideEditableExtensionArea && scrollWrapper.parentElement) {
+    // The editable extension area may have its own scroll wrapper, so we want to keep searching up the tree for the page level scroll wrapper.
 
-      scrollWrapper = scrollWrapper.parentElement.closest('.fabric-editor-popup-scroll-parent') || scrollWrapper;
-    }
-  } else {
-    if (!isBodiedExtensionInsideMBE) {
-      return nextPos;
-    }
+    scrollWrapper = scrollWrapper.parentElement.closest('.fabric-editor-popup-scroll-parent') || scrollWrapper;
   }
 
   // Ignored via go/ees005
@@ -265,21 +256,14 @@ var calculateToolbarPosition = function calculateToolbarPosition(editorView, nex
 var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref) {
   var _ref$breakoutEnabled = _ref.breakoutEnabled,
     breakoutEnabled = _ref$breakoutEnabled === void 0 ? true : _ref$breakoutEnabled,
-    hoverDecoration = _ref.hoverDecoration,
-    applyChangeToContextPanel = _ref.applyChangeToContextPanel,
-    editorAnalyticsAPI = _ref.editorAnalyticsAPI,
     extensionApi = _ref.extensionApi;
   return function (state, intl) {
-    var _extensionApi$connect, _hoverDecoration5, _hoverDecoration6, _hoverDecoration7, _hoverDecoration8;
+    var _extensionApi$decorat, _extensionApi$context, _extensionApi$analyti, _extensionApi$connect;
     var formatMessage = intl.formatMessage;
     var extensionState = (0, _pluginFactory.getPluginState)(state);
-    if ((0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro')) {
-      var _extensionApi$decorat, _extensionApi$context, _extensionApi$analyti;
-      // TODO: ED-26962 - Change these all to const upon removal of the above FG. Remove the function params also.
-      hoverDecoration = extensionApi === null || extensionApi === void 0 || (_extensionApi$decorat = extensionApi.decorations) === null || _extensionApi$decorat === void 0 ? void 0 : _extensionApi$decorat.actions.hoverDecoration;
-      applyChangeToContextPanel = extensionApi === null || extensionApi === void 0 || (_extensionApi$context = extensionApi.contextPanel) === null || _extensionApi$context === void 0 ? void 0 : _extensionApi$context.actions.applyChange;
-      editorAnalyticsAPI = extensionApi === null || extensionApi === void 0 || (_extensionApi$analyti = extensionApi.analytics) === null || _extensionApi$analyti === void 0 ? void 0 : _extensionApi$analyti.actions;
-    }
+    var hoverDecoration = extensionApi === null || extensionApi === void 0 || (_extensionApi$decorat = extensionApi.decorations) === null || _extensionApi$decorat === void 0 ? void 0 : _extensionApi$decorat.actions.hoverDecoration;
+    var applyChangeToContextPanel = extensionApi === null || extensionApi === void 0 || (_extensionApi$context = extensionApi.contextPanel) === null || _extensionApi$context === void 0 ? void 0 : _extensionApi$context.actions.applyChange;
+    var editorAnalyticsAPI = extensionApi === null || extensionApi === void 0 || (_extensionApi$analyti = extensionApi.analytics) === null || _extensionApi$analyti === void 0 ? void 0 : _extensionApi$analyti.actions;
     if (!extensionState || extensionState.showContextPanel || !extensionState.element) {
       return;
     }
@@ -312,12 +296,11 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
       };
     }
     var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
-      var _hoverDecoration, _hoverDecoration2, _hoverDecoration3, _hoverDecoration4;
       return {
-        onMouseEnter: (_hoverDecoration = hoverDecoration) === null || _hoverDecoration === void 0 ? void 0 : _hoverDecoration(nodeType, true, className),
-        onMouseLeave: (_hoverDecoration2 = hoverDecoration) === null || _hoverDecoration2 === void 0 ? void 0 : _hoverDecoration2(nodeType, false, className),
-        onFocus: (_hoverDecoration3 = hoverDecoration) === null || _hoverDecoration3 === void 0 ? void 0 : _hoverDecoration3(nodeType, true, className),
-        onBlur: (_hoverDecoration4 = hoverDecoration) === null || _hoverDecoration4 === void 0 ? void 0 : _hoverDecoration4(nodeType, false, className)
+        onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
+        onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className),
+        onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
+        onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className)
       };
     };
     return {
@@ -358,10 +341,10 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
         iconFallback: _delete.default,
         appearance: 'danger',
         onClick: (0, _commands.removeExtension)(editorAnalyticsAPI),
-        onMouseEnter: (_hoverDecoration5 = hoverDecoration) === null || _hoverDecoration5 === void 0 ? void 0 : _hoverDecoration5(nodeType, true),
-        onMouseLeave: (_hoverDecoration6 = hoverDecoration) === null || _hoverDecoration6 === void 0 ? void 0 : _hoverDecoration6(nodeType, false),
-        onFocus: (_hoverDecoration7 = hoverDecoration) === null || _hoverDecoration7 === void 0 ? void 0 : _hoverDecoration7(nodeType, true),
-        onBlur: (_hoverDecoration8 = hoverDecoration) === null || _hoverDecoration8 === void 0 ? void 0 : _hoverDecoration8(nodeType, false),
+        onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
+        onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
+        onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
+        onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
         focusEditoronEnter: true,
         title: formatMessage(_messages.default.remove),
         tabIndex: null,

package/dist/cjs/pm-plugins/unique-id.js

@@ -7,9 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _adfSchema = require("@atlaskit/adf-schema");
+var _steps = require("@atlaskit/adf-schema/steps");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var pluginKey = new _state.PluginKey('extensionUniqueIdPlugin');
@@ -31,7 +33,14 @@ var createPlugin = exports.createPlugin = function createPlugin() {
           return;
         }
         var isAddingExtension = transaction.steps.some(function (step) {
-          return (0, _utils.stepAddsOneOf)(step, extensionTypes);
+          var _step$attrs;
+          return (0, _utils.stepAddsOneOf)(step, extensionTypes) ||
+          // There are instances where the localId will be reset to null on publish due to extension
+          // not existing in the Storage format (eg. Legacy Content Extensions) or not having a localId
+          // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+          (0, _platformFeatureFlags.fg)('platform_editor_update_extension_local_id_on_reset') && step instanceof _steps.SetAttrsStep &&
+          // @ts-expect-error Bad ProseMirror step types
+          ((_step$attrs = step.attrs) === null || _step$attrs === void 0 ? void 0 : _step$attrs.localId) === null;
         });
         if (isAddingExtension) {
           // Can't simply look at changed nodes, as we could be adding an extension

package/dist/cjs/ui/ConfigPanel/NestedForms/RemovableField.js

@@ -54,7 +54,7 @@ var RemovableField = function RemovableField(_ref) {
     ,
     className: className
   }, children, canRemoveField &&
-  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions, @atlassian/a11y/interactive-element-not-keyboard-focusable
   (0, _react2.jsx)("div", {
     css: removeButtonWrapperStyles,
     "data-testid": "remove-field-".concat(name),

package/dist/es2019/extensionPlugin.js

@@ -1,7 +1,6 @@
 import { extension, extensionFrame, inlineExtension, multiBodiedExtension } from '@atlaskit/adf-schema';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createEditSelectedExtensionAction, insertOrReplaceBodiedExtension, insertOrReplaceExtension } from './editor-actions/actions';
 import { forceAutoSave } from './editor-commands/commands';
 import { createExtensionAPI } from './pm-plugins/extension-api';
@@ -20,7 +19,7 @@ export const extensionPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$featureFlags, _api$contextPanel, _api$contextPanel$act, _api$analytics2, _api$analytics3, _api$contextPanel4, _api$decorations, _api$contextPanel5, _api$analytics4;
+  var _api$featureFlags, _api$contextPanel, _api$contextPanel$act, _api$analytics2, _api$analytics3, _api$contextPanel4;
   const featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   //Note: This is a hack to get the editor view reference in the plugin. Copied from table plugin.
   //This is needed to get the current selection in the editor
@@ -162,15 +161,9 @@ export const extensionPlugin = ({
       forceAutoSave
     },
     pluginsOptions: {
-      floatingToolbar: fg('platform_editor_legacy_content_macro') ? getToolbarConfig({
+      floatingToolbar: getToolbarConfig({
         breakoutEnabled: options.breakoutEnabled,
         extensionApi: api
-      }) : getToolbarConfig({
-        breakoutEnabled: options.breakoutEnabled,
-        hoverDecoration: api === null || api === void 0 ? void 0 : (_api$decorations = api.decorations) === null || _api$decorations === void 0 ? void 0 : _api$decorations.actions.hoverDecoration,
-        applyChangeToContextPanel: api === null || api === void 0 ? void 0 : (_api$contextPanel5 = api.contextPanel) === null || _api$contextPanel5 === void 0 ? void 0 : _api$contextPanel5.actions.applyChange,
-        editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions,
-        extensionApi: editorExperiment('platform_editor_controls', 'variant1') || editorExperiment('platform_editor_offline_editing_web', true) ? api : undefined
       }),
       contextPanel:
       // if showContextPanel action is not available, or platform_editor_ai_object_sidebar_injection feature flag is off

package/dist/es2019/pm-plugins/extension-api.js

@@ -5,7 +5,6 @@ import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { Fragment, Mark } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { setTextSelection } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { setEditingContextToContextPanel } from '../editor-commands/commands';
 import { insertMacroFromMacroBrowser } from './macro/actions';
 import { pluginKey as macroPluginKey } from './macro/plugin-key';
@@ -278,7 +277,7 @@ export const createExtensionAPI = options => {
       if (typeof (opts === null || opts === void 0 ? void 0 : opts.addToHistory) === 'boolean') {
         tr.setMeta('addToHistory', opts.addToHistory);
       }
-      if (typeof (opts === null || opts === void 0 ? void 0 : opts.scrollIntoView) === 'boolean' && fg('platform_editor_legacy_content_macro')) {
+      if (typeof (opts === null || opts === void 0 ? void 0 : opts.scrollIntoView) === 'boolean') {
         tr.setMeta('scrollIntoView', opts.scrollIntoView);
       }
       dispatch(tr);

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

@@ -1,8 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createSelectionClickHandler, GapCursorSelection, isSelectionAtEndOfNode, isSelectionAtStartOfNode } from '@atlaskit/editor-common/selection';
+import { GapCursorSelection, createSelectionClickHandler, isSelectionAtEndOfNode, isSelectionAtStartOfNode } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfTypeClosestToPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { clearEditingContext, updateState } from '../editor-commands/commands';
 import { lazyExtensionNodeView } from '../nodeviews/lazyExtension';
 import { createPluginState, getPluginState } from './plugin-factory';
@@ -265,7 +264,7 @@ export const createPlugin = (dispatch, providerFactory, extensionHandlers, porta
         }
         return null;
       },
-      handleClickOn: createSelectionClickHandler(['extension', 'bodiedExtension', 'multiBodiedExtension'], target => fg('platform_editor_legacy_content_macro') ? !target.closest('.extension-non-editable-area') && (!target.closest('.extension-content') || !!target.closest('.extension-container')) : !target.closest('.extension-content'),
+      handleClickOn: createSelectionClickHandler(['extension', 'bodiedExtension', 'multiBodiedExtension'], target => !target.closest('.extension-non-editable-area') && (!target.closest('.extension-content') || !!target.closest('.extension-container')),
       // It's to enable nested extensions selection
       {
         useLongPressSelection

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

@@ -32,9 +32,6 @@ const isNestedNBM = (state, selectedExtNode) => {
     },
     selection
   } = state;
-  if (!editorExperiment('platform_editor_nested_non_bodied_macros', 'test')) {
-    return false;
-  }
   if (!selectedExtNode) {
     return false;
   }
@@ -231,23 +228,17 @@ const calculateToolbarPosition = (editorView, nextPos, state, extensionNode) =>
   // We only want to use calculated position in case of a bodiedExtension present inside an MBE node
   const isBodiedExtensionInsideMBE = possibleMbeParent && (extensionNode === null || extensionNode === void 0 ? void 0 : extensionNode.node.type.name) === 'bodiedExtension';
   let scrollWrapper = editorView.dom.closest('.fabric-editor-popup-scroll-parent') || document.body;
-  if (fg('platform_editor_legacy_content_macro')) {
-    if (!extensionNode) {
-      return nextPos;
-    }
-    const isInsideEditableExtensionArea = !!editorView.dom.closest('.extension-editable-area');
-    if (!isBodiedExtensionInsideMBE && !isInsideEditableExtensionArea) {
-      return nextPos;
-    }
-    if (isInsideEditableExtensionArea && scrollWrapper.parentElement) {
-      // The editable extension area may have its own scroll wrapper, so we want to keep searching up the tree for the page level scroll wrapper.
+  if (!extensionNode) {
+    return nextPos;
+  }
+  const isInsideEditableExtensionArea = !!editorView.dom.closest('.extension-editable-area');
+  if (!isBodiedExtensionInsideMBE && !isInsideEditableExtensionArea) {
+    return nextPos;
+  }
+  if (isInsideEditableExtensionArea && scrollWrapper.parentElement) {
+    // The editable extension area may have its own scroll wrapper, so we want to keep searching up the tree for the page level scroll wrapper.
 
-      scrollWrapper = scrollWrapper.parentElement.closest('.fabric-editor-popup-scroll-parent') || scrollWrapper;
-    }
-  } else {
-    if (!isBodiedExtensionInsideMBE) {
-      return nextPos;
-    }
+    scrollWrapper = scrollWrapper.parentElement.closest('.fabric-editor-popup-scroll-parent') || scrollWrapper;
   }
 
   // Ignored via go/ees005
@@ -263,23 +254,16 @@ const calculateToolbarPosition = (editorView, nextPos, state, extensionNode) =>
 };
 export const getToolbarConfig = ({
   breakoutEnabled = true,
-  hoverDecoration,
-  applyChangeToContextPanel,
-  editorAnalyticsAPI,
   extensionApi
 }) => (state, intl) => {
-  var _extensionApi$connect, _extensionApi$connect2, _extensionApi$connect3, _hoverDecoration5, _hoverDecoration6, _hoverDecoration7, _hoverDecoration8;
+  var _extensionApi$decorat, _extensionApi$context, _extensionApi$analyti, _extensionApi$connect, _extensionApi$connect2, _extensionApi$connect3;
   const {
     formatMessage
   } = intl;
   const extensionState = getPluginState(state);
-  if (fg('platform_editor_legacy_content_macro')) {
-    var _extensionApi$decorat, _extensionApi$context, _extensionApi$analyti;
-    // TODO: ED-26962 - Change these all to const upon removal of the above FG. Remove the function params also.
-    hoverDecoration = extensionApi === null || extensionApi === void 0 ? void 0 : (_extensionApi$decorat = extensionApi.decorations) === null || _extensionApi$decorat === void 0 ? void 0 : _extensionApi$decorat.actions.hoverDecoration;
-    applyChangeToContextPanel = extensionApi === null || extensionApi === void 0 ? void 0 : (_extensionApi$context = extensionApi.contextPanel) === null || _extensionApi$context === void 0 ? void 0 : _extensionApi$context.actions.applyChange;
-    editorAnalyticsAPI = extensionApi === null || extensionApi === void 0 ? void 0 : (_extensionApi$analyti = extensionApi.analytics) === null || _extensionApi$analyti === void 0 ? void 0 : _extensionApi$analyti.actions;
-  }
+  const hoverDecoration = extensionApi === null || extensionApi === void 0 ? void 0 : (_extensionApi$decorat = extensionApi.decorations) === null || _extensionApi$decorat === void 0 ? void 0 : _extensionApi$decorat.actions.hoverDecoration;
+  const applyChangeToContextPanel = extensionApi === null || extensionApi === void 0 ? void 0 : (_extensionApi$context = extensionApi.contextPanel) === null || _extensionApi$context === void 0 ? void 0 : _extensionApi$context.actions.applyChange;
+  const editorAnalyticsAPI = extensionApi === null || extensionApi === void 0 ? void 0 : (_extensionApi$analyti = extensionApi.analytics) === null || _extensionApi$analyti === void 0 ? void 0 : _extensionApi$analyti.actions;
   if (!extensionState || extensionState.showContextPanel || !extensionState.element) {
     return;
   }
@@ -306,15 +290,12 @@ export const getToolbarConfig = ({
       };
     };
   }
-  const hoverDecorationProps = (nodeType, className) => {
-    var _hoverDecoration, _hoverDecoration2, _hoverDecoration3, _hoverDecoration4;
-    return {
-      onMouseEnter: (_hoverDecoration = hoverDecoration) === null || _hoverDecoration === void 0 ? void 0 : _hoverDecoration(nodeType, true, className),
-      onMouseLeave: (_hoverDecoration2 = hoverDecoration) === null || _hoverDecoration2 === void 0 ? void 0 : _hoverDecoration2(nodeType, false, className),
-      onFocus: (_hoverDecoration3 = hoverDecoration) === null || _hoverDecoration3 === void 0 ? void 0 : _hoverDecoration3(nodeType, true, className),
-      onBlur: (_hoverDecoration4 = hoverDecoration) === null || _hoverDecoration4 === void 0 ? void 0 : _hoverDecoration4(nodeType, false, className)
-    };
-  };
+  const hoverDecorationProps = (nodeType, className) => ({
+    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
+    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className),
+    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
+    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className)
+  });
   return {
     title: 'Extension floating controls',
     // Ignored via go/ees005
@@ -347,10 +328,10 @@ export const getToolbarConfig = ({
       iconFallback: DeleteIcon,
       appearance: 'danger',
       onClick: removeExtension(editorAnalyticsAPI),
-      onMouseEnter: (_hoverDecoration5 = hoverDecoration) === null || _hoverDecoration5 === void 0 ? void 0 : _hoverDecoration5(nodeType, true),
-      onMouseLeave: (_hoverDecoration6 = hoverDecoration) === null || _hoverDecoration6 === void 0 ? void 0 : _hoverDecoration6(nodeType, false),
-      onFocus: (_hoverDecoration7 = hoverDecoration) === null || _hoverDecoration7 === void 0 ? void 0 : _hoverDecoration7(nodeType, true),
-      onBlur: (_hoverDecoration8 = hoverDecoration) === null || _hoverDecoration8 === void 0 ? void 0 : _hoverDecoration8(nodeType, false),
+      onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
+      onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
+      onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
+      onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
       focusEditoronEnter: true,
       title: formatMessage(commonMessages.remove),
       tabIndex: null,

package/dist/es2019/pm-plugins/unique-id.js

@@ -1,7 +1,9 @@
 import { uuid } from '@atlaskit/adf-schema';
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { stepAddsOneOf } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 const pluginKey = new PluginKey('extensionUniqueIdPlugin');
 const createPlugin = () => new SafePlugin({
   appendTransaction: (transactions, _oldState, newState) => {
@@ -20,7 +22,16 @@ const createPlugin = () => new SafePlugin({
       if (!transaction.docChanged) {
         return;
       }
-      const isAddingExtension = transaction.steps.some(step => stepAddsOneOf(step, extensionTypes));
+      const isAddingExtension = transaction.steps.some(step => {
+        var _step$attrs;
+        return stepAddsOneOf(step, extensionTypes) ||
+        // There are instances where the localId will be reset to null on publish due to extension
+        // not existing in the Storage format (eg. Legacy Content Extensions) or not having a localId
+        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+        fg('platform_editor_update_extension_local_id_on_reset') && step instanceof SetAttrsStep &&
+        // @ts-expect-error Bad ProseMirror step types
+        ((_step$attrs = step.attrs) === null || _step$attrs === void 0 ? void 0 : _step$attrs.localId) === null;
+      });
       if (isAddingExtension) {
         // Can't simply look at changed nodes, as we could be adding an extension
         newState.doc.descendants((node, pos) => {

package/dist/es2019/ui/ConfigPanel/NestedForms/RemovableField.js

@@ -45,7 +45,7 @@ const RemovableField = ({
     ,
     className: className
   }, children, canRemoveField &&
-  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions, @atlassian/a11y/interactive-element-not-keyboard-focusable
   jsx("div", {
     css: removeButtonWrapperStyles,
     "data-testid": `remove-field-${name}`,

package/dist/esm/extensionPlugin.js

@@ -1,7 +1,6 @@
 import { extension, extensionFrame, inlineExtension, multiBodiedExtension } from '@atlaskit/adf-schema';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createEditSelectedExtensionAction, insertOrReplaceBodiedExtension as _insertOrReplaceBodiedExtension, insertOrReplaceExtension as _insertOrReplaceExtension } from './editor-actions/actions';
 import { forceAutoSave } from './editor-commands/commands';
 import { createExtensionAPI } from './pm-plugins/extension-api';
@@ -17,7 +16,7 @@ import { createPlugin as createUniqueIdPlugin } from './pm-plugins/unique-id';
 import { getContextPanel } from './ui/context-panel';
 import { useConfigPanelPluginHook } from './ui/useConfigPanelPluginHook';
 export var extensionPlugin = function extensionPlugin(_ref) {
-  var _api$featureFlags, _api$contextPanel, _api$analytics2, _api$analytics3, _api$contextPanel4, _api$decorations, _api$contextPanel5, _api$analytics4;
+  var _api$featureFlags, _api$contextPanel, _api$analytics2, _api$analytics3, _api$contextPanel4;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     _api = _ref.api;
@@ -166,15 +165,9 @@ export var extensionPlugin = function extensionPlugin(_ref) {
       forceAutoSave: forceAutoSave
     },
     pluginsOptions: {
-      floatingToolbar: fg('platform_editor_legacy_content_macro') ? getToolbarConfig({
+      floatingToolbar: getToolbarConfig({
         breakoutEnabled: options.breakoutEnabled,
         extensionApi: _api
-      }) : getToolbarConfig({
-        breakoutEnabled: options.breakoutEnabled,
-        hoverDecoration: _api === null || _api === void 0 || (_api$decorations = _api.decorations) === null || _api$decorations === void 0 ? void 0 : _api$decorations.actions.hoverDecoration,
-        applyChangeToContextPanel: _api === null || _api === void 0 || (_api$contextPanel5 = _api.contextPanel) === null || _api$contextPanel5 === void 0 ? void 0 : _api$contextPanel5.actions.applyChange,
-        editorAnalyticsAPI: _api === null || _api === void 0 || (_api$analytics4 = _api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions,
-        extensionApi: editorExperiment('platform_editor_controls', 'variant1') || editorExperiment('platform_editor_offline_editing_web', true) ? _api : undefined
       }),
       contextPanel:
       // if showContextPanel action is not available, or platform_editor_ai_object_sidebar_injection feature flag is off

package/dist/esm/pm-plugins/extension-api.js

@@ -9,7 +9,6 @@ import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { Fragment, Mark } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { setTextSelection } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { setEditingContextToContextPanel } from '../editor-commands/commands';
 import { insertMacroFromMacroBrowser } from './macro/actions';
 import { pluginKey as macroPluginKey } from './macro/plugin-key';
@@ -253,7 +252,7 @@ export var createExtensionAPI = function createExtensionAPI(options) {
       if (typeof (opts === null || opts === void 0 ? void 0 : opts.addToHistory) === 'boolean') {
         tr.setMeta('addToHistory', opts.addToHistory);
       }
-      if (typeof (opts === null || opts === void 0 ? void 0 : opts.scrollIntoView) === 'boolean' && fg('platform_editor_legacy_content_macro')) {
+      if (typeof (opts === null || opts === void 0 ? void 0 : opts.scrollIntoView) === 'boolean') {
         tr.setMeta('scrollIntoView', opts.scrollIntoView);
       }
       dispatch(tr);

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

@@ -2,10 +2,9 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _typeof from "@babel/runtime/helpers/typeof";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createSelectionClickHandler, GapCursorSelection, isSelectionAtEndOfNode, isSelectionAtStartOfNode } from '@atlaskit/editor-common/selection';
+import { GapCursorSelection, createSelectionClickHandler, isSelectionAtEndOfNode, isSelectionAtStartOfNode } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfTypeClosestToPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { clearEditingContext, updateState } from '../editor-commands/commands';
 import { lazyExtensionNodeView } from '../nodeviews/lazyExtension';
 import { createPluginState, getPluginState } from './plugin-factory';
@@ -303,7 +302,7 @@ export var createPlugin = function createPlugin(dispatch, providerFactory, exten
         return null;
       },
       handleClickOn: createSelectionClickHandler(['extension', 'bodiedExtension', 'multiBodiedExtension'], function (target) {
-        return fg('platform_editor_legacy_content_macro') ? !target.closest('.extension-non-editable-area') && (!target.closest('.extension-content') || !!target.closest('.extension-container')) : !target.closest('.extension-content');
+        return !target.closest('.extension-non-editable-area') && (!target.closest('.extension-content') || !!target.closest('.extension-container'));
       },
       // It's to enable nested extensions selection
       {

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

@@ -31,9 +31,6 @@ var isNestedNBM = function isNestedNBM(state, selectedExtNode) {
     blockquote = _state$schema$nodes.blockquote,
     listItem = _state$schema$nodes.listItem,
     selection = state.selection;
-  if (!editorExperiment('platform_editor_nested_non_bodied_macros', 'test')) {
-    return false;
-  }
   if (!selectedExtNode) {
     return false;
   }
@@ -226,23 +223,17 @@ var calculateToolbarPosition = function calculateToolbarPosition(editorView, nex
   // We only want to use calculated position in case of a bodiedExtension present inside an MBE node
   var isBodiedExtensionInsideMBE = possibleMbeParent && (extensionNode === null || extensionNode === void 0 ? void 0 : extensionNode.node.type.name) === 'bodiedExtension';
   var scrollWrapper = editorView.dom.closest('.fabric-editor-popup-scroll-parent') || document.body;
-  if (fg('platform_editor_legacy_content_macro')) {
-    if (!extensionNode) {
-      return nextPos;
-    }
-    var isInsideEditableExtensionArea = !!editorView.dom.closest('.extension-editable-area');
-    if (!isBodiedExtensionInsideMBE && !isInsideEditableExtensionArea) {
-      return nextPos;
-    }
-    if (isInsideEditableExtensionArea && scrollWrapper.parentElement) {
-      // The editable extension area may have its own scroll wrapper, so we want to keep searching up the tree for the page level scroll wrapper.
+  if (!extensionNode) {
+    return nextPos;
+  }
+  var isInsideEditableExtensionArea = !!editorView.dom.closest('.extension-editable-area');
+  if (!isBodiedExtensionInsideMBE && !isInsideEditableExtensionArea) {
+    return nextPos;
+  }
+  if (isInsideEditableExtensionArea && scrollWrapper.parentElement) {
+    // The editable extension area may have its own scroll wrapper, so we want to keep searching up the tree for the page level scroll wrapper.
 
-      scrollWrapper = scrollWrapper.parentElement.closest('.fabric-editor-popup-scroll-parent') || scrollWrapper;
-    }
-  } else {
-    if (!isBodiedExtensionInsideMBE) {
-      return nextPos;
-    }
+    scrollWrapper = scrollWrapper.parentElement.closest('.fabric-editor-popup-scroll-parent') || scrollWrapper;
   }
 
   // Ignored via go/ees005
@@ -259,21 +250,14 @@ var calculateToolbarPosition = function calculateToolbarPosition(editorView, nex
 export var getToolbarConfig = function getToolbarConfig(_ref) {
   var _ref$breakoutEnabled = _ref.breakoutEnabled,
     breakoutEnabled = _ref$breakoutEnabled === void 0 ? true : _ref$breakoutEnabled,
-    hoverDecoration = _ref.hoverDecoration,
-    applyChangeToContextPanel = _ref.applyChangeToContextPanel,
-    editorAnalyticsAPI = _ref.editorAnalyticsAPI,
     extensionApi = _ref.extensionApi;
   return function (state, intl) {
-    var _extensionApi$connect, _hoverDecoration5, _hoverDecoration6, _hoverDecoration7, _hoverDecoration8;
+    var _extensionApi$decorat, _extensionApi$context, _extensionApi$analyti, _extensionApi$connect;
     var formatMessage = intl.formatMessage;
     var extensionState = getPluginState(state);
-    if (fg('platform_editor_legacy_content_macro')) {
-      var _extensionApi$decorat, _extensionApi$context, _extensionApi$analyti;
-      // TODO: ED-26962 - Change these all to const upon removal of the above FG. Remove the function params also.
-      hoverDecoration = extensionApi === null || extensionApi === void 0 || (_extensionApi$decorat = extensionApi.decorations) === null || _extensionApi$decorat === void 0 ? void 0 : _extensionApi$decorat.actions.hoverDecoration;
-      applyChangeToContextPanel = extensionApi === null || extensionApi === void 0 || (_extensionApi$context = extensionApi.contextPanel) === null || _extensionApi$context === void 0 ? void 0 : _extensionApi$context.actions.applyChange;
-      editorAnalyticsAPI = extensionApi === null || extensionApi === void 0 || (_extensionApi$analyti = extensionApi.analytics) === null || _extensionApi$analyti === void 0 ? void 0 : _extensionApi$analyti.actions;
-    }
+    var hoverDecoration = extensionApi === null || extensionApi === void 0 || (_extensionApi$decorat = extensionApi.decorations) === null || _extensionApi$decorat === void 0 ? void 0 : _extensionApi$decorat.actions.hoverDecoration;
+    var applyChangeToContextPanel = extensionApi === null || extensionApi === void 0 || (_extensionApi$context = extensionApi.contextPanel) === null || _extensionApi$context === void 0 ? void 0 : _extensionApi$context.actions.applyChange;
+    var editorAnalyticsAPI = extensionApi === null || extensionApi === void 0 || (_extensionApi$analyti = extensionApi.analytics) === null || _extensionApi$analyti === void 0 ? void 0 : _extensionApi$analyti.actions;
     if (!extensionState || extensionState.showContextPanel || !extensionState.element) {
       return;
     }
@@ -306,12 +290,11 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
       };
     }
     var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
-      var _hoverDecoration, _hoverDecoration2, _hoverDecoration3, _hoverDecoration4;
       return {
-        onMouseEnter: (_hoverDecoration = hoverDecoration) === null || _hoverDecoration === void 0 ? void 0 : _hoverDecoration(nodeType, true, className),
-        onMouseLeave: (_hoverDecoration2 = hoverDecoration) === null || _hoverDecoration2 === void 0 ? void 0 : _hoverDecoration2(nodeType, false, className),
-        onFocus: (_hoverDecoration3 = hoverDecoration) === null || _hoverDecoration3 === void 0 ? void 0 : _hoverDecoration3(nodeType, true, className),
-        onBlur: (_hoverDecoration4 = hoverDecoration) === null || _hoverDecoration4 === void 0 ? void 0 : _hoverDecoration4(nodeType, false, className)
+        onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
+        onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className),
+        onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
+        onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className)
       };
     };
     return {
@@ -352,10 +335,10 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
         iconFallback: DeleteIcon,
         appearance: 'danger',
         onClick: removeExtension(editorAnalyticsAPI),
-        onMouseEnter: (_hoverDecoration5 = hoverDecoration) === null || _hoverDecoration5 === void 0 ? void 0 : _hoverDecoration5(nodeType, true),
-        onMouseLeave: (_hoverDecoration6 = hoverDecoration) === null || _hoverDecoration6 === void 0 ? void 0 : _hoverDecoration6(nodeType, false),
-        onFocus: (_hoverDecoration7 = hoverDecoration) === null || _hoverDecoration7 === void 0 ? void 0 : _hoverDecoration7(nodeType, true),
-        onBlur: (_hoverDecoration8 = hoverDecoration) === null || _hoverDecoration8 === void 0 ? void 0 : _hoverDecoration8(nodeType, false),
+        onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
+        onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
+        onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
+        onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
         focusEditoronEnter: true,
         title: formatMessage(commonMessages.remove),
         tabIndex: null,

package/dist/esm/pm-plugins/unique-id.js

@@ -2,9 +2,11 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { uuid } from '@atlaskit/adf-schema';
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { stepAddsOneOf } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 var pluginKey = new PluginKey('extensionUniqueIdPlugin');
 var createPlugin = function createPlugin() {
   return new SafePlugin({
@@ -24,7 +26,14 @@ var createPlugin = function createPlugin() {
           return;
         }
         var isAddingExtension = transaction.steps.some(function (step) {
-          return stepAddsOneOf(step, extensionTypes);
+          var _step$attrs;
+          return stepAddsOneOf(step, extensionTypes) ||
+          // There are instances where the localId will be reset to null on publish due to extension
+          // not existing in the Storage format (eg. Legacy Content Extensions) or not having a localId
+          // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+          fg('platform_editor_update_extension_local_id_on_reset') && step instanceof SetAttrsStep &&
+          // @ts-expect-error Bad ProseMirror step types
+          ((_step$attrs = step.attrs) === null || _step$attrs === void 0 ? void 0 : _step$attrs.localId) === null;
         });
         if (isAddingExtension) {
           // Can't simply look at changed nodes, as we could be adding an extension

package/dist/esm/ui/ConfigPanel/NestedForms/RemovableField.js

@@ -46,7 +46,7 @@ var RemovableField = function RemovableField(_ref) {
     ,
     className: className
   }, children, canRemoveField &&
-  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+  // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions, @atlassian/a11y/interactive-element-not-keyboard-focusable
   jsx("div", {
     css: removeButtonWrapperStyles,
     "data-testid": "remove-field-".concat(name),

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

@@ -1,15 +1,11 @@
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { FloatingToolbarHandler, PublicPluginAPI } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity';
-import type { ApplyChangeHandler, ContextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
-import type { DecorationsPlugin, HoverDecorationHandler } from '@atlaskit/editor-plugin-decorations';
+import type { ContextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
+import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 interface GetToolbarConfigProps {
     breakoutEnabled: boolean | undefined;
-    hoverDecoration?: HoverDecorationHandler | undefined;
-    applyChangeToContextPanel?: ApplyChangeHandler | undefined;
-    editorAnalyticsAPI?: EditorAnalyticsAPI | undefined;
     extensionApi?: PublicPluginAPI<[ContextPanelPlugin, AnalyticsPlugin, DecorationsPlugin, ConnectivityPlugin]> | undefined;
 }
-export declare const getToolbarConfig: ({ breakoutEnabled, hoverDecoration, applyChangeToContextPanel, editorAnalyticsAPI, extensionApi, }: GetToolbarConfigProps) => FloatingToolbarHandler;
+export declare const getToolbarConfig: ({ breakoutEnabled, extensionApi }: GetToolbarConfigProps) => FloatingToolbarHandler;
 export {};

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

@@ -1,14 +1,10 @@
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { FloatingToolbarHandler, PublicPluginAPI } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity';
-import type { ApplyChangeHandler, ContextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
-import type { DecorationsPlugin, HoverDecorationHandler } from '@atlaskit/editor-plugin-decorations';
+import type { ContextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
+import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 interface GetToolbarConfigProps {
     breakoutEnabled: boolean | undefined;
-    hoverDecoration?: HoverDecorationHandler | undefined;
-    applyChangeToContextPanel?: ApplyChangeHandler | undefined;
-    editorAnalyticsAPI?: EditorAnalyticsAPI | undefined;
     extensionApi?: PublicPluginAPI<[
         ContextPanelPlugin,
         AnalyticsPlugin,
@@ -16,5 +12,5 @@ interface GetToolbarConfigProps {
         ConnectivityPlugin
     ]> | undefined;
 }
-export declare const getToolbarConfig: ({ breakoutEnabled, hoverDecoration, applyChangeToContextPanel, editorAnalyticsAPI, extensionApi, }: GetToolbarConfigProps) => FloatingToolbarHandler;
+export declare const getToolbarConfig: ({ breakoutEnabled, extensionApi }: GetToolbarConfigProps) => FloatingToolbarHandler;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-extension",
-	"version": "5.3.0",
+	"version": "5.3.2",
 	"description": "editor-plugin-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 		"@atlaskit/button": "^23.0.0",
 		"@atlaskit/checkbox": "^17.1.0",
 		"@atlaskit/datetime-picker": "^17.0.0",
-		"@atlaskit/editor-common": "^103.16.0",
+		"@atlaskit/editor-common": "^103.21.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -49,7 +49,7 @@
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^14.4.0",
+		"@atlaskit/primitives": "^14.5.0",
 		"@atlaskit/radio": "^8.1.0",
 		"@atlaskit/section-message": "^8.2.0",
 		"@atlaskit/select": "^20.4.0",
@@ -59,7 +59,7 @@
 		"@atlaskit/textarea": "^8.0.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.14.0",
+		"@atlaskit/tmp-editor-statsig": "^4.15.0",
 		"@atlaskit/toggle": "^15.0.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/tooltip": "^20.0.0",
@@ -122,6 +122,9 @@
 		"platform_editor_extension_deprecation_status": {
 			"type": "boolean"
 		},
+		"platform_editor_update_extension_local_id_on_reset": {
+			"type": "boolean"
+		},
 		"platform_editor_controls_patch_2": {
 			"type": "boolean"
 		}