@atlaskit/editor-core 161.0.0 → 163.0.0

package/dist/esm/nodeviews/ReactNodeView.js

@@ -3,17 +3,12 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import { startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
-import { analyticsPluginKey } from '../plugins/analytics/plugin-key';
 import { createDispatch } from '../event-dispatcher';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../plugins/analytics';
+import { ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../plugins/analytics';
 import { analyticsEventKey } from '../plugins/analytics/consts';
-import { getParticipantsCount } from '../plugins/collab-edit/get-participants-count';
 import { getFeatureFlags } from '../plugins/feature-flags-context';
 import { ErrorBoundary } from '../ui/ErrorBoundary';
-var DEFAULT_SAMPLING_RATE = 100;
-var DEFAULT_SLOW_THRESHOLD = 7;
-var nodeViewEventsCounter = 0;
+import { getPerformanceOptions, startMeasureReactNodeViewRendered, stopMeasureReactNodeViewRendered } from './getPerformanceOptions';
 
 var ReactNodeView = /*#__PURE__*/function () {
   function ReactNodeView(_node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent) {
@@ -86,27 +81,24 @@ var ReactNodeView = /*#__PURE__*/function () {
 
 
       this.domRef.classList.add("".concat(this.node.type.name, "View-content-wrap"));
-      var _this$performanceOpti = this.performanceOptions,
-          samplingRate = _this$performanceOpti.samplingRate,
-          slowThreshold = _this$performanceOpti.slowThreshold,
-          trackingEnabled = _this$performanceOpti.enabled;
-      trackingEnabled && startMeasure("\uD83E\uDD89".concat(this.node.type.name, "::ReactNodeView"));
+
+      var _getPerformanceOption = getPerformanceOptions(this.view),
+          samplingRate = _getPerformanceOption.samplingRate,
+          slowThreshold = _getPerformanceOption.slowThreshold,
+          trackingEnabled = _getPerformanceOption.trackingEnabled;
+
+      trackingEnabled && startMeasureReactNodeViewRendered({
+        nodeTypeName: this.node.type.name
+      });
       this.renderReactComponent(function () {
         return _this2.render(_this2.reactComponentProps, _this2.handleRef);
       });
-      trackingEnabled && stopMeasure("\uD83E\uDD89".concat(this.node.type.name, "::ReactNodeView"), function (duration) {
-        if (++nodeViewEventsCounter % samplingRate === 0 && duration > slowThreshold) {
-          _this2.dispatchAnalyticsEvent({
-            action: ACTION.REACT_NODEVIEW_RENDERED,
-            actionSubject: ACTION_SUBJECT.EDITOR,
-            eventType: EVENT_TYPE.OPERATIONAL,
-            attributes: {
-              node: _this2.node.type.name,
-              duration: duration,
-              participants: getParticipantsCount(_this2.view.state)
-            }
-          });
-        }
+      trackingEnabled && stopMeasureReactNodeViewRendered({
+        nodeTypeName: this.node.type.name,
+        dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
+        editorState: this.view.state,
+        samplingRate: samplingRate,
+        slowThreshold: slowThreshold
       });
       return this;
     }
@@ -242,19 +234,6 @@ var ReactNodeView = /*#__PURE__*/function () {
       this.domRef = undefined;
       this.contentDOM = undefined;
     }
-  }, {
-    key: "performanceOptions",
-    get: function get() {
-      var pluginState = analyticsPluginKey.getState(this.view.state);
-      var nodeViewTracking = pluginState && pluginState.performanceTracking ? pluginState.performanceTracking.nodeViewTracking || {} : {};
-      var samplingRate = nodeViewTracking.samplingRate || DEFAULT_SAMPLING_RATE;
-      var slowThreshold = nodeViewTracking.slowThreshold || DEFAULT_SLOW_THRESHOLD;
-      return {
-        enabled: !!nodeViewTracking.enabled,
-        samplingRate: samplingRate,
-        slowThreshold: slowThreshold
-      };
-    }
   }], [{
     key: "fromComponent",
     value: function fromComponent(component, portalProviderAPI, eventDispatcher, props, viewShouldUpdate) {

package/dist/esm/nodeviews/getInlineNodeViewProducer.js

@@ -0,0 +1,212 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
+import { ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../plugins/analytics';
+import { analyticsEventKey } from '../plugins/analytics/consts';
+import { ErrorBoundary } from '../ui/ErrorBoundary';
+import { getPerformanceOptions, startMeasureReactNodeViewRendered, stopMeasureReactNodeViewRendered } from './getPerformanceOptions';
+
+function createNodeView(_ref) {
+  var nodeViewParams = _ref.nodeViewParams,
+      pmPluginFactoryParams = _ref.pmPluginFactoryParams,
+      Component = _ref.Component,
+      extraComponentProps = _ref.extraComponentProps;
+  // We set a variable for the current node which is
+  // used for comparisions when doing updates, before being
+  // overwritten to the updated node.
+  var currentNode = nodeViewParams.node; // First we setup the dom element which will be rendered and "tracked" by prosemirror
+  // and also used as a "editor portal" (not react portal) target by the editor
+  // portal provider api, for rendering the Component passed.
+
+  var domRef = document.createElement('span');
+  domRef.contentEditable = 'false';
+  setDomAttrs(nodeViewParams.node, domRef); // @see ED-3790
+  // something gets messed up during mutation processing inside of a
+  // nodeView if DOM structure has nested plain "div"s, it doesn't see the
+  // difference between them and it kills the nodeView
+
+  domRef.classList.add("".concat(nodeViewParams.node.type.name, "View-content-wrap"), "inlineNodeViewOuterContainer"); // This util is shared for tracking rendering, and the ErrorBoundary that
+  // is setup to wrap the Component when rendering
+  // NOTE: This is not a prosemirror dispatch
+
+  function dispatchAnalyticsEvent(payload) {
+    pmPluginFactoryParams.eventDispatcher.emit(analyticsEventKey, {
+      payload: payload
+    });
+  } // This is called to render the Component into domRef which is inside the
+  // prosemirror View.
+  // Internally it uses the unstable_renderSubtreeIntoContainer api to render,
+  // to the passed dom element (domRef) which means it is automatically
+  // "cleaned up" when you do a "re render".
+
+
+  function renderComponent() {
+    pmPluginFactoryParams.portalProviderAPI.render(getPortalChildren({
+      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+      currentNode: currentNode,
+      nodeViewParams: nodeViewParams,
+      Component: Component,
+      extraComponentProps: extraComponentProps
+    }), domRef, false, // node views should be rendered with intl context
+    true);
+  }
+
+  var _getPerformanceOption = getPerformanceOptions(nodeViewParams.view),
+      samplingRate = _getPerformanceOption.samplingRate,
+      slowThreshold = _getPerformanceOption.slowThreshold,
+      trackingEnabled = _getPerformanceOption.trackingEnabled;
+
+  trackingEnabled && startMeasureReactNodeViewRendered({
+    nodeTypeName: currentNode.type.name
+  }); // We render the component while creating the node view
+
+  renderComponent();
+  trackingEnabled && stopMeasureReactNodeViewRendered({
+    nodeTypeName: currentNode.type.name,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    editorState: nodeViewParams.view.state,
+    samplingRate: samplingRate,
+    slowThreshold: slowThreshold
+  }); // https://prosemirror.net/docs/ref/#view.NodeView
+
+  var nodeView = {
+    get dom() {
+      return domRef;
+    },
+
+    update: function update(nextNode, _decorations) {
+      // Let ProseMirror handle the update if node types are different.
+      // This prevents an issue where it was not possible to select the
+      // inline node view then replace it by entering text - the node
+      // view contents would be deleted but the node view itself would
+      // stay in the view and become uneditable.
+      if (currentNode.type !== nextNode.type) {
+        return false;
+      } // On updates, we only set the new attributes if the type, attributes, and marks
+      // have changed on the node.
+      // NOTE: this could mean attrs changes aren't reflected in the dom,
+      // when an attribute key which was previously present is no longer
+      // present.
+      // ie.
+      // -> Original attributes { text: "hello world", color: "red" }
+      // -> Updated attributes { color: "blue" }
+      // in this case, the dom text attribute will not be cleared.
+      //
+      // This may not be an issue with any of our current node schemas.
+
+
+      if (!currentNode.sameMarkup(nextNode)) {
+        setDomAttrs(nextNode, domRef);
+      }
+
+      currentNode = nextNode;
+      renderComponent();
+      return true;
+    },
+    destroy: function destroy() {
+      // When prosemirror destroys the node view, we need to clean up
+      // what we have previously rendered using the editor portal
+      // provider api.
+      pmPluginFactoryParams.portalProviderAPI.remove(domRef); // @ts-expect-error Expect an error as domRef is expected to be
+      // of HTMLSpanElement type however once the node view has
+      // been destroyed no other consumers should still be using it.
+
+      domRef = undefined;
+    }
+  };
+  return nodeView;
+}
+/**
+ * Copies the attributes from a ProseMirror Node to a DOM node.
+ * @param node The Prosemirror Node from which to source the attributes
+ */
+
+
+function setDomAttrs(node, element) {
+  Object.keys(node.attrs || {}).forEach(function (attr) {
+    element.setAttribute(attr, node.attrs[attr]);
+  });
+}
+
+function getPortalChildren(_ref2) {
+  var dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
+      currentNode = _ref2.currentNode,
+      nodeViewParams = _ref2.nodeViewParams,
+      Component = _ref2.Component,
+      extraComponentProps = _ref2.extraComponentProps;
+  return function portalChildren() {
+    var _currentNode$type$nam, _currentNode$type;
+
+    //  All inline nodes use `display: inline` to allow for multi-line
+    //  wrapping. This does produce an issue in Chrome where it is not
+    //  possible to click select the position after the node,
+    //  see: https://product-fabric.atlassian.net/browse/ED-12003
+    //  however this is only a problem for node views that use
+    //  `display: inline-block` somewhere within the Component.
+    //  Looking at the below structure, spans with className
+    //  `inlineNodeViewAddZeroWidthSpace` have pseudo elements that
+    //  add a zero width space which fixes the problem.
+    //  Without the additional zero width space before the Component,
+    //  it is not possible to use the keyboard to range select in Safari.
+    //
+    //  Zero width spaces on either side of the Component also prevent
+    //  the cursor from appearing inside the node view on all browsers.
+    //
+    //  Note:
+    //  In future it is worth considering prohibiting the use of `display: inline-block`
+    //  within inline node view Components however would require a sizable
+    //  refactor. A test suite to catch any instances of this is ideal however
+    //  the refactor required is currently out of scope for https://product-fabric.atlassian.net/browse/ED-14176
+    return /*#__PURE__*/React.createElement(ErrorBoundary, {
+      component: ACTION_SUBJECT.REACT_NODE_VIEW,
+      componentId: (_currentNode$type$nam = currentNode === null || currentNode === void 0 ? void 0 : (_currentNode$type = currentNode.type) === null || _currentNode$type === void 0 ? void 0 : _currentNode$type.name) !== null && _currentNode$type$nam !== void 0 ? _currentNode$type$nam : ACTION_SUBJECT_ID.UNKNOWN_NODE,
+      dispatchAnalyticsEvent: dispatchAnalyticsEvent
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "inlineNodeViewAddZeroWidthSpace"
+    }), ZERO_WIDTH_SPACE, /*#__PURE__*/React.createElement(Component, _extends({
+      view: nodeViewParams.view,
+      getPos: nodeViewParams.getPos,
+      node: currentNode
+    }, extraComponentProps)), /*#__PURE__*/React.createElement("span", {
+      className: "inlineNodeViewAddZeroWidthSpace"
+    }));
+  };
+} // https://prosemirror.net/docs/ref/#view.EditorProps.nodeViews
+// The prosemirror EditorProps has a nodeViews key which has the rough shape:
+// type nodeViews: {
+//   [nodeViewName: string]: (node, editorView, getPos, decorations, innerDecorations) => NodeView
+// }
+// So the value of the keys on the nodeViews object, are a function which should return a NodeView.
+// The following type NodeViewProducer, refers to these functions which return a NodeView.
+//
+// So the above type could also be described as
+// type NodeViewProducer = (node, editorView, getPos, decorations, innerDecorations) => NodeView
+// nodeViews: {
+//   [nodeViewName: string]: NodeViewProducer
+// }
+
+
+// This return of this function is intended to be the value of a key
+// in a ProseMirror nodeViews object.
+export function getInlineNodeViewProducer(_ref3) {
+  var pmPluginFactoryParams = _ref3.pmPluginFactoryParams,
+      Component = _ref3.Component,
+      extraComponentProps = _ref3.extraComponentProps;
+
+  function nodeViewProducer() {
+    var nodeView = createNodeView({
+      nodeViewParams: {
+        node: arguments.length <= 0 ? undefined : arguments[0],
+        view: arguments.length <= 1 ? undefined : arguments[1],
+        getPos: arguments.length <= 2 ? undefined : arguments[2],
+        decorations: arguments.length <= 3 ? undefined : arguments[3]
+      },
+      pmPluginFactoryParams: pmPluginFactoryParams,
+      Component: Component,
+      extraComponentProps: extraComponentProps
+    });
+    return nodeView;
+  }
+
+  return nodeViewProducer;
+}

package/dist/esm/nodeviews/getInlineNodeViewProducer.styles.js

@@ -0,0 +1,9 @@
+import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
+
+var _templateObject;
+
+import { css } from '@emotion/react';
+import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils'; // For reasoning behind styles, see comments in:
+// ./getInlineNodeViewProducer -> portalChildren()
+
+export var InlineNodeViewSharedStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .inlineNodeViewOuterContainer {\n    display: inline;\n  }\n\n  .inlineNodeViewAddZeroWidthSpace {\n    ::after {\n      content: '", "';\n    }\n  }\n"])), ZERO_WIDTH_SPACE);

package/dist/esm/nodeviews/getPerformanceOptions.js

@@ -0,0 +1,45 @@
+import { startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
+import { getParticipantsCount } from '../plugins/collab-edit/get-participants-count';
+import { analyticsPluginKey } from '../plugins/analytics/plugin-key';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../plugins/analytics'; // This was existing logic when converting from ReactNodeView
+// our current sampling for this event is not bound by node.type
+
+export var nodeViewRenderedEventsCounter = 0;
+var DEFAULT_SAMPLING_RATE = 100;
+var DEFAULT_SLOW_THRESHOLD = 7;
+export function getPerformanceOptions(view) {
+  var pluginState = analyticsPluginKey.getState(view.state);
+  var nodeViewTracking = pluginState && pluginState.performanceTracking ? pluginState.performanceTracking.nodeViewTracking || {} : {};
+  var samplingRate = nodeViewTracking.samplingRate || DEFAULT_SAMPLING_RATE;
+  var slowThreshold = nodeViewTracking.slowThreshold || DEFAULT_SLOW_THRESHOLD;
+  return {
+    trackingEnabled: !!nodeViewTracking.enabled,
+    samplingRate: samplingRate,
+    slowThreshold: slowThreshold
+  };
+}
+export function startMeasureReactNodeViewRendered(_ref) {
+  var nodeTypeName = _ref.nodeTypeName;
+  startMeasure("\uD83E\uDD89".concat(nodeTypeName, "::ReactNodeView"));
+}
+export function stopMeasureReactNodeViewRendered(_ref2) {
+  var nodeTypeName = _ref2.nodeTypeName,
+      dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
+      editorState = _ref2.editorState,
+      samplingRate = _ref2.samplingRate,
+      slowThreshold = _ref2.slowThreshold;
+  stopMeasure("\uD83E\uDD89".concat(nodeTypeName, "::ReactNodeView"), function (duration) {
+    if (++nodeViewRenderedEventsCounter % samplingRate === 0 && duration > slowThreshold) {
+      dispatchAnalyticsEvent({
+        action: ACTION.REACT_NODEVIEW_RENDERED,
+        actionSubject: ACTION_SUBJECT.EDITOR,
+        eventType: EVENT_TYPE.OPERATIONAL,
+        attributes: {
+          node: nodeTypeName,
+          duration: duration,
+          participants: getParticipantsCount(editorState)
+        }
+      });
+    }
+  });
+}

package/dist/esm/plugins/alignment/ui/ToolbarAlignment/index.js

@@ -10,13 +10,15 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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 */
 import React from 'react';
+import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ToolbarButton from '../../../../ui/ToolbarButton';
 import Dropdown from '../../../../ui/Dropdown';
 import Alignment from '../../../../ui/Alignment';
-import { ExpandIconWrapper, Separator, TriggerWrapper, Wrapper } from './styles';
+import { expandIconWrapper, separator, triggerWrapper, wrapper } from './styles';
 import { IconMap } from './icon-map';
 import { messages } from './messages';
 export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
@@ -85,7 +87,9 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
           disabled = _this$props.disabled,
           intl = _this$props.intl;
       var title = intl.formatMessage(messages.alignment);
-      return /*#__PURE__*/React.createElement(Wrapper, null, /*#__PURE__*/React.createElement(Dropdown, {
+      return jsx("span", {
+        css: wrapper
+      }, jsx(Dropdown, {
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
         scrollableElement: popupsScrollableElement,
@@ -94,7 +98,7 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         handleEscapeKeydown: this.hide,
         fitWidth: 112,
         fitHeight: 80,
-        trigger: /*#__PURE__*/React.createElement(ToolbarButton, {
+        trigger: jsx(ToolbarButton, {
           spacing: isReducedSpacing ? 'none' : 'default',
           disabled: disabled,
           selected: isOpen,
@@ -104,18 +108,24 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
           "aria-expanded": isOpen,
           "aria-haspopup": true,
           onClick: this.toggleOpen,
-          iconBefore: /*#__PURE__*/React.createElement(TriggerWrapper, null, /*#__PURE__*/React.createElement(IconMap, {
+          iconBefore: jsx("div", {
+            css: triggerWrapper
+          }, jsx(IconMap, {
             alignment: pluginState.align
-          }), /*#__PURE__*/React.createElement(ExpandIconWrapper, null, /*#__PURE__*/React.createElement(ExpandIcon, {
+          }), jsx("span", {
+            css: expandIconWrapper
+          }, jsx(ExpandIcon, {
             label: ""
           })))
         })
-      }, /*#__PURE__*/React.createElement(Alignment, {
+      }, jsx(Alignment, {
         onClick: function onClick(align) {
           return _this2.changeAlignment(align);
         },
         selectedAlignment: pluginState.align
-      })), /*#__PURE__*/React.createElement(Separator, null));
+      })), jsx("span", {
+        css: separator
+      }));
     }
   }]);
 

package/dist/esm/plugins/alignment/ui/ToolbarAlignment/styles.js

@@ -2,9 +2,9 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
-import styled from 'styled-components';
+import { css } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
-export var TriggerWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n"])));
-export var Separator = styled.span(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  background: ", ";\n  width: 1px;\n  height: 24px;\n  display: inline-block;\n  margin: 0 8px;\n"])), N30);
-export var Wrapper = styled.span(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  div {\n    display: flex;\n  }\n"])));
-export var ExpandIconWrapper = styled.span(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  margin-left: -8px;\n"])));
+export var triggerWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n"])));
+export var separator = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  background: ", ";\n  width: 1px;\n  height: 24px;\n  display: inline-block;\n  margin: 0 8px;\n"])), N30);
+export var wrapper = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  div {\n    display: flex;\n  }\n"])));
+export var expandIconWrapper = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  margin-left: -8px;\n"])));

package/dist/esm/plugins/analytics/types/enums.js

@@ -43,6 +43,7 @@ export var ACTION;
   ACTION["RE_RENDERED"] = "reRendered";
   ACTION["ENTERED"] = "entered";
   ACTION["ERRORED"] = "errored";
+  ACTION["EXPOSED"] = "exposed";
   ACTION["FAILED_TO_UNMOUNT"] = "failedToUnmount";
   ACTION["FIND_NEXT_PERFORMED"] = "findNextPerformed";
   ACTION["FIND_PERFORMED"] = "findPerformed";
@@ -158,6 +159,7 @@ export var ACTION_SUBJECT;
   ACTION_SUBJECT["EMBEDS"] = "embeds";
   ACTION_SUBJECT["EXPAND"] = "expand";
   ACTION_SUBJECT["EXTENSION"] = "extension";
+  ACTION_SUBJECT["FEATURE"] = "feature";
   ACTION_SUBJECT["FEEDBACK_DIALOG"] = "feedbackDialog";
   ACTION_SUBJECT["FIND_REPLACE_DIALOG"] = "findReplaceDialog";
   ACTION_SUBJECT["FLOATING_CONTEXTUAL_BUTTON"] = "floatingContextualButton";

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

@@ -1,16 +1,16 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
-var _templateObject;
+var _templateObject, _templateObject2;
 
-import React, { useEffect } from 'react';
+/** @jsx jsx */
+import { useEffect } from 'react';
+import { css, jsx } from '@emotion/react';
 import AvatarsWithPluginState from '../../collab-edit/ui/avatars-with-plugin-state';
-import styled from 'styled-components';
 import { useIntl } from 'react-intl-next';
 import { avatarGroupMessages } from '../messages';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '../../analytics';
-var ToolbarButtonWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-grow: ", ";\n  justify-content: flex-end;\n  align-items: center;\n  & > div {\n    margin-right: 0;\n  }\n"])), function (props) {
-  return props.takeFullWidth ? 1 : 0;
-});
+var toolbarButtonWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: flex-end;\n  flex-grow: 0;\n  align-items: center;\n  & > div {\n    margin-right: 0;\n  }\n"])));
+var toolbarButtonWrapperFullWidth = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", "\n  flex-grow: 1;\n"])), toolbarButtonWrapper);
 
 var AvatarGroupPluginWrapper = function AvatarGroupPluginWrapper(props) {
   var dispatchAnalyticsEvent = props.dispatchAnalyticsEvent;
@@ -27,11 +27,11 @@ var AvatarGroupPluginWrapper = function AvatarGroupPluginWrapper(props) {
       eventType: EVENT_TYPE.UI
     });
   }, [dispatchAnalyticsEvent]);
-  return /*#__PURE__*/React.createElement(ToolbarButtonWrapper, {
+  return jsx("div", {
     "aria-label": intl.formatMessage(avatarGroupMessages.editors),
     "data-testid": 'avatar-group-in-plugin',
-    takeFullWidth: props.takeFullWidth
-  }, /*#__PURE__*/React.createElement(AvatarsWithPluginState, {
+    css: props.takeFullWidth ? toolbarButtonWrapperFullWidth : toolbarButtonWrapper
+  }, jsx(AvatarsWithPluginState, {
     editorView: props.editorView,
     eventDispatcher: props.eventDispatcher,
     inviteToEditComponent: props.collabEdit && props.collabEdit.inviteToEditComponent,

package/dist/esm/plugins/base/index.js

@@ -34,12 +34,31 @@ var basePlugin = function basePlugin(options) {
           var dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
           return filterStepsPlugin(dispatchAnalyticsEvent);
         }
-      }, {
-        name: 'inlineCursorTargetPlugin',
-        plugin: function plugin() {
-          return options && options.allowInlineCursorTarget ? inlineCursorTargetPlugin() : undefined;
-        }
-      }, {
+      }]; // In Chrome, when the selection is placed between adjacent nodes which are not contenteditatble
+      // the cursor appears at the right most point of the parent container.
+      // In Firefox, when the selection is placed between adjacent nodes which are not contenteditatble
+      // no cursor is presented to users.
+      // In Safari, when the selection is placed between adjacent nodes which are not contenteditatble
+      // the cursor appears inside the adjacent nodes.
+      // This plugin workarounds the issues with chrome and firefox by inserting decorations between
+      // inline nodes which are set as contenteditable, and have a zero width space.
+      // At time of development, using this workaround in Safari caused additional issues;
+      // - visual artifacts when moving across inline nodes (ie. using the arrow key to traverse a
+      //   series of inline nodes)
+      // - blocking the right arrow key when at the start of a line from moving to the end of the
+      //   previous line.
+      // As such we only apply the workaround for firefox and chrome.
+
+      if (browser.chrome || browser.gecko) {
+        plugins.push({
+          name: 'inlineCursorTargetPlugin',
+          plugin: function plugin() {
+            return options && options.allowInlineCursorTarget ? inlineCursorTargetPlugin() : undefined;
+          }
+        });
+      }
+
+      plugins.push({
         name: 'focusHandlerPlugin',
         plugin: function plugin(_ref2) {
           var dispatch = _ref2.dispatch;
@@ -98,7 +117,7 @@ var basePlugin = function basePlugin(options) {
               providerFactory = _ref5.providerFactory;
           return betterTypeHistoryPlugin();
         }
-      }];
+      });
 
       if (options && options.allowScrollGutter) {
         plugins.push({