@atlaskit/editor-core 188.11.3 → 188.12.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-core
 
+## 188.12.0
+
+### Minor Changes
+
+- [#41770](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41770) [`0d7961fbb3b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0d7961fbb3b) - Extract History Plugin
+
+### Patch Changes
+
+- Updated dependencies
+
+## 188.11.4
+
+### Patch Changes
+
+- [#41366](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41366) [`b0fae9ec9d9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b0fae9ec9d9) - [ux] Avatar group removed from confluence full page toolbar if launch darkly feature flag set (platform.confluence.frontend.editor.no.platform.avatar.group)
+
 ## 188.11.3
 
 ### Patch Changes

package/dist/cjs/labs/next/presets/universal.js

@@ -8,6 +8,7 @@ exports.default = createUniversalPreset;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _plugins = require("../../../plugins");
+var _editorPluginHistory = require("@atlaskit/editor-plugin-history");
 var _editorPluginStatus = require("@atlaskit/editor-plugin-status");
 var _editorPluginDate = require("@atlaskit/editor-plugin-date");
 var _editorPluginCaption = require("@atlaskit/editor-plugin-caption");
@@ -334,9 +335,9 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       return builder.add(_editorPluginScrollIntoView.scrollIntoViewPlugin);
     }
     return builder;
-  }).maybeAdd(_plugins.historyPlugin, function (plugin, builder) {
+  }).maybeAdd(_editorPluginHistory.historyPlugin, function (plugin, builder) {
     if (isMobile || props.allowUndoRedoButtons) {
-      return builder.add(_plugins.historyPlugin);
+      return builder.add(_editorPluginHistory.historyPlugin);
     }
     return builder;
   }).maybeAdd(_plugins.mobileDimensionsPlugin, function (plugin, builder) {
@@ -361,14 +362,14 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     showElementBrowserLink: props.elementBrowser && props.elementBrowser.showModal || false,
     replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false
   }]).maybeAdd(_plugins.beforePrimaryToolbarPlugin, function (plugin, builder) {
-    if (hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
+    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.confluence.frontend.editor.no.platform.avatar.group') && hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
       return builder.add([plugin, {
         beforePrimaryToolbarComponents: props.primaryToolbarComponents.before
       }]);
     }
     return builder;
   }).maybeAdd(_plugins.avatarGroupPlugin, function (plugin, builder) {
-    if (featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
+    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.confluence.frontend.editor.no.platform.avatar.group') && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
       return builder.add([plugin, {
         collabEdit: props.collabEdit,
         takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents)
@@ -378,7 +379,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
   }).maybeAdd(_plugins.findReplacePlugin, function (plugin, builder) {
     if (props.allowFindReplace) {
       return builder.add([plugin, {
-        takeFullWidth: !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
+        takeFullWidth: !(0, _platformFeatureFlags.getBooleanFF)('platform.confluence.frontend.editor.no.platform.avatar.group') && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
         twoLineEditorToolbar: !!featureFlags.twoLineEditorToolbar
       }]);
     }

package/dist/cjs/plugins/index.js

@@ -113,12 +113,6 @@ Object.defineProperty(exports, "fragmentMarkPlugin", {
     return _fragment.default;
   }
 });
-Object.defineProperty(exports, "historyPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _history.default;
-  }
-});
 Object.defineProperty(exports, "indentationPlugin", {
   enumerable: true,
   get: function get() {
@@ -253,7 +247,6 @@ var _annotation = _interopRequireDefault(require("./annotation"));
 var _analytics = _interopRequireDefault(require("./analytics"));
 var _customAutoformat = _interopRequireDefault(require("./custom-autoformat"));
 var _feedbackDialog = _interopRequireDefault(require("./feedback-dialog"));
-var _history = _interopRequireDefault(require("./history"));
 var _expand = _interopRequireWildcard(require("./expand"));
 var _mobileDimensions = _interopRequireDefault(require("./mobile-dimensions"));
 var _findReplace = _interopRequireDefault(require("./find-replace"));

package/dist/cjs/plugins/undo-redo/index.js

@@ -8,9 +8,9 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _keymaps = require("./pm-plugins/keymaps");
 var _main = require("./pm-plugins/main");
-var _history = require("../history");
 var _ToolbarUndoRedo = _interopRequireDefault(require("./ui/ToolbarUndoRedo"));
-var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
+// eslint-disable-next-line @atlassian/tangerine/import/entry-points
+
 var undoRedoPlugin = function undoRedoPlugin(_ref) {
   var api = _ref.api;
   return {
@@ -32,20 +32,11 @@ var undoRedoPlugin = function undoRedoPlugin(_ref) {
       var editorView = _ref2.editorView,
         disabled = _ref2.disabled,
         isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing;
-      return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
-        plugins: {
-          historyState: _history.historyPluginKey
-        },
-        render: function render(_ref3) {
-          var historyState = _ref3.historyState;
-          return /*#__PURE__*/_react.default.createElement(_ToolbarUndoRedo.default, {
-            isReducedSpacing: isToolbarReducedSpacing,
-            disabled: disabled,
-            historyState: historyState,
-            editorView: editorView,
-            api: api
-          });
-        }
+      return /*#__PURE__*/_react.default.createElement(_ToolbarUndoRedo.default, {
+        isReducedSpacing: isToolbarReducedSpacing,
+        disabled: disabled,
+        editorView: editorView,
+        api: api
       });
     }
   };

package/dist/cjs/plugins/undo-redo/ui/ToolbarUndoRedo/index.js

@@ -6,16 +6,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ToolbarUndoRedo = void 0;
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _react = require("react");
-var _react2 = require("@emotion/react");
+var _react = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _undo = _interopRequireDefault(require("@atlaskit/icon/glyph/undo"));
 var _redo = _interopRequireDefault(require("@atlaskit/icon/glyph/redo"));
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("../../../../keymaps");
 var _styles = require("@atlaskit/editor-common/styles");
 var _ToolbarButton = _interopRequireWildcard(require("../../../../ui/ToolbarButton"));
@@ -24,8 +19,8 @@ var _commands = require("../../commands");
 var _keymaps2 = require("@atlaskit/editor-common/keymaps");
 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 _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; } } /** @jsx jsx */
+/** @jsx jsx */
+
 var closeTypeAheadAndRunCommand = function closeTypeAheadAndRunCommand(editorView, api) {
   return function (command) {
     var _api$typeAhead;
@@ -51,70 +46,59 @@ var forceFocus = function forceFocus(editorView, api) {
     }
   };
 };
-var ToolbarUndoRedo = exports.ToolbarUndoRedo = /*#__PURE__*/function (_PureComponent) {
-  (0, _inherits2.default)(ToolbarUndoRedo, _PureComponent);
-  var _super = _createSuper(ToolbarUndoRedo);
-  function ToolbarUndoRedo() {
-    (0, _classCallCheck2.default)(this, ToolbarUndoRedo);
-    return _super.apply(this, arguments);
-  }
-  (0, _createClass2.default)(ToolbarUndoRedo, [{
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-        disabled = _this$props.disabled,
-        isReducedSpacing = _this$props.isReducedSpacing,
-        historyState = _this$props.historyState,
-        editorView = _this$props.editorView,
-        api = _this$props.api,
-        formatMessage = _this$props.intl.formatMessage;
-      var handleUndo = function handleUndo() {
-        forceFocus(editorView, api)(_commands.undoFromToolbar);
-      };
-      var handleRedo = function handleRedo() {
-        forceFocus(editorView, api)(_commands.redoFromToolbar);
-      };
-      var labelUndo = formatMessage(_messages.undoRedoMessages.undo);
-      var labelRedo = formatMessage(_messages.undoRedoMessages.redo);
-      var canUndo = historyState.canUndo,
-        canRedo = historyState.canRedo;
-      return (0, _react2.jsx)("span", {
-        css: _styles.buttonGroupStyle
-      }, (0, _react2.jsx)(_ToolbarButton.default, {
-        buttonId: _ToolbarButton.TOOLBAR_BUTTON.UNDO,
-        spacing: isReducedSpacing ? 'none' : 'default',
-        onClick: handleUndo,
-        disabled: !canUndo || disabled,
-        "aria-label": (0, _keymaps.tooltip)(_keymaps.undo, labelUndo),
-        "aria-keyshortcuts": (0, _keymaps2.getAriaKeyshortcuts)(_keymaps.undo),
-        title: (0, _react2.jsx)(_keymaps.ToolTipContent, {
-          description: labelUndo,
-          keymap: _keymaps.undo
-        }),
-        iconBefore: (0, _react2.jsx)(_undo.default, {
-          label: ""
-        }),
-        testId: "ak-editor-toolbar-button-undo"
-      }), (0, _react2.jsx)(_ToolbarButton.default, {
-        spacing: isReducedSpacing ? 'none' : 'default',
-        buttonId: _ToolbarButton.TOOLBAR_BUTTON.REDO,
-        onClick: handleRedo,
-        disabled: !canRedo || disabled,
-        title: (0, _react2.jsx)(_keymaps.ToolTipContent, {
-          description: labelRedo,
-          keymap: _keymaps.redo
-        }),
-        iconBefore: (0, _react2.jsx)(_redo.default, {
-          label: ""
-        }),
-        testId: "ak-editor-toolbar-button-redo",
-        "aria-label": (0, _keymaps.tooltip)(_keymaps.redo, labelRedo),
-        "aria-keyshortcuts": (0, _keymaps2.getAriaKeyshortcuts)(_keymaps.redo)
-      }), (0, _react2.jsx)("span", {
-        css: _styles.separatorStyles
-      }));
-    }
-  }]);
-  return ToolbarUndoRedo;
-}(_react.PureComponent);
+var ToolbarUndoRedo = exports.ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
+  var disabled = _ref.disabled,
+    isReducedSpacing = _ref.isReducedSpacing,
+    editorView = _ref.editorView,
+    api = _ref.api,
+    formatMessage = _ref.intl.formatMessage;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['history']),
+    historyState = _useSharedPluginState.historyState;
+  var handleUndo = function handleUndo() {
+    forceFocus(editorView, api)(_commands.undoFromToolbar);
+  };
+  var handleRedo = function handleRedo() {
+    forceFocus(editorView, api)(_commands.redoFromToolbar);
+  };
+  var labelUndo = formatMessage(_messages.undoRedoMessages.undo);
+  var labelRedo = formatMessage(_messages.undoRedoMessages.redo);
+  var _ref2 = historyState !== null && historyState !== void 0 ? historyState : {},
+    canUndo = _ref2.canUndo,
+    canRedo = _ref2.canRedo;
+  return (0, _react.jsx)("span", {
+    css: _styles.buttonGroupStyle
+  }, (0, _react.jsx)(_ToolbarButton.default, {
+    buttonId: _ToolbarButton.TOOLBAR_BUTTON.UNDO,
+    spacing: isReducedSpacing ? 'none' : 'default',
+    onClick: handleUndo,
+    disabled: !canUndo || disabled,
+    "aria-label": (0, _keymaps.tooltip)(_keymaps.undo, labelUndo),
+    "aria-keyshortcuts": (0, _keymaps2.getAriaKeyshortcuts)(_keymaps.undo),
+    title: (0, _react.jsx)(_keymaps.ToolTipContent, {
+      description: labelUndo,
+      keymap: _keymaps.undo
+    }),
+    iconBefore: (0, _react.jsx)(_undo.default, {
+      label: ""
+    }),
+    testId: "ak-editor-toolbar-button-undo"
+  }), (0, _react.jsx)(_ToolbarButton.default, {
+    spacing: isReducedSpacing ? 'none' : 'default',
+    buttonId: _ToolbarButton.TOOLBAR_BUTTON.REDO,
+    onClick: handleRedo,
+    disabled: !canRedo || disabled,
+    title: (0, _react.jsx)(_keymaps.ToolTipContent, {
+      description: labelRedo,
+      keymap: _keymaps.redo
+    }),
+    iconBefore: (0, _react.jsx)(_redo.default, {
+      label: ""
+    }),
+    testId: "ak-editor-toolbar-button-redo",
+    "aria-label": (0, _keymaps.tooltip)(_keymaps.redo, labelRedo),
+    "aria-keyshortcuts": (0, _keymaps2.getAriaKeyshortcuts)(_keymaps.redo)
+  }), (0, _react.jsx)("span", {
+    css: _styles.separatorStyles
+  }));
+};
 var _default = exports.default = (0, _reactIntlNext.injectIntl)(ToolbarUndoRedo);

package/dist/cjs/ui/Appearance/FullPage/FullPageToolbar.js

@@ -18,6 +18,7 @@ var _MainToolbar = require("./MainToolbar");
 var _ui2 = require("@atlaskit/editor-common/ui");
 var _messages = require("@atlaskit/editor-common/messages");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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; }
 /** @jsx jsx */
@@ -52,7 +53,7 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
     css: _MainToolbar.customToolbarWrapperStyle
   }, (_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? (0, _react2.jsx)(_BeforePrimaryToolbarWrapper.BeforePrimaryToolbarWrapper, {
     beforePrimaryToolbarComponents: props.customPrimaryToolbarComponents.before
-  }) : null, (props === null || props === void 0 || (_props$featureFlags3 = props.featureFlags) === null || _props$featureFlags3 === void 0 ? void 0 : _props$featureFlags3.showAvatarGroupAsPlugin) === true && !((_props$featureFlags4 = props.featureFlags) !== null && _props$featureFlags4 !== void 0 && _props$featureFlags4.twoLineEditorToolbar) ? null : (0, _react2.jsx)(_ui.default, {
+  }) : null, (0, _platformFeatureFlags.getBooleanFF)('platform.confluence.frontend.editor.no.platform.avatar.group') || (props === null || props === void 0 || (_props$featureFlags3 = props.featureFlags) === null || _props$featureFlags3 === void 0 ? void 0 : _props$featureFlags3.showAvatarGroupAsPlugin) === true && !((_props$featureFlags4 = props.featureFlags) !== null && _props$featureFlags4 !== void 0 && _props$featureFlags4.twoLineEditorToolbar) ? null : (0, _react2.jsx)(_ui.default, {
     editorView: props.editorView,
     eventDispatcher: props.eventDispatcher,
     inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "188.11.3";
+var version = exports.version = "188.12.0";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/labs/next/presets/universal.js

@@ -1,4 +1,5 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, fragmentMarkPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, panelPlugin, placeholderTextPlugin, tasksAndDecisionsPlugin, textColorPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../../../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, fragmentMarkPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, panelPlugin, placeholderTextPlugin, tasksAndDecisionsPlugin, textColorPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, expandPlugin, isExpandInsertionEnabled, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../../../plugins';
+import { historyPlugin } from '@atlaskit/editor-plugin-history';
 import { statusPlugin } from '@atlaskit/editor-plugin-status';
 import { datePlugin } from '@atlaskit/editor-plugin-date';
 import { captionPlugin } from '@atlaskit/editor-plugin-caption';
@@ -358,14 +359,14 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     showElementBrowserLink: props.elementBrowser && props.elementBrowser.showModal || false,
     replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false
   }]).maybeAdd(beforePrimaryToolbarPlugin, (plugin, builder) => {
-    if (hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
+    if (!getBooleanFF('platform.confluence.frontend.editor.no.platform.avatar.group') && hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
       return builder.add([plugin, {
         beforePrimaryToolbarComponents: props.primaryToolbarComponents.before
       }]);
     }
     return builder;
   }).maybeAdd(avatarGroupPlugin, (plugin, builder) => {
-    if (featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
+    if (!getBooleanFF('platform.confluence.frontend.editor.no.platform.avatar.group') && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
       return builder.add([plugin, {
         collabEdit: props.collabEdit,
         takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents)
@@ -375,7 +376,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
   }).maybeAdd(findReplacePlugin, (plugin, builder) => {
     if (props.allowFindReplace) {
       return builder.add([plugin, {
-        takeFullWidth: !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
+        takeFullWidth: !getBooleanFF('platform.confluence.frontend.editor.no.platform.avatar.group') && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
         twoLineEditorToolbar: !!featureFlags.twoLineEditorToolbar
       }]);
     }

package/dist/es2019/plugins/index.js

@@ -24,7 +24,6 @@ export { default as annotationPlugin } from './annotation';
 export { default as analyticsPlugin } from './analytics';
 export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';
-export { default as historyPlugin } from './history';
 export { default as expandPlugin, isExpandInsertionEnabled } from './expand';
 export { default as mobileDimensionsPlugin } from './mobile-dimensions';
 export { default as findReplacePlugin } from './find-replace';

package/dist/es2019/plugins/undo-redo/index.js

@@ -1,9 +1,8 @@
 import React from 'react';
 import { keymapPlugin } from './pm-plugins/keymaps';
 import { createPlugin } from './pm-plugins/main';
-import { historyPluginKey } from '../history';
+// eslint-disable-next-line @atlassian/tangerine/import/entry-points
 import ToolbarUndoRedo from './ui/ToolbarUndoRedo';
-import WithPluginState from '../../ui/WithPluginState';
 const undoRedoPlugin = ({
   api
 }) => ({
@@ -22,21 +21,11 @@ const undoRedoPlugin = ({
     disabled,
     isToolbarReducedSpacing
   }) {
-    return /*#__PURE__*/React.createElement(WithPluginState, {
-      plugins: {
-        historyState: historyPluginKey
-      },
-      render: ({
-        historyState
-      }) => {
-        return /*#__PURE__*/React.createElement(ToolbarUndoRedo, {
-          isReducedSpacing: isToolbarReducedSpacing,
-          disabled: disabled,
-          historyState: historyState,
-          editorView: editorView,
-          api: api
-        });
-      }
+    return /*#__PURE__*/React.createElement(ToolbarUndoRedo, {
+      isReducedSpacing: isToolbarReducedSpacing,
+      disabled: disabled,
+      editorView: editorView,
+      api: api
     });
   }
 });

package/dist/es2019/plugins/undo-redo/ui/ToolbarUndoRedo/index.js

@@ -1,9 +1,9 @@
 /** @jsx jsx */
-import { PureComponent } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import UndoIcon from '@atlaskit/icon/glyph/undo';
 import RedoIcon from '@atlaskit/icon/glyph/redo';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { undo as undoKeymap, redo as redoKeymap, ToolTipContent, tooltip } from '../../../../keymaps';
 import { separatorStyles, buttonGroupStyle } from '@atlaskit/editor-common/styles';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
@@ -31,65 +31,64 @@ const forceFocus = (editorView, api) => command => {
     editorView.focus();
   }
 };
-export class ToolbarUndoRedo extends PureComponent {
-  render() {
-    const {
-      disabled,
-      isReducedSpacing,
-      historyState,
-      editorView,
-      api,
-      intl: {
-        formatMessage
-      }
-    } = this.props;
-    const handleUndo = () => {
-      forceFocus(editorView, api)(undoFromToolbar);
-    };
-    const handleRedo = () => {
-      forceFocus(editorView, api)(redoFromToolbar);
-    };
-    const labelUndo = formatMessage(undoRedoMessages.undo);
-    const labelRedo = formatMessage(undoRedoMessages.redo);
-    const {
-      canUndo,
-      canRedo
-    } = historyState;
-    return jsx("span", {
-      css: buttonGroupStyle
-    }, jsx(ToolbarButton, {
-      buttonId: TOOLBAR_BUTTON.UNDO,
-      spacing: isReducedSpacing ? 'none' : 'default',
-      onClick: handleUndo,
-      disabled: !canUndo || disabled,
-      "aria-label": tooltip(undoKeymap, labelUndo),
-      "aria-keyshortcuts": getAriaKeyshortcuts(undoKeymap),
-      title: jsx(ToolTipContent, {
-        description: labelUndo,
-        keymap: undoKeymap
-      }),
-      iconBefore: jsx(UndoIcon, {
-        label: ""
-      }),
-      testId: "ak-editor-toolbar-button-undo"
-    }), jsx(ToolbarButton, {
-      spacing: isReducedSpacing ? 'none' : 'default',
-      buttonId: TOOLBAR_BUTTON.REDO,
-      onClick: handleRedo,
-      disabled: !canRedo || disabled,
-      title: jsx(ToolTipContent, {
-        description: labelRedo,
-        keymap: redoKeymap
-      }),
-      iconBefore: jsx(RedoIcon, {
-        label: ""
-      }),
-      testId: "ak-editor-toolbar-button-redo",
-      "aria-label": tooltip(redoKeymap, labelRedo),
-      "aria-keyshortcuts": getAriaKeyshortcuts(redoKeymap)
-    }), jsx("span", {
-      css: separatorStyles
-    }));
+export const ToolbarUndoRedo = ({
+  disabled,
+  isReducedSpacing,
+  editorView,
+  api,
+  intl: {
+    formatMessage
   }
-}
+}) => {
+  const {
+    historyState
+  } = useSharedPluginState(api, ['history']);
+  const handleUndo = () => {
+    forceFocus(editorView, api)(undoFromToolbar);
+  };
+  const handleRedo = () => {
+    forceFocus(editorView, api)(redoFromToolbar);
+  };
+  const labelUndo = formatMessage(undoRedoMessages.undo);
+  const labelRedo = formatMessage(undoRedoMessages.redo);
+  const {
+    canUndo,
+    canRedo
+  } = historyState !== null && historyState !== void 0 ? historyState : {};
+  return jsx("span", {
+    css: buttonGroupStyle
+  }, jsx(ToolbarButton, {
+    buttonId: TOOLBAR_BUTTON.UNDO,
+    spacing: isReducedSpacing ? 'none' : 'default',
+    onClick: handleUndo,
+    disabled: !canUndo || disabled,
+    "aria-label": tooltip(undoKeymap, labelUndo),
+    "aria-keyshortcuts": getAriaKeyshortcuts(undoKeymap),
+    title: jsx(ToolTipContent, {
+      description: labelUndo,
+      keymap: undoKeymap
+    }),
+    iconBefore: jsx(UndoIcon, {
+      label: ""
+    }),
+    testId: "ak-editor-toolbar-button-undo"
+  }), jsx(ToolbarButton, {
+    spacing: isReducedSpacing ? 'none' : 'default',
+    buttonId: TOOLBAR_BUTTON.REDO,
+    onClick: handleRedo,
+    disabled: !canRedo || disabled,
+    title: jsx(ToolTipContent, {
+      description: labelRedo,
+      keymap: redoKeymap
+    }),
+    iconBefore: jsx(RedoIcon, {
+      label: ""
+    }),
+    testId: "ak-editor-toolbar-button-redo",
+    "aria-label": tooltip(redoKeymap, labelRedo),
+    "aria-keyshortcuts": getAriaKeyshortcuts(redoKeymap)
+  }), jsx("span", {
+    css: separatorStyles
+  }));
+};
 export default injectIntl(ToolbarUndoRedo);

package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js

@@ -11,6 +11,7 @@ import { mainToolbarStyle, mainToolbarIconBeforeStyle, mainToolbarFirstChildStyl
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
 import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export const EditorToolbar = /*#__PURE__*/React.memo(props => {
   var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _props$featureFlags5, _props$featureFlags6;
   const [shouldSplitToolbar, setShouldSplitToolbar] = useState(false);
@@ -38,7 +39,7 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
     css: customToolbarWrapperStyle
   }, (_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
     beforePrimaryToolbarComponents: props.customPrimaryToolbarComponents.before
-  }) : null, (props === null || props === void 0 ? void 0 : (_props$featureFlags3 = props.featureFlags) === null || _props$featureFlags3 === void 0 ? void 0 : _props$featureFlags3.showAvatarGroupAsPlugin) === true && !((_props$featureFlags4 = props.featureFlags) !== null && _props$featureFlags4 !== void 0 && _props$featureFlags4.twoLineEditorToolbar) ? null : jsx(AvatarsWithPluginState, {
+  }) : null, getBooleanFF('platform.confluence.frontend.editor.no.platform.avatar.group') || (props === null || props === void 0 ? void 0 : (_props$featureFlags3 = props.featureFlags) === null || _props$featureFlags3 === void 0 ? void 0 : _props$featureFlags3.showAvatarGroupAsPlugin) === true && !((_props$featureFlags4 = props.featureFlags) !== null && _props$featureFlags4 !== void 0 && _props$featureFlags4.twoLineEditorToolbar) ? null : jsx(AvatarsWithPluginState, {
     editorView: props.editorView,
     eventDispatcher: props.eventDispatcher,
     inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "188.11.3";
+export const version = "188.12.0";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/labs/next/presets/universal.js

@@ -2,7 +2,8 @@ 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, fragmentMarkPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, panelPlugin, placeholderTextPlugin, tasksAndDecisionsPlugin, textColorPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../../../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, fragmentMarkPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, panelPlugin, placeholderTextPlugin, tasksAndDecisionsPlugin, textColorPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, expandPlugin, isExpandInsertionEnabled, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../../../plugins';
+import { historyPlugin } from '@atlaskit/editor-plugin-history';
 import { statusPlugin } from '@atlaskit/editor-plugin-status';
 import { datePlugin } from '@atlaskit/editor-plugin-date';
 import { captionPlugin } from '@atlaskit/editor-plugin-caption';
@@ -354,14 +355,14 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     showElementBrowserLink: props.elementBrowser && props.elementBrowser.showModal || false,
     replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false
   }]).maybeAdd(beforePrimaryToolbarPlugin, function (plugin, builder) {
-    if (hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
+    if (!getBooleanFF('platform.confluence.frontend.editor.no.platform.avatar.group') && hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
       return builder.add([plugin, {
         beforePrimaryToolbarComponents: props.primaryToolbarComponents.before
       }]);
     }
     return builder;
   }).maybeAdd(avatarGroupPlugin, function (plugin, builder) {
-    if (featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
+    if (!getBooleanFF('platform.confluence.frontend.editor.no.platform.avatar.group') && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
       return builder.add([plugin, {
         collabEdit: props.collabEdit,
         takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents)
@@ -371,7 +372,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
   }).maybeAdd(findReplacePlugin, function (plugin, builder) {
     if (props.allowFindReplace) {
       return builder.add([plugin, {
-        takeFullWidth: !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
+        takeFullWidth: !getBooleanFF('platform.confluence.frontend.editor.no.platform.avatar.group') && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
         twoLineEditorToolbar: !!featureFlags.twoLineEditorToolbar
       }]);
     }

package/dist/esm/plugins/index.js

@@ -24,7 +24,6 @@ export { default as annotationPlugin } from './annotation';
 export { default as analyticsPlugin } from './analytics';
 export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';
-export { default as historyPlugin } from './history';
 export { default as expandPlugin, isExpandInsertionEnabled } from './expand';
 export { default as mobileDimensionsPlugin } from './mobile-dimensions';
 export { default as findReplacePlugin } from './find-replace';