@atlaskit/editor-core 189.3.22 → 189.3.24

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-core
 
+## 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
+
+- [#42651](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42651) [`92e9957a8bf`](https://bitbucket.org/atlassian/atlassian-frontend/commits/92e9957a8bf) - [ux] [ECA11Y-148] Added screen reader announcement for Find and Replace search results count
+- [#43111](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43111) [`d71dda4f834`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d71dda4f834) - Decouple indentation plugin from editor-core.
+- Updated dependencies
+
 ## 189.3.22
 
 ### Patch Changes

package/dist/cjs/plugins/find-replace/ui/Find.js

@@ -272,10 +272,13 @@ var Find = /*#__PURE__*/function (_React$Component) {
         onBlur: this.props.onFindBlur,
         onCompositionStart: this.handleCompositionStart,
         onCompositionEnd: this.handleCompositionEnd
-      }), findText && (0, _react2.jsx)("span", {
+      }), (0, _react2.jsx)("div", {
+        css: _styles.countWrapperStyles,
+        "aria-live": "polite"
+      }, findText && (0, _react2.jsx)("span", {
         "data-testid": "textfield-count",
         css: _styles.countStyles
-      }, count.total === 0 ? this.noResultsFound : resultsCount), allowMatchCase && (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
+      }, count.total === 0 ? this.noResultsFound : resultsCount)), allowMatchCase && (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
         title: this.matchCase,
         icon: this.matchCaseIcon,
         onClick: this.handleMatchCaseClick,

package/dist/cjs/plugins/find-replace/ui/styles.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.wrapperStyles = exports.sectionWrapperStyles = exports.ruleStyles = exports.replaceSectionButtonStyles = exports.countStyles = void 0;
+exports.wrapperStyles = exports.sectionWrapperStyles = exports.ruleStyles = exports.replaceSectionButtonStyles = exports.countWrapperStyles = exports.countStyles = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
 var _colors = require("@atlaskit/theme/colors");
@@ -12,13 +12,13 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _templateObject;
 /** @jsx jsx */
 var replaceSectionButtonStyles = exports.replaceSectionButtonStyles = (0, _react.css)({
-  marginLeft: '4px'
+  marginLeft: "var(--ds-space-050, 4px)"
 });
 var ruleStyles = exports.ruleStyles = (0, _react.css)({
   width: '100%',
   border: 'none',
   backgroundColor: "".concat("var(--ds-border, ".concat(_colors.N30A, ")")),
-  margin: '4px 0px',
+  margin: "var(--ds-space-050, 4px)".concat(" 0px"),
   height: '1px',
   borderRadius: '1px'
 });
@@ -26,7 +26,7 @@ var wrapperStyles = exports.wrapperStyles = (0, _react.css)({
   display: 'flex',
   flexDirection: 'column',
   '> *:not(#replace-hr-element)': {
-    margin: '0px 4px'
+    margin: "0px ".concat("var(--ds-space-050, 4px)")
   }
 });
 var sectionWrapperStyles = exports.sectionWrapperStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n\n  & > * {\n    display: inline-flex;\n    height: 32px;\n    flex: 0 0 auto;\n  }\n\n  & > [data-ds--text-field--container] {\n    display: flex;\n    flex: 1 1 auto;\n  }\n"])));
@@ -36,6 +36,9 @@ var countStyles = exports.countStyles = (0, _react.css)({
   flex: '0 0 auto',
   justifyContent: 'center',
   alignItems: 'center',
-  marginLeft: '4px',
-  marginRight: '8px'
+  marginLeft: "var(--ds-space-050, 4px)",
+  marginRight: "var(--ds-space-100, 8px)"
+});
+var countWrapperStyles = exports.countWrapperStyles = (0, _react.css)({
+  alignItems: 'center'
 });

package/dist/cjs/plugins/indentation/commands/index.js

@@ -4,12 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.removeIndentation = exports.isIndentationAllowed = exports.getOutdentCommand = exports.getIndentCommand = exports.MAX_INDENTATION_LEVEL = void 0;
-var _commands = require("../../../commands");
+exports.removeIndentation = exports.isIndentationAllowed = exports.getOutdentCommand = exports.getIndentCommand = void 0;
+var _commands = require("@atlaskit/editor-common/commands");
 var _utils = require("./utils");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _getAttrsWithChangesRecorder = _interopRequireDefault(require("../../../utils/getAttrsWithChangesRecorder"));
-var MAX_INDENTATION_LEVEL = exports.MAX_INDENTATION_LEVEL = 6;
+var _getAttrsWithChangesRecorder = _interopRequireDefault(require("../getAttrsWithChangesRecorder"));
+var _indentation = require("@atlaskit/editor-common/indentation");
 var isIndentationAllowed = exports.isIndentationAllowed = function isIndentationAllowed(schema, node) {
   var _schema$nodes = schema.nodes,
     paragraph = _schema$nodes.paragraph,
@@ -79,7 +79,7 @@ var getIndentAttrs = function getIndentAttrs(oldAttr) {
   }
 
   var level = oldAttr.level;
-  if (level >= MAX_INDENTATION_LEVEL) {
+  if (level >= _indentation.MAX_INDENTATION_LEVEL) {
     return undefined; // Max indentation level reached, do nothing.
   }
 

package/dist/cjs/plugins/indentation/index.js

@@ -6,7 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _adfSchema = require("@atlaskit/adf-schema");
 var _keymap = require("./pm-plugins/keymap");
+var _commands = require("./commands");
+var _indentation = require("@atlaskit/editor-common/indentation");
 var indentationPlugin = function indentationPlugin(_ref) {
+  var _api$analytics, _api$analytics2;
   var api = _ref.api;
   return {
     name: 'indentation',
@@ -16,12 +19,33 @@ var indentationPlugin = function indentationPlugin(_ref) {
         mark: _adfSchema.indentation
       }];
     },
+    actions: {
+      indentParagraphOrHeading: (0, _commands.getIndentCommand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      outdentParagraphOrHeading: (0, _commands.getOutdentCommand)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
+    },
+    getSharedState: function getSharedState(editorState) {
+      var _ref2;
+      if (!editorState) {
+        return undefined;
+      }
+      var selection = editorState.tr.selection,
+        indentation = editorState.schema.marks.indentation;
+      var node = selection.$from.node();
+      var indentationMark = node.marks.find(function (mark) {
+        return mark.type === indentation;
+      });
+      return {
+        isIndentationAllowed: (0, _commands.isIndentationAllowed)(editorState.schema, node),
+        indentDisabled: (_ref2 = (indentationMark === null || indentationMark === void 0 ? void 0 : indentationMark.attrs.level) >= _indentation.MAX_INDENTATION_LEVEL) !== null && _ref2 !== void 0 ? _ref2 : false,
+        outdentDisabled: !indentationMark
+      };
+    },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'indentationKeymap',
         plugin: function plugin() {
-          var _api$analytics;
-          return (0, _keymap.keymapPlugin)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+          var _api$analytics3;
+          return (0, _keymap.keymapPlugin)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
         }
       }];
     }

package/dist/cjs/plugins/indentation/pm-plugins/keymap.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 exports.keymapPlugin = keymapPlugin;
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _utils = require("../../../utils");
+var _utils = require("@atlaskit/editor-common/utils");
 var _commands = require("../commands");
 var _analytics = require("@atlaskit/editor-common/analytics");
 function keymapPlugin(editorAnalyticsAPI) {

package/dist/cjs/plugins/tasks-and-decisions/index.js

@@ -18,6 +18,8 @@ var _keymaps = _interopRequireDefault(require("./pm-plugins/keymaps"));
 var _main = require("./pm-plugins/main");
 var _ToolbarDecision = _interopRequireDefault(require("./ui/ToolbarDecision"));
 var _ToolbarTask = _interopRequireDefault(require("./ui/ToolbarTask"));
+var _helpers = require("./pm-plugins/helpers");
+var _indentation = require("@atlaskit/editor-common/indentation");
 var _templateObject;
 /** @jsx jsx */
 var taskDecisionToolbarGroup = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n"])));
@@ -64,8 +66,13 @@ var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
         return undefined;
       }
       var pluginState = _pluginKey.stateKey.getState(editorState);
+      var indentLevel = (0, _helpers.getCurrentIndentLevel)(editorState.selection) || 0;
+      var itemIndex = (0, _helpers.getTaskItemIndex)(editorState);
       return {
-        focusedTaskItemLocalId: (pluginState === null || pluginState === void 0 ? void 0 : pluginState.focusedTaskItemLocalId) || null
+        focusedTaskItemLocalId: (pluginState === null || pluginState === void 0 ? void 0 : pluginState.focusedTaskItemLocalId) || null,
+        isInsideTask: (0, _helpers.isInsideTask)(editorState),
+        indentDisabled: itemIndex === 0 || indentLevel >= _indentation.MAX_INDENTATION_LEVEL,
+        outdentDisabled: indentLevel <= 1
       };
     },
     pmPlugins: function pmPlugins() {

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

@@ -1,15 +1,19 @@
 "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 = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(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,
@@ -28,28 +32,14 @@ var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref)
       }
       return _indentationButtons.pluginKey.getState(editorState);
     },
-    pmPlugins: function pmPlugins() {
-      return [{
-        name: 'indentationButtons',
-        plugin: function plugin(_ref3) {
-          var dispatch = _ref3.dispatch;
-          return (0, _indentationButtons.createPlugin)({
-            dispatch: dispatch,
-            showIndentationButtons: showIndentationButtons,
-            allowHeadingAndParagraphIndentation: allowHeadingAndParagraphIndentation,
-            api: api
-          });
-        }
-      }];
-    },
-    primaryToolbarComponent: function primaryToolbarComponent(_ref4) {
-      var editorView = _ref4.editorView,
-        popupsMountPoint = _ref4.popupsMountPoint,
-        popupsBoundariesElement = _ref4.popupsBoundariesElement,
-        popupsScrollableElement = _ref4.popupsScrollableElement,
-        toolbarSize = _ref4.toolbarSize,
-        disabled = _ref4.disabled,
-        isToolbarReducedSpacing = _ref4.isToolbarReducedSpacing;
+    primaryToolbarComponent: function primaryToolbarComponent(_ref3) {
+      var editorView = _ref3.editorView,
+        popupsMountPoint = _ref3.popupsMountPoint,
+        popupsBoundariesElement = _ref3.popupsBoundariesElement,
+        popupsScrollableElement = _ref3.popupsScrollableElement,
+        toolbarSize = _ref3.toolbarSize,
+        disabled = _ref3.disabled,
+        isToolbarReducedSpacing = _ref3.isToolbarReducedSpacing;
       var isSmall = toolbarSize < _types.ToolbarSize.L;
       return /*#__PURE__*/_react.default.createElement(PrimaryToolbarComponent, {
         featureFlags: featureFlags,
@@ -61,25 +51,31 @@ var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref)
         disabled: disabled,
         editorView: editorView,
         showIndentationButtons: showIndentationButtons,
-        pluginInjectionApi: api
+        pluginInjectionApi: api,
+        allowHeadingAndParagraphIndentation: allowHeadingAndParagraphIndentation
       });
     }
   };
 };
-function PrimaryToolbarComponent(_ref5) {
-  var featureFlags = _ref5.featureFlags,
-    popupsMountPoint = _ref5.popupsMountPoint,
-    popupsBoundariesElement = _ref5.popupsBoundariesElement,
-    popupsScrollableElement = _ref5.popupsScrollableElement,
-    isSmall = _ref5.isSmall,
-    isToolbarReducedSpacing = _ref5.isToolbarReducedSpacing,
-    disabled = _ref5.disabled,
-    editorView = _ref5.editorView,
-    showIndentationButtons = _ref5.showIndentationButtons,
-    pluginInjectionApi = _ref5.pluginInjectionApi;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['list', 'toolbarListsIndentation']),
+function PrimaryToolbarComponent(_ref4) {
+  var featureFlags = _ref4.featureFlags,
+    popupsMountPoint = _ref4.popupsMountPoint,
+    popupsBoundariesElement = _ref4.popupsBoundariesElement,
+    popupsScrollableElement = _ref4.popupsScrollableElement,
+    isSmall = _ref4.isSmall,
+    isToolbarReducedSpacing = _ref4.isToolbarReducedSpacing,
+    disabled = _ref4.disabled,
+    editorView = _ref4.editorView,
+    showIndentationButtons = _ref4.showIndentationButtons,
+    pluginInjectionApi = _ref4.pluginInjectionApi,
+    allowHeadingAndParagraphIndentation = _ref4.allowHeadingAndParagraphIndentation;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['list', 'indentation', 'taskDecision']),
     listState = _useSharedPluginState.listState,
-    toolbarListsIndentationState = _useSharedPluginState.toolbarListsIndentationState;
+    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]);
   if (!listState) {
     return null;
   }
@@ -99,6 +95,7 @@ function PrimaryToolbarComponent(_ref5) {
     showIndentationButtons: !!showIndentationButtons,
     indentDisabled: toolbarListsIndentationState.indentDisabled,
     outdentDisabled: toolbarListsIndentationState.outdentDisabled,
+    indentationStateNode: toolbarListsIndentationState === null || toolbarListsIndentationState === void 0 ? void 0 : toolbarListsIndentationState.node,
     pluginInjectionApi: pluginInjectionApi
   });
 }

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

@@ -3,35 +3,33 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.pluginKey = exports.createPlugin = void 0;
+exports.getIndentationButtonsState = getIndentationButtonsState;
+exports.pluginKey = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _utils2 = require("@atlaskit/editor-common/utils");
-var _helpers = require("../../tasks-and-decisions/pm-plugins/helpers");
-var _commands = require("../../indentation/commands");
 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, api) {
+function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, isInsideListItem) {
+  var _indentationState$isI;
   var state = {
     indentDisabled: true,
     outdentDisabled: true,
     node: null
   };
   var selection = editorState.selection;
-  var node = selection.$from.node();
 
   // Handle bullet and numbered lists seperately as they do
   // not use the indentation mark.
   // Check for lists before paragraphs and headings in case
   // the selection is in a list nested in a layout column.
-  if (api !== null && api !== void 0 && api.list.actions.isInsideListItem(editorState.tr)) {
+  if (isInsideListItem !== null && isInsideListItem !== void 0 && isInsideListItem(editorState.tr)) {
     var _getListItemAttribute = (0, _lists.getListItemAttributes)(selection.$head),
       indentLevel = _getListItemAttribute.indentLevel,
       itemIndex = _getListItemAttribute.itemIndex;
     return {
       // List indent levels are zero indexed so we need to subtract 1
-      indentDisabled: itemIndex === 0 || indentLevel >= _commands.MAX_INDENTATION_LEVEL - 1,
+      indentDisabled: itemIndex === 0 || indentLevel >= _indentation.MAX_INDENTATION_LEVEL - 1,
       outdentDisabled: false,
       node: 'list'
     };
@@ -39,12 +37,10 @@ function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndenta
 
   // Handle tasks seperately as they do not use the indentation mark
   // and have different behaviour for outdent compared to lists
-  if ((0, _helpers.isInsideTask)(editorState)) {
-    var _indentLevel = (0, _helpers.getCurrentIndentLevel)(selection) || 0;
-    var _itemIndex = (0, _helpers.getTaskItemIndex)(editorState);
+  if (taskDecisionState !== null && taskDecisionState !== void 0 && taskDecisionState.isInsideTask) {
     return {
-      indentDisabled: _itemIndex === 0 || _indentLevel >= _commands.MAX_INDENTATION_LEVEL,
-      outdentDisabled: _indentLevel <= 1,
+      indentDisabled: taskDecisionState.indentDisabled,
+      outdentDisabled: taskDecisionState.outdentDisabled,
       node: 'taskList'
     };
   }
@@ -52,51 +48,12 @@ function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndenta
   var isInLayoutNode = (0, _utils.hasParentNodeOfType)(editorState.schema.nodes.layoutColumn)(selection) &&
   // depth of non-nested paragraphs and headings in layouts will always be 3
   selection.$from.depth === 3;
-  if (allowHeadingAndParagraphIndentation && (0, _commands.isIndentationAllowed)(editorState.schema, node) && (isTopLevelParagraphOrHeading || isInLayoutNode)) {
-    var indentationMark = node.marks.find(function (mark) {
-      return mark.type === editorState.schema.marks.indentation;
-    });
-    if (!indentationMark) {
-      return {
-        outdentDisabled: true,
-        indentDisabled: false,
-        node: 'paragraph_heading'
-      };
-    }
+  if (allowHeadingAndParagraphIndentation && ((_indentationState$isI = indentationState === null || indentationState === void 0 ? void 0 : indentationState.isIndentationAllowed) !== null && _indentationState$isI !== void 0 ? _indentationState$isI : false) && (isTopLevelParagraphOrHeading || isInLayoutNode) && indentationState) {
     return {
-      indentDisabled: indentationMark.attrs.level >= _commands.MAX_INDENTATION_LEVEL,
-      outdentDisabled: false,
+      indentDisabled: indentationState.indentDisabled,
+      outdentDisabled: indentationState.outdentDisabled,
       node: 'paragraph_heading'
     };
   }
   return state;
-}
-var createPlugin = exports.createPlugin = function createPlugin(_ref) {
-  var dispatch = _ref.dispatch,
-    showIndentationButtons = _ref.showIndentationButtons,
-    allowHeadingAndParagraphIndentation = _ref.allowHeadingAndParagraphIndentation,
-    api = _ref.api;
-  return new _safePlugin.SafePlugin({
-    state: {
-      init: function init(_config, state) {
-        var initialState = {
-          indentDisabled: true,
-          outdentDisabled: true,
-          node: null
-        };
-        return showIndentationButtons ? getIndentationButtonsState(state, allowHeadingAndParagraphIndentation, api) : initialState;
-      },
-      apply: function apply(_tr, pluginState, _oldState, newState) {
-        if (showIndentationButtons) {
-          var state = getIndentationButtonsState(newState, allowHeadingAndParagraphIndentation, api);
-          if (!(0, _utils2.shallowEqual)(pluginState, state)) {
-            dispatch(pluginKey, state);
-            return state;
-          }
-        }
-        return pluginState;
-      }
-    },
-    key: pluginKey
-  });
-};
+}

package/dist/cjs/plugins/toolbar-lists-indentation/ui/Toolbar.js

@@ -15,7 +15,6 @@ var _outdent = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/outde
 var _keymaps = require("../../../keymaps");
 var _ToolbarButton = _interopRequireWildcard(require("../../../ui/ToolbarButton"));
 var _messages = require("@atlaskit/editor-common/messages");
-var _messages2 = require("../../indentation/messages");
 var _styles = require("@atlaskit/editor-common/styles");
 var _keymaps2 = require("@atlaskit/editor-common/keymaps");
 var _react2 = require("react");
@@ -40,8 +39,8 @@ function Toolbar(props) {
     onItemActivated = props.onItemActivated;
   var labelUnorderedList = formatMessage(_messages.listMessages.unorderedList);
   var labelOrderedList = formatMessage(_messages.listMessages.orderedList);
-  var indentMessage = formatMessage(_messages2.messages.indent);
-  var outdentMessage = formatMessage(_messages2.messages.outdent);
+  var indentMessage = formatMessage(_messages.indentationMessages.indent);
+  var outdentMessage = formatMessage(_messages.indentationMessages.outdent);
   var isIndentButtonFocused = document.activeElement === indentButtonRef.current;
   var isOutdentButtonFocused = document.activeElement === outdentButtonRef.current;
   var handleOnItemActivated = function handleOnItemActivated(buttonName) {

package/dist/cjs/plugins/toolbar-lists-indentation/ui/ToolbarDropdown.js

@@ -17,7 +17,6 @@ var _ToolbarButton = _interopRequireDefault(require("../../../ui/ToolbarButton")
 var _styles = require("../../../ui/styles");
 var _styles2 = require("@atlaskit/editor-common/styles");
 var _messages = require("@atlaskit/editor-common/messages");
-var _messages2 = require("../../indentation/messages");
 /** @jsx jsx */
 
 function ToolbarDropdown(props) {
@@ -137,8 +136,8 @@ function useItems(props) {
     }, (0, _keymaps.tooltip)(_keymaps.toggleOrderedList))
   }];
   if (props.showIndentationButtons) {
-    var labelIndent = formatMessage(_messages2.messages.indent);
-    var labelOutdent = formatMessage(_messages2.messages.outdent);
+    var labelIndent = formatMessage(_messages.indentationMessages.indent);
+    var labelOutdent = formatMessage(_messages.indentationMessages.outdent);
     items.push({
       key: 'outdent',
       content: labelOutdent,

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

@@ -24,6 +24,7 @@ function ToolbarListsIndentation(props) {
     popupsScrollableElement = props.popupsScrollableElement,
     indentDisabled = props.indentDisabled,
     outdentDisabled = props.outdentDisabled,
+    indentationStateNode = props.indentationStateNode,
     featureFlags = props.featureFlags,
     pluginInjectionApi = props.pluginInjectionApi;
   if (isSmall) {
@@ -41,7 +42,7 @@ function ToolbarListsIndentation(props) {
       indentDisabled: indentDisabled,
       outdentDisabled: outdentDisabled,
       disabled: disabled,
-      onItemActivated: (0, _onItemActivated.onItemActivated)(pluginInjectionApi),
+      onItemActivated: (0, _onItemActivated.onItemActivated)(pluginInjectionApi, indentationStateNode),
       featureFlags: featureFlags
     });
   }
@@ -56,7 +57,7 @@ function ToolbarListsIndentation(props) {
     indentDisabled: indentDisabled,
     outdentDisabled: outdentDisabled,
     disabled: disabled,
-    onItemActivated: (0, _onItemActivated.onItemActivated)(pluginInjectionApi),
+    onItemActivated: (0, _onItemActivated.onItemActivated)(pluginInjectionApi, indentationStateNode),
     featureFlags: featureFlags
   });
 }

package/dist/cjs/plugins/toolbar-lists-indentation/ui/onItemActivated.js

@@ -4,11 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.onItemActivated = void 0;
-var _commands = require("../../indentation/commands");
 var _keymaps = require("../../tasks-and-decisions/pm-plugins/keymaps");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _indentationButtons = require("../pm-plugins/indentation-buttons");
-var onItemActivated = exports.onItemActivated = function onItemActivated(pluginInjectionApi) {
+var onItemActivated = exports.onItemActivated = function onItemActivated(pluginInjectionApi, indentationStateNode) {
   return function (_ref) {
     var buttonName = _ref.buttonName,
       editorView = _ref.editorView;
@@ -21,35 +19,33 @@ var onItemActivated = exports.onItemActivated = function onItemActivated(pluginI
         break;
       case 'indent':
         {
-          var _indentationButtonsPl;
-          var node = (_indentationButtonsPl = _indentationButtons.pluginKey.getState(editorView.state)) === null || _indentationButtonsPl === void 0 ? void 0 : _indentationButtonsPl.node;
+          var node = indentationStateNode;
           if (node === 'paragraph_heading') {
-            var _pluginInjectionApi$a;
-            (0, _commands.getIndentCommand)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+            var _pluginInjectionApi$i;
+            pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$i = pluginInjectionApi.indentation) === null || _pluginInjectionApi$i === void 0 || _pluginInjectionApi$i.actions.indentParagraphOrHeading(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
           }
           if (node === 'list') {
             pluginInjectionApi === null || pluginInjectionApi === void 0 || pluginInjectionApi.core.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.commands.indentList(_analytics.INPUT_METHOD.TOOLBAR));
           }
           if (node === 'taskList') {
-            var _pluginInjectionApi$a2;
-            (0, _keymaps.getIndentCommand)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+            var _pluginInjectionApi$a;
+            (0, _keymaps.getIndentCommand)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
           }
           break;
         }
       case 'outdent':
         {
-          var _indentationButtonsPl2;
-          var _node = (_indentationButtonsPl2 = _indentationButtons.pluginKey.getState(editorView.state)) === null || _indentationButtonsPl2 === void 0 ? void 0 : _indentationButtonsPl2.node;
+          var _node = indentationStateNode;
           if (_node === 'paragraph_heading') {
-            var _pluginInjectionApi$a3;
-            (0, _commands.getOutdentCommand)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+            var _pluginInjectionApi$i2;
+            pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$i2 = pluginInjectionApi.indentation) === null || _pluginInjectionApi$i2 === void 0 || _pluginInjectionApi$i2.actions.outdentParagraphOrHeading(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
           }
           if (_node === 'list') {
             pluginInjectionApi === null || pluginInjectionApi === void 0 || pluginInjectionApi.core.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.commands.outdentList(_analytics.INPUT_METHOD.TOOLBAR));
           }
           if (_node === 'taskList') {
-            var _pluginInjectionApi$a4;
-            (0, _keymaps.getUnindentCommand)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+            var _pluginInjectionApi$a2;
+            (0, _keymaps.getUnindentCommand)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
           }
           break;
         }

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.22";
+var version = exports.version = "189.3.24";