@atlaskit/editor-core 189.3.23 → 189.3.25

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-core
 
+## 189.3.25
+
+### Patch Changes
+
+- [#43274](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43274) [`d162c359ccf`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d162c359ccf) - Move indentation plugin code from editor-core to editor-plugin-indentation.
+- Updated dependencies
+
+## 189.3.24
+
+### Patch Changes
+
+- [#42256](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42256) [`9c1a79051b6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9c1a79051b6) - Avoid submitting certain attributes for config panel analytic events
+
 ## 189.3.23
 
 ### Patch Changes

package/dist/cjs/plugins/index.js

@@ -82,12 +82,6 @@ Object.defineProperty(exports, "findReplacePlugin", {
     return _findReplace.default;
   }
 });
-Object.defineProperty(exports, "indentationPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _indentation.default;
-  }
-});
 Object.defineProperty(exports, "insertBlockPlugin", {
   enumerable: true,
   get: function get() {
@@ -153,7 +147,6 @@ var _tasksAndDecisions = _interopRequireDefault(require("./tasks-and-decisions")
 var _breakout = _interopRequireDefault(require("./breakout"));
 var _alignment = _interopRequireDefault(require("./alignment"));
 var _dataConsumer = _interopRequireDefault(require("./data-consumer"));
-var _indentation = _interopRequireDefault(require("./indentation"));
 var _annotation = _interopRequireDefault(require("./annotation"));
 var _customAutoformat = _interopRequireDefault(require("./custom-autoformat"));
 var _feedbackDialog = _interopRequireDefault(require("./feedback-dialog"));

package/dist/cjs/plugins/toolbar-lists-indentation/index.js

@@ -1,19 +1,16 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PrimaryToolbarComponent = PrimaryToolbarComponent;
 exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _ui = _interopRequireDefault(require("./ui"));
 var _types = require("../../ui/Toolbar/types");
 var _indentationButtons = require("./pm-plugins/indentation-buttons");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref) {
   var _api$featureFlags;
   var config = _ref.config,
@@ -26,12 +23,6 @@ var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref)
   var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'toolbarListsIndentation',
-    getSharedState: function getSharedState(editorState) {
-      if (!editorState) {
-        return undefined;
-      }
-      return _indentationButtons.pluginKey.getState(editorState);
-    },
     primaryToolbarComponent: function primaryToolbarComponent(_ref3) {
       var editorView = _ref3.editorView,
         popupsMountPoint = _ref3.popupsMountPoint,
@@ -73,9 +64,7 @@ function PrimaryToolbarComponent(_ref4) {
     listState = _useSharedPluginState.listState,
     indentationState = _useSharedPluginState.indentationState,
     taskDecisionState = _useSharedPluginState.taskDecisionState;
-  var toolbarListsIndentationState = (0, _react.useMemo)(function () {
-    return (0, _indentationButtons.getIndentationButtonsState)(editorView.state, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.actions.isInsideListItem);
-  }, [editorView.state, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.actions.isInsideListItem]);
+  var toolbarListsIndentationState = (0, _indentationButtons.getIndentationButtonsState)(editorView.state, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.actions.isInsideListItem);
   if (!listState) {
     return null;
   }

package/dist/cjs/plugins/toolbar-lists-indentation/pm-plugins/indentation-buttons.js

@@ -4,12 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getIndentationButtonsState = getIndentationButtonsState;
-exports.pluginKey = void 0;
-var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _lists = require("@atlaskit/editor-common/lists");
 var _indentation = require("@atlaskit/editor-common/indentation");
-var pluginKey = exports.pluginKey = new _state.PluginKey('indentationButtonsPlugin');
 function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, isInsideListItem) {
   var _indentationState$isI;
   var state = {

package/dist/cjs/presets/universal.js

@@ -12,6 +12,7 @@ var _plugins = require("../plugins");
 var _editorPluginPanel = require("@atlaskit/editor-plugin-panel");
 var _editorPluginTextColor = require("@atlaskit/editor-plugin-text-color");
 var _editorPluginHistory = require("@atlaskit/editor-plugin-history");
+var _editorPluginIndentation = require("@atlaskit/editor-plugin-indentation");
 var _editorPluginStatus = require("@atlaskit/editor-plugin-status");
 var _editorPluginDate = require("@atlaskit/editor-plugin-date");
 var _editorPluginMaxContentSize = require("@atlaskit/editor-plugin-max-content-size");
@@ -329,7 +330,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       }]);
     }
     return builder;
-  }).maybeAdd(_plugins.indentationPlugin, function (plugin, builder) {
+  }).maybeAdd(_editorPluginIndentation.indentationPlugin, function (plugin, builder) {
     if (props.allowIndentation) {
       return builder.add(plugin);
     }

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

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -37,14 +36,10 @@ var _WithPluginState = _interopRequireDefault(require("../WithPluginState"));
 var _FormContent = _interopRequireDefault(require("./FormContent"));
 var _messages = require("./messages");
 var _FormErrorBoundary = require("./FormErrorBoundary");
-var _excluded = ["page", "labels", "types", "name", "width"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-var LOGGED_MACRO_KEYS = ['children', 'recently-updated', 'excerpt'];
 function ConfigForm(_ref) {
   var canSave = _ref.canSave,
     errorMessage = _ref.errorMessage,
@@ -342,50 +337,15 @@ var ConfigPanel = /*#__PURE__*/function (_React$Component) {
       var _this$props4 = this.props,
         createAnalyticsEvent = _this$props4.createAnalyticsEvent,
         extensionManifest = _this$props4.extensionManifest;
-      var currentParameters = this.state.currentParameters;
-
-      // PGXT-4393 We need to collect configuration analytics for the macros in LOGGED_MACRO_KEYS.
-      // This function takes the parameters and filters out anything which might have UGC.
-      var getMacroParameters = function getMacroParameters() {
-        var page = currentParameters.page,
-          labels = currentParameters.labels,
-          types = currentParameters.types,
-          name = currentParameters.name,
-          width = currentParameters.width,
-          safeParams = (0, _objectWithoutProperties2.default)(currentParameters, _excluded);
-        var ugcFreeParams = _objectSpread({}, safeParams);
-        // Parse types field as an array of valid content types and include in the result
-        if (types) {
-          var contentTypes = ['page', 'blogpost', 'comment', 'attachment'];
-          var parsedTypes = types.split(',').map(function (type) {
-            return type.trim();
-          }).filter(function (type) {
-            return contentTypes.includes(type);
-          });
-          ugcFreeParams = _objectSpread({
-            types: parsedTypes
-          }, ugcFreeParams);
-        }
-        // Since width is a raw string input, parse then return
-        if (width) {
-          var parsedWidth = parseFloat(width);
-          ugcFreeParams = _objectSpread({
-            width: parsedWidth
-          }, ugcFreeParams);
-        }
-        return ugcFreeParams;
-      };
       (0, _analytics.fireAnalyticsEvent)(createAnalyticsEvent)({
         payload: {
           action: _analytics.ACTION.CLOSED,
           actionSubject: _analytics.ACTION_SUBJECT.CONFIG_PANEL,
           eventType: _analytics.EVENT_TYPE.UI,
-          attributes: _objectSpread({
+          attributes: {
             extensionKey: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.key,
             extensionType: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.type
-          }, extensionManifest !== null && extensionManifest !== void 0 && extensionManifest.key && LOGGED_MACRO_KEYS.includes(extensionManifest.key) ? {
-            parameters: getMacroParameters()
-          } : {})
+          }
         }
       });
     }

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "189.3.23";
+var version = exports.version = "189.3.25";

package/dist/es2019/plugins/index.js

@@ -9,7 +9,6 @@ export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as breakoutPlugin } from './breakout';
 export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';
-export { default as indentationPlugin } from './indentation';
 export { default as annotationPlugin } from './annotation';
 export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';

package/dist/es2019/plugins/toolbar-lists-indentation/index.js

@@ -1,9 +1,8 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ToolbarListsIndentation from './ui';
 import { ToolbarSize } from '../../ui/Toolbar/types';
 import { getIndentationButtonsState } from './pm-plugins/indentation-buttons';
-import { pluginKey as indentationButtonPluginKey } from './pm-plugins/indentation-buttons';
 const toolbarListsIndentationPlugin = ({
   config,
   api
@@ -16,12 +15,6 @@ const toolbarListsIndentationPlugin = ({
   const featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'toolbarListsIndentation',
-    getSharedState(editorState) {
-      if (!editorState) {
-        return undefined;
-      }
-      return indentationButtonPluginKey.getState(editorState);
-    },
     primaryToolbarComponent({
       editorView,
       popupsMountPoint,
@@ -66,9 +59,7 @@ export function PrimaryToolbarComponent({
     indentationState,
     taskDecisionState
   } = useSharedPluginState(pluginInjectionApi, ['list', 'indentation', 'taskDecision']);
-  const toolbarListsIndentationState = useMemo(() => {
-    return getIndentationButtonsState(editorView.state, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.actions.isInsideListItem);
-  }, [editorView.state, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.actions.isInsideListItem]);
+  const toolbarListsIndentationState = getIndentationButtonsState(editorView.state, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.actions.isInsideListItem);
   if (!listState) {
     return null;
   }

package/dist/es2019/plugins/toolbar-lists-indentation/pm-plugins/indentation-buttons.js

@@ -1,8 +1,6 @@
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getListItemAttributes } from '@atlaskit/editor-common/lists';
 import { MAX_INDENTATION_LEVEL } from '@atlaskit/editor-common/indentation';
-export const pluginKey = new PluginKey('indentationButtonsPlugin');
 export function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, isInsideListItem) {
   var _indentationState$isI;
   const state = {

package/dist/es2019/presets/universal.js

@@ -1,7 +1,8 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, insertBlockPlugin, jiraIssuePlugin, toolbarListsIndentationPlugin, tasksAndDecisionsPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, insertBlockPlugin, jiraIssuePlugin, toolbarListsIndentationPlugin, tasksAndDecisionsPlugin, alignmentPlugin, customAutoformatPlugin, feedbackDialogPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
 import { panelPlugin } from '@atlaskit/editor-plugin-panel';
 import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
 import { historyPlugin } from '@atlaskit/editor-plugin-history';
+import { indentationPlugin } from '@atlaskit/editor-plugin-indentation';
 import { statusPlugin } from '@atlaskit/editor-plugin-status';
 import { datePlugin } from '@atlaskit/editor-plugin-date';
 import { maxContentSizePlugin } from '@atlaskit/editor-plugin-max-content-size';

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

@@ -21,7 +21,6 @@ import WithPluginState from '../WithPluginState';
 import FormContent from './FormContent';
 import { messages } from './messages';
 import { FormErrorBoundary } from './FormErrorBoundary';
-const LOGGED_MACRO_KEYS = ['children', 'recently-updated', 'excerpt'];
 function ConfigForm({
   canSave,
   errorMessage,
@@ -279,43 +278,6 @@ class ConfigPanel extends React.Component {
       createAnalyticsEvent,
       extensionManifest
     } = this.props;
-    const {
-      currentParameters
-    } = this.state;
-
-    // PGXT-4393 We need to collect configuration analytics for the macros in LOGGED_MACRO_KEYS.
-    // This function takes the parameters and filters out anything which might have UGC.
-    const getMacroParameters = () => {
-      const {
-        page,
-        labels,
-        types,
-        name,
-        width,
-        ...safeParams
-      } = currentParameters;
-      let ugcFreeParams = {
-        ...safeParams
-      };
-      // Parse types field as an array of valid content types and include in the result
-      if (types) {
-        const contentTypes = ['page', 'blogpost', 'comment', 'attachment'];
-        const parsedTypes = types.split(',').map(type => type.trim()).filter(type => contentTypes.includes(type));
-        ugcFreeParams = {
-          types: parsedTypes,
-          ...ugcFreeParams
-        };
-      }
-      // Since width is a raw string input, parse then return
-      if (width) {
-        const parsedWidth = parseFloat(width);
-        ugcFreeParams = {
-          width: parsedWidth,
-          ...ugcFreeParams
-        };
-      }
-      return ugcFreeParams;
-    };
     fireAnalyticsEvent(createAnalyticsEvent)({
       payload: {
         action: ACTION.CLOSED,
@@ -323,10 +285,7 @@ class ConfigPanel extends React.Component {
         eventType: EVENT_TYPE.UI,
         attributes: {
           extensionKey: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.key,
-          extensionType: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.type,
-          ...(extensionManifest !== null && extensionManifest !== void 0 && extensionManifest.key && LOGGED_MACRO_KEYS.includes(extensionManifest.key) ? {
-            parameters: getMacroParameters()
-          } : {})
+          extensionType: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.type
         }
       }
     });

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.3.23";
+export const version = "189.3.25";

package/dist/esm/plugins/index.js

@@ -9,7 +9,6 @@ export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as breakoutPlugin } from './breakout';
 export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';
-export { default as indentationPlugin } from './indentation';
 export { default as annotationPlugin } from './annotation';
 export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';

package/dist/esm/plugins/toolbar-lists-indentation/index.js

@@ -1,9 +1,8 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ToolbarListsIndentation from './ui';
 import { ToolbarSize } from '../../ui/Toolbar/types';
 import { getIndentationButtonsState } from './pm-plugins/indentation-buttons';
-import { pluginKey as indentationButtonPluginKey } from './pm-plugins/indentation-buttons';
 var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref) {
   var _api$featureFlags;
   var config = _ref.config,
@@ -16,12 +15,6 @@ var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref)
   var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'toolbarListsIndentation',
-    getSharedState: function getSharedState(editorState) {
-      if (!editorState) {
-        return undefined;
-      }
-      return indentationButtonPluginKey.getState(editorState);
-    },
     primaryToolbarComponent: function primaryToolbarComponent(_ref3) {
       var editorView = _ref3.editorView,
         popupsMountPoint = _ref3.popupsMountPoint,
@@ -63,9 +56,7 @@ export function PrimaryToolbarComponent(_ref4) {
     listState = _useSharedPluginState.listState,
     indentationState = _useSharedPluginState.indentationState,
     taskDecisionState = _useSharedPluginState.taskDecisionState;
-  var toolbarListsIndentationState = useMemo(function () {
-    return getIndentationButtonsState(editorView.state, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.actions.isInsideListItem);
-  }, [editorView.state, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.actions.isInsideListItem]);
+  var toolbarListsIndentationState = getIndentationButtonsState(editorView.state, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.actions.isInsideListItem);
   if (!listState) {
     return null;
   }

package/dist/esm/plugins/toolbar-lists-indentation/pm-plugins/indentation-buttons.js

@@ -1,8 +1,6 @@
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getListItemAttributes } from '@atlaskit/editor-common/lists';
 import { MAX_INDENTATION_LEVEL } from '@atlaskit/editor-common/indentation';
-export var pluginKey = new PluginKey('indentationButtonsPlugin');
 export function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, isInsideListItem) {
   var _indentationState$isI;
   var state = {

package/dist/esm/presets/universal.js

@@ -2,10 +2,11 @@ import _typeof from "@babel/runtime/helpers/typeof";
 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 { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, insertBlockPlugin, jiraIssuePlugin, toolbarListsIndentationPlugin, tasksAndDecisionsPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, insertBlockPlugin, jiraIssuePlugin, toolbarListsIndentationPlugin, tasksAndDecisionsPlugin, alignmentPlugin, customAutoformatPlugin, feedbackDialogPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
 import { panelPlugin } from '@atlaskit/editor-plugin-panel';
 import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
 import { historyPlugin } from '@atlaskit/editor-plugin-history';
+import { indentationPlugin } from '@atlaskit/editor-plugin-indentation';
 import { statusPlugin } from '@atlaskit/editor-plugin-status';
 import { datePlugin } from '@atlaskit/editor-plugin-date';
 import { maxContentSizePlugin } from '@atlaskit/editor-plugin-max-content-size';

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

@@ -1,5 +1,4 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -8,9 +7,6 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["page", "labels", "types", "name", "width"];
-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 _regeneratorRuntime from "@babel/runtime/regenerator";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -35,7 +31,6 @@ import WithPluginState from '../WithPluginState';
 import FormContent from './FormContent';
 import { messages } from './messages';
 import { FormErrorBoundary } from './FormErrorBoundary';
-var LOGGED_MACRO_KEYS = ['children', 'recently-updated', 'excerpt'];
 function ConfigForm(_ref) {
   var canSave = _ref.canSave,
     errorMessage = _ref.errorMessage,
@@ -333,50 +328,15 @@ var ConfigPanel = /*#__PURE__*/function (_React$Component) {
       var _this$props4 = this.props,
         createAnalyticsEvent = _this$props4.createAnalyticsEvent,
         extensionManifest = _this$props4.extensionManifest;
-      var currentParameters = this.state.currentParameters;
-
-      // PGXT-4393 We need to collect configuration analytics for the macros in LOGGED_MACRO_KEYS.
-      // This function takes the parameters and filters out anything which might have UGC.
-      var getMacroParameters = function getMacroParameters() {
-        var page = currentParameters.page,
-          labels = currentParameters.labels,
-          types = currentParameters.types,
-          name = currentParameters.name,
-          width = currentParameters.width,
-          safeParams = _objectWithoutProperties(currentParameters, _excluded);
-        var ugcFreeParams = _objectSpread({}, safeParams);
-        // Parse types field as an array of valid content types and include in the result
-        if (types) {
-          var contentTypes = ['page', 'blogpost', 'comment', 'attachment'];
-          var parsedTypes = types.split(',').map(function (type) {
-            return type.trim();
-          }).filter(function (type) {
-            return contentTypes.includes(type);
-          });
-          ugcFreeParams = _objectSpread({
-            types: parsedTypes
-          }, ugcFreeParams);
-        }
-        // Since width is a raw string input, parse then return
-        if (width) {
-          var parsedWidth = parseFloat(width);
-          ugcFreeParams = _objectSpread({
-            width: parsedWidth
-          }, ugcFreeParams);
-        }
-        return ugcFreeParams;
-      };
       fireAnalyticsEvent(createAnalyticsEvent)({
         payload: {
           action: ACTION.CLOSED,
           actionSubject: ACTION_SUBJECT.CONFIG_PANEL,
           eventType: EVENT_TYPE.UI,
-          attributes: _objectSpread({
+          attributes: {
             extensionKey: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.key,
             extensionType: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest.type
-          }, extensionManifest !== null && extensionManifest !== void 0 && extensionManifest.key && LOGGED_MACRO_KEYS.includes(extensionManifest.key) ? {
-            parameters: getMacroParameters()
-          } : {})
+          }
         }
       });
     }

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "189.3.23";
+export var version = "189.3.25";

package/dist/types/plugins/index.d.ts

@@ -9,7 +9,6 @@ export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as breakoutPlugin } from './breakout';
 export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';
-export { default as indentationPlugin } from './indentation';
 export { default as annotationPlugin } from './annotation';
 export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';

package/dist/types/plugins/toolbar-lists-indentation/index.d.ts

@@ -3,10 +3,9 @@ import type { FeatureFlags, NextEditorPlugin, OptionalPlugin } from '@atlaskit/e
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { ListPlugin } from '@atlaskit/editor-plugin-list';
-import type { IndentationButtons } from './pm-plugins/indentation-buttons';
 import type { ToolbarUiComponentFactoryParams } from '../../types';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { IndentationPlugin } from '../indentation';
+import type { IndentationPlugin } from '@atlaskit/editor-plugin-indentation';
 import type { TaskAndDecisionsPlugin } from '../tasks-and-decisions/types';
 type Config = {
     showIndentationButtons: boolean;
@@ -21,7 +20,6 @@ type ToolbarListsIndentationPlugin = NextEditorPlugin<'toolbarListsIndentation',
         OptionalPlugin<TaskAndDecisionsPlugin>,
         OptionalPlugin<AnalyticsPlugin>
     ];
-    sharedState: IndentationButtons | undefined;
 }>;
 declare const toolbarListsIndentationPlugin: ToolbarListsIndentationPlugin;
 type PrimaryToolbarComponentProps = Pick<ToolbarUiComponentFactoryParams, 'editorView' | 'popupsMountPoint' | 'popupsBoundariesElement' | 'popupsScrollableElement' | 'disabled' | 'isToolbarReducedSpacing'> & {

package/dist/types/plugins/toolbar-lists-indentation/pm-plugins/indentation-buttons.d.ts

@@ -1,12 +1,10 @@
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 export type IndentationButtonNode = null | 'paragraph_heading' | 'list' | 'taskList';
 export interface IndentationButtons {
     indentDisabled: boolean;
     outdentDisabled: boolean;
     node: IndentationButtonNode;
 }
-export declare const pluginKey: PluginKey<IndentationButtons>;
 interface TaskDecisionState {
     isInsideTask: boolean;
     indentDisabled: boolean;

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

@@ -1,7 +1,8 @@
 import React from 'react';
-import type { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
-import type { ExtensionManifest, FieldDefinition, Parameters, OnSaveCallback } from '@atlaskit/editor-common/extensions';
-import type { FeatureFlags } from '@atlaskit/editor-common/types';
+import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
+import type { ExtensionManifest } from '@atlaskit/editor-common/extensions';
+import { FieldDefinition, Parameters, OnSaveCallback } from '@atlaskit/editor-common/extensions';
+import { FeatureFlags } from '@atlaskit/editor-common/types';
 type Props = {
     extensionManifest?: ExtensionManifest;
     fields?: FieldDefinition[];

package/dist/types-ts4.5/plugins/index.d.ts

@@ -9,7 +9,6 @@ export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as breakoutPlugin } from './breakout';
 export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';
-export { default as indentationPlugin } from './indentation';
 export { default as annotationPlugin } from './annotation';
 export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';

package/dist/types-ts4.5/plugins/toolbar-lists-indentation/index.d.ts

@@ -3,10 +3,9 @@ import type { FeatureFlags, NextEditorPlugin, OptionalPlugin } from '@atlaskit/e
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { ListPlugin } from '@atlaskit/editor-plugin-list';
-import type { IndentationButtons } from './pm-plugins/indentation-buttons';
 import type { ToolbarUiComponentFactoryParams } from '../../types';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { IndentationPlugin } from '../indentation';
+import type { IndentationPlugin } from '@atlaskit/editor-plugin-indentation';
 import type { TaskAndDecisionsPlugin } from '../tasks-and-decisions/types';
 type Config = {
     showIndentationButtons: boolean;
@@ -21,7 +20,6 @@ type ToolbarListsIndentationPlugin = NextEditorPlugin<'toolbarListsIndentation',
         OptionalPlugin<TaskAndDecisionsPlugin>,
         OptionalPlugin<AnalyticsPlugin>
     ];
-    sharedState: IndentationButtons | undefined;
 }>;
 declare const toolbarListsIndentationPlugin: ToolbarListsIndentationPlugin;
 type PrimaryToolbarComponentProps = Pick<ToolbarUiComponentFactoryParams, 'editorView' | 'popupsMountPoint' | 'popupsBoundariesElement' | 'popupsScrollableElement' | 'disabled' | 'isToolbarReducedSpacing'> & {

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

@@ -1,12 +1,10 @@
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 export type IndentationButtonNode = null | 'paragraph_heading' | 'list' | 'taskList';
 export interface IndentationButtons {
     indentDisabled: boolean;
     outdentDisabled: boolean;
     node: IndentationButtonNode;
 }
-export declare const pluginKey: PluginKey<IndentationButtons>;
 interface TaskDecisionState {
     isInsideTask: boolean;
     indentDisabled: boolean;

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

@@ -1,7 +1,8 @@
 import React from 'react';
-import type { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
-import type { ExtensionManifest, FieldDefinition, Parameters, OnSaveCallback } from '@atlaskit/editor-common/extensions';
-import type { FeatureFlags } from '@atlaskit/editor-common/types';
+import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
+import type { ExtensionManifest } from '@atlaskit/editor-common/extensions';
+import { FieldDefinition, Parameters, OnSaveCallback } from '@atlaskit/editor-common/extensions';
+import { FeatureFlags } from '@atlaskit/editor-common/types';
 type Props = {
     extensionManifest?: ExtensionManifest;
     fields?: FieldDefinition[];