@atlaskit/editor-core 152.0.1 → 153.1.1

package/dist/es2019/plugins/status/nodeviews/status.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 styled from 'styled-components';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common';
 import { Status } from '@atlaskit/status/element';
@@ -93,7 +93,10 @@ export class StatusNodeView extends ReactNodeView {
 
 }
 export default function statusNodeView(portalProviderAPI, eventDispatcher, options) {
-  return (node, view, getPos) => new StatusNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {
-    options
-  }).init();
+  return (node, view, getPos) => {
+    const hasIntlContext = true;
+    return new StatusNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {
+      options
+    }, undefined, undefined, undefined, hasIntlContext).init();
+  };
 }

package/dist/es2019/plugins/table/pm-plugins/table-resizing/utils/resize-state.js

@@ -148,7 +148,8 @@ export const bulkColumnsResize = (resizeState, columnsIndexes, sourceColumnIndex
   });
   let newState = { ...resizeState,
     cols: cols.map(col => {
-      if (columnsIndexes.indexOf(col.index) > -1 || columnsIndexes.indexOf(sourceColumnIndex) > -1 && col.index < colIndex) {
+      if (columnsIndexes.indexOf(col.index) > -1 || // take from prev columns only if dragging the first handle to the left
+      columnsIndexes.indexOf(sourceColumnIndex) > -1 && col.index < colIndex) {
         return col;
       }
 

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

@@ -1,4 +1,4 @@
-import { defineMessages } from 'react-intl';
+import { defineMessages } from 'react-intl-next';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import commonMessages from '../../messages';
 import { clearHoverSelection, hoverTable } from './commands';

package/dist/es2019/plugins/table/ui/FloatingContextualButton/index.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { findDomRefAtPos } from 'prosemirror-utils';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import styled from 'styled-components';
 import { Popup } from '@atlaskit/editor-common';
 import { akEditorFloatingOverlapPanelZIndex, akEditorSmallZIndex } from '@atlaskit/editor-shared-styles';
@@ -49,7 +49,7 @@ export class FloatingContextualButtonInner extends React.Component {
         formatMessage
       },
       dispatchAnalyticsEvent
-    } = this.props; //  : Props & InjectedIntlProps
+    } = this.props; //  : Props & WrappedComponentProps
 
     const domAtPos = editorView.domAtPos.bind(editorView);
     let targetCellRef;

package/dist/es2019/plugins/table/ui/FloatingContextualMenu/ContextualMenu.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { Component } from 'react';
 import { splitCell } from '@atlaskit/editor-tables/utils';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl-next';
 import { addColumnAfter, addRowAfter, backspace, tooltip } from '../../../../keymaps';
 import ColorPalette from '../../../../ui/ColorPalette';
 import cellBackgroundColorPalette from '../../../../ui/ColorPalette/Palettes/cellBackgroundColorPalette';
@@ -61,8 +61,7 @@ export const messages = defineMessages({
     description: `Distribute widths between selected columns`
   }
 });
-
-class ContextualMenu extends Component {
+export class ContextualMenu extends Component {
   constructor(...args) {
     super(...args);
 

package/dist/es2019/plugins/table/ui/FloatingDeleteButton/DeleteButton.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { TableCssClassName as ClassName } from '../../types';
 
 const DeleteButton = ({

package/dist/es2019/plugins/table/ui/FloatingInsertButton/InsertButton.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { tableMarginTop } from '@atlaskit/editor-common';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import Tooltip from '@atlaskit/tooltip';

package/dist/es2019/plugins/table/ui/FloatingInsertButton/index.js

@@ -5,7 +5,7 @@ import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { findDomRefAtPos } from 'prosemirror-utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { Popup } from '@atlaskit/editor-common';
 import { closestElement } from '../../../../utils/dom';
 import { INPUT_METHOD } from '../../../analytics';
@@ -15,8 +15,7 @@ import { checkIfNumberColumnEnabled } from '../../utils';
 import getPopupOptions from './getPopupOptions';
 import InsertButton from './InsertButton';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, CONTENT_COMPONENT } from '../../../analytics/types/enums';
-
-class FloatingInsertButton extends React.Component {
+export class FloatingInsertButton extends React.Component {
   constructor(props) {
     super(props);
     this.insertColumn = this.insertColumn.bind(this);

package/dist/es2019/plugins/table/ui/LayoutButton/index.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import classnames from 'classnames';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import { Popup } from '@atlaskit/editor-common';
 import CollapseIcon from '@atlaskit/icon/glyph/editor/collapse';
 import ExpandIcon from '@atlaskit/icon/glyph/editor/expand';

package/dist/es2019/plugins/table/ui/messages.js

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

package/dist/es2019/plugins/tasks-and-decisions/nodeviews/decisionItem.js

@@ -48,5 +48,6 @@ class Decision extends ReactNodeView {
 }
 
 export const decisionItemNodeView = (portalProviderAPI, eventDispatcher) => (node, view, getPos) => {
-  return new Decision(node, view, getPos, portalProviderAPI, eventDispatcher, {}).init();
+  const hasIntlContext = true;
+  return new Decision(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext).init();
 };

package/dist/es2019/plugins/tasks-and-decisions/nodeviews/taskItem.js

@@ -118,8 +118,9 @@ class Task extends ReactNodeView {
 
 export function taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory) {
   return (node, view, getPos) => {
+    const hasIntlContext = true;
     return new Task(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory
-    }).init();
+    }, undefined, undefined, undefined, hasIntlContext).init();
   };
 }

package/dist/es2019/plugins/tasks-and-decisions/pm-plugins/keymaps.js

@@ -173,7 +173,8 @@ const deleteHandler = filter([isInsideTaskOrDecisionItem, isEmptySelectionAtEnd]
   } // if nested, just unindent
 
 
-  if ($next.node($next.depth - 2).type === taskList || $next.node($next.depth - 1).type === taskList && $next.parent.type === taskList) {
+  if ($next.node($next.depth - 2).type === taskList || // this is for the case when we are on a non-nested item and next one is nested
+  $next.node($next.depth - 1).type === taskList && $next.parent.type === taskList) {
     const tr = liftBlock(state.tr, $next, $next);
 
     if (dispatch && tr) {

package/dist/es2019/plugins/tasks-and-decisions/ui/Decision/index.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl-next';
 import { DecisionItem } from '@atlaskit/task-decision';
 const messages = defineMessages({
   placeholder: {

package/dist/es2019/plugins/tasks-and-decisions/ui/Task/index.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { PureComponent } from 'react';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl-next';
 import { ProviderFactory, WithProviders } from '@atlaskit/editor-common';
 import TaskItemWithProviders from './task-item-with-providers';
 const messages = defineMessages({

package/dist/es2019/plugins/tasks-and-decisions/ui/ToolbarDecision/index.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { PureComponent } from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import DecisionIcon from '@atlaskit/icon/glyph/editor/decision';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
 import { messages } from '../../../insert-block/ui/ToolbarInsertBlock/messages';

package/dist/es2019/plugins/tasks-and-decisions/ui/ToolbarTask/index.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { PureComponent } from 'react';
-import { injectIntl } from 'react-intl';
+import { injectIntl } from 'react-intl-next';
 import TaskIcon from '@atlaskit/icon/glyph/editor/task';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
 import { messages } from '../../../insert-block/ui/ToolbarInsertBlock/messages';

package/dist/es2019/plugins/text-color/ui/ToolbarTextColor/index.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl-next';
 import Button from '@atlaskit/button/custom-theme-button';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
@@ -34,8 +34,7 @@ export const messages = defineMessages({
     description: 'Fewer colors'
   }
 });
-
-class ToolbarTextColor extends React.Component {
+export class ToolbarTextColor extends React.Component {
   constructor(...args) {
     super(...args);
 
@@ -274,5 +273,4 @@ class ToolbarTextColor extends React.Component {
   }
 
 }
-
 export default injectIntl(ToolbarTextColor);

package/dist/es2019/plugins/text-color/utils/disabled.js

@@ -1,4 +1,26 @@
 import { isMarkAllowedInRange, isMarkExcluded } from '../../../utils/mark';
+
+const hasLinkMark = $pos => {
+  const {
+    doc: {
+      type: {
+        schema: {
+          marks: {
+            link: linkMarkType
+          }
+        }
+      }
+    },
+    pos
+  } = $pos;
+
+  if (!linkMarkType) {
+    return false;
+  }
+
+  return $pos.doc.rangeHasMark(pos, Math.min(pos + 1, $pos.doc.content.size), linkMarkType);
+};
+
 export const getDisabledState = state => {
   const {
     textColor
@@ -11,7 +33,7 @@ export const getDisabledState = state => {
       $cursor
     } = state.selection;
 
-    if (empty && !$cursor || isMarkAllowedInRange(state.doc, ranges, textColor) === false) {
+    if (empty && !$cursor || $cursor && hasLinkMark($cursor) || isMarkAllowedInRange(state.doc, ranges, textColor) === false) {
       return true;
     }
 

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/ContentStyles/index.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import styled from 'styled-components';
-import { whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, shadowSharedStyle, inlineNodeSharedStyle, dateSharedStyle, tasksAndDecisionsStyles, annotationSharedStyles, smartCardSharedStyles } from '@atlaskit/editor-common';
+import { whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, shadowSharedStyle, inlineNodeSharedStyle, dateSharedStyle, tasksAndDecisionsStyles, annotationSharedStyles, smartCardSharedStyles, textColorStyles } from '@atlaskit/editor-common/styles';
 import { editorFontSize } from '@atlaskit/editor-shared-styles';
 import { unsupportedStyles } from '../../plugins/unsupported-content/styles';
 import { telepointerStyle } from '../../plugins/collab-edit/styles';
@@ -72,6 +72,7 @@ const ContentStyles = styled.div`
   ${({
   featureFlags
 }) => featureFlags !== null && featureFlags !== void 0 && featureFlags.codeBlockSyntaxHighlighting ? highlightingCodeBlockStyles : codeBlockStyles}
+  ${textColorStyles}
   ${listsStyles}
   ${ruleStyles}
   ${mediaStyles}

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',