@atlaskit/editor-core 152.0.1 → 153.0.0

package/dist/es2019/plugins/text-formatting/pm-plugins/cursor.js

@@ -28,7 +28,10 @@ export default new Plugin({
       const clickWasAtTextNode = !!(clickNode && clickNode.isText);
       const clickWasAtEndOfAParagraphNode = $click.parent.type === paragraph && $click.textOffset === 0 && $click.nodeAfter === null;
 
-      if (clickWasAtEdgeOfATextNode && clickWasNearACodeMark && clickedDOMElementPosition && (clickWasAtTextNode || clickWasAtEndOfAParagraphNode)) {
+      if (clickWasAtEdgeOfATextNode && clickWasNearACodeMark && clickedDOMElementPosition && ( // if click did not occur at a text node or end of paragraph, then
+      // it was at a directly adjacent non-text node, so we skip this manual
+      // text selection logic to preserve that non-text node's selection
+      clickWasAtTextNode || clickWasAtEndOfAParagraphNode)) {
         const clickWasInsideNodeDOM = event.target.parentNode === view.domAtPos(clickedDOMElementPosition).node && code.isInSet(view.state.doc.resolve(clickedDOMElementPosition).nodeAfter.marks);
         const nodeNextToClick = $click.nodeBefore && code.isInSet($click.nodeBefore.marks) ? $click.nodeAfter : $click.nodeBefore; // Need to set the selection here to allow clicking between [code('text'),{<>},emoji()]
 

package/dist/es2019/plugins/text-formatting/ui/Toolbar/index.js

@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { Separator, Wrapper, ButtonGroup } from '../../../../ui/styles';
 import { useFormattingIcons, useHasFormattingActived } from './hooks/formatting-icons';
 import { useClearIcon } from './hooks/clear-formatting-icon';

package/dist/es2019/plugins/text-formatting/ui/Toolbar/toolbar-messages.js

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

package/dist/es2019/plugins/type-ahead/index.js

@@ -110,9 +110,9 @@ const typeAheadPlugin = options => {
         name: 'typeAhead',
         plugin: ({
           dispatch,
-          reactContext
+          getIntl
         }) => createPlugin({
-          reactContext,
+          getIntl,
           popupMountRef,
           reactDispatch: dispatch,
           typeAheadHandlers: typeAhead,

package/dist/es2019/plugins/type-ahead/pm-plugins/decorations.js

@@ -5,7 +5,7 @@ import { TextSelection } from 'prosemirror-state';
 import { DecorationSet, Decoration } from 'prosemirror-view';
 import { B400 } from '@atlaskit/theme/colors';
 import { keyName as keyNameNormalized } from 'w3c-keyname';
-import { IntlProvider } from 'react-intl';
+import { IntlProvider } from 'react-intl-next';
 import { redo, undo } from 'prosemirror-history';
 import { TYPE_AHEAD_DECORATION_KEY, TYPE_AHEAD_DECORATION_DATA_ATTRIBUTE } from '../constants';
 import { WrapperTypeAhead } from '../ui/WrapperTypeAhead';

package/dist/es2019/plugins/type-ahead/pm-plugins/main.js

@@ -21,12 +21,12 @@ const hasTypeAheadStep = tr => {
 
 export function createPlugin({
   reactDispatch,
-  reactContext,
   popupMountRef,
   createAnalyticsEvent,
-  typeAheadHandlers
+  typeAheadHandlers,
+  getIntl
 }) {
-  const intl = reactContext().intl;
+  const intl = getIntl();
   const {
     createDecorations,
     removeDecorations

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

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

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

@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import UndoIcon from '@atlaskit/icon/glyph/undo';
 import RedoIcon from '@atlaskit/icon/glyph/redo';
 import { undo as undoKeymap, redo as redoKeymap, ToolTipContent } from '../../../../keymaps';

package/dist/es2019/plugins/unsupported-content/index.js

@@ -9,22 +9,23 @@ const createPlugin = ({
   eventDispatcher,
   dispatchAnalyticsEvent
 }) => {
+  const hasIntlContext = true;
   return new Plugin({
     key: pluginKey,
     props: {
       nodeViews: {
         confluenceUnsupportedBlock: ReactNodeView.fromComponent(UnsupportedBlock, portalProviderAPI, eventDispatcher, {
           dispatchAnalyticsEvent
-        }),
+        }, undefined, hasIntlContext),
         confluenceUnsupportedInline: ReactNodeView.fromComponent(UnsupportedInline, portalProviderAPI, eventDispatcher, {
           dispatchAnalyticsEvent
-        }),
+        }, undefined, hasIntlContext),
         unsupportedBlock: ReactNodeView.fromComponent(UnsupportedBlock, portalProviderAPI, eventDispatcher, {
           dispatchAnalyticsEvent
-        }),
+        }, undefined, hasIntlContext),
         unsupportedInline: ReactNodeView.fromComponent(UnsupportedInline, portalProviderAPI, eventDispatcher, {
           dispatchAnalyticsEvent
-        })
+        }, undefined, hasIntlContext)
       }
     }
   });

package/dist/es2019/plugins/view-update-subscription/subscribe/toolbarAndPickerUpdates.js

@@ -60,7 +60,9 @@ export const subscribeToToolbarAndPickerUpdates = (editorView, cb) => {
       const oldToolbarConfig = getOldConfigWithNodeInfo(lastUpdatedState);
       const isToolbarEqual = areToolbarsSame(toolbarConfig, oldToolbarConfig);
 
-      if (dateState !== oldDateState || statusState !== oldStatusState || !isToolbarEqual && !statusState.showStatusPickerAt && !dateState.showDatePickerAt) {
+      if (dateState !== oldDateState || statusState !== oldStatusState || // Sometimes the toolbar changes while a picker is open, we dont care about this
+      // EG A nested status or date node in a table
+      !isToolbarEqual && !statusState.showStatusPickerAt && !dateState.showDatePickerAt) {
         shouldCallback = true;
       }
     } else {

package/dist/es2019/ui/Alignment/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { PureComponent } from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { iconMap } from '../../plugins/alignment/ui/ToolbarAlignment/icon-map';
 import AlignmentButton from './AlignmentButton';
 import { alignmentMessages } from './messages';

package/dist/es2019/ui/Alignment/messages.js

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

package/dist/es2019/ui/Appearance/Comment/Comment.js

@@ -19,7 +19,7 @@ import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
 import WidthEmitter from '../../WidthEmitter';
 import { GRID_GUTTER } from '../../../plugins/grid';
 import classnames from 'classnames';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import messages from '../../../messages';
 import { TableControlsPadding, MainToolbar, MainToolbarCustomComponentsSlot } from './Toolbar';
 const CommentEditorMargin = 14;

package/dist/es2019/ui/ColorPalette/Palettes/paletteMessages.js

@@ -1,4 +1,4 @@
-import { defineMessages } from 'react-intl';
+import { defineMessages } from 'react-intl-next';
 export default defineMessages({
   white: {
     id: 'fabric.theme.white',

package/dist/es2019/ui/ColorPalette/index.js

@@ -2,7 +2,7 @@ import React from 'react';
 import chromatism from 'chromatism';
 import Color from './Color';
 import { ColorPaletteWrapper } from './styles';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { N0, N500 } from '@atlaskit/theme/colors';
 
 /**

package/dist/es2019/ui/ConfigPanel/ConfigPanel.js

@@ -12,7 +12,7 @@ import LoadingState from './LoadingState';
 import Header from './Header';
 import ErrorMessage from './ErrorMessage';
 import { serialize, deserialize, findDuplicateFields } from './transformers';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import ButtonGroup from '@atlaskit/button/button-group';
 import Button from '@atlaskit/button/custom-theme-button';
 import { FormFooter } from '@atlaskit/form';

package/dist/es2019/ui/ConfigPanel/ErrorMessage/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import EmptyState from '@atlaskit/empty-state';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl-next';
 import ErrorImage from './ErrorImage';
 const messages = defineMessages({
   configFailedToLoad: {

package/dist/es2019/ui/ConfigPanel/FieldMessages.js

@@ -1,5 +1,5 @@
 import React, { Fragment, useMemo } from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { ErrorMessage, HelperMessage } from '@atlaskit/form';
 import { ValidationError, FieldTypeError } from './types';
 import { messages } from './messages'; // sidestep XSS issues

package/dist/es2019/ui/ConfigPanel/Fields/CustomSelect.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useState } from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { messages } from '../messages';
 import { Field } from '@atlaskit/form';
 import { AsyncCreatableSelect } from '@atlaskit/select';

package/dist/es2019/ui/ConfigPanel/Fields/Date.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { Field } from '@atlaskit/form';
 import { DatePicker } from '@atlaskit/datetime-picker';
 import FieldMessages from '../FieldMessages';

package/dist/es2019/ui/ConfigPanel/Fields/DateRange.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { Fragment, useState, useEffect, useMemo } from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import styled from 'styled-components';
 import { Field } from '@atlaskit/form';
 import { RadioGroup } from '@atlaskit/radio';

package/dist/es2019/ui/ConfigPanel/Fields/Expand.js

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import styled from 'styled-components';
 import { N40 } from '@atlaskit/theme/colors';
 import ChevronDownIcon from '@atlaskit/icon/glyph/chevron-down';

package/dist/es2019/ui/ConfigPanel/Fields/Fieldset.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import styled from 'styled-components';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import SectionMessage from '@atlaskit/section-message';
 import Button from '@atlaskit/button/custom-theme-button';
 import Select from '@atlaskit/select';

package/dist/es2019/ui/ConfigPanel/Fields/TabGroup.js

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import styled from 'styled-components';
 import Tabs, { Tab, TabList, TabPanel } from '@atlaskit/tabs';
 const TabWrapper = styled.div`

package/dist/es2019/ui/ConfigPanel/FormErrorBoundary.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 SectionMessage from '@atlaskit/section-message';
 import { withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../../plugins/analytics';

package/dist/es2019/ui/ConfigPanel/Header.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import styled from 'styled-components';
 import Loadable from 'react-loadable';
 import Button from '@atlaskit/button/custom-theme-button';

package/dist/es2019/ui/ConfigPanel/NestedForms/RemovableField.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import styled from 'styled-components';
 import { gridSize } from '@atlaskit/theme/constants';
 import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';

package/dist/es2019/ui/ConfigPanel/messages.js

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

package/dist/es2019/ui/ElementBrowser/ModalElementBrowser.js

@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react';
 import styled from 'styled-components';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { DN50, N0 } from '@atlaskit/theme/colors';
 import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';

package/dist/es2019/ui/ElementBrowser/categories.js

@@ -1,4 +1,4 @@
-import { defineMessages } from 'react-intl';
+import { defineMessages } from 'react-intl-next';
 export function getCategories(intl) {
   return [{
     title: intl.formatMessage(messages.all),

package/dist/es2019/ui/ElementBrowser/components/ElementList/EmptyState.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from 'styled-components';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'react-intl-next';
 import Button from '@atlaskit/button';
 import NotFoundIllustration from './NotFoundIllustration';
 export default function EmptyState({

package/dist/es2019/ui/ElementBrowser/components/ElementSearch.js

@@ -1,6 +1,6 @@
 import React, { memo } from 'react';
 import styled from 'styled-components';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import Textfield from '@atlaskit/textfield';
 import SearchIcon from '@atlaskit/icon/glyph/search';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';

package/dist/es2019/ui/ElementBrowser/components/StatelessElementBrowser.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { memo, useState, useCallback, useEffect } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'react-intl-next';
 import styled, { css } from 'styled-components';
 import { withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { fireAnalyticsEvent, EVENT_TYPE, ACTION_SUBJECT, ACTION } from '../../../plugins/analytics';

package/dist/es2019/ui/ElementBrowser/messages.js

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

package/dist/es2019/ui/LinkSearch/LinkSearchListItem.js

@@ -10,7 +10,7 @@ import formatDistance from 'date-fns/formatDistance';
 import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
 import format from 'date-fns/format';
 import { getCorrectAltByIconUrl } from './listItemAlts';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import messages from '../../messages';
 export const Container = styled.li`
   background-color: ${props => props.selected ? N20 : 'transparent'};

package/dist/es2019/ui/LinkSearch/index.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import LinkSearchList from './LinkSearchList';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import withActivityProvider from './withActivityProvider';
 import { INPUT_METHOD } from '../../plugins/analytics';
 const DEFAULT_ITEMS_LIMIT = 5;

package/dist/es2019/ui/LinkSearch/listItemAlts.js

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

package/dist/es2019/ui/MediaAndEmbedsToolbar/toolbar-messages.js

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

package/dist/es2019/ui/PanelTextInput/index.js

@@ -143,7 +143,9 @@ export default class PanelTextInput extends PureComponent {
   }
 
   isUndoEvent(event) {
-    return event.keyCode === KeyZCode && (browser.mac && event.metaKey && !event.shiftKey || !browser.mac && event.ctrlKey);
+    return event.keyCode === KeyZCode && ( // cmd + z for mac
+    browser.mac && event.metaKey && !event.shiftKey || // ctrl + z for non-mac
+    !browser.mac && event.ctrlKey);
   }
 
   isRedoEvent(event) {

package/dist/es2019/ui/PortalProvider/index.js

@@ -8,8 +8,9 @@ import PropTypes from 'prop-types';
 import { default as AnalyticsReactContext } from '@atlaskit/analytics-next-stable-react-context';
 import { EventDispatcher } from '../../event-dispatcher';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../../plugins/analytics/types/enums';
+import { injectIntl, RawIntlProvider } from 'react-intl-next';
 export class PortalProviderAPI extends EventDispatcher {
-  constructor(onAnalyticsEvent, analyticsContext) {
+  constructor(intl, onAnalyticsEvent, analyticsContext) {
     super();
 
     _defineProperty(this, "portals", new Map());
@@ -18,29 +19,52 @@ export class PortalProviderAPI extends EventDispatcher {
       this.context = context;
     });
 
+    this.intl = intl;
     this.onAnalyticsEvent = onAnalyticsEvent;
     this.useAnalyticsContext = analyticsContext;
   }
 
-  render(children, container, hasReactContext = false) {
+  render(children, container, hasAnalyticsContext = false, hasIntlContext = false) {
     this.portals.set(container, {
       children,
-      hasReactContext
+      hasAnalyticsContext,
+      hasIntlContext
     });
-    const wrappedChildren = this.useAnalyticsContext ? /*#__PURE__*/React.createElement(AnalyticsContextWrapper, null, children()) : children();
+    let wrappedChildren = this.useAnalyticsContext ? /*#__PURE__*/React.createElement(AnalyticsContextWrapper, null, children()) : children();
+
+    if (hasIntlContext) {
+      wrappedChildren = /*#__PURE__*/React.createElement(RawIntlProvider, {
+        value: this.intl
+      }, wrappedChildren);
+    }
+
     unstable_renderSubtreeIntoContainer(this.context, wrappedChildren, container);
   } // TODO: until https://product-fabric.atlassian.net/browse/ED-5013
   // we (unfortunately) need to re-render to pass down any updated context.
-  // selectively do this for nodeviews that opt-in via `hasReactContext`
+  // selectively do this for nodeviews that opt-in via `hasAnalyticsContext`
 
 
-  forceUpdate() {
+  forceUpdate({
+    intl
+  }) {
+    this.intl = intl;
     this.portals.forEach((portal, container) => {
-      if (!portal.hasReactContext && !this.useAnalyticsContext) {
+      if (!portal.hasAnalyticsContext && !this.useAnalyticsContext && !portal.hasIntlContext) {
         return;
       }
 
-      const wrappedChildren = this.useAnalyticsContext ? /*#__PURE__*/React.createElement(AnalyticsContextWrapper, null, portal.children()) : portal.children();
+      let wrappedChildren = portal.children();
+
+      if (portal.hasAnalyticsContext && this.useAnalyticsContext) {
+        wrappedChildren = /*#__PURE__*/React.createElement(AnalyticsContextWrapper, null, wrappedChildren);
+      }
+
+      if (portal.hasIntlContext) {
+        wrappedChildren = /*#__PURE__*/React.createElement(RawIntlProvider, {
+          value: this.intl
+        }, wrappedChildren);
+      }
+
       unstable_renderSubtreeIntoContainer(this.context, wrappedChildren, container);
     });
   }
@@ -77,10 +101,11 @@ export class PortalProviderAPI extends EventDispatcher {
   }
 
 }
-export class PortalProvider extends React.Component {
+
+class BasePortalProvider extends React.Component {
   constructor(props) {
     super(props);
-    this.portalProviderAPI = new PortalProviderAPI(props.onAnalyticsEvent, props.useAnalyticsContext);
+    this.portalProviderAPI = new PortalProviderAPI(props.intl, props.onAnalyticsEvent, props.useAnalyticsContext);
   }
 
   render() {
@@ -88,13 +113,16 @@ export class PortalProvider extends React.Component {
   }
 
   componentDidUpdate() {
-    this.portalProviderAPI.forceUpdate();
+    this.portalProviderAPI.forceUpdate({
+      intl: this.props.intl
+    });
   }
 
 }
 
-_defineProperty(PortalProvider, "displayName", 'PortalProvider');
+_defineProperty(BasePortalProvider, "displayName", 'PortalProvider');
 
+export const PortalProvider = injectIntl(BasePortalProvider);
 export class PortalRenderer extends React.Component {
   constructor(props) {
     super(props);

package/dist/es2019/utils/index.js

@@ -278,7 +278,8 @@ export function liftSelection(tr, doc, $from, $to) {
   let endPos = $to.end($to.depth);
   const target = Math.max(0, findAncestorPosition(doc, $from).depth - 1);
   tr.doc.nodesBetween(startPos, endPos, (node, pos) => {
-    if (node.isText || node.isTextblock && !node.textContent // Empty paragraph
+    if (node.isText || // Text node
+    node.isTextblock && !node.textContent // Empty paragraph
     ) {
       const res = tr.doc.resolve(tr.mapping.map(pos));
       const sel = new NodeSelection(res);

package/dist/es2019/version-wrapper.js

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

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "152.0.1",
+	"version": "153.0.0",
 	"sideEffects": false
 }

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

@@ -19,7 +19,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 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';
@@ -247,7 +247,7 @@ export var ErrorBoundaryWithEditorView = /*#__PURE__*/function (_React$Component
   }, {
     key: "render",
     value: function render() {
-      return this.props.children;
+      return /*#__PURE__*/React.createElement(IntlNextErrorBoundary, null, this.props.children);
     }
   }]);
 

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

@@ -20,7 +20,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';
@@ -77,8 +77,7 @@ export function shouldReconfigureState(props, nextProps) {
     return acc || props[curr] !== nextProps[curr];
   }, false);
 }
-
-var ReactEditorView = /*#__PURE__*/function (_React$Component) {
+export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
   _inherits(ReactEditorView, _React$Component);
 
   var _super = _createSuper(ReactEditorView);
@@ -187,7 +186,10 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
         dispatchAnalyticsEvent: _this.dispatchAnalyticsEvent,
         performanceTracking: props.editorProps.performanceTracking,
         transactionTracker: _this.transactionTracker,
-        featureFlags: createFeatureFlagsFromProps(props.editorProps)
+        featureFlags: createFeatureFlagsFromProps(props.editorProps),
+        getIntl: function getIntl() {
+          return _this.props.intl;
+        }
       });
       var newState = state.reconfigure({
         plugins: plugins
@@ -240,7 +242,10 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
         dispatchAnalyticsEvent: _this.dispatchAnalyticsEvent,
         performanceTracking: _this.props.editorProps.performanceTracking,
         transactionTracker: _this.transactionTracker,
-        featureFlags: _this.featureFlags
+        featureFlags: _this.featureFlags,
+        getIntl: function getIntl() {
+          return _this.props.intl;
+        }
       });
       _this.contentTransformer = contentTransformerProvider ? contentTransformerProvider(schema) : undefined;
       var doc;
@@ -802,11 +807,10 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
 }(React.Component);
 
 _defineProperty(ReactEditorView, "contextTypes", {
-  getAtlaskitAnalyticsEventHandlers: PropTypes.func,
-  intl: intlShape
+  getAtlaskitAnalyticsEventHandlers: PropTypes.func
 });
 
-export { ReactEditorView as default };
+export default injectIntl(ReactEditorView);
 
 function getUAPrefix() {
   if (browser.chrome) {

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

@@ -129,7 +129,8 @@ export function createPMPlugins(config) {
       portalProviderAPI: config.portalProviderAPI,
       reactContext: config.reactContext,
       dispatchAnalyticsEvent: config.dispatchAnalyticsEvent,
-      featureFlags: config.featureFlags || {}
+      featureFlags: config.featureFlags || {},
+      getIntl: config.getIntl
     });
   }).filter(function (plugin) {
     return typeof plugin !== 'undefined';

package/dist/esm/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';