@atlaskit/editor-core 151.2.1 → 153.0.0

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

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import uuid from 'uuid';
 import memoizeOne from 'memoize-one';
-import { sniffUserBrowserExtensions } from '@atlaskit/editor-common';
+import { IntlNextErrorBoundary, sniffUserBrowserExtensions } from '@atlaskit/editor-common';
 import { ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../plugins/analytics';
 import { editorAnalyticsChannel } from '../plugins/analytics/consts';
@@ -150,7 +150,7 @@ export class ErrorBoundaryWithEditorView extends React.Component {
   }
 
   render() {
-    return this.props.children;
+    return /*#__PURE__*/React.createElement(IntlNextErrorBoundary, null, this.props.children);
   }
 
 }

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

@@ -3,7 +3,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { EditorState, Selection } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
-import { intlShape } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { browser, getAnalyticsEventSeverity, getResponseEndTime, measureRender, startMeasure, stopMeasure, shouldForceTracking } from '@atlaskit/editor-common';
 import { ExperienceStore, EditorExperience, RELIABILITY_INTERVAL } from '@atlaskit/editor-common/ufo';
 import { createDispatch, EventDispatcher } from '../event-dispatcher';
@@ -54,7 +54,7 @@ export function shouldReconfigureState(props, nextProps) {
   const properties = ['appearance', 'persistScrollGutter', 'UNSAFE_allowUndoRedoButtons', 'placeholder', ...mobileProperties];
   return properties.reduce((acc, curr) => acc || props[curr] !== nextProps[curr], false);
 }
-export default class ReactEditorView extends React.Component {
+export class ReactEditorView extends React.Component {
   // ProseMirror is instantiated prior to the initial React render cycle,
   // so we allow transactions by default, to avoid discarding the initial one.
   get transactionTracking() {
@@ -167,7 +167,8 @@ export default class ReactEditorView extends React.Component {
         dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
         performanceTracking: props.editorProps.performanceTracking,
         transactionTracker: this.transactionTracker,
-        featureFlags: createFeatureFlagsFromProps(props.editorProps)
+        featureFlags: createFeatureFlagsFromProps(props.editorProps),
+        getIntl: () => this.props.intl
       });
       const newState = state.reconfigure({
         plugins
@@ -219,7 +220,8 @@ export default class ReactEditorView extends React.Component {
         dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
         performanceTracking: this.props.editorProps.performanceTracking,
         transactionTracker: this.transactionTracker,
-        featureFlags: this.featureFlags
+        featureFlags: this.featureFlags,
+        getIntl: () => this.props.intl
       });
       this.contentTransformer = contentTransformerProvider ? contentTransformerProvider(schema) : undefined;
       let doc;
@@ -471,8 +473,27 @@ export default class ReactEditorView extends React.Component {
           transformer: this.contentTransformer
         });
 
+        if (this.props.editorProps.shouldFocus && view.props.editable && view.props.editable(view.state)) {
+          this.focusTimeoutId = handleEditorFocus(view);
+        }
+
         if (this.featureFlags.ufo) {
+          this.experienceStore = ExperienceStore.getInstance(view);
+          this.experienceStore.start(EditorExperience.editSession);
+          this.experienceStore.addMetadata(EditorExperience.editSession, {
+            reliabilityInterval: RELIABILITY_INTERVAL
+          });
           this.reliabilityInterval = window.setInterval(() => {
+            var _this$experienceStore11, _this$experienceStore12;
+
+            (_this$experienceStore11 = this.experienceStore) === null || _this$experienceStore11 === void 0 ? void 0 : (_this$experienceStore12 = _this$experienceStore11.success(EditorExperience.editSession)) === null || _this$experienceStore12 === void 0 ? void 0 : _this$experienceStore12.finally(() => {
+              var _this$experienceStore13, _this$experienceStore14;
+
+              (_this$experienceStore13 = this.experienceStore) === null || _this$experienceStore13 === void 0 ? void 0 : _this$experienceStore13.start(EditorExperience.editSession);
+              (_this$experienceStore14 = this.experienceStore) === null || _this$experienceStore14 === void 0 ? void 0 : _this$experienceStore14.addMetadata(EditorExperience.editSession, {
+                reliabilityInterval: RELIABILITY_INTERVAL
+              });
+            });
             const reliabilityEvent = {
               action: ACTION.UFO_SESSION_COMPLETE,
               actionSubject: ACTION_SUBJECT.EDITOR,
@@ -483,14 +504,6 @@ export default class ReactEditorView extends React.Component {
             };
             this.dispatchAnalyticsEvent(reliabilityEvent);
           }, RELIABILITY_INTERVAL);
-        }
-
-        if (this.props.editorProps.shouldFocus && view.props.editable && view.props.editable(view.state)) {
-          this.focusTimeoutId = handleEditorFocus(view);
-        }
-
-        if (this.featureFlags.ufo) {
-          this.experienceStore = ExperienceStore.getInstance(view);
         } // Force React to re-render so consumers get a reference to the editor view
 
 
@@ -702,10 +715,11 @@ export default class ReactEditorView extends React.Component {
 }
 
 _defineProperty(ReactEditorView, "contextTypes", {
-  getAtlaskitAnalyticsEventHandlers: PropTypes.func,
-  intl: intlShape
+  getAtlaskitAnalyticsEventHandlers: PropTypes.func
 });
 
+export default injectIntl(ReactEditorView);
+
 function getUAPrefix() {
   if (browser.chrome) {
     return 'ua-chrome';

package/dist/es2019/create-editor/create-editor.js

@@ -115,7 +115,8 @@ export function createPMPlugins(config) {
     portalProviderAPI: config.portalProviderAPI,
     reactContext: config.reactContext,
     dispatchAnalyticsEvent: config.dispatchAnalyticsEvent,
-    featureFlags: config.featureFlags || {}
+    featureFlags: config.featureFlags || {},
+    getIntl: config.getIntl
   })).filter(plugin => typeof plugin !== 'undefined').map(instrumentPlugin);
 }
 export function createErrorReporter(errorReporterHandler) {

package/dist/es2019/create-editor/create-plugins-list.js

@@ -1,4 +1,4 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, helpDialogPlugin, imageUploadPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, tablesPlugin, tasksAndDecisionsPlugin, textColorPlugin, cardPlugin, gridPlugin, statusPlugin, alignmentPlugin, indentationPlugin, analyticsPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, contextPanelPlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, codeBidiWarningPlugin } from '../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, imageUploadPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, tablesPlugin, tasksAndDecisionsPlugin, textColorPlugin, cardPlugin, gridPlugin, statusPlugin, alignmentPlugin, indentationPlugin, analyticsPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, contextPanelPlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
 import { isFullPage as fullPageCheck } from '../utils/is-full-page';
 import { GUTTER_SIZE_MOBILE_IN_PX } from '../plugins/base/pm-plugins/scroll-gutter';
 import { createFeatureFlagsFromProps } from '../plugins/feature-flags-context/feature-flags-from-props';
@@ -100,8 +100,6 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
  */
 
 export default function createPluginsList(props, prevProps, createAnalyticsEvent) {
-  var _props$featureFlags;
-
   const appearance = props.appearance;
   const isMobile = appearance === 'mobile';
   const isComment = appearance === 'comment';
@@ -273,8 +271,8 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
   if (props.allowPanel) {
     preset.add([panelPlugin, {
       useLongPressSelection: false,
-      UNSAFE_allowCustomPanel: props.allowPanel.UNSAFE_allowCustomPanel,
-      UNSAFE_allowCustomPanelEdit: props.allowPanel.UNSAFE_allowCustomPanelEdit
+      allowCustomPanel: props.allowPanel.allowCustomPanel,
+      allowCustomPanelEdit: props.allowPanel.allowCustomPanelEdit
     }]);
   }
 
@@ -372,20 +370,38 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
     replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false
   }]);
 
-  if (((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.showAvatarGroupAsPlugin) === true) {
+  const hasBeforePrimaryToolbar = components => {
+    if (components && 'before' in components) {
+      return !!components.before;
+    }
+
+    return false;
+  };
+
+  if (hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
+    preset.add([beforePrimaryToolbarPlugin, {
+      beforePrimaryToolbarComponents: props.primaryToolbarComponents.before
+    }]);
+  }
+
+  if (featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
     preset.add([avatarGroupPlugin, {
-      collabEdit: props.collabEdit
+      collabEdit: props.collabEdit,
+      takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents)
     }]);
   }
 
   if (props.allowFindReplace) {
-    var _props$featureFlags2;
-
     preset.add([findReplacePlugin, {
-      takeFullWidth: !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.showAvatarGroupAsPlugin) === false
+      takeFullWidth: !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
+      twoLineEditorToolbar: !!featureFlags.twoLineEditorToolbar
     }]);
   }
 
+  if (props.UNSAFE_allowFragmentMark) {
+    preset.add(fragmentMarkPlugin);
+  }
+
   if (featureFlags.enableViewUpdateSubscription) {
     preset.add([viewUpdateSubscriptionPlugin]);
   }

package/dist/es2019/create-editor/index.js

@@ -1,3 +1,3 @@
-export { default as ReactEditorView } from './ReactEditorView';
+export { default as ReactEditorView, ReactEditorView as BaseReactEditorView } from './ReactEditorView';
 export { default as getUiComponent } from './get-ui-component';
 export { default as createPluginsList, getDefaultPresetOptionsFromEditorProps } from './create-plugins-list';

package/dist/es2019/editor.js

@@ -2,11 +2,10 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import { intlShape, IntlProvider } from 'react-intl';
 import memoizeOne from 'memoize-one';
 import uuid from 'uuid/v4';
 import { name, version } from './version-wrapper';
-import { ProviderFactory, BaseTheme, getAnalyticsAppearance, WithCreateAnalyticsEvent, startMeasure, stopMeasure, clearMeasure, measureTTI, getTTISeverity, combineExtensionProviders, WidthProvider } from '@atlaskit/editor-common';
+import { ProviderFactory, BaseTheme, getAnalyticsAppearance, WithCreateAnalyticsEvent, startMeasure, stopMeasure, clearMeasure, measureTTI, getTTISeverity, combineExtensionProviders, WidthProvider, LegacyToNextIntlProvider, IntlLegacyFallbackProvider } from '@atlaskit/editor-common';
 import { EditorExperience, ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { akEditorFullPageDefaultFontSize } from '@atlaskit/editor-shared-styles';
 import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
@@ -140,7 +139,10 @@ export default class Editor extends React.Component {
       quickInsert
     } = this.props;
 
-    if (extensionProviders && extensionProviders !== prevProps.extensionProviders || quickInsert && quickInsert !== prevProps.quickInsert) {
+    if (extensionProviders && extensionProviders !== prevProps.extensionProviders || // Though this will introduce some performance regression related to quick insert
+    // loading but we can remove it soon when Forge will move to new API.
+    // quickInsert={Promise.resolve(consumerQuickInsert)} is one of the main reason behind this performance issue.
+    quickInsert && quickInsert !== prevProps.quickInsert) {
       const extensionProvider = this.prepareExtensionProvider(extensionProviders);
       const quickInsertProvider = this.prepareQuickInsertProvider(extensionProvider, quickInsert);
       this.setState({
@@ -498,9 +500,7 @@ export default class Editor extends React.Component {
         }))
       }))))))
     }));
-    return this.context.intl ? editor : /*#__PURE__*/React.createElement(IntlProvider, {
-      locale: "en"
-    }, editor);
+    return /*#__PURE__*/React.createElement(LegacyToNextIntlProvider, null, /*#__PURE__*/React.createElement(IntlLegacyFallbackProvider, null, editor));
   }
 
 }
@@ -515,6 +515,5 @@ _defineProperty(Editor, "defaultProps", {
 });
 
 _defineProperty(Editor, "contextTypes", {
-  editorActions: PropTypes.object,
-  intl: intlShape
+  editorActions: PropTypes.object
 });

package/dist/es2019/index.js

@@ -45,7 +45,7 @@ export { setKeyboardHeight, setMobilePaddingTop } from './plugins/mobile-dimensi
 
 export { setTextSelection, dedupe, getNodesCount, measurements, hasVisibleContent } from './utils';
 export { getListCommands } from './utils/list-commands';
-export { ReactEditorView } from './create-editor';
+export { ReactEditorView, BaseReactEditorView } from './create-editor';
 export { getDefaultPresetOptionsFromEditorProps } from './create-editor';
 export { default as EditorActions } from './actions'; // Re-export from provider factory to not cause a breaking change
 

package/dist/es2019/labs/next/Editor.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import { IntlProvider } from 'react-intl';
+import { IntlProvider } from 'react-intl-next';
 import { PortalRenderer, PortalProvider } from '../../ui/PortalProvider';
 import { EditorInternal } from './internal/components/EditorInternal';
 import { usePresetContext, PresetProvider } from './internal/context/preset-context';

package/dist/es2019/labs/next/internal/components/EditorInternal.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { intlShape } from 'react-intl';
 import PropTypes from 'prop-types';
+import { injectIntl } from 'react-intl-next';
 import { WidthProvider } from '@atlaskit/editor-common';
 import { useProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import EditorContext from '../../../../ui/EditorContext';
@@ -8,7 +8,8 @@ import EditorActions from '../../../../actions';
 import { EditorSharedConfigProvider } from '../context/shared-config';
 import { useEditor } from '../hooks/use-editor';
 import { EditorContentProvider } from './EditorContent';
-export function EditorInternal({
+
+function BaseEditorInternal({
   onAnalyticsEvent,
   disabled,
   transformer,
@@ -21,7 +22,8 @@ export function EditorInternal({
   onChange,
   onDestroy,
   onMount,
-  children
+  children,
+  intl
 }, context) {
   // Need to memoize editor actions otherwise in case when editor is not
   // wrapped with EditorContext every prop change triggers all hooks
@@ -30,6 +32,9 @@ export function EditorInternal({
   const editorActions = React.useMemo(() => maybeEditorActions || new EditorActions(), [maybeEditorActions]); // Get the provider factory from context
 
   const providerFactory = useProviderFactory();
+
+  const getIntl = () => intl;
+
   const [editorSharedConfig, mountEditor] = useEditor({
     context,
     editorActions,
@@ -46,7 +51,8 @@ export function EditorInternal({
     onDestroy,
     onMount,
     providerFactory,
-    featureFlags: {}
+    featureFlags: {},
+    getIntl
   });
   return /*#__PURE__*/React.createElement(WidthProvider, null, /*#__PURE__*/React.createElement(EditorContext, {
     editorActions: editorActions
@@ -56,7 +62,8 @@ export function EditorInternal({
     value: mountEditor
   }, children))));
 }
-EditorInternal.contextTypes = {
-  editorActions: PropTypes.object,
-  intl: intlShape
-};
+
+BaseEditorInternal.contextTypes = {
+  editorActions: PropTypes.object
+};
+export const EditorInternal = injectIntl(BaseEditorInternal);

package/dist/es2019/labs/next/internal/hooks/use-editor/create-editor.js

@@ -21,7 +21,8 @@ export function createEditor({
   onChange,
   onDestroy,
   onMount,
-  featureFlags
+  featureFlags,
+  getIntl
 }) {
   if (!ref) {
     return null;
@@ -45,7 +46,8 @@ export function createEditor({
     // TODO: ED-8133 Need to make types more generic otherwise it's not extensible.
     dispatchAnalyticsEvent: onAnalyticsEvent,
     performanceTracking: {},
-    featureFlags
+    featureFlags,
+    getIntl
   });
   const state = EditorState.create({
     schema,

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

@@ -26,8 +26,7 @@ export function useCXHTMLPreset({
     }
   }]);
   preset.add([panelPlugin, {
-    UNSAFE_allowCustomPanel: true,
-    UNSAFE_allowCustomPanelEdit: true
+    allowCustomPanel: true
   }]);
   preset.add(listPlugin);
   preset.add(textColorPlugin);

package/dist/es2019/messages.js

@@ -1,5 +1,5 @@
 // Common Translations will live here
-import { defineMessages } from 'react-intl';
+import { defineMessages } from 'react-intl-next';
 import { linkMessages } from '@atlaskit/editor-common/messages';
 import { messages as statusMessages } from './plugins/status/nodeviews/messages';
 import { messages as dateMessages } from './plugins/date/nodeviews/messages';

package/dist/es2019/nodeviews/ReactNodeView.js

@@ -13,7 +13,7 @@ const DEFAULT_SAMPLING_RATE = 100;
 const DEFAULT_SLOW_THRESHOLD = 7;
 let nodeViewEventsCounter = 0;
 export default class ReactNodeView {
-  constructor(_node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasContext = false, viewShouldUpdate) {
+  constructor(_node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasAnalyticsContext = false, viewShouldUpdate, hasIntlContext = false) {
     _defineProperty(this, "handleRef", node => this._handleRef(node));
 
     _defineProperty(this, "dispatchAnalyticsEvent", payload => {
@@ -31,9 +31,10 @@ export default class ReactNodeView {
     this.portalProviderAPI = portalProviderAPI;
     this.reactComponentProps = reactComponentProps || {};
     this.reactComponent = reactComponent;
-    this.hasContext = hasContext;
+    this.hasAnalyticsContext = hasAnalyticsContext;
     this._viewShouldUpdate = viewShouldUpdate;
     this.eventDispatcher = eventDispatcher;
+    this.hasIntlContext = hasIntlContext;
   }
   /**
    * This method exists to move initialization logic out of the constructor,
@@ -107,7 +108,7 @@ export default class ReactNodeView {
       }, component());
     };
 
-    this.portalProviderAPI.render(componentWithErrorBoundary, this.domRef, this.hasContext);
+    this.portalProviderAPI.render(componentWithErrorBoundary, this.domRef, this.hasAnalyticsContext, this.hasIntlContext);
   }
 
   createDomRef(options) {
@@ -148,7 +149,7 @@ export default class ReactNodeView {
     }, props)) : null;
   }
 
-  update(node, _decorations, validUpdate = () => true) {
+  update(node, _decorations, _innerDecorations, validUpdate = () => true) {
     // @see https://github.com/ProseMirror/prosemirror/issues/648
     const isValidUpdate = this.node.type === node.type && validUpdate(this.node, node);
 
@@ -217,8 +218,8 @@ export default class ReactNodeView {
     };
   }
 
-  static fromComponent(component, portalProviderAPI, eventDispatcher, props, viewShouldUpdate) {
-    return (node, view, getPos) => new ReactNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, props, component, false, viewShouldUpdate).init();
+  static fromComponent(component, portalProviderAPI, eventDispatcher, props, viewShouldUpdate, hasIntlContext = false) {
+    return (node, view, getPos) => new ReactNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, props, component, false, viewShouldUpdate, hasIntlContext).init();
   }
 
 }

package/dist/es2019/nodeviews/SelectionBasedNodeView.js

@@ -27,8 +27,8 @@ import ReactNodeView from './ReactNodeView';
  */
 
 export class SelectionBasedNodeView extends ReactNodeView {
-  constructor(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasContext = false, viewShouldUpdate) {
-    super(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasContext, viewShouldUpdate);
+  constructor(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasContext = false, viewShouldUpdate, hasIntlContext = false) {
+    super(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasContext, viewShouldUpdate, hasIntlContext);
 
     _defineProperty(this, "isNodeInsideSelection", (from, to, pos, posEnd) => {
       ({
@@ -64,7 +64,8 @@ export class SelectionBasedNodeView extends ReactNodeView {
             to
           }
         } = this.view.state;
-        return selection.node === this.node || this.pos === from && this.posEnd === to && selection.node.eq(this.node);
+        return selection.node === this.node || // If nodes are not the same object, we check if they are referring to the same document node
+        this.pos === from && this.posEnd === to && selection.node.eq(this.node);
       }
 
       return false;
@@ -80,6 +81,17 @@ export class SelectionBasedNodeView extends ReactNodeView {
       return this.isSelectedNode(this.view.state.selection) || this.isSelectionInsideNode(from, to);
     });
 
+    _defineProperty(this, "nodeInsideSelection", () => {
+      const {
+        selection
+      } = this.view.state;
+      const {
+        from,
+        to
+      } = selection;
+      return this.isSelectedNode(selection) || this.isNodeInsideSelection(from, to);
+    });
+
     _defineProperty(this, "onSelectionChange", () => {
       this.update(this.node, []);
     });

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

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ToolbarButton from '../../../../ui/ToolbarButton';
 import Dropdown from '../../../../ui/Dropdown';
@@ -8,8 +8,7 @@ import Alignment from '../../../../ui/Alignment';
 import { ExpandIconWrapper, Separator, TriggerWrapper, Wrapper } from './styles';
 import { iconMap } from './icon-map';
 import { messages } from './messages';
-
-class AlignmentToolbar extends React.Component {
+export class AlignmentToolbar extends React.Component {
   constructor(...args) {
     super(...args);
 

package/dist/es2019/plugins/alignment/ui/ToolbarAlignment/messages.js

@@ -1,4 +1,4 @@
-import { defineMessages } from 'react-intl';
+import { defineMessages } from 'react-intl-next';
 export const messages = defineMessages({
   alignment: {
     id: 'fabric.editor.alignment',

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

@@ -55,6 +55,7 @@ export let ACTION;
   ACTION["INITIALISED"] = "initialised";
   ACTION["INPUT_PERF_SAMPLING"] = "inputPerfSampling";
   ACTION["INSERTED"] = "inserted";
+  ACTION["INVALID_DOCUMENT_ENCOUNTERED"] = "invalidDocumentEncountered";
   ACTION["INVOKED"] = "invoked";
   ACTION["LANGUAGE_SELECTED"] = "languageSelected";
   ACTION["LIST_ITEM_JOINED"] = "listItemJoined";

package/dist/es2019/plugins/annotation/toolbar.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { defineMessages } from 'react-intl';
+import { defineMessages } from 'react-intl-next';
 import CommentIcon from '@atlaskit/icon/glyph/comment'; // AFP-2532 TODO: Fix automatic suppressions below
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
 

package/dist/es2019/plugins/annotation/utils.js

@@ -254,7 +254,7 @@ export const isSelectionValid = state => {
     return AnnotationSelectionType.DISABLED;
   }
 
-  if (disallowOnWhitespace && hasWhitespaceNode(selection)) {
+  if (disallowOnWhitespace && hasInvalidWhitespaceNode(selection)) {
     return AnnotationSelectionType.INVALID;
   }
 
@@ -307,16 +307,27 @@ function isEmptyTextSelection(selection, schema) {
  */
 
 
-export function hasWhitespaceNode(selection) {
-  let foundWhitespace = false;
-  selection.content().content.descendants(node => {
+export function hasInvalidWhitespaceNode(selection) {
+  let foundInvalidWhitespace = false;
+  const content = selection.content().content;
+  content.descendants(node => {
     if (node.textContent.trim() === '') {
-      foundWhitespace = true;
+      // Trailing new lines do not result in the annotation spanning into
+      // the trailing new line so can be ignored when looking for invalid
+      // whitespace nodes.
+      const nodeIsTrailingNewLine = // it is the final node
+      node.eq(content.lastChild) && // and there are multiple nodes
+      !node.eq(content.firstChild) && // and it is a paragraph node
+      node.type.name === 'paragraph';
+
+      if (!nodeIsTrailingNewLine) {
+        foundInvalidWhitespace = true;
+      }
     }
 
-    return !foundWhitespace;
+    return !foundInvalidWhitespace;
   });
-  return foundWhitespace;
+  return foundInvalidWhitespace;
 }
 /*
  * verifies if node contains annotation mark

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

@@ -18,7 +18,8 @@ const avatarGroup = props => ({
       dispatchAnalyticsEvent: dispatchAnalyticsEvent,
       editorView: editorView,
       eventDispatcher: eventDispatcher,
-      collabEdit: props.collabEdit
+      collabEdit: props.collabEdit,
+      takeFullWidth: props.takeFullWidth
     });
   }
 

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

@@ -4,7 +4,7 @@ import styled from 'styled-components';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '../../analytics';
 const ToolbarButtonWrapper = styled.div`
   display: flex;
-  flex-grow: 1;
+  flex-grow: ${props => props.takeFullWidth ? 1 : 0};
   justify-content: flex-end;
   align-items: center;
   & > div {
@@ -29,7 +29,8 @@ export const AvatarGroupPluginWrapper = props => {
   }, [dispatchAnalyticsEvent]);
   return /*#__PURE__*/React.createElement(ToolbarButtonWrapper, {
     "aria-label": "Editors",
-    "data-testid": 'avatar-group-in-plugin'
+    "data-testid": 'avatar-group-in-plugin',
+    takeFullWidth: props.takeFullWidth
   }, /*#__PURE__*/React.createElement(AvatarsWithPluginState, {
     editorView: props.editorView,
     eventDispatcher: props.eventDispatcher,

package/dist/es2019/plugins/before-primaryToolbar/index.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import { BeforePrimaryToolbarWrapper } from './ui/BeforePrimaryToolbarWrapper';
+
+const beforePrimaryToolbar = props => ({
+  name: 'beforePrimaryToolbar',
+
+  primaryToolbarComponent() {
+    return /*#__PURE__*/React.createElement(BeforePrimaryToolbarWrapper, {
+      beforePrimaryToolbarComponents: props.beforePrimaryToolbarComponents
+    });
+  }
+
+});
+
+export default beforePrimaryToolbar;

package/dist/es2019/plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper.js

@@ -0,0 +1,12 @@
+import React from 'react';
+import styled from 'styled-components';
+export const BeforePrimaryToolbarPluginWrapper = styled.div`
+  display: flex;
+  margin-right: 8px;
+  flex-grow: 1;
+  justify-content: flex-end;
+  align-items: center;
+`;
+export const BeforePrimaryToolbarWrapper = props => /*#__PURE__*/React.createElement(BeforePrimaryToolbarPluginWrapper, {
+  "data-testid": 'before-primary-toolbar-components-plugin'
+}, props.beforePrimaryToolbarComponents);

package/dist/es2019/plugins/block-type/messages.js

@@ -1,4 +1,4 @@
-import { defineMessages } from 'react-intl';
+import { defineMessages } from 'react-intl-next';
 export const messages = defineMessages({
   normal: {
     id: 'fabric.editor.normal',

package/dist/es2019/plugins/block-type/ui/ToolbarBlockType/blocktype-button.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FormattedMessage, defineMessages } from 'react-intl';
+import { FormattedMessage, defineMessages } from 'react-intl-next';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import TextStyleIcon from '@atlaskit/icon/glyph/editor/text-style';
 import ToolbarButton from '../../../../ui/ToolbarButton';

package/dist/es2019/plugins/block-type/ui/ToolbarBlockType/index.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 import DropdownMenu from '../../../../ui/DropdownMenu';
 import { Separator, Wrapper, MenuWrapper } from '../../../../ui/styles';

package/dist/es2019/plugins/block-type/ui/ToolbarBlockType/toolbar-messages.js

@@ -1,4 +1,4 @@
-import { defineMessages } from 'react-intl';
+import { defineMessages } from 'react-intl-next';
 export const toolbarMessages = defineMessages({
   textStyles: {
     id: 'fabric.editor.textStyles',

package/dist/es2019/plugins/breakout/ui/LayoutButton.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import * as colors from '@atlaskit/theme/colors';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { findParentDomRefOfType, findDomRefAtPos } from 'prosemirror-utils';
 import { Popup } from '@atlaskit/editor-common';
 import CollapseIcon from '@atlaskit/icon/glyph/editor/collapse';