@atlaskit/editor-plugin-extension 5.3.4 → 5.3.6

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-extension
 
+## 5.3.6
+
+### Patch Changes
+
+- Updated dependencies
+
+## 5.3.5
+
+### Patch Changes
+
+- [#149482](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/149482)
+  [`1f1f73876c3c8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1f1f73876c3c8) -
+  ED-27860 Add analytics for copy and delete button in floating toolbars
+- Updated dependencies
+
 ## 5.3.4
 
 ### Patch Changes

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

@@ -13,6 +13,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _utils3 = 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; }
@@ -91,7 +92,7 @@ var updateExtensionLayout = exports.updateExtensionLayout = function updateExten
     return tr;
   });
 };
-var removeExtension = exports.removeExtension = function removeExtension(editorAnalyticsAPI) {
+var removeExtension = exports.removeExtension = function removeExtension(editorAnalyticsAPI, inputMethod) {
   return (0, _pluginFactory.createCommand)({
     type: 'UPDATE_STATE',
     data: {
@@ -99,9 +100,9 @@ var removeExtension = exports.removeExtension = function removeExtension(editorA
     }
   }, function (tr, state) {
     if ((0, _utils3.getSelectedExtension)(state)) {
-      return removeSelectedNodeWithAnalytics(state, tr, editorAnalyticsAPI);
+      return removeSelectedNodeWithAnalytics(state, tr, editorAnalyticsAPI, inputMethod);
     } else {
-      return checkAndRemoveExtensionNode(state, tr, editorAnalyticsAPI);
+      return checkAndRemoveExtensionNode(state, tr, editorAnalyticsAPI, inputMethod);
     }
   });
 };
@@ -115,7 +116,7 @@ var removeDescendantNodes = exports.removeDescendantNodes = function removeDesce
     return sourceNode ? (0, _utils.removeConnectedNodes)(state, sourceNode) : tr;
   });
 };
-var removeSelectedNodeWithAnalytics = exports.removeSelectedNodeWithAnalytics = function removeSelectedNodeWithAnalytics(state, tr, analyticsApi) {
+var removeSelectedNodeWithAnalytics = exports.removeSelectedNodeWithAnalytics = function removeSelectedNodeWithAnalytics(state, tr, analyticsApi, inputMethod) {
   if (state.selection instanceof _state.NodeSelection) {
     var node = state.selection.node;
     if (analyticsApi) {
@@ -127,14 +128,15 @@ var removeSelectedNodeWithAnalytics = exports.removeSelectedNodeWithAnalytics =
         attributes: {
           extensionType: node.attrs.extensionType,
           extensionKey: node.attrs.extensionKey,
-          localId: node.attrs.localId
+          localId: node.attrs.localId,
+          inputMethod: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics_2') ? inputMethod : undefined
         }
       })(tr);
     }
   }
   return (0, _utils2.removeSelectedNode)(tr);
 };
-var checkAndRemoveExtensionNode = exports.checkAndRemoveExtensionNode = function checkAndRemoveExtensionNode(state, tr, analyticsApi) {
+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);
   if (maybeMBENode) {
@@ -148,7 +150,8 @@ var checkAndRemoveExtensionNode = exports.checkAndRemoveExtensionNode = function
           extensionType: maybeMBENode.node.attrs.extensionType,
           extensionKey: maybeMBENode.node.attrs.extensionKey,
           localId: maybeMBENode.node.attrs.localId,
-          currentFramesCount: maybeMBENode.node.content.childCount
+          currentFramesCount: maybeMBENode.node.content.childCount,
+          inputMethod: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics_2') ? inputMethod : undefined
         }
       })(tr);
     }
@@ -164,7 +167,8 @@ var checkAndRemoveExtensionNode = exports.checkAndRemoveExtensionNode = function
         attributes: {
           extensionType: bodiedExtensionNode.node.attrs.extensionType,
           extensionKey: bodiedExtensionNode.node.attrs.extensionKey,
-          localId: bodiedExtensionNode.node.attrs.localId
+          localId: bodiedExtensionNode.node.attrs.localId,
+          inputMethod: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics_2') ? inputMethod : undefined
         }
       })(tr);
     }

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

@@ -8,6 +8,7 @@ exports.getToolbarConfig = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _extensions = require("@atlaskit/editor-common/extensions");
 var _messages = _interopRequireDefault(require("@atlaskit/editor-common/messages"));
 var _styles = require("@atlaskit/editor-common/styles");
@@ -340,7 +341,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
         },
         iconFallback: _delete.default,
         appearance: 'danger',
-        onClick: (0, _commands.removeExtension)(editorAnalyticsAPI),
+        onClick: (0, _commands.removeExtension)(editorAnalyticsAPI, _analytics.INPUT_METHOD.FLOATING_TB),
         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),
@@ -362,7 +363,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
           onClick: function onClick() {
             var _extensionApi$core, _extensionApi$floatin;
             extensionApi === null || extensionApi === void 0 || (_extensionApi$core = extensionApi.core) === null || _extensionApi$core === void 0 || _extensionApi$core.actions.execute( // @ts-ignore
-            extensionApi === null || extensionApi === void 0 || (_extensionApi$floatin = extensionApi.floatingToolbar) === null || _extensionApi$floatin === void 0 ? void 0 : _extensionApi$floatin.commands.copyNode(nodeType));
+            extensionApi === null || extensionApi === void 0 || (_extensionApi$floatin = extensionApi.floatingToolbar) === null || _extensionApi$floatin === void 0 ? void 0 : _extensionApi$floatin.commands.copyNode(nodeType, _analytics.INPUT_METHOD.FLOATING_TB));
             return true;
           },
           icon: /*#__PURE__*/_react.default.createElement(_copy.default, {
@@ -370,7 +371,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
           })
         }, hoverDecorationProps(nodeType, _editorSharedStyles.akEditorSelectedNodeClassName)), _objectSpread({
           title: formatMessage(_messages.default.delete),
-          onClick: (0, _commands.removeExtension)(editorAnalyticsAPI),
+          onClick: (0, _commands.removeExtension)(editorAnalyticsAPI, _analytics.INPUT_METHOD.FLOATING_TB),
           icon: /*#__PURE__*/_react.default.createElement(_delete.default, {
             label: ""
           })

package/dist/cjs/ui/useConfigPanelPluginHook.js

@@ -120,28 +120,48 @@ function showConfigPanel(_ref2) {
       },
       BodyComponent: BodyComponent,
       closeOptions: {
-        canClosePanel: function canClosePanel() {
-          // When navigating away from the editor, the editorView is destroyed.
-          if (editorView.isDestroyed) {
-            return true;
-          }
-          var extensionState = (0, _pluginFactory.getPluginState)(editorView.state);
-          /**
-           * 	If context panel is open, then first update extension plugin state.
-           * 	Updating extension plugin state will trigger useEffect in useConfigPanelPluginHook,
-           * 		which will call hideConfigPanel.
-           */
-          if (extensionState !== null && extensionState !== void 0 && extensionState.showContextPanel) {
-            startClosingConfigPanel({
-              api: api,
-              editorView: editorView
-            });
-            return false;
+        canClosePanel: function () {
+          var _canClosePanel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+            var extensionState;
+            return _regenerator.default.wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  if (!editorView.isDestroyed) {
+                    _context.next = 2;
+                    break;
+                  }
+                  return _context.abrupt("return", true);
+                case 2:
+                  extensionState = (0, _pluginFactory.getPluginState)(editorView.state);
+                  /**
+                   * 	If context panel is open, then first update extension plugin state.
+                   * 	Updating extension plugin state will trigger useEffect in useConfigPanelPluginHook,
+                   * 		which will call hideConfigPanel.
+                   */
+                  if (!(extensionState !== null && extensionState !== void 0 && extensionState.showContextPanel)) {
+                    _context.next = 7;
+                    break;
+                  }
+                  _context.next = 6;
+                  return startClosingConfigPanel({
+                    api: api,
+                    editorView: editorView
+                  });
+                case 6:
+                  return _context.abrupt("return", false);
+                case 7:
+                  return _context.abrupt("return", true);
+                case 8:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee);
+          }));
+          function canClosePanel() {
+            return _canClosePanel.apply(this, arguments);
           }
-
-          // Return true if extension plugin state has been updated and hideConfigPanel has been called.
-          return true;
-        }
+          return canClosePanel;
+        }()
       }
     }, 'push', _constants.CONFIG_PANEL_WIDTH);
   }
@@ -150,34 +170,34 @@ function startClosingConfigPanel(_x) {
   return _startClosingConfigPanel.apply(this, arguments);
 }
 function _startClosingConfigPanel() {
-  _startClosingConfigPanel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_ref3) {
+  _startClosingConfigPanel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(_ref3) {
     var _api$contextPanel3;
     var api, editorView, applyChange;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regenerator.default.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           api = _ref3.api, editorView = _ref3.editorView;
           applyChange = api === null || api === void 0 || (_api$contextPanel3 = api.contextPanel) === null || _api$contextPanel3 === void 0 ? void 0 : _api$contextPanel3.actions.applyChange; // Even if the save failed, we should proceed with closing the panel
           (0, _commands.clearEditingContext)(applyChange)(editorView.state, editorView.dispatch);
-          _context2.prev = 3;
-          _context2.next = 6;
+          _context3.prev = 3;
+          _context3.next = 6;
           return new Promise(function (resolve, reject) {
             (0, _commands.forceAutoSave)(applyChange)(resolve, reject)(editorView.state, editorView.dispatch);
           });
         case 6:
-          _context2.next = 11;
+          _context3.next = 11;
           break;
         case 8:
-          _context2.prev = 8;
-          _context2.t0 = _context2["catch"](3);
+          _context3.prev = 8;
+          _context3.t0 = _context3["catch"](3);
           // Even if the save failed, we should proceed with closing the panel
           // eslint-disable-next-line no-console
-          console.error("Autosave failed with error", _context2.t0);
+          console.error("Autosave failed with error", _context3.t0);
         case 11:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[3, 8]]);
+    }, _callee3, null, [[3, 8]]);
   }));
   return _startClosingConfigPanel.apply(this, arguments);
 }
@@ -224,11 +244,11 @@ var getContextPanelBodyComponent = exports.getContextPanelBodyComponent = functi
         autoSaveTrigger: autoSaveResolve,
         autoSaveReject: autoSaveReject,
         onChange: ( /*#__PURE__*/function () {
-          var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(updatedParameters) {
-            return _regenerator.default.wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
+          var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(updatedParameters) {
+            return _regenerator.default.wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
                 case 0:
-                  _context.next = 2;
+                  _context2.next = 2;
                   return (0, _contextPanel.onChangeAction)(editorView, updatedParameters, parameters, nodeWithPos, onSaveStarted);
                 case 2:
                   onSaveEnded();
@@ -237,9 +257,9 @@ var getContextPanelBodyComponent = exports.getContextPanelBodyComponent = functi
                   }
                 case 4:
                 case "end":
-                  return _context.stop();
+                  return _context2.stop();
               }
-            }, _callee);
+            }, _callee2);
           }));
           return function (_x2) {
             return _ref6.apply(this, arguments);

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

@@ -2,6 +2,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, TARGET_SELECTION
 import { removeConnectedNodes } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, removeParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { getSelectedExtension } from '../pm-plugins/utils';
 
@@ -72,16 +73,16 @@ export const updateExtensionLayout = (layout, analyticsApi) => createCommand({
   }
   return tr;
 });
-export const removeExtension = editorAnalyticsAPI => createCommand({
+export const removeExtension = (editorAnalyticsAPI, inputMethod) => createCommand({
   type: 'UPDATE_STATE',
   data: {
     element: undefined
   }
 }, (tr, state) => {
   if (getSelectedExtension(state)) {
-    return removeSelectedNodeWithAnalytics(state, tr, editorAnalyticsAPI);
+    return removeSelectedNodeWithAnalytics(state, tr, editorAnalyticsAPI, inputMethod);
   } else {
-    return checkAndRemoveExtensionNode(state, tr, editorAnalyticsAPI);
+    return checkAndRemoveExtensionNode(state, tr, editorAnalyticsAPI, inputMethod);
   }
 });
 export const removeDescendantNodes = sourceNode => createCommand({
@@ -92,7 +93,7 @@ export const removeDescendantNodes = sourceNode => createCommand({
 }, (tr, state) => {
   return sourceNode ? removeConnectedNodes(state, sourceNode) : tr;
 });
-export const removeSelectedNodeWithAnalytics = (state, tr, analyticsApi) => {
+export const removeSelectedNodeWithAnalytics = (state, tr, analyticsApi, inputMethod) => {
   if (state.selection instanceof NodeSelection) {
     const node = state.selection.node;
     if (analyticsApi) {
@@ -104,14 +105,15 @@ export const removeSelectedNodeWithAnalytics = (state, tr, analyticsApi) => {
         attributes: {
           extensionType: node.attrs.extensionType,
           extensionKey: node.attrs.extensionKey,
-          localId: node.attrs.localId
+          localId: node.attrs.localId,
+          inputMethod: fg('platform_editor_controls_patch_analytics_2') ? inputMethod : undefined
         }
       })(tr);
     }
   }
   return removeSelectedNode(tr);
 };
-export const checkAndRemoveExtensionNode = (state, tr, analyticsApi) => {
+export const checkAndRemoveExtensionNode = (state, tr, analyticsApi, inputMethod) => {
   let nodeType = state.schema.nodes.bodiedExtension;
   const maybeMBENode = findParentNodeOfType(state.schema.nodes.multiBodiedExtension)(state.selection);
   if (maybeMBENode) {
@@ -125,7 +127,8 @@ export const checkAndRemoveExtensionNode = (state, tr, analyticsApi) => {
           extensionType: maybeMBENode.node.attrs.extensionType,
           extensionKey: maybeMBENode.node.attrs.extensionKey,
           localId: maybeMBENode.node.attrs.localId,
-          currentFramesCount: maybeMBENode.node.content.childCount
+          currentFramesCount: maybeMBENode.node.content.childCount,
+          inputMethod: fg('platform_editor_controls_patch_analytics_2') ? inputMethod : undefined
         }
       })(tr);
     }
@@ -141,7 +144,8 @@ export const checkAndRemoveExtensionNode = (state, tr, analyticsApi) => {
         attributes: {
           extensionType: bodiedExtensionNode.node.attrs.extensionType,
           extensionKey: bodiedExtensionNode.node.attrs.extensionKey,
-          localId: bodiedExtensionNode.node.attrs.localId
+          localId: bodiedExtensionNode.node.attrs.localId,
+          inputMethod: fg('platform_editor_controls_patch_analytics_2') ? inputMethod : undefined
         }
       })(tr);
     }

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

@@ -1,4 +1,5 @@
 import React from 'react';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from '@atlaskit/editor-common/extensions';
 import commonMessages from '@atlaskit/editor-common/messages';
 import { BODIED_EXT_MBE_MARGIN_TOP } from '@atlaskit/editor-common/styles';
@@ -327,7 +328,7 @@ export const getToolbarConfig = ({
       }),
       iconFallback: DeleteIcon,
       appearance: 'danger',
-      onClick: removeExtension(editorAnalyticsAPI),
+      onClick: removeExtension(editorAnalyticsAPI, INPUT_METHOD.FLOATING_TB),
       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),
@@ -349,7 +350,7 @@ export const getToolbarConfig = ({
         onClick: () => {
           var _extensionApi$core, _extensionApi$floatin;
           extensionApi === null || extensionApi === void 0 ? void 0 : (_extensionApi$core = extensionApi.core) === null || _extensionApi$core === void 0 ? void 0 : _extensionApi$core.actions.execute( // @ts-ignore
-          extensionApi === null || extensionApi === void 0 ? void 0 : (_extensionApi$floatin = extensionApi.floatingToolbar) === null || _extensionApi$floatin === void 0 ? void 0 : _extensionApi$floatin.commands.copyNode(nodeType));
+          extensionApi === null || extensionApi === void 0 ? void 0 : (_extensionApi$floatin = extensionApi.floatingToolbar) === null || _extensionApi$floatin === void 0 ? void 0 : _extensionApi$floatin.commands.copyNode(nodeType, INPUT_METHOD.FLOATING_TB));
           return true;
         },
         icon: /*#__PURE__*/React.createElement(CopyIcon, {
@@ -358,7 +359,7 @@ export const getToolbarConfig = ({
         ...hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)
       }, {
         title: formatMessage(commonMessages.delete),
-        onClick: removeExtension(editorAnalyticsAPI),
+        onClick: removeExtension(editorAnalyticsAPI, INPUT_METHOD.FLOATING_TB),
         icon: /*#__PURE__*/React.createElement(DeleteIcon, {
           label: ""
         }),

package/dist/es2019/ui/useConfigPanelPluginHook.js

@@ -105,7 +105,7 @@ export function showConfigPanel({
       },
       BodyComponent,
       closeOptions: {
-        canClosePanel: () => {
+        canClosePanel: async () => {
           // When navigating away from the editor, the editorView is destroyed.
           if (editorView.isDestroyed) {
             return true;
@@ -117,7 +117,7 @@ export function showConfigPanel({
            * 		which will call hideConfigPanel.
            */
           if (extensionState !== null && extensionState !== void 0 && extensionState.showContextPanel) {
-            startClosingConfigPanel({
+            await startClosingConfigPanel({
               api,
               editorView
             });

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

@@ -5,6 +5,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, TARGET_SELECTION
 import { removeConnectedNodes } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, removeParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { getSelectedExtension } from '../pm-plugins/utils';
 
@@ -82,7 +83,7 @@ export var updateExtensionLayout = function updateExtensionLayout(layout, analyt
     return tr;
   });
 };
-export var removeExtension = function removeExtension(editorAnalyticsAPI) {
+export var removeExtension = function removeExtension(editorAnalyticsAPI, inputMethod) {
   return createCommand({
     type: 'UPDATE_STATE',
     data: {
@@ -90,9 +91,9 @@ export var removeExtension = function removeExtension(editorAnalyticsAPI) {
     }
   }, function (tr, state) {
     if (getSelectedExtension(state)) {
-      return removeSelectedNodeWithAnalytics(state, tr, editorAnalyticsAPI);
+      return removeSelectedNodeWithAnalytics(state, tr, editorAnalyticsAPI, inputMethod);
     } else {
-      return checkAndRemoveExtensionNode(state, tr, editorAnalyticsAPI);
+      return checkAndRemoveExtensionNode(state, tr, editorAnalyticsAPI, inputMethod);
     }
   });
 };
@@ -106,7 +107,7 @@ export var removeDescendantNodes = function removeDescendantNodes(sourceNode) {
     return sourceNode ? removeConnectedNodes(state, sourceNode) : tr;
   });
 };
-export var removeSelectedNodeWithAnalytics = function removeSelectedNodeWithAnalytics(state, tr, analyticsApi) {
+export var removeSelectedNodeWithAnalytics = function removeSelectedNodeWithAnalytics(state, tr, analyticsApi, inputMethod) {
   if (state.selection instanceof NodeSelection) {
     var node = state.selection.node;
     if (analyticsApi) {
@@ -118,14 +119,15 @@ export var removeSelectedNodeWithAnalytics = function removeSelectedNodeWithAnal
         attributes: {
           extensionType: node.attrs.extensionType,
           extensionKey: node.attrs.extensionKey,
-          localId: node.attrs.localId
+          localId: node.attrs.localId,
+          inputMethod: fg('platform_editor_controls_patch_analytics_2') ? inputMethod : undefined
         }
       })(tr);
     }
   }
   return removeSelectedNode(tr);
 };
-export var checkAndRemoveExtensionNode = function checkAndRemoveExtensionNode(state, tr, analyticsApi) {
+export var checkAndRemoveExtensionNode = function checkAndRemoveExtensionNode(state, tr, analyticsApi, inputMethod) {
   var nodeType = state.schema.nodes.bodiedExtension;
   var maybeMBENode = findParentNodeOfType(state.schema.nodes.multiBodiedExtension)(state.selection);
   if (maybeMBENode) {
@@ -139,7 +141,8 @@ export var checkAndRemoveExtensionNode = function checkAndRemoveExtensionNode(st
           extensionType: maybeMBENode.node.attrs.extensionType,
           extensionKey: maybeMBENode.node.attrs.extensionKey,
           localId: maybeMBENode.node.attrs.localId,
-          currentFramesCount: maybeMBENode.node.content.childCount
+          currentFramesCount: maybeMBENode.node.content.childCount,
+          inputMethod: fg('platform_editor_controls_patch_analytics_2') ? inputMethod : undefined
         }
       })(tr);
     }
@@ -155,7 +158,8 @@ export var checkAndRemoveExtensionNode = function checkAndRemoveExtensionNode(st
         attributes: {
           extensionType: bodiedExtensionNode.node.attrs.extensionType,
           extensionKey: bodiedExtensionNode.node.attrs.extensionKey,
-          localId: bodiedExtensionNode.node.attrs.localId
+          localId: bodiedExtensionNode.node.attrs.localId,
+          inputMethod: fg('platform_editor_controls_patch_analytics_2') ? inputMethod : undefined
         }
       })(tr);
     }

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

@@ -3,6 +3,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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 React from 'react';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from '@atlaskit/editor-common/extensions';
 import commonMessages from '@atlaskit/editor-common/messages';
 import { BODIED_EXT_MBE_MARGIN_TOP } from '@atlaskit/editor-common/styles';
@@ -334,7 +335,7 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
         },
         iconFallback: DeleteIcon,
         appearance: 'danger',
-        onClick: removeExtension(editorAnalyticsAPI),
+        onClick: removeExtension(editorAnalyticsAPI, INPUT_METHOD.FLOATING_TB),
         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),
@@ -356,7 +357,7 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
           onClick: function onClick() {
             var _extensionApi$core, _extensionApi$floatin;
             extensionApi === null || extensionApi === void 0 || (_extensionApi$core = extensionApi.core) === null || _extensionApi$core === void 0 || _extensionApi$core.actions.execute( // @ts-ignore
-            extensionApi === null || extensionApi === void 0 || (_extensionApi$floatin = extensionApi.floatingToolbar) === null || _extensionApi$floatin === void 0 ? void 0 : _extensionApi$floatin.commands.copyNode(nodeType));
+            extensionApi === null || extensionApi === void 0 || (_extensionApi$floatin = extensionApi.floatingToolbar) === null || _extensionApi$floatin === void 0 ? void 0 : _extensionApi$floatin.commands.copyNode(nodeType, INPUT_METHOD.FLOATING_TB));
             return true;
           },
           icon: /*#__PURE__*/React.createElement(CopyIcon, {
@@ -364,7 +365,7 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
           })
         }, hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)), _objectSpread({
           title: formatMessage(commonMessages.delete),
-          onClick: removeExtension(editorAnalyticsAPI),
+          onClick: removeExtension(editorAnalyticsAPI, INPUT_METHOD.FLOATING_TB),
           icon: /*#__PURE__*/React.createElement(DeleteIcon, {
             label: ""
           })

package/dist/esm/ui/useConfigPanelPluginHook.js

@@ -106,28 +106,48 @@ export function showConfigPanel(_ref2) {
       },
       BodyComponent: BodyComponent,
       closeOptions: {
-        canClosePanel: function canClosePanel() {
-          // When navigating away from the editor, the editorView is destroyed.
-          if (editorView.isDestroyed) {
-            return true;
-          }
-          var extensionState = getPluginState(editorView.state);
-          /**
-           * 	If context panel is open, then first update extension plugin state.
-           * 	Updating extension plugin state will trigger useEffect in useConfigPanelPluginHook,
-           * 		which will call hideConfigPanel.
-           */
-          if (extensionState !== null && extensionState !== void 0 && extensionState.showContextPanel) {
-            startClosingConfigPanel({
-              api: api,
-              editorView: editorView
-            });
-            return false;
+        canClosePanel: function () {
+          var _canClosePanel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+            var extensionState;
+            return _regeneratorRuntime.wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  if (!editorView.isDestroyed) {
+                    _context.next = 2;
+                    break;
+                  }
+                  return _context.abrupt("return", true);
+                case 2:
+                  extensionState = getPluginState(editorView.state);
+                  /**
+                   * 	If context panel is open, then first update extension plugin state.
+                   * 	Updating extension plugin state will trigger useEffect in useConfigPanelPluginHook,
+                   * 		which will call hideConfigPanel.
+                   */
+                  if (!(extensionState !== null && extensionState !== void 0 && extensionState.showContextPanel)) {
+                    _context.next = 7;
+                    break;
+                  }
+                  _context.next = 6;
+                  return startClosingConfigPanel({
+                    api: api,
+                    editorView: editorView
+                  });
+                case 6:
+                  return _context.abrupt("return", false);
+                case 7:
+                  return _context.abrupt("return", true);
+                case 8:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee);
+          }));
+          function canClosePanel() {
+            return _canClosePanel.apply(this, arguments);
           }
-
-          // Return true if extension plugin state has been updated and hideConfigPanel has been called.
-          return true;
-        }
+          return canClosePanel;
+        }()
       }
     }, 'push', CONFIG_PANEL_WIDTH);
   }
@@ -136,34 +156,34 @@ export function startClosingConfigPanel(_x) {
   return _startClosingConfigPanel.apply(this, arguments);
 }
 function _startClosingConfigPanel() {
-  _startClosingConfigPanel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref3) {
+  _startClosingConfigPanel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref3) {
     var _api$contextPanel3;
     var api, editorView, applyChange;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           api = _ref3.api, editorView = _ref3.editorView;
           applyChange = api === null || api === void 0 || (_api$contextPanel3 = api.contextPanel) === null || _api$contextPanel3 === void 0 ? void 0 : _api$contextPanel3.actions.applyChange; // Even if the save failed, we should proceed with closing the panel
           clearEditingContext(applyChange)(editorView.state, editorView.dispatch);
-          _context2.prev = 3;
-          _context2.next = 6;
+          _context3.prev = 3;
+          _context3.next = 6;
           return new Promise(function (resolve, reject) {
             forceAutoSave(applyChange)(resolve, reject)(editorView.state, editorView.dispatch);
           });
         case 6:
-          _context2.next = 11;
+          _context3.next = 11;
           break;
         case 8:
-          _context2.prev = 8;
-          _context2.t0 = _context2["catch"](3);
+          _context3.prev = 8;
+          _context3.t0 = _context3["catch"](3);
           // Even if the save failed, we should proceed with closing the panel
           // eslint-disable-next-line no-console
-          console.error("Autosave failed with error", _context2.t0);
+          console.error("Autosave failed with error", _context3.t0);
         case 11:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[3, 8]]);
+    }, _callee3, null, [[3, 8]]);
   }));
   return _startClosingConfigPanel.apply(this, arguments);
 }
@@ -210,11 +230,11 @@ export var getContextPanelBodyComponent = function getContextPanelBodyComponent(
         autoSaveTrigger: autoSaveResolve,
         autoSaveReject: autoSaveReject,
         onChange: ( /*#__PURE__*/function () {
-          var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(updatedParameters) {
-            return _regeneratorRuntime.wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
+          var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(updatedParameters) {
+            return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
                 case 0:
-                  _context.next = 2;
+                  _context2.next = 2;
                   return onChangeAction(editorView, updatedParameters, parameters, nodeWithPos, onSaveStarted);
                 case 2:
                   onSaveEnded();
@@ -223,9 +243,9 @@ export var getContextPanelBodyComponent = function getContextPanelBodyComponent(
                   }
                 case 4:
                 case "end":
-                  return _context.stop();
+                  return _context2.stop();
               }
-            }, _callee);
+            }, _callee2);
           }));
           return function (_x2) {
             return _ref6.apply(this, arguments);

package/dist/types/editor-commands/commands.d.ts

@@ -1,5 +1,5 @@
 import type { ExtensionLayout } from '@atlaskit/adf-schema';
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Parameters, TransformAfter, TransformBefore } from '@atlaskit/editor-common/extensions';
 import type { ApplyChangeHandler } from '@atlaskit/editor-plugin-context-panel';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
@@ -10,7 +10,7 @@ export declare function setEditingContextToContextPanel<T extends Parameters = P
 export declare const clearEditingContext: (applyChangeToContextPanel: ApplyChangeHandler | undefined) => import("@atlaskit/editor-common/types").Command;
 export declare const forceAutoSave: (applyChangeToContextPanel: ApplyChangeHandler | undefined) => (resolve: () => void, reject?: RejectSave) => import("@atlaskit/editor-common/types").Command;
 export declare const updateExtensionLayout: (layout: ExtensionLayout, analyticsApi?: EditorAnalyticsAPI) => import("@atlaskit/editor-common/types").Command;
-export declare const removeExtension: (editorAnalyticsAPI?: EditorAnalyticsAPI) => import("@atlaskit/editor-common/types").Command;
+export declare const removeExtension: (editorAnalyticsAPI?: EditorAnalyticsAPI, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.FLOATING_TB) => import("@atlaskit/editor-common/types").Command;
 export declare const removeDescendantNodes: (sourceNode?: PMNode) => import("@atlaskit/editor-common/types").Command;
-export declare const removeSelectedNodeWithAnalytics: (state: EditorState, tr: Transaction, analyticsApi?: EditorAnalyticsAPI) => Transaction;
-export declare const checkAndRemoveExtensionNode: (state: EditorState, tr: Transaction, analyticsApi?: EditorAnalyticsAPI) => Transaction;
+export declare const removeSelectedNodeWithAnalytics: (state: EditorState, tr: Transaction, analyticsApi?: EditorAnalyticsAPI, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.FLOATING_TB) => Transaction;
+export declare const checkAndRemoveExtensionNode: (state: EditorState, tr: Transaction, analyticsApi?: EditorAnalyticsAPI, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.FLOATING_TB) => Transaction;

package/dist/types-ts4.5/editor-commands/commands.d.ts

@@ -1,5 +1,5 @@
 import type { ExtensionLayout } from '@atlaskit/adf-schema';
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Parameters, TransformAfter, TransformBefore } from '@atlaskit/editor-common/extensions';
 import type { ApplyChangeHandler } from '@atlaskit/editor-plugin-context-panel';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
@@ -10,7 +10,7 @@ export declare function setEditingContextToContextPanel<T extends Parameters = P
 export declare const clearEditingContext: (applyChangeToContextPanel: ApplyChangeHandler | undefined) => import("@atlaskit/editor-common/types").Command;
 export declare const forceAutoSave: (applyChangeToContextPanel: ApplyChangeHandler | undefined) => (resolve: () => void, reject?: RejectSave) => import("@atlaskit/editor-common/types").Command;
 export declare const updateExtensionLayout: (layout: ExtensionLayout, analyticsApi?: EditorAnalyticsAPI) => import("@atlaskit/editor-common/types").Command;
-export declare const removeExtension: (editorAnalyticsAPI?: EditorAnalyticsAPI) => import("@atlaskit/editor-common/types").Command;
+export declare const removeExtension: (editorAnalyticsAPI?: EditorAnalyticsAPI, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.FLOATING_TB) => import("@atlaskit/editor-common/types").Command;
 export declare const removeDescendantNodes: (sourceNode?: PMNode) => import("@atlaskit/editor-common/types").Command;
-export declare const removeSelectedNodeWithAnalytics: (state: EditorState, tr: Transaction, analyticsApi?: EditorAnalyticsAPI) => Transaction;
-export declare const checkAndRemoveExtensionNode: (state: EditorState, tr: Transaction, analyticsApi?: EditorAnalyticsAPI) => Transaction;
+export declare const removeSelectedNodeWithAnalytics: (state: EditorState, tr: Transaction, analyticsApi?: EditorAnalyticsAPI, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.FLOATING_TB) => Transaction;
+export declare const checkAndRemoveExtensionNode: (state: EditorState, tr: Transaction, analyticsApi?: EditorAnalyticsAPI, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.FLOATING_TB) => Transaction;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-extension",
-	"version": "5.3.4",
+	"version": "5.3.6",
 	"description": "editor-plugin-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,12 +32,12 @@
 		"@atlaskit/button": "^23.0.0",
 		"@atlaskit/checkbox": "^17.1.0",
 		"@atlaskit/datetime-picker": "^17.0.0",
-		"@atlaskit/editor-common": "^103.22.0",
+		"@atlaskit/editor-common": "^104.1.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
 		"@atlaskit/editor-plugin-context-identifier": "^2.1.0",
-		"@atlaskit/editor-plugin-context-panel": "^4.0.0",
+		"@atlaskit/editor-plugin-context-panel": "^4.1.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.4.0",
 		"@atlaskit/editor-plugin-width": "^3.0.0",
@@ -47,7 +47,7 @@
 		"@atlaskit/empty-state": "^10.0.0",
 		"@atlaskit/form": "^12.0.0",
 		"@atlaskit/heading": "^5.2.0",
-		"@atlaskit/icon": "^25.6.0",
+		"@atlaskit/icon": "^26.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.7.0",
 		"@atlaskit/radio": "^8.1.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.15.0",
+		"@atlaskit/tmp-editor-statsig": "^4.19.0",
 		"@atlaskit/toggle": "^15.0.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/tooltip": "^20.0.0",
@@ -113,9 +113,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_legacy_content_macro": {
-			"type": "boolean"
-		},
 		"platform_editor_ai_object_sidebar_injection": {
 			"type": "boolean"
 		},
@@ -127,6 +124,9 @@
 		},
 		"platform_editor_controls_patch_2": {
 			"type": "boolean"
+		},
+		"platform_editor_controls_patch_analytics_2": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {