@atlaskit/editor-core 190.2.3 → 191.0.1

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # @atlaskit/editor-core
 
+## 191.0.1
+
+### Patch Changes
+
+- [#65604](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65604) [`c39131fa9ab3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c39131fa9ab3) - [ux] ED-21422 Fix MBE floating toolbar position issue on new tab and scroll.
+- [#65494](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65494) [`14c48a2fa93d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/14c48a2fa93d) - Moved the example helpers from the test utlity library to editor-core
+
+## 191.0.0
+
+### Major Changes
+
+- [#65382](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65382) [`5f67f805635f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5f67f805635f) - # WHAT
+
+  Deprecating entry-points from `@atlaskit/editor-core` to decouple the `extension` plugin.
+
+  These entry-points will no longer be available:
+
+  - `@atlaskit/editor-core/extensibility`
+  - `@atlaskit/editor-core/extensions`
+
+  # WHY
+
+  We are going to extract the `extension` plugin code to its own package.
+  These entry-points are only used for internal packages and are no longer required.
+
+  They couple the `extension` plugin to `editor-core` which blocks extraction.
+
+  # HOW
+
+  In general these were only used internally and should not be required.
+
+  However we do expose some of the components from `@atlaskit/editor-core/extensibility` in `@atlaskit/editor-common/extensibility`.
+
+  This includes:
+
+  - Extension
+  - ExtensionNode
+  - ExtensionNodeWrapper
+
+  For any issues please reach out to #help-editor
+
+### Patch Changes
+
+- [#64844](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64844) [`fdad147e2231`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fdad147e2231) - [ED-21730] Extract Collab Edit Plugin
+- [#65031](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65031) [`a00094111b5a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a00094111b5a) - ED-21609 Update adf-schema to 35.3.0
+- Updated dependencies
+
 ## 190.2.3
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -97,6 +97,9 @@
         {
             "path": "../../editor-plugin-code-block/afm-cc/tsconfig.json"
         },
+        {
+            "path": "../../editor-plugin-collab-edit/afm-cc/tsconfig.json"
+        },
         {
             "path": "../../editor-plugin-composition/afm-cc/tsconfig.json"
         },

package/dist/cjs/actions/index.js

@@ -15,12 +15,20 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _eventDispatcher = require("../event-dispatcher");
-var _nativeCollabProviderPlugin = require("../plugins/collab-edit/native-collab-provider-plugin");
 var _utils3 = require("../utils");
 var _action = require("../utils/action");
 var _deprecationWarnings = _interopRequireDefault(require("../utils/deprecation-warnings"));
 var _document = require("../utils/document");
 var _nodesByLocalIds = require("../utils/nodes-by-localIds");
+// TODO: ED-21786
+// Please, do not copy or use this kind of code below
+// @ts-ignore
+var fakePluginKey = {
+  key: 'nativeCollabProviderPlugin$',
+  getState: function getState(state) {
+    return state['nativeCollabProviderPlugin$'];
+  }
+};
 var EditorActions = exports.default = /*#__PURE__*/function () {
   function EditorActions() {
     var _this = this;
@@ -43,8 +51,7 @@ var EditorActions = exports.default = /*#__PURE__*/function () {
      * steps.
      */
     (0, _defineProperty2.default)(this, "getResolvedEditorState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var _getCollabProvider;
-      var _this$getFeatureFlags, useNativeCollabPlugin, editorValue, editorView;
+      var _this$getFeatureFlags, useNativeCollabPlugin, editorValue, editorView, collabEditState;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -79,8 +86,9 @@ var EditorActions = exports.default = /*#__PURE__*/function () {
             _context.next = 13;
             return (0, _action.getEditorValueWithMedia)(editorView);
           case 13:
-            return _context.abrupt("return", (_getCollabProvider = (0, _nativeCollabProviderPlugin.getCollabProvider)(editorView.state)) === null || _getCollabProvider === void 0 ? void 0 : _getCollabProvider.getFinalAcknowledgedState());
-          case 14:
+            collabEditState = fakePluginKey.getState(editorView.state);
+            return _context.abrupt("return", collabEditState === null || collabEditState === void 0 ? void 0 : collabEditState.getFinalAcknowledgedState());
+          case 15:
           case "end":
             return _context.stop();
         }

package/dist/cjs/create-editor/ErrorBoundary.js

@@ -21,7 +21,7 @@ var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _ufo = require("@atlaskit/editor-common/ufo");
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
-var _documentLogger = require("../utils/document-logger");
+var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _WithEditorView = require("./WithEditorView");
 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; }
@@ -59,7 +59,7 @@ var ErrorBoundaryWithEditorView = exports.ErrorBoundaryWithEditorView = /*#__PUR
                 errorInfo: errorInfo,
                 errorId: sharedId,
                 browserExtensions: _this.browserExtensions,
-                docStructure: _this.featureFlags.errorBoundaryDocStructure && _this.props.editorView ? (0, _documentLogger.getDocStructure)(_this.props.editorView.state.doc, {
+                docStructure: _this.featureFlags.errorBoundaryDocStructure && _this.props.editorView ? (0, _coreUtils.getDocStructure)(_this.props.editorView.state.doc, {
                   compact: true
                 }) : undefined,
                 outdatedBrowser: (0, _utils.isOutdatedBrowser)(browserInfo)

package/dist/cjs/create-editor/ReactEditorView.js

@@ -29,13 +29,12 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _featureFlagsFromProps = require("./feature-flags-from-props");
 var _normalizeFeatureFlags = require("@atlaskit/editor-common/normalize-feature-flags");
 var _createEditor = require("./create-editor");
-var _documentLogger = require("../utils/document-logger");
+var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _isFullPage = require("../utils/is-full-page");
 var _measureEnum = _interopRequireDefault(require("../utils/performance/measure-enum"));
 var _document = require("../utils/document");
 var _createSchema = require("./create-schema");
 var _pluginPerformanceObserver = require("../utils/performance/plugin-performance-observer");
-var _getParticipantsCount = require("../plugins/collab-edit/get-participants-count");
 var _trackTransactions = require("../utils/performance/track-transactions");
 var _createPluginsList = _interopRequireDefault(require("./create-plugins-list"));
 var _consts = require("./consts");
@@ -95,14 +94,15 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
     // ProseMirror is instantiated prior to the initial React render cycle,
     // so we allow transactions by default, to avoid discarding the initial one.
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "canDispatchTransactions", true);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onPluginObservation", function (report, editorState) {
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onPluginObservation", function (report) {
+      var _this$pluginInjection;
       _this.dispatchAnalyticsEvent({
         action: _analytics.ACTION.TRANSACTION_DISPATCHED,
         actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
         eventType: _analytics.EVENT_TYPE.OPERATIONAL,
         attributes: {
           report: report,
-          participants: (0, _getParticipantsCount.getParticipantsCount)(editorState)
+          participants: ((_this$pluginInjection = _this.pluginInjectionAPI.api().collabEdit) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.sharedState.currentState().participants.size()) || 1
         }
       });
     });
@@ -350,7 +350,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
         var invalidNodes = nodes.filter(function (node) {
           return !(0, _nodes.validNode)(node);
         }).map(function (node) {
-          return (0, _documentLogger.getDocStructure)(node, {
+          return (0, _coreUtils.getDocStructure)(node, {
             compact: true
           });
         });
@@ -401,10 +401,10 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
         var forceSeverityTracking = typeof proseMirrorRenderedTracking === 'undefined' && (0, _utils.shouldForceTracking)();
         _this.proseMirrorRenderedSeverity = !!forceSeverityTracking || proseMirrorRenderedTracking !== null && proseMirrorRenderedTracking !== void 0 && proseMirrorRenderedTracking.trackSeverity ? (0, _utils.getAnalyticsEventSeverity)(duration, (_proseMirrorRenderedT = proseMirrorRenderedTracking === null || proseMirrorRenderedTracking === void 0 ? void 0 : proseMirrorRenderedTracking.severityNormalThreshold) !== null && _proseMirrorRenderedT !== void 0 ? _proseMirrorRenderedT : _consts.PROSEMIRROR_RENDERED_NORMAL_SEVERITY_THRESHOLD, (_proseMirrorRenderedT2 = proseMirrorRenderedTracking === null || proseMirrorRenderedTracking === void 0 ? void 0 : proseMirrorRenderedTracking.severityDegradedThreshold) !== null && _proseMirrorRenderedT2 !== void 0 ? _proseMirrorRenderedT2 : _consts.PROSEMIRROR_RENDERED_DEGRADED_SEVERITY_THRESHOLD) : undefined;
         if (_this.view) {
-          var _this$pluginInjection, _this$experienceStore10;
+          var _this$pluginInjection2, _this$experienceStore10;
           var nodes = (0, _document.getNodesCount)(_this.view.state.doc);
           var ttfb = (0, _utils.getResponseEndTime)();
-          var contextIdentifier = (_this$pluginInjection = _this.pluginInjectionAPI.api().base) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.sharedState.currentState();
+          var contextIdentifier = (_this$pluginInjection2 = _this.pluginInjectionAPI.api().base) === null || _this$pluginInjection2 === void 0 ? void 0 : _this$pluginInjection2.sharedState.currentState();
           _this.dispatchAnalyticsEvent({
             action: _analytics.ACTION.PROSEMIRROR_RENDERED,
             actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
@@ -547,7 +547,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
     _this.errorReporter = (0, _createEditor.createErrorReporter)(props.editorProps.errorReporterHandler);
     _this.transactionTracker = new _trackTransactions.TransactionTracker();
     _this.pluginPerformanceObserver = new _pluginPerformanceObserver.PluginPerformanceObserver(function (report) {
-      return _this.onPluginObservation(report, _this.editorState);
+      return _this.onPluginObservation(report);
     }).withPlugins(function () {
       return _this.getPluginNames();
     }).withNodeCounts(function () {

package/dist/cjs/plugins/avatar-group/index.js

@@ -31,7 +31,8 @@ var avatarGroup = function avatarGroup(_ref) {
         collabEdit: props === null || props === void 0 ? void 0 : props.collabEdit,
         takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
         featureFlags: featureFlags,
-        editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
+        editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions,
+        editorAPI: api
       });
     }
   };

package/dist/cjs/plugins/avatar-group/ui/AvatarGroupPluginWrapper.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _avatarsWithPluginState = _interopRequireDefault(require("../../collab-edit/ui/avatars-with-plugin-state"));
+var _avatarsWithPluginState = _interopRequireDefault(require("./avatars-with-plugin-state"));
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("../messages");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -42,7 +42,8 @@ var AvatarGroupPluginWrapper = function AvatarGroupPluginWrapper(props) {
     inviteToEditHandler: props.collabEdit && props.collabEdit.inviteToEditHandler,
     isInviteToEditButtonSelected: props.collabEdit && props.collabEdit.isInviteToEditButtonSelected,
     featureFlags: featureFlags,
-    editorAnalyticsAPI: props.editorAnalyticsAPI
+    editorAnalyticsAPI: props.editorAnalyticsAPI,
+    editorAPI: props.editorAPI
   }));
 };
 var _default = exports.default = AvatarGroupPluginWrapper;

package/dist/cjs/plugins/{collab-edit → avatar-group}/ui/avatars-with-plugin-state.js

@@ -7,11 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
-var _WithPluginState = _interopRequireDefault(require("../../../ui/WithPluginState"));
-var _plugin = require("../plugin");
 var _messages = _interopRequireDefault(require("../../../messages"));
 var _avatars = require("./avatars");
 var _inviteToEdit = require("./invite-to-edit");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var AvatarsWithPluginState = function AvatarsWithPluginState(props) {
   var title = props.intl.formatMessage(_messages.default.inviteToEditButtonTitle);
   var selected = props.isInviteToEditButtonSelected,
@@ -19,7 +18,8 @@ var AvatarsWithPluginState = function AvatarsWithPluginState(props) {
     Component = props.inviteToEditComponent,
     editorView = props.editorView,
     featureFlags = props.featureFlags,
-    editorAnalyticsAPI = props.editorAnalyticsAPI;
+    editorAnalyticsAPI = props.editorAnalyticsAPI,
+    editorAPI = props.editorAPI;
   var render = _react.default.useCallback(function (_ref) {
     var data = _ref.data;
     if (!data) {
@@ -30,20 +30,19 @@ var AvatarsWithPluginState = function AvatarsWithPluginState(props) {
       participants: data.activeParticipants,
       editorView: editorView,
       featureFlags: featureFlags,
-      editorAnalyticsAPI: editorAnalyticsAPI
+      editorAnalyticsAPI: editorAnalyticsAPI,
+      editorAPI: editorAPI
     }, /*#__PURE__*/_react.default.createElement(_inviteToEdit.InviteToEditButton, {
       title: title,
       selected: selected,
       onClick: onClick,
       Component: Component
     }));
-  }, [selected, onClick, Component, title, editorView, featureFlags, editorAnalyticsAPI]);
-  return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
-    plugins: {
-      data: _plugin.pluginKey
-    },
-    render: render,
-    editorView: editorView
+  }, [selected, onClick, Component, title, editorView, featureFlags, editorAnalyticsAPI, editorAPI]);
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(editorAPI, ['collabEdit']),
+    collabEditState = _useSharedPluginState.collabEditState;
+  return render({
+    data: collabEditState
   });
 };
 var _default = exports.default = (0, _reactIntlNext.injectIntl)(AvatarsWithPluginState);

package/dist/cjs/plugins/avatar-group/ui/avatars.js

@@ -0,0 +1,70 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.scrollToCollabCursor = exports.Avatars = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@emotion/react");
+var _avatarGroup = _interopRequireDefault(require("@atlaskit/avatar-group"));
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _styles = require("./styles");
+var _toAvatar = _interopRequireDefault(require("./to-avatar"));
+var _analytics2 = require("@atlaskit/editor-common/analytics");
+/** @jsx jsx */
+
+var scrollToCollabCursor = exports.scrollToCollabCursor = function scrollToCollabCursor(editorView, participants, sessionId, index, editorAnalyticsAPI) {
+  var selectedUser = participants[index];
+  if (selectedUser && selectedUser.cursorPos !== undefined && selectedUser.sessionId !== sessionId) {
+    var state = editorView.state;
+    var tr = state.tr;
+    var analyticsPayload = {
+      action: _analytics2.ACTION.MATCHED,
+      actionSubject: _analytics2.ACTION_SUBJECT.SELECTION,
+      eventType: _analytics2.EVENT_TYPE.TRACK
+    };
+    tr.setSelection(_state.Selection.near(tr.doc.resolve(selectedUser.cursorPos)));
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(analyticsPayload)(tr);
+    tr.scrollIntoView();
+    editorView.dispatch(tr);
+    if (!editorView.hasFocus()) {
+      editorView.focus();
+    }
+  }
+};
+var Avatars = exports.Avatars = /*#__PURE__*/_react.default.memo(function (props) {
+  var _props$participants;
+  var sessionId = props.sessionId,
+    editorView = props.editorView,
+    featureFlags = props.featureFlags,
+    editorAPI = props.editorAPI;
+  var participants = (_props$participants = props.participants) === null || _props$participants === void 0 ? void 0 : _props$participants.toArray();
+  var avatars = participants.sort(function (p) {
+    return p.sessionId === sessionId ? -1 : 1;
+  }).map(function (participant) {
+    return (0, _toAvatar.default)(participant, editorAPI);
+  });
+  if (!avatars.length) {
+    return null;
+  }
+  return (0, _react2.jsx)("div", {
+    css: _styles.avatarContainer
+  }, (0, _react2.jsx)(_avatarGroup.default, {
+    appearance: "stack",
+    size: "medium",
+    data: avatars,
+    maxCount: 3,
+    onAvatarClick: function onAvatarClick(_event, _analytics, index) {
+      if (!editorView) {
+        return;
+      }
+      var allowCollabAvatarScroll = featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.collabAvatarScroll;
+
+      // user does not need to scroll to their own position (index 0)
+      if (allowCollabAvatarScroll && index > 0) {
+        scrollToCollabCursor(editorView, participants, props.sessionId, index, props.editorAnalyticsAPI);
+      }
+    }
+  }), props.children);
+});

package/dist/cjs/plugins/{collab-edit → avatar-group}/ui/colored-avatar-item.js

@@ -5,15 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ColoredAvatarItem = void 0;
 var _react = require("@emotion/react");
-var _utils = require("../utils");
 var _styles = require("./styles");
+var _colors = require("@atlaskit/theme/colors");
 /** @jsx jsx */
 
 var ColoredAvatarItem = exports.ColoredAvatarItem = function ColoredAvatarItem(props) {
-  var color = (0, _utils.getAvatarColor)(props.sessionId).color.solid;
+  var _props$api;
+  var color = (_props$api = props.api) === null || _props$api === void 0 || (_props$api = _props$api.collabEdit) === null || _props$api === void 0 ? void 0 : _props$api.actions.getAvatarColor(props.sessionId).color.solid;
   var avatar = props.name.substr(0, 1).toUpperCase();
   return (0, _react.jsx)("div", {
-    css: (0, _styles.badge)(color),
+    css: (0, _styles.badge)(color || _colors.R100),
     "data-testid": "editor-collab-badge"
   }, avatar);
 };

package/dist/cjs/plugins/{collab-edit → avatar-group}/ui/to-avatar.js

@@ -9,12 +9,13 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireDefault(require("react"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _coloredAvatarItem = require("./colored-avatar-item");
-var toAvatar = function toAvatar(participant) {
+var toAvatar = function toAvatar(participant, api) {
   return {
     name: participant.name,
     src: participant.avatar,
     size: 'medium',
     presence: /*#__PURE__*/_react.default.createElement(_coloredAvatarItem.ColoredAvatarItem, {
+      api: api,
       name: participant.name,
       sessionId: participant.sessionId
     })

package/dist/cjs/plugins/extension/actions.js

@@ -163,6 +163,9 @@ var updateExtensionParams = function updateExtensionParams(editorAnalyticsAPI) {
     }();
   };
 };
+
+// This is to decouple extensions from editor core
+// Ideally in the future we completely deprecate `EditorActions`
 var editSelectedExtension = exports.editSelectedExtension = function editSelectedExtension(editorActions) {
   var editorView = editorActions._privateGetEditorView();
   var _getPluginState = (0, _main.getPluginState)(editorView.state),

package/dist/cjs/plugins/extension/context-panel.js

@@ -15,7 +15,7 @@ var _react = _interopRequireDefault(require("react"));
 var _extensions = require("@atlaskit/editor-common/extensions");
 var _main = require("./pm-plugins/main");
 var _utils = require("./utils");
-var _ConfigPanelLoader = _interopRequireDefault(require("../../ui/ConfigPanel/ConfigPanelLoader"));
+var _ConfigPanelLoader = _interopRequireDefault(require("./ui/ConfigPanel/ConfigPanelLoader"));
 var _commands = require("./commands");
 var _actions = require("./actions");
 var _SaveIndicator = require("./ui/SaveIndicator/SaveIndicator");

package/dist/cjs/plugins/extension/pm-plugins/main.js

@@ -31,7 +31,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _selection = require("@atlaskit/editor-common/selection");
-var _extension = _interopRequireDefault(require("../nodeviews/extension"));
+var _extensibility = require("@atlaskit/editor-common/extensibility");
 var _commands = require("../commands");
 var _utils2 = require("../utils");
 var _pluginFactory = require("../plugin-factory");
@@ -306,12 +306,12 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
       },
       nodeViews: {
         // WARNING: referentiality-plugin also creates these nodeviews
-        extension: (0, _extension.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),
+        extension: (0, _extensibility.ExtensionNodeView)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),
         // WARNING: referentiality-plugin also creates these nodeviews
-        bodiedExtension: (0, _extension.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),
+        bodiedExtension: (0, _extensibility.ExtensionNodeView)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),
         // WARNING: referentiality-plugin also creates these nodeviews
-        inlineExtension: (0, _extension.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),
-        multiBodiedExtension: (0, _extension.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi)
+        inlineExtension: (0, _extensibility.ExtensionNodeView)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),
+        multiBodiedExtension: (0, _extensibility.ExtensionNodeView)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi)
       },
       handleClickOn: (0, _selection.createSelectionClickHandler)(['extension', 'bodiedExtension'], function (target) {
         return !target.closest('.extension-content');

package/dist/cjs/plugins/extension/toolbar.js

@@ -176,15 +176,18 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
           var mbeFrameElement = editorView.nodeDOM(mbeFrame.pos);
           var mbeNodeRect = mbeDomElement === null || mbeDomElement === void 0 ? void 0 : mbeDomElement.getBoundingClientRect();
           var mbeFrameRect = mbeFrameElement.getBoundingClientRect();
+          var scrollWrapper = editorView.dom.closest('.fabric-editor-popup-scroll-parent') || document.body;
 
           /**
            * MbeNodeRect height will include mbeFrameRect height and the navigation toolbar of the MBE
            * excluding nav toolbar height from the floaing extention toolbar position calculated.
-           * adding 15px extra for the spacing between MBE node and floating toolbar.
+           * In case of new tabs, MBE does not update the frame to the new tab so height comes as 0,
+           * so we add the min height (100px) + borders (2px) as the default minimum frame height for toolbar to appear
            *
            */
+          var frameheight = mbeFrameRect.height > 0 ? mbeFrameRect.height : 102;
           return {
-            top: mbeNodeRect.top + mbeFrameRect.height + 15,
+            top: mbeNodeRect.top + frameheight + scrollWrapper.scrollTop,
             left: nextPos.left
           };
         },

package/dist/cjs/{ui → plugins/extension/ui}/ConfigPanel/ConfigPanel.js

@@ -31,8 +31,8 @@ var _transformers = require("./transformers");
 var _reactIntlNext = require("react-intl-next");
 var _buttonGroup = _interopRequireDefault(require("@atlaskit/button/button-group"));
 var _customThemeButton = _interopRequireDefault(require("@atlaskit/button/custom-theme-button"));
-var _pluginKey = require("../../plugins/extension/plugin-key");
-var _WithPluginState = _interopRequireDefault(require("../WithPluginState"));
+var _pluginKey = require("../../plugin-key");
+var _withPluginState = require("@atlaskit/editor-common/with-plugin-state");
 var _FormContent = _interopRequireDefault(require("./FormContent"));
 var _messages = require("./messages");
 var _FormErrorBoundary = require("./FormErrorBoundary");
@@ -436,7 +436,7 @@ var ConfigPanel = /*#__PURE__*/function (_React$Component) {
             noValidate: true,
             onKeyDown: handleKeyDown,
             "data-testid": "extension-config-panel"
-          }), _this2.renderHeader(extensionManifest), /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
+          }), _this2.renderHeader(extensionManifest), /*#__PURE__*/_react.default.createElement(_withPluginState.WithPluginState, {
             plugins: {
               extension: _pluginKey.pluginKey
             },

package/dist/cjs/{ui → plugins/extension/ui}/ConfigPanel/ConfigPanelFieldsLoader.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = FieldsLoader;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _useStateFromPromise3 = require("../../utils/react-hooks/use-state-from-promise");
+var _useStateFromPromise3 = require("./use-state-from-promise");
 var _ConfigPanel = _interopRequireDefault(require("./ConfigPanel"));
 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; }

package/dist/cjs/plugins/index.js

@@ -16,12 +16,6 @@ Object.defineProperty(exports, "beforePrimaryToolbarPlugin", {
     return _beforePrimaryToolbar.default;
   }
 });
-Object.defineProperty(exports, "collabEditPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _collabEdit.default;
-  }
-});
 Object.defineProperty(exports, "extensionPlugin", {
   enumerable: true,
   get: function get() {
@@ -40,7 +34,6 @@ Object.defineProperty(exports, "jiraIssuePlugin", {
     return _jiraIssue.default;
   }
 });
-var _collabEdit = _interopRequireDefault(require("./collab-edit"));
 var _extension = _interopRequireDefault(require("./extension"));
 var _jiraIssue = _interopRequireDefault(require("./jira-issue"));
 var _findReplace = _interopRequireDefault(require("./find-replace"));

package/dist/cjs/presets/universal.js

@@ -48,6 +48,7 @@ var _editorPluginAlignment = require("@atlaskit/editor-plugin-alignment");
 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 _plugins = require("../plugins");
 var _editorPluginFeedbackDialog = require("@atlaskit/editor-plugin-feedback-dialog");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -237,7 +238,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       }]);
     }
     return builder;
-  }).maybeAdd(_plugins.collabEditPlugin, function (plugin, builder) {
+  }).maybeAdd(_editorPluginCollabEdit.collabEditPlugin, function (plugin, builder) {
     if (props.collabEdit || props.collabEditProvider) {
       var _collabEditOptions$EX;
       var collabEditOptions = {

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

@@ -10,7 +10,7 @@ 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/collab-edit/ui"));
+var _ui = _interopRequireDefault(require("../../../plugins/avatar-group/ui"));
 var _FindReplaceToolbarButtonWithState = _interopRequireDefault(require("../../../plugins/find-replace/FindReplaceToolbarButtonWithState"));
 var _BeforePrimaryToolbarWrapper = require("../../../plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper");
 var _Toolbar = _interopRequireDefault(require("../../Toolbar"));
@@ -69,7 +69,8 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
     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
+    editorAnalyticsAPI: editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions,
+    editorAPI: editorAPI
   }), editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? (0, _react2.jsx)(_FindReplaceToolbarButtonWithState.default, {
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,

package/dist/cjs/ui/ContentStyles/index.js

@@ -12,18 +12,18 @@ var _react2 = require("@emotion/react");
 var _styles = require("@atlaskit/editor-common/styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _mention = require("@atlaskit/editor-common/mention");
-var _styles2 = require("../../plugins/collab-edit/styles");
+var _collab = require("@atlaskit/editor-common/collab");
 var _commonStyles = require("@atlaskit/editor-plugin-table/ui/common-styles");
-var _styles3 = require("@atlaskit/editor-plugin-block-type/styles");
-var _styles4 = require("@atlaskit/editor-plugin-paste-options-toolbar/styles");
+var _styles2 = require("@atlaskit/editor-plugin-block-type/styles");
+var _styles3 = require("@atlaskit/editor-plugin-paste-options-toolbar/styles");
 var _codeBlock = require("./code-block");
 var _media = require("./media");
 var _layout = require("./layout");
 var _panel = require("./panel");
-var _styles5 = require("@atlaskit/editor-plugin-placeholder-text/styles");
+var _styles4 = require("@atlaskit/editor-plugin-placeholder-text/styles");
 var _extension = require("./extension");
 var _expand = require("./expand");
-var _styles6 = require("../../plugins/find-replace/styles");
+var _styles5 = require("../../plugins/find-replace/styles");
 var _tasksAndDecisions = require("./tasks-and-decisions");
 var _status = require("./status");
 var _date = require("./date");
@@ -47,7 +47,7 @@ var placeholderStyles = exports.placeholderStyles = (0, _react2.css)(_templateOb
 var contentStyles = function contentStyles(props) {
   return (0, _react2.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    outline: none;\n    font-size: ", "px;\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n  }\n\n  .ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n    pointer-events: none;\n    opacity: 0.7;\n  }\n\n  .ProseMirror-hideselection *::selection {\n    background: transparent;\n  }\n\n  .ProseMirror-hideselection *::-moz-selection {\n    background: transparent;\n  }\n\n  .ProseMirror-selectednode {\n    outline: none;\n  }\n\n  .ProseMirror-selectednode:empty {\n    outline: 2px solid ", ";\n  }\n\n  ", "\n  ", "\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n    box-sizing: border-box;\n  }\n\n  .mediaGroupView-content-wrap ul {\n    padding: 0;\n  }\n\n  /** Needed to override any cleared floats, e.g. image wrapping */\n\n  div.fabric-editor-block-mark[class^='fabric-editor-align'] {\n    clear: none !important;\n  }\n\n  .fabric-editor-align-end {\n    text-align: right;\n  }\n\n  .fabric-editor-align-start {\n    text-align: left;\n  }\n\n  .fabric-editor-align-center {\n    text-align: center;\n  }\n\n  .pm-table-header-content-wrap :not(.fabric-editor-alignment),\n  .pm-table-header-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark,\n  .pm-table-cell-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark {\n    p:first-of-type {\n      margin-top: 0;\n    }\n  }\n\n  .hyperlink-floating-toolbar,\n  .", " {\n    padding: 0;\n  }\n\n  /* Link icon in the Atlaskit package\n     is bigger than the others\n  */\n  .hyperlink-open-link {\n    svg {\n      max-width: 18px;\n    }\n    &[href] {\n      padding: 0 4px;\n    }\n  }\n"])), (0, _editorSharedStyles.editorFontSize)({
     theme: props.theme
-  }), _styles.whitespaceSharedStyles, _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", _styles5.placeholderTextStyles, placeholderStyles, (0, _codeBlock.codeBlockStyles)(), (0, _styles3.blocktypeStyles)(), (0, _styles.codeMarkSharedStyles)(), _styles.textColorStyles, listsStyles, ruleStyles(), _media.mediaStyles, _layout.layoutStyles, _styles2.telepointerStyle, _selection.gapCursorStyles, (0, _commonStyles.tableStyles)(props), (0, _panel.panelStyles)(), mentionsStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _extension.extensionStyles, (0, _expand.expandStyles)(), _styles6.findReplaceStyles, _styles4.textHighlightStyle, _tasksAndDecisions.taskDecisionStyles, _status.statusStyles, (0, _styles.annotationSharedStyles)(), _styles.smartCardStyles, _styles.smartCardSharedStyles, _date.dateStyles, _styles.embedCardStyles, _styles.unsupportedStyles, _styles.resizerStyles, _styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT);
+  }), _styles.whitespaceSharedStyles, _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", _styles4.placeholderTextStyles, placeholderStyles, (0, _codeBlock.codeBlockStyles)(), (0, _styles2.blocktypeStyles)(), (0, _styles.codeMarkSharedStyles)(), _styles.textColorStyles, listsStyles, ruleStyles(), _media.mediaStyles, _layout.layoutStyles, _collab.telepointerStyle, _selection.gapCursorStyles, (0, _commonStyles.tableStyles)(props), (0, _panel.panelStyles)(), mentionsStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _extension.extensionStyles, (0, _expand.expandStyles)(), _styles5.findReplaceStyles, _styles3.textHighlightStyle, _tasksAndDecisions.taskDecisionStyles, _status.statusStyles, (0, _styles.annotationSharedStyles)(), _styles.smartCardStyles, _styles.smartCardSharedStyles, _date.dateStyles, _styles.embedCardStyles, _styles.unsupportedStyles, _styles.resizerStyles, _styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT);
 };
 var createEditorContentStyle = exports.createEditorContentStyle = function createEditorContentStyle(styles) {
   return /*#__PURE__*/_react.default.forwardRef(function (props, ref) {

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