@atlaskit/editor-core 191.1.0 → 191.1.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-core
 
+## 191.1.3
+
+### Patch Changes
+
+- [#65788](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65788) [`be744e423e9f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/be744e423e9f) - ED-21700 Extraction of avatar group plugin
+- [#67194](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/67194) [`37379761475c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/37379761475c) - [ED-21806] Skip changes from NCS and tinted transactions.
+- Updated dependencies
+
 ## 191.1.0
 
 ### Minor Changes

package/afm-cc/tsconfig.json

@@ -28,12 +28,6 @@
         {
             "path": "../../../analytics/analytics-next/afm-cc/tsconfig.json"
         },
-        {
-            "path": "../../../design-system/avatar/afm-cc/tsconfig.json"
-        },
-        {
-            "path": "../../../design-system/avatar-group/afm-cc/tsconfig.json"
-        },
         {
             "path": "../../../design-system/button/afm-cc/tsconfig.json"
         },
@@ -52,6 +46,9 @@
         {
             "path": "../../editor-plugin-annotation/afm-cc/tsconfig.json"
         },
+        {
+            "path": "../../editor-plugin-avatar-group/afm-cc/tsconfig.json"
+        },
         {
             "path": "../../editor-plugin-base/afm-cc/tsconfig.json"
         },

package/dist/cjs/plugins/index.js

@@ -4,17 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "avatarGroupPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _avatarGroup.default;
-  }
-});
 Object.defineProperty(exports, "jiraIssuePlugin", {
   enumerable: true,
   get: function get() {
     return _jiraIssue.default;
   }
 });
-var _jiraIssue = _interopRequireDefault(require("./jira-issue"));
-var _avatarGroup = _interopRequireDefault(require("./avatar-group"));
+var _jiraIssue = _interopRequireDefault(require("./jira-issue"));

package/dist/cjs/presets/universal.js

@@ -49,6 +49,7 @@ var _editorPluginDataConsumer = require("@atlaskit/editor-plugin-data-consumer")
 var _editorPluginAnnotation = require("@atlaskit/editor-plugin-annotation");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _editorPluginCollabEdit = require("@atlaskit/editor-plugin-collab-edit");
+var _editorPluginAvatarGroup = require("@atlaskit/editor-plugin-avatar-group");
 var _plugins = require("../plugins");
 var _editorPluginExtension = require("@atlaskit/editor-plugin-extension");
 var _editorPluginBeforePrimaryToolbar = require("@atlaskit/editor-plugin-before-primary-toolbar");
@@ -386,19 +387,15 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       }]);
     }
     return builder;
-  }).maybeAdd(_plugins.avatarGroupPlugin, function (plugin, builder) {
-    if (!props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
-      // Avatars are moved to Confluence codebase for Edit in Context
-      // When Edit in Context is enabled primaryToolbarComponents is undefined
-      // For more details please check
-      // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
-      return builder.add([plugin, {
-        collabEdit: props.collabEdit,
-        takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents)
-      }]);
-    }
-    return builder;
-  }).maybeAdd(_editorPluginFindReplace.findReplacePlugin, function (plugin, builder) {
+  }).add([_editorPluginAvatarGroup.avatarGroupPlugin, {
+    // Avatars are moved to Confluence codebase for Edit in Context
+    // When Edit in Context is enabled primaryToolbarComponents is undefined
+    // For more details please check
+    // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
+    collabEdit: props.collabEdit,
+    takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
+    showAvatarGroup: !props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar
+  }]).maybeAdd(_editorPluginFindReplace.findReplacePlugin, function (plugin, builder) {
     if (props.allowFindReplace) {
       return builder.add([plugin, {
         takeFullWidth: !props.hideAvatarGroup && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),

package/dist/cjs/ui/Addon/click-area-helper.js

@@ -7,6 +7,7 @@ exports.clickAreaClickHandler = exports.checkForModal = void 0;
 var _utils = require("@atlaskit/editor-common/utils");
 var _selection = require("@atlaskit/editor-common/selection");
 var _commands = require("@atlaskit/editor-common/commands");
+var _collab = require("@atlaskit/editor-common/collab");
 // we ignore all of the clicks made inside <div class="ak-editor-content-area" /> (but not clicks on the node itself)
 var insideContentArea = function insideContentArea(ref) {
   while (ref) {
@@ -101,6 +102,7 @@ var outsideProsemirrorEditorClickHandler = function outsideProsemirrorEditorClic
     (0, _commands.addParagraphAtEnd)(tr);
   }
   (0, _selection.setSelectionTopLevelBlocks)(tr, event, dom, view.posAtCoords.bind(view), isEditorFocused);
+  (0, _collab.tintDirtyTransaction)(tr);
   if (!tr.docChanged && !tr.selectionSet) {
     return;
   }

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

@@ -10,10 +10,9 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
-var _ui = _interopRequireDefault(require("../../../plugins/avatar-group/ui"));
 var _Toolbar = _interopRequireDefault(require("../../Toolbar"));
 var _MainToolbar = require("./MainToolbar");
-var _ui2 = require("@atlaskit/editor-common/ui");
+var _ui = require("@atlaskit/editor-common/ui");
 var _messages = require("@atlaskit/editor-common/messages");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _context = require("../../../presets/context");
@@ -23,7 +22,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 /** @jsx jsx */
 
 var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(function (props) {
-  var _props$featureFlags, _props$customPrimaryT, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
+  var _props$featureFlags, _props$customPrimaryT, _props$featureFlags2, _props$featureFlags3, _editorAPI$avatarGrou, _props$collabEdit, _props$collabEdit2, _props$collabEdit3;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     shouldSplitToolbar = _useState2[0],
@@ -56,20 +55,15 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
     css: _MainToolbar.customToolbarWrapperStyle
   }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? (0, _react2.jsx)(_BeforeWrapper.BeforePrimaryToolbarWrapper, {
     beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
-  }) : null, props.hideAvatarGroup || (props === null || props === void 0 || (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.showAvatarGroupAsPlugin) === true && !((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.twoLineEditorToolbar) ? null :
-  // Avatars are moved to Confluence codebase for Edit in Context
+  }) : null, props.hideAvatarGroup || (props === null || props === void 0 || (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.showAvatarGroupAsPlugin) === true && !((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.twoLineEditorToolbar) ? null : // Avatars are moved to Confluence codebase for Edit in Context
   // When Edit in Context is enabled customPrimaryToolbarComponents is undefined
   // For more details please check
   // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
-  (0, _react2.jsx)(_ui.default, {
+  editorAPI === null || editorAPI === void 0 || (_editorAPI$avatarGrou = editorAPI.avatarGroup) === null || _editorAPI$avatarGrou === void 0 ? void 0 : _editorAPI$avatarGrou.actions.getToolbarItem({
     editorView: props.editorView,
-    eventDispatcher: props.eventDispatcher,
     inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
     inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
-    isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected,
-    featureFlags: props.featureFlags || {},
-    editorAnalyticsAPI: editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions,
-    editorAPI: editorAPI
+    isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected
   }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
@@ -103,7 +97,7 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
     event.preventDefault();
     event.stopPropagation();
   };
-  return (0, _react2.jsx)(_ui2.ContextPanelConsumer, null, function (_ref) {
+  return (0, _react2.jsx)(_ui.ContextPanelConsumer, null, function (_ref) {
     var contextPanelWidth = _ref.width;
     return (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
       editorView: props.editorView,

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

package/dist/es2019/plugins/index.js

@@ -1,2 +1 @@
-export { default as jiraIssuePlugin } from './jira-issue';
-export { default as avatarGroupPlugin } from './avatar-group';
+export { default as jiraIssuePlugin } from './jira-issue';

package/dist/es2019/presets/universal.js

@@ -39,7 +39,8 @@ import { dataConsumerPlugin } from '@atlaskit/editor-plugin-data-consumer';
 import { annotationPlugin } from '@atlaskit/editor-plugin-annotation';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { collabEditPlugin } from '@atlaskit/editor-plugin-collab-edit';
-import { avatarGroupPlugin, jiraIssuePlugin } from '../plugins';
+import { avatarGroupPlugin } from '@atlaskit/editor-plugin-avatar-group';
+import { jiraIssuePlugin } from '../plugins';
 import { extensionPlugin } from '@atlaskit/editor-plugin-extension';
 import { beforePrimaryToolbarPlugin } from '@atlaskit/editor-plugin-before-primary-toolbar';
 import { feedbackDialogPlugin } from '@atlaskit/editor-plugin-feedback-dialog';
@@ -384,19 +385,15 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       }]);
     }
     return builder;
-  }).maybeAdd(avatarGroupPlugin, (plugin, builder) => {
-    if (!props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
-      // Avatars are moved to Confluence codebase for Edit in Context
-      // When Edit in Context is enabled primaryToolbarComponents is undefined
-      // For more details please check
-      // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
-      return builder.add([plugin, {
-        collabEdit: props.collabEdit,
-        takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents)
-      }]);
-    }
-    return builder;
-  }).maybeAdd(findReplacePlugin, (plugin, builder) => {
+  }).add([avatarGroupPlugin, {
+    // Avatars are moved to Confluence codebase for Edit in Context
+    // When Edit in Context is enabled primaryToolbarComponents is undefined
+    // For more details please check
+    // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
+    collabEdit: props.collabEdit,
+    takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
+    showAvatarGroup: !props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar
+  }]).maybeAdd(findReplacePlugin, (plugin, builder) => {
     if (props.allowFindReplace) {
       return builder.add([plugin, {
         takeFullWidth: !props.hideAvatarGroup && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),

package/dist/es2019/ui/Addon/click-area-helper.js

@@ -1,6 +1,7 @@
 import { closestElement } from '@atlaskit/editor-common/utils';
 import { setSelectionTopLevelBlocks } from '@atlaskit/editor-common/selection';
 import { addParagraphAtEnd } from '@atlaskit/editor-common/commands';
+import { tintDirtyTransaction } from '@atlaskit/editor-common/collab';
 
 // we ignore all of the clicks made inside <div class="ak-editor-content-area" /> (but not clicks on the node itself)
 const insideContentArea = ref => {
@@ -100,6 +101,7 @@ const outsideProsemirrorEditorClickHandler = (view, event) => {
     addParagraphAtEnd(tr);
   }
   setSelectionTopLevelBlocks(tr, event, dom, view.posAtCoords.bind(view), isEditorFocused);
+  tintDirtyTransaction(tr);
   if (!tr.docChanged && !tr.selectionSet) {
     return;
   }

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

@@ -3,7 +3,6 @@
 import React, { useState, useEffect } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
-import AvatarsWithPluginState from '../../../plugins/avatar-group/ui';
 import Toolbar from '../../Toolbar';
 import { mainToolbarStyle, mainToolbarIconBeforeStyle, mainToolbarFirstChildStyle, mainToolbarSecondChildStyle, nonCustomToolbarWrapperStyle, customToolbarWrapperStyle, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
@@ -12,7 +11,7 @@ import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-me
 import { usePresetContext } from '../../../presets/context';
 import { BeforePrimaryToolbarWrapper } from './BeforeWrapper';
 export const EditorToolbar = /*#__PURE__*/React.memo(props => {
-  var _props$featureFlags, _props$customPrimaryT, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
+  var _props$featureFlags, _props$customPrimaryT, _props$featureFlags2, _props$featureFlags3, _editorAPI$avatarGrou, _props$collabEdit, _props$collabEdit2, _props$collabEdit3;
   const [shouldSplitToolbar, setShouldSplitToolbar] = useState(false);
   const editorAPI = usePresetContext();
 
@@ -42,20 +41,15 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
     css: customToolbarWrapperStyle
   }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
     beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
-  }) : null, props.hideAvatarGroup || (props === null || props === void 0 ? void 0 : (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.showAvatarGroupAsPlugin) === true && !((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.twoLineEditorToolbar) ? null :
-  // Avatars are moved to Confluence codebase for Edit in Context
+  }) : null, props.hideAvatarGroup || (props === null || props === void 0 ? void 0 : (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.showAvatarGroupAsPlugin) === true && !((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.twoLineEditorToolbar) ? null : // Avatars are moved to Confluence codebase for Edit in Context
   // When Edit in Context is enabled customPrimaryToolbarComponents is undefined
   // For more details please check
   // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
-  jsx(AvatarsWithPluginState, {
+  editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$avatarGrou = editorAPI.avatarGroup) === null || _editorAPI$avatarGrou === void 0 ? void 0 : _editorAPI$avatarGrou.actions.getToolbarItem({
     editorView: props.editorView,
-    eventDispatcher: props.eventDispatcher,
     inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
     inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
-    isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected,
-    featureFlags: props.featureFlags || {},
-    editorAnalyticsAPI: editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions,
-    editorAPI: editorAPI
+    isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected
   }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,

package/dist/es2019/version-wrapper.js

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

package/dist/esm/plugins/index.js

@@ -1,2 +1 @@
-export { default as jiraIssuePlugin } from './jira-issue';
-export { default as avatarGroupPlugin } from './avatar-group';
+export { default as jiraIssuePlugin } from './jira-issue';

package/dist/esm/presets/universal.js

@@ -43,7 +43,8 @@ import { dataConsumerPlugin } from '@atlaskit/editor-plugin-data-consumer';
 import { annotationPlugin } from '@atlaskit/editor-plugin-annotation';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { collabEditPlugin } from '@atlaskit/editor-plugin-collab-edit';
-import { avatarGroupPlugin, jiraIssuePlugin } from '../plugins';
+import { avatarGroupPlugin } from '@atlaskit/editor-plugin-avatar-group';
+import { jiraIssuePlugin } from '../plugins';
 import { extensionPlugin } from '@atlaskit/editor-plugin-extension';
 import { beforePrimaryToolbarPlugin } from '@atlaskit/editor-plugin-before-primary-toolbar';
 import { feedbackDialogPlugin } from '@atlaskit/editor-plugin-feedback-dialog';
@@ -378,19 +379,15 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       }]);
     }
     return builder;
-  }).maybeAdd(avatarGroupPlugin, function (plugin, builder) {
-    if (!props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
-      // Avatars are moved to Confluence codebase for Edit in Context
-      // When Edit in Context is enabled primaryToolbarComponents is undefined
-      // For more details please check
-      // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
-      return builder.add([plugin, {
-        collabEdit: props.collabEdit,
-        takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents)
-      }]);
-    }
-    return builder;
-  }).maybeAdd(findReplacePlugin, function (plugin, builder) {
+  }).add([avatarGroupPlugin, {
+    // Avatars are moved to Confluence codebase for Edit in Context
+    // When Edit in Context is enabled primaryToolbarComponents is undefined
+    // For more details please check
+    // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
+    collabEdit: props.collabEdit,
+    takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
+    showAvatarGroup: !props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar
+  }]).maybeAdd(findReplacePlugin, function (plugin, builder) {
     if (props.allowFindReplace) {
       return builder.add([plugin, {
         takeFullWidth: !props.hideAvatarGroup && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),

package/dist/esm/ui/Addon/click-area-helper.js

@@ -1,6 +1,7 @@
 import { closestElement } from '@atlaskit/editor-common/utils';
 import { setSelectionTopLevelBlocks } from '@atlaskit/editor-common/selection';
 import { addParagraphAtEnd } from '@atlaskit/editor-common/commands';
+import { tintDirtyTransaction } from '@atlaskit/editor-common/collab';
 
 // we ignore all of the clicks made inside <div class="ak-editor-content-area" /> (but not clicks on the node itself)
 var insideContentArea = function insideContentArea(ref) {
@@ -96,6 +97,7 @@ var outsideProsemirrorEditorClickHandler = function outsideProsemirrorEditorClic
     addParagraphAtEnd(tr);
   }
   setSelectionTopLevelBlocks(tr, event, dom, view.posAtCoords.bind(view), isEditorFocused);
+  tintDirtyTransaction(tr);
   if (!tr.docChanged && !tr.selectionSet) {
     return;
   }

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

@@ -4,7 +4,6 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useState, useEffect } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
-import AvatarsWithPluginState from '../../../plugins/avatar-group/ui';
 import Toolbar from '../../Toolbar';
 import { mainToolbarStyle, mainToolbarIconBeforeStyle, mainToolbarFirstChildStyle, mainToolbarSecondChildStyle, nonCustomToolbarWrapperStyle, customToolbarWrapperStyle, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
@@ -13,7 +12,7 @@ import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-me
 import { usePresetContext } from '../../../presets/context';
 import { BeforePrimaryToolbarWrapper } from './BeforeWrapper';
 export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
-  var _props$featureFlags, _props$customPrimaryT, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
+  var _props$featureFlags, _props$customPrimaryT, _props$featureFlags2, _props$featureFlags3, _editorAPI$avatarGrou, _props$collabEdit, _props$collabEdit2, _props$collabEdit3;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     shouldSplitToolbar = _useState2[0],
@@ -46,20 +45,15 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
     css: customToolbarWrapperStyle
   }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
     beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
-  }) : null, props.hideAvatarGroup || (props === null || props === void 0 || (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.showAvatarGroupAsPlugin) === true && !((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.twoLineEditorToolbar) ? null :
-  // Avatars are moved to Confluence codebase for Edit in Context
+  }) : null, props.hideAvatarGroup || (props === null || props === void 0 || (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.showAvatarGroupAsPlugin) === true && !((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.twoLineEditorToolbar) ? null : // Avatars are moved to Confluence codebase for Edit in Context
   // When Edit in Context is enabled customPrimaryToolbarComponents is undefined
   // For more details please check
   // https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
-  jsx(AvatarsWithPluginState, {
+  editorAPI === null || editorAPI === void 0 || (_editorAPI$avatarGrou = editorAPI.avatarGroup) === null || _editorAPI$avatarGrou === void 0 ? void 0 : _editorAPI$avatarGrou.actions.getToolbarItem({
     editorView: props.editorView,
-    eventDispatcher: props.eventDispatcher,
     inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
     inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
-    isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected,
-    featureFlags: props.featureFlags || {},
-    editorAnalyticsAPI: editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions,
-    editorAPI: editorAPI
+    isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected
   }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,

package/dist/esm/version-wrapper.js

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

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

@@ -1,2 +1 @@
 export { default as jiraIssuePlugin } from './jira-issue';
-export { default as avatarGroupPlugin } from './avatar-group';

package/dist/types/presets/default.d.ts

@@ -338,12 +338,7 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
             }, import("@atlaskit/editor-common/types").FeatureFlags>>];
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-        sharedState: {
-            query: string;
-            isOpen: boolean;
-            isAllowed: boolean;
-            currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-        };
+        sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
         actions: {
             isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
             isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -386,12 +381,7 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
         }, import("@atlaskit/editor-common/types").FeatureFlags>>];
         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-    sharedState: {
-        query: string;
-        isOpen: boolean;
-        isAllowed: boolean;
-        currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-    };
+    sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
     actions: {
         isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
         isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -435,12 +425,7 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
             }, import("@atlaskit/editor-common/types").FeatureFlags>>];
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-        sharedState: {
-            query: string;
-            isOpen: boolean;
-            isAllowed: boolean;
-            currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-        };
+        sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
         actions: {
             isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
             isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -834,12 +819,7 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
             }, import("@atlaskit/editor-common/types").FeatureFlags>>];
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-        sharedState: {
-            query: string;
-            isOpen: boolean;
-            isAllowed: boolean;
-            currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-        };
+        sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
         actions: {
             isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
             isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -882,12 +862,7 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
         }, import("@atlaskit/editor-common/types").FeatureFlags>>];
         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-    sharedState: {
-        query: string;
-        isOpen: boolean;
-        isAllowed: boolean;
-        currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-    };
+    sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
     actions: {
         isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
         isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -931,12 +906,7 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
             }, import("@atlaskit/editor-common/types").FeatureFlags>>];
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-        sharedState: {
-            query: string;
-            isOpen: boolean;
-            isAllowed: boolean;
-            currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-        };
+        sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
         actions: {
             isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
             isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;

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

@@ -1,2 +1 @@
 export { default as jiraIssuePlugin } from './jira-issue';
-export { default as avatarGroupPlugin } from './avatar-group';

package/dist/types-ts4.5/presets/default.d.ts

@@ -435,12 +435,7 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
                         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
                     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
                 ];
-                sharedState: {
-                    query: string;
-                    isOpen: boolean;
-                    isAllowed: boolean;
-                    currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-                };
+                sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
                 actions: {
                     isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
                     isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -489,12 +484,7 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
                 actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
             }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
         ];
-        sharedState: {
-            query: string;
-            isOpen: boolean;
-            isAllowed: boolean;
-            currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-        };
+        sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
         actions: {
             isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
             isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -544,12 +534,7 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
                         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
                     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
                 ];
-                sharedState: {
-                    query: string;
-                    isOpen: boolean;
-                    isAllowed: boolean;
-                    currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-                };
+                sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
                 actions: {
                     isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
                     isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -1054,12 +1039,7 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
                         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
                     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
                 ];
-                sharedState: {
-                    query: string;
-                    isOpen: boolean;
-                    isAllowed: boolean;
-                    currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-                };
+                sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
                 actions: {
                     isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
                     isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -1108,12 +1088,7 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
                 actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
             }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
         ];
-        sharedState: {
-            query: string;
-            isOpen: boolean;
-            isAllowed: boolean;
-            currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-        };
+        sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
         actions: {
             isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
             isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
@@ -1163,12 +1138,7 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
                         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
                     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
                 ];
-                sharedState: {
-                    query: string;
-                    isOpen: boolean;
-                    isAllowed: boolean;
-                    currentHandler?: import("@atlaskit/editor-plugin-type-ahead").TypeAheadHandler | undefined;
-                };
+                sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
                 actions: {
                     isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
                     isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;