@atlaskit/editor-core 152.0.1 → 153.0.0

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

@@ -24,7 +24,10 @@ export default new Plugin({
       var clickWasAtTextNode = !!(clickNode && clickNode.isText);
       var 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)) {
         var clickWasInsideNodeDOM = event.target.parentNode === view.domAtPos(clickedDOMElementPosition).node && code.isInSet(view.state.doc.resolve(clickedDOMElementPosition).nodeAfter.marks);
         var 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/esm/plugins/text-formatting/ui/Toolbar/index.js

@@ -10,7 +10,7 @@ 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; } }
 
 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/esm/plugins/text-formatting/ui/Toolbar/toolbar-messages.js

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

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

@@ -113,9 +113,9 @@ var typeAheadPlugin = function typeAheadPlugin(options) {
         name: 'typeAhead',
         plugin: function plugin(_ref3) {
           var dispatch = _ref3.dispatch,
-              reactContext = _ref3.reactContext;
+              getIntl = _ref3.getIntl;
           return createPlugin({
-            reactContext: reactContext,
+            getIntl: getIntl,
             popupMountRef: popupMountRef,
             reactDispatch: dispatch,
             typeAheadHandlers: typeAhead,

package/dist/esm/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/esm/plugins/type-ahead/pm-plugins/main.js

@@ -23,11 +23,11 @@ var hasTypeAheadStep = function hasTypeAheadStep(tr) {
 
 export function createPlugin(_ref) {
   var reactDispatch = _ref.reactDispatch,
-      reactContext = _ref.reactContext,
       popupMountRef = _ref.popupMountRef,
       createAnalyticsEvent = _ref.createAnalyticsEvent,
-      typeAheadHandlers = _ref.typeAheadHandlers;
-  var intl = reactContext().intl;
+      typeAheadHandlers = _ref.typeAheadHandlers,
+      getIntl = _ref.getIntl;
+  var intl = getIntl();
 
   var _factoryDecorations = factoryDecorations({
     intl: intl,

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

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

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

@@ -9,7 +9,7 @@ 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; } }
 
 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/esm/plugins/unsupported-content/index.js

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

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

@@ -62,7 +62,9 @@ export var subscribeToToolbarAndPickerUpdates = function subscribeToToolbarAndPi
       var oldToolbarConfig = getOldConfigWithNodeInfo(lastUpdatedState);
       var 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/esm/ui/Alignment/index.js

@@ -10,7 +10,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 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/esm/ui/Alignment/messages.js

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

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

@@ -33,7 +33,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';
 var CommentEditorMargin = 14;

package/dist/esm/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/esm/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/esm/ui/ConfigPanel/ConfigPanel.js

@@ -25,7 +25,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/esm/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';
 var messages = defineMessages({
   configFailedToLoad: {

package/dist/esm/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/esm/ui/ConfigPanel/Fields/CustomSelect.js

@@ -3,7 +3,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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/esm/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/esm/ui/ConfigPanel/Fields/DateRange.js

@@ -11,7 +11,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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/esm/ui/ConfigPanel/Fields/Expand.js

@@ -4,7 +4,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 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/esm/ui/ConfigPanel/Fields/Fieldset.js

@@ -21,7 +21,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 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/esm/ui/ConfigPanel/Fields/TabGroup.js

@@ -4,7 +4,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject, _templateObject2;
 
 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';
 var TabWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  // increase specificity to make sure the tab style is overridden\n  &&& [role='tabpanel'][tabindex] {\n    padding: 0;\n  }\n\n  &&& [role='tablist']::before {\n    left: 0;\n    right: 0;\n  }\n"])));

package/dist/esm/ui/ConfigPanel/FormErrorBoundary.js

@@ -13,7 +13,7 @@ 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; } }
 
 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/esm/ui/ConfigPanel/Header.js

@@ -3,7 +3,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
 
 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/esm/ui/ConfigPanel/NestedForms/RemovableField.js

@@ -3,7 +3,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject, _templateObject2;
 
 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/esm/ui/ConfigPanel/messages.js

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

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

@@ -5,7 +5,7 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 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/esm/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/esm/ui/ElementBrowser/components/ElementList/EmptyState.js

@@ -4,7 +4,7 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 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(_ref) {

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

@@ -4,7 +4,7 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 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/esm/ui/ElementBrowser/components/StatelessElementBrowser.js

@@ -5,7 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13;
 
 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/esm/ui/ElementBrowser/messages.js

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

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

@@ -24,7 +24,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 var Container = styled.li(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background-color: ", ";\n  padding: 8px 12px;\n  cursor: pointer;\n  display: flex;\n  margin-top: 0;\n"])), function (props) {
   return props.selected ? N20 : 'transparent';

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

@@ -14,7 +14,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 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';
 var DEFAULT_ITEMS_LIMIT = 5;

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

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

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

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

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

@@ -161,7 +161,9 @@ var PanelTextInput = /*#__PURE__*/function (_PureComponent) {
   }, {
     key: "isUndoEvent",
     value: function 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);
     }
   }, {
     key: "isRedoEvent",

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

@@ -19,12 +19,13 @@ 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 var PortalProviderAPI = /*#__PURE__*/function (_EventDispatcher) {
   _inherits(PortalProviderAPI, _EventDispatcher);
 
   var _super = _createSuper(PortalProviderAPI);
 
-  function PortalProviderAPI(onAnalyticsEvent, analyticsContext) {
+  function PortalProviderAPI(intl, onAnalyticsEvent, analyticsContext) {
     var _this;
 
     _classCallCheck(this, PortalProviderAPI);
@@ -37,6 +38,7 @@ export var PortalProviderAPI = /*#__PURE__*/function (_EventDispatcher) {
       _this.context = context;
     });
 
+    _this.intl = intl;
     _this.onAnalyticsEvent = onAnalyticsEvent;
     _this.useAnalyticsContext = analyticsContext;
     return _this;
@@ -45,28 +47,50 @@ export var PortalProviderAPI = /*#__PURE__*/function (_EventDispatcher) {
   _createClass(PortalProviderAPI, [{
     key: "render",
     value: function render(children, container) {
-      var hasReactContext = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      var hasAnalyticsContext = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      var hasIntlContext = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       this.portals.set(container, {
         children: children,
-        hasReactContext: hasReactContext
+        hasAnalyticsContext: hasAnalyticsContext,
+        hasIntlContext: hasIntlContext
       });
       var 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`
 
   }, {
     key: "forceUpdate",
-    value: function forceUpdate() {
+    value: function forceUpdate(_ref) {
       var _this2 = this;
 
+      var intl = _ref.intl;
+      this.intl = intl;
       this.portals.forEach(function (portal, container) {
-        if (!portal.hasReactContext && !_this2.useAnalyticsContext) {
+        if (!portal.hasAnalyticsContext && !_this2.useAnalyticsContext && !portal.hasIntlContext) {
           return;
         }
 
-        var wrappedChildren = _this2.useAnalyticsContext ? /*#__PURE__*/React.createElement(AnalyticsContextWrapper, null, portal.children()) : portal.children();
+        var wrappedChildren = portal.children();
+
+        if (portal.hasAnalyticsContext && _this2.useAnalyticsContext) {
+          wrappedChildren = /*#__PURE__*/React.createElement(AnalyticsContextWrapper, null, wrappedChildren);
+        }
+
+        if (portal.hasIntlContext) {
+          wrappedChildren = /*#__PURE__*/React.createElement(RawIntlProvider, {
+            value: _this2.intl
+          }, wrappedChildren);
+        }
+
         unstable_renderSubtreeIntoContainer(_this2.context, wrappedChildren, container);
       });
     }
@@ -106,22 +130,23 @@ export var PortalProviderAPI = /*#__PURE__*/function (_EventDispatcher) {
 
   return PortalProviderAPI;
 }(EventDispatcher);
-export var PortalProvider = /*#__PURE__*/function (_React$Component) {
-  _inherits(PortalProvider, _React$Component);
 
-  var _super2 = _createSuper(PortalProvider);
+var BasePortalProvider = /*#__PURE__*/function (_React$Component) {
+  _inherits(BasePortalProvider, _React$Component);
 
-  function PortalProvider(props) {
+  var _super2 = _createSuper(BasePortalProvider);
+
+  function BasePortalProvider(props) {
     var _this3;
 
-    _classCallCheck(this, PortalProvider);
+    _classCallCheck(this, BasePortalProvider);
 
     _this3 = _super2.call(this, props);
-    _this3.portalProviderAPI = new PortalProviderAPI(props.onAnalyticsEvent, props.useAnalyticsContext);
+    _this3.portalProviderAPI = new PortalProviderAPI(props.intl, props.onAnalyticsEvent, props.useAnalyticsContext);
     return _this3;
   }
 
-  _createClass(PortalProvider, [{
+  _createClass(BasePortalProvider, [{
     key: "render",
     value: function render() {
       return this.props.render(this.portalProviderAPI);
@@ -129,15 +154,18 @@ export var PortalProvider = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate() {
-      this.portalProviderAPI.forceUpdate();
+      this.portalProviderAPI.forceUpdate({
+        intl: this.props.intl
+      });
     }
   }]);
 
-  return PortalProvider;
+  return BasePortalProvider;
 }(React.Component);
 
-_defineProperty(PortalProvider, "displayName", 'PortalProvider');
+_defineProperty(BasePortalProvider, "displayName", 'PortalProvider');
 
+export var PortalProvider = injectIntl(BasePortalProvider);
 export var PortalRenderer = /*#__PURE__*/function (_React$Component2) {
   _inherits(PortalRenderer, _React$Component2);
 
@@ -168,10 +196,10 @@ export var PortalRenderer = /*#__PURE__*/function (_React$Component2) {
     key: "render",
     value: function render() {
       var portals = this.state.portals;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, Array.from(portals.entries()).map(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-            container = _ref2[0],
-            children = _ref2[1];
+      return /*#__PURE__*/React.createElement(React.Fragment, null, Array.from(portals.entries()).map(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+            container = _ref3[0],
+            children = _ref3[1];
 
         return /*#__PURE__*/createPortal(children, container);
       }));
@@ -202,10 +230,10 @@ var AnalyticsContextWrapper = (_temp = _class = /*#__PURE__*/function (_React$Co
   _createClass(AnalyticsContextWrapper, [{
     key: "render",
     value: function render() {
-      var _ref3 = this.context.contextAdapter.analytics || {
+      var _ref4 = this.context.contextAdapter.analytics || {
         value: dummyAnalyticsContext
       },
-          value = _ref3.value;
+          value = _ref4.value;
 
       return /*#__PURE__*/React.createElement(AnalyticsReactContext.Provider, {
         value: value

package/dist/esm/utils/index.js

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

package/dist/esm/version-wrapper.js

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

package/dist/esm/version.json

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

package/dist/types/create-editor/ErrorBoundary.d.ts

@@ -35,7 +35,7 @@ export declare class ErrorBoundaryWithEditorView extends React.Component<ErrorBo
     private getExperienceMetadata;
     componentDidCatch(error: Error, errorInfo: AnalyticsErrorBoundaryErrorInfo): void;
     componentDidMount(): Promise<void>;
-    render(): React.ReactNode;
+    render(): JSX.Element;
 }
 declare const _default: React.ComponentType<Pick<ErrorBoundaryProps, "contextIdentifierProvider" | "children" | "createAnalyticsEvent" | "rethrow">>;
 export default _default;