@atlaskit/editor-plugin-extension 29.0.3 → 29.0.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-extension
 
+## 29.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 29.0.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 29.0.3
 
 ### Patch Changes

package/dist/cjs/editor-actions/actions.js

@@ -8,7 +8,8 @@ exports.performNodeUpdate = exports.insertOrReplaceExtension = exports.insertOrR
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _extensionEvents = require("@atlaskit/editor-common/analytics/types/extension-events");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _extensionApi = require("../pm-plugins/extension-api");
@@ -59,8 +60,8 @@ var performNodeUpdate = exports.performNodeUpdate = function performNodeUpdate(e
         // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
         tr.setSelection(_state2.TextSelection.create(tr.doc, state.selection.anchor));
       };
-      var targetSelectionSource = _analytics.TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
-      var action = _analytics.ACTION.UPDATED;
+      var targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
+      var action = _enums.ACTION.UPDATED;
       var tr = state.tr;
 
       // When it's a bodiedExtension but not selected
@@ -84,9 +85,9 @@ var performNodeUpdate = exports.performNodeUpdate = function performNodeUpdate(e
         if (pos > -1) {
           tr = tr.replaceWith(pos, pos + (content.size || 0) + 1, newNode);
           tr.setSelection(_state2.Selection.near(tr.doc.resolve(pos)));
-          targetSelectionSource = _analytics.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
+          targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
         } else {
-          action = _analytics.ACTION.ERRORED;
+          action = _enums.ACTION.ERRORED;
         }
       }
 
@@ -99,13 +100,13 @@ var performNodeUpdate = exports.performNodeUpdate = function performNodeUpdate(e
           localId = _newNode$attrs.localId;
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
           action: action,
-          actionSubject: _analytics.ACTION_SUBJECT.EXTENSION,
+          actionSubject: _enums.ACTION_SUBJECT.EXTENSION,
           actionSubjectId: newNode.type.name,
-          eventType: _analytics.EVENT_TYPE.TRACK,
+          eventType: _enums.EVENT_TYPE.TRACK,
           attributes: {
             // @ts-expect-error - Type is not assignable to parameter of type 'AnalyticsEventPayload'
             // This error was introduced after upgrading to TypeScript 5
-            inputMethod: _analytics.INPUT_METHOD.CONFIG_PANEL,
+            inputMethod: _enums.INPUT_METHOD.CONFIG_PANEL,
             extensionType: extensionType,
             extensionKey: extensionKey,
             layout: layout,

package/dist/cjs/editor-commands/commands.js

@@ -9,12 +9,13 @@ exports.setEditingContextToContextPanel = setEditingContextToContextPanel;
 exports.updateExtensionLayout = void 0;
 exports.updateState = updateState;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _utils = require("@atlaskit/editor-common/utils");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _extensionEvents = require("@atlaskit/editor-common/analytics/types/extension-events");
+var _referentiality = require("@atlaskit/editor-common/utils/referentiality");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
-var _utils3 = require("../pm-plugins/utils");
+var _utils2 = require("../pm-plugins/utils");
 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; }
 // AFP-2532 TODO: Fix automatic suppressions below
@@ -63,7 +64,7 @@ var updateExtensionLayout = exports.updateExtensionLayout = function updateExten
       layout: layout
     }
   }, function (tr, state) {
-    var selectedExtension = (0, _utils3.getSelectedExtension)(state, true);
+    var selectedExtension = (0, _utils2.getSelectedExtension)(state, true);
     if (selectedExtension) {
       var trWithNewNodeMarkup = tr.setNodeMarkup(selectedExtension.pos, undefined, _objectSpread(_objectSpread({}, selectedExtension.node.attrs), {}, {
         layout: layout
@@ -71,17 +72,17 @@ var updateExtensionLayout = exports.updateExtensionLayout = function updateExten
       trWithNewNodeMarkup.setMeta('scrollIntoView', false);
       if (analyticsApi) {
         analyticsApi.attachAnalyticsEvent({
-          action: _analytics.ACTION.UPDATED,
-          actionSubject: _analytics.ACTION_SUBJECT.EXTENSION,
-          actionSubjectId: _analytics.ACTION_SUBJECT_ID.EXTENSION,
-          eventType: _analytics.EVENT_TYPE.TRACK,
+          action: _enums.ACTION.UPDATED,
+          actionSubject: _enums.ACTION_SUBJECT.EXTENSION,
+          actionSubjectId: _enums.ACTION_SUBJECT_ID.EXTENSION,
+          eventType: _enums.EVENT_TYPE.TRACK,
           attributes: {
             extensionType: selectedExtension.node.attrs.extensionType,
             extensionKey: selectedExtension.node.attrs.extensionKey,
             localId: selectedExtension.node.attrs.localId,
             layout: layout,
             selection: tr.selection.toJSON(),
-            targetSelectionSource: _analytics.TARGET_SELECTION_SOURCE.CURRENT_SELECTION
+            targetSelectionSource: _extensionEvents.TARGET_SELECTION_SOURCE.CURRENT_SELECTION
           }
         })(tr);
       }
@@ -97,7 +98,7 @@ var removeExtension = exports.removeExtension = function removeExtension(editorA
       element: undefined
     }
   }, function (tr, state) {
-    if ((0, _utils3.getSelectedExtension)(state)) {
+    if ((0, _utils2.getSelectedExtension)(state)) {
       return removeSelectedNodeWithAnalytics(state, tr, editorAnalyticsAPI, inputMethod);
     } else {
       return checkAndRemoveExtensionNode(state, tr, editorAnalyticsAPI, inputMethod);
@@ -111,7 +112,7 @@ var removeDescendantNodes = exports.removeDescendantNodes = function removeDesce
       element: undefined
     }
   }, function (tr, state) {
-    return sourceNode ? (0, _utils.removeConnectedNodes)(state, sourceNode) : tr;
+    return sourceNode ? (0, _referentiality.removeConnectedNodes)(state, sourceNode) : tr;
   });
 };
 var removeSelectedNodeWithAnalytics = exports.removeSelectedNodeWithAnalytics = function removeSelectedNodeWithAnalytics(state, tr, analyticsApi, inputMethod) {
@@ -119,10 +120,10 @@ var removeSelectedNodeWithAnalytics = exports.removeSelectedNodeWithAnalytics =
     var node = state.selection.node;
     if (analyticsApi) {
       analyticsApi.attachAnalyticsEvent({
-        action: _analytics.ACTION.DELETED,
-        actionSubject: _analytics.ACTION_SUBJECT.EXTENSION,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.EXTENSION,
-        eventType: _analytics.EVENT_TYPE.TRACK,
+        action: _enums.ACTION.DELETED,
+        actionSubject: _enums.ACTION_SUBJECT.EXTENSION,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.EXTENSION,
+        eventType: _enums.EVENT_TYPE.TRACK,
         attributes: {
           extensionType: node.attrs.extensionType,
           extensionKey: node.attrs.extensionKey,
@@ -132,18 +133,18 @@ var removeSelectedNodeWithAnalytics = exports.removeSelectedNodeWithAnalytics =
       })(tr);
     }
   }
-  return (0, _utils2.removeSelectedNode)(tr);
+  return (0, _utils.removeSelectedNode)(tr);
 };
 var checkAndRemoveExtensionNode = exports.checkAndRemoveExtensionNode = function checkAndRemoveExtensionNode(state, tr, analyticsApi, inputMethod) {
   var nodeType = state.schema.nodes.bodiedExtension;
-  var maybeMBENode = (0, _utils2.findParentNodeOfType)(state.schema.nodes.multiBodiedExtension)(state.selection);
+  var maybeMBENode = (0, _utils.findParentNodeOfType)(state.schema.nodes.multiBodiedExtension)(state.selection);
   if (maybeMBENode) {
     nodeType = state.schema.nodes.multiBodiedExtension;
     if (analyticsApi) {
       analyticsApi.attachAnalyticsEvent({
-        action: _analytics.ACTION.DELETED,
-        actionSubject: _analytics.ACTION_SUBJECT.MULTI_BODIED_EXTENSION,
-        eventType: _analytics.EVENT_TYPE.TRACK,
+        action: _enums.ACTION.DELETED,
+        actionSubject: _enums.ACTION_SUBJECT.MULTI_BODIED_EXTENSION,
+        eventType: _enums.EVENT_TYPE.TRACK,
         attributes: {
           extensionType: maybeMBENode.node.attrs.extensionType,
           extensionKey: maybeMBENode.node.attrs.extensionKey,
@@ -154,14 +155,14 @@ var checkAndRemoveExtensionNode = exports.checkAndRemoveExtensionNode = function
       })(tr);
     }
   }
-  var bodiedExtensionNode = (0, _utils2.findParentNodeOfType)(state.schema.nodes.bodiedExtension)(state.selection);
+  var bodiedExtensionNode = (0, _utils.findParentNodeOfType)(state.schema.nodes.bodiedExtension)(state.selection);
   if (bodiedExtensionNode) {
     if (analyticsApi) {
       analyticsApi.attachAnalyticsEvent({
-        action: _analytics.ACTION.DELETED,
-        actionSubject: _analytics.ACTION_SUBJECT.EXTENSION,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.EXTENSION_BODIED,
-        eventType: _analytics.EVENT_TYPE.TRACK,
+        action: _enums.ACTION.DELETED,
+        actionSubject: _enums.ACTION_SUBJECT.EXTENSION,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.EXTENSION_BODIED,
+        eventType: _enums.EVENT_TYPE.TRACK,
         attributes: {
           extensionType: bodiedExtensionNode.node.attrs.extensionType,
           extensionKey: bodiedExtensionNode.node.attrs.extensionKey,
@@ -171,5 +172,5 @@ var checkAndRemoveExtensionNode = exports.checkAndRemoveExtensionNode = function
       })(tr);
     }
   }
-  return (0, _utils2.removeParentNodeOfType)(nodeType)(tr);
+  return (0, _utils.removeParentNodeOfType)(nodeType)(tr);
 };

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

@@ -8,18 +8,19 @@ exports.getEditInLegacyMacroBrowser = exports.createExtensionAPI = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _validator = require("@atlaskit/adf-utils/validator");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _utils = require("@atlaskit/editor-common/utils");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _autojoin = require("@atlaskit/editor-common/utils/autojoin");
+var _nodes = require("@atlaskit/editor-common/utils/nodes");
 var _JSONTransformer = require("@atlaskit/editor-json-transformer/JSONTransformer-2");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commands = require("../editor-commands/commands");
 var _actions = require("./macro/actions");
 var _pluginKey = require("./macro/plugin-key");
-var _utils3 = require("./utils");
+var _utils2 = require("./utils");
 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 getEditInLegacyMacroBrowser = exports.getEditInLegacyMacroBrowser = function getEditInLegacyMacroBrowser(_ref) {
@@ -33,7 +34,7 @@ var getEditInLegacyMacroBrowser = exports.getEditInLegacyMacroBrowser = function
     if (!macroProvider) {
       throw new Error("Missing macroProvider. Can't use the macro browser for updates");
     }
-    var nodeWithPos = (0, _utils3.getSelectedExtension)(view.state, true);
+    var nodeWithPos = (0, _utils2.getSelectedExtension)(view.state, true);
     if (!nodeWithPos) {
       throw new Error("Missing nodeWithPos. Can't determine position of node");
     }
@@ -42,13 +43,13 @@ var getEditInLegacyMacroBrowser = exports.getEditInLegacyMacroBrowser = function
 };
 var extensionAPICallPayload = function extensionAPICallPayload(functionName) {
   return {
-    action: _analytics.ACTION.INVOKED,
-    actionSubject: _analytics.ACTION_SUBJECT.EXTENSION,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.EXTENSION_API,
+    action: _enums.ACTION.INVOKED,
+    actionSubject: _enums.ACTION_SUBJECT.EXTENSION,
+    actionSubjectId: _enums.ACTION_SUBJECT_ID.EXTENSION_API,
     attributes: {
       functionName: functionName
     },
-    eventType: _analytics.EVENT_TYPE.TRACK
+    eventType: _enums.EVENT_TYPE.TRACK
   };
 };
 var createExtensionAPI = exports.createExtensionAPI = function createExtensionAPI(options) {
@@ -75,7 +76,7 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
 
     // Find the node + position matching the given ID
     var state = options.editorView.state;
-    var nodePos = (0, _utils3.findNodePosWithLocalId)(state, localId);
+    var nodePos = (0, _utils2.findNodePosWithLocalId)(state, localId);
     if (!nodePos) {
       throw new Error("".concat(opName, "(): Could not find node with ID '").concat(localId, "'."));
     }
@@ -134,27 +135,27 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
         var _node$attrs = node.attrs,
           extensionKey = _node$attrs.extensionKey,
           extensionType = _node$attrs.extensionType;
-        var dataConsumerMark = (0, _utils3.getDataConsumerMark)(node);
+        var dataConsumerMark = (0, _utils2.getDataConsumerMark)(node);
         var stringIds = (dataConsumerMark === null || dataConsumerMark === void 0 ? void 0 : dataConsumerMark.attrs.sources.map(function (sourceId) {
           return sourceId;
         })) || [];
         var hasReferentiality = !!dataConsumerMark;
-        var nodeTypesReferenced = hasReferentiality ? (0, _utils3.getNodeTypesReferenced)(stringIds, state) : undefined;
+        var nodeTypesReferenced = hasReferentiality ? (0, _utils2.getNodeTypesReferenced)(stringIds, state) : undefined;
 
         // fire off analytics for this ADF
         var payload = {
-          action: _analytics.ACTION.INSERTED,
-          actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+          action: _enums.ACTION.INSERTED,
+          actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
           attributes: {
             nodeType: node.type.name,
-            inputMethod: _analytics.INPUT_METHOD.EXTENSION_API,
+            inputMethod: _enums.INPUT_METHOD.EXTENSION_API,
             hasReferentiality: hasReferentiality,
             nodeTypesReferenced: nodeTypesReferenced,
             layout: node.attrs.layout,
             extensionType: extensionType,
             extensionKey: extensionKey
           },
-          eventType: _analytics.EVENT_TYPE.TRACK
+          eventType: _enums.EVENT_TYPE.TRACK
         };
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
       });
@@ -201,7 +202,7 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
         state = _options$editorView2.state;
       var tr = state.tr;
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(apiCallPayload)(tr);
-      tr = (0, _utils2.setTextSelection)(nodePos.pos)(tr);
+      tr = (0, _utils.setTextSelection)(nodePos.pos)(tr);
       var useScrollIntoView = true;
       if (nodePos.node.type.name === 'table' && (0, _expValEquals.expValEquals)('platform_editor_table_sticky_header_improvements', 'cohort', 'test_with_overflow') && (0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true)) {
         var tableDOM = options.editorView.nodeDOM(nodePos.pos);
@@ -233,7 +234,7 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
       var changedValues = mutationCallback(_objectSpread(_objectSpread({}, (0, _fg.fg)('platform_forge_inline_bodied_macro') ? {
         type: node.type.name
       } : {}), {}, {
-        content: (0, _utils.nodeToJSON)(node).content,
+        content: (0, _nodes.nodeToJSON)(node).content,
         attrs: node.attrs,
         marks: node.marks.map(function (pmMark) {
           return {
@@ -295,7 +296,7 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
         } else {
           tr.replaceRangeWith(pos, pos + node.nodeSize, newNode);
           if (node.isBlock && newNode.isInline) {
-            (0, _utils.autoJoinTr)(tr, ['paragraph']);
+            (0, _autojoin.autoJoinTr)(tr, ['paragraph']);
           }
           tr.doc.check();
         }

package/dist/cjs/pm-plugins/macro/actions.js

@@ -9,9 +9,10 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _assert = _interopRequireDefault(require("assert"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _extensionEvents = require("@atlaskit/editor-common/analytics/types/extension-events");
 var _insert = require("@atlaskit/editor-common/insert");
-var _validator = require("@atlaskit/editor-common/validator");
+var _validator = require("@atlaskit/editor-common/utils/validator");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _pluginFactory = require("../plugin-factory");
@@ -60,7 +61,7 @@ var insertMacroFromMacroBrowser = exports.insertMacroFromMacroBrowser = function
                 tr.setSelection(_state.TextSelection.create(tr.doc, state.selection.anchor));
               };
               extensionState = (0, _pluginFactory.getPluginState)(state);
-              targetSelectionSource = _analytics.TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
+              targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
               tr = state.tr;
               isBodiedExtensionSelected = !!(0, _utils.findSelectedNodeOfType)([bodiedExtension])(selection);
               isMultiBodiedExtensionSelected = !!(0, _utils.findSelectedNodeOfType)([multiBodiedExtension])(selection); // When it's a bodiedExtension but not selected
@@ -84,7 +85,7 @@ var insertMacroFromMacroBrowser = exports.insertMacroFromMacroBrowser = function
                 if (pos > -1) {
                   tr = tr.replaceWith(pos, pos + macroNode.nodeSize, node);
                   tr.setSelection(_state.Selection.near(tr.doc.resolve(pos)));
-                  targetSelectionSource = _analytics.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
+                  targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
                 }
               }
 
@@ -92,14 +93,14 @@ var insertMacroFromMacroBrowser = exports.insertMacroFromMacroBrowser = function
               if (dispatch && tr.docChanged) {
                 _macroNode$attrs = macroNode.attrs, extensionType = _macroNode$attrs.extensionType, extensionKey = _macroNode$attrs.extensionKey, layout = _macroNode$attrs.layout, localId = _macroNode$attrs.localId;
                 editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
-                  action: _analytics.ACTION.UPDATED,
-                  actionSubject: _analytics.ACTION_SUBJECT.EXTENSION,
+                  action: _enums.ACTION.UPDATED,
+                  actionSubject: _enums.ACTION_SUBJECT.EXTENSION,
                   actionSubjectId: macroNode.type.name,
-                  eventType: _analytics.EVENT_TYPE.TRACK,
+                  eventType: _enums.EVENT_TYPE.TRACK,
                   attributes: {
                     // @ts-expect-error - Type is not assignable to parameter of type 'AnalyticsEventPayload'
                     // This error was introduced after upgrading to TypeScript 5
-                    inputMethod: isEditing ? _analytics.INPUT_METHOD.MACRO_BROWSER : _analytics.INPUT_METHOD.TOOLBAR,
+                    inputMethod: isEditing ? _enums.INPUT_METHOD.MACRO_BROWSER : _enums.INPUT_METHOD.TOOLBAR,
                     extensionType: extensionType,
                     extensionKey: extensionKey,
                     layout: layout,

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

@@ -8,9 +8,10 @@ exports.handleUpdate = exports.createPlugin = exports.createExtensionProviderHan
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _extensibility = require("@atlaskit/editor-common/extensibility");
+var _extensionNodeView = _interopRequireDefault(require("@atlaskit/editor-common/extensionNodeView"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _selection2 = require("@atlaskit/editor-common/selection");
+var _selection3 = require("@atlaskit/editor-common/selection/gap-cursor/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _commands = require("../editor-commands/commands");
@@ -280,14 +281,14 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
               multiBodiedExtension = _schema$nodes.multiBodiedExtension,
               extensionFrame = _schema$nodes.extensionFrame,
               paragraph = _schema$nodes.paragraph;
-            if (_selection instanceof _selection2.GapCursorSelection || _selection instanceof _state.TextSelection && _$head.parent.type === paragraph) {
+            if (_selection instanceof _selection3.GapCursorSelection || _selection instanceof _state.TextSelection && _$head.parent.type === paragraph) {
               var maybeMultiBodiedExtension = (0, _utils.findParentNodeOfTypeClosestToPos)(_$head, multiBodiedExtension);
               if (maybeMultiBodiedExtension) {
                 var _tr$doc$nodeAt;
                 /* In case of gap cursor, we need to decrement the position by 1 as we need to check the node at previous position
                  * In case of text selection, we need to decrement the position by 2 as we need to jump back twice, once from text node and then its parent paragraph node
                  */
-                var previousPositionDecrement = _selection instanceof _selection2.GapCursorSelection ? 1 : 2;
+                var previousPositionDecrement = _selection instanceof _selection3.GapCursorSelection ? 1 : 2;
                 if (((_tr$doc$nodeAt = _tr.doc.nodeAt(_$head.pos - previousPositionDecrement)) === null || _tr$doc$nodeAt === void 0 ? void 0 : _tr$doc$nodeAt.type) === extensionFrame) {
                   var _newSelection2 = _state.TextSelection.create(_doc, _tr.doc.resolve(_$head.pos - previousPositionDecrement).start(_$head.depth - previousPositionDecrement));
                   view.dispatch(_tr.setSelection(_newSelection2));
@@ -300,12 +301,12 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
       },
       nodeViews: {
         // WARNING: referentiality-plugin also creates these nodeviews
-        extension: (0, _extensibility.ExtensionNodeView)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionLoadingHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, undefined, undefined, undefined, intl),
+        extension: (0, _extensionNodeView.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionLoadingHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, undefined, undefined, undefined, intl),
         // WARNING: referentiality-plugin also creates these nodeviews
-        bodiedExtension: (0, _extensibility.ExtensionNodeView)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionLoadingHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, __rendererExtensionOptions === null || __rendererExtensionOptions === void 0 ? void 0 : __rendererExtensionOptions.showUpdated1PBodiedExtensionUI, __rendererExtensionOptions === null || __rendererExtensionOptions === void 0 ? void 0 : __rendererExtensionOptions.rendererExtensionHandlers, intl),
+        bodiedExtension: (0, _extensionNodeView.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionLoadingHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, __rendererExtensionOptions === null || __rendererExtensionOptions === void 0 ? void 0 : __rendererExtensionOptions.showUpdated1PBodiedExtensionUI, __rendererExtensionOptions === null || __rendererExtensionOptions === void 0 ? void 0 : __rendererExtensionOptions.rendererExtensionHandlers, intl),
         // WARNING: referentiality-plugin also creates these nodeviews
-        inlineExtension: (0, _extensibility.ExtensionNodeView)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionLoadingHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, undefined, undefined, undefined, intl),
-        multiBodiedExtension: (0, _extensibility.ExtensionNodeView)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionLoadingHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, undefined, undefined, undefined, intl)
+        inlineExtension: (0, _extensionNodeView.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionLoadingHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, undefined, undefined, undefined, intl),
+        multiBodiedExtension: (0, _extensionNodeView.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionLoadingHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, undefined, undefined, undefined, intl)
       },
       createSelectionBetween: function createSelectionBetween(view, anchor, head) {
         var _view$state3 = view.state,

package/dist/cjs/pm-plugins/plugin-factory.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getPluginState = exports.createPluginState = exports.createCommand = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _utils = require("@atlaskit/editor-common/utils");
+var _pluginStateFactory = require("@atlaskit/editor-common/utils/plugin-state-factory");
 var _pluginKey = require("./plugin-key");
 var _reducer = _interopRequireDefault(require("./reducer"));
 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 factory = (0, _utils.pluginFactory)(_pluginKey.pluginKey, _reducer.default, {
+var factory = (0, _pluginStateFactory.pluginFactory)(_pluginKey.pluginKey, _reducer.default, {
   mapping: function mapping(tr, state) {
     var _ref = state,
       previousPositions = _ref.positions;

package/dist/cjs/pm-plugins/toDOM-fixes/bodiedExtension.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.bodiedExtensionSpecWithFixedToDOM = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _bodiedExtension = require("@atlaskit/adf-schema/bodied-extension");
-var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
+var _cssHelper = require("@atlaskit/editor-common/css-helper");
 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 capitalizeFirstLetter = function capitalizeFirstLetter(str) {
@@ -26,7 +26,7 @@ var bodiedExtensionSpecWithFixedToDOM = exports.bodiedExtensionSpecWithFixedToDO
         'data-parameters': JSON.stringify(node.attrs.parameters),
         'data-layout': node.attrs.layout,
         'data-local-id:': node.attrs.localId,
-        style: (0, _lazyNodeView.convertToInlineCss)({
+        style: (0, _cssHelper.convertToInlineCss)({
           position: 'relative',
           marginTop: "var(--ds-space-300, 24px)"
         })
@@ -34,7 +34,7 @@ var bodiedExtensionSpecWithFixedToDOM = exports.bodiedExtensionSpecWithFixedToDO
       var title = node.attrs && node.attrs.extensionTitle || node.attrs && node.attrs.macroMetadata && node.attrs.macroMetadata.title || node.attrs.extensionKey;
       return ['div', attrs, ['span', {
         // Styles based on `packages/editor/editor-common/src/extensibility/Extension/Lozenge/ExtensionLabel.tsx`
-        style: (0, _lazyNodeView.convertToInlineCss)({
+        style: (0, _cssHelper.convertToInlineCss)({
           boxShadow: "0 0 0 1px ".concat("var(--ds-border, #0B120E24)"),
           fontSize: '14px',
           padding: "var(--ds-space-025, 2px)".concat(" ", "var(--ds-space-050, 4px)"),
@@ -51,7 +51,7 @@ var bodiedExtensionSpecWithFixedToDOM = exports.bodiedExtensionSpecWithFixedToDO
         'data-bodied-extension-label': capitalizeFirstLetter(title),
         class: 'bodied-extension-to-dom-label'
       }], ['div', {
-        style: (0, _lazyNodeView.convertToInlineCss)({
+        style: (0, _cssHelper.convertToInlineCss)({
           padding: "var(--ds-space-200, 16px)",
           marginLeft: "var(--ds-space-negative-150, -12px)",
           marginRight: "var(--ds-space-negative-150, -12px)",