@atlaskit/editor-core 151.3.0 → 153.0.1

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

@@ -146,6 +146,7 @@ export default class Resizer extends React.Component {
   render() {
     const handleStyles = {};
     const handles = {};
+    const handleComponent = {};
     const {
       innerPadding = 0,
       width,
@@ -154,7 +155,8 @@ export default class Resizer extends React.Component {
       layout,
       enable,
       children,
-      ratio
+      ratio,
+      handleComponentFunc
     } = this.props;
     const {
       isResizing
@@ -167,6 +169,11 @@ export default class Resizer extends React.Component {
         zIndex: akRichMediaResizeZIndex,
         pointerEvents: 'auto'
       };
+      const sideHandleComponent = handleComponentFunc && handleComponentFunc(side);
+
+      if (sideHandleComponent) {
+        handleComponent[side] = sideHandleComponent;
+      }
     });
     const className = classnames(richMediaClassName, `image-${layout}`, this.props.className, {
       'is-resizing': isResizing,
@@ -199,6 +206,7 @@ export default class Resizer extends React.Component {
       handleClasses: handles,
       handleStyles: handleStyles,
       handleWrapperStyle: handleWrapperStyle,
+      handleComponent: handleComponent,
       enable: enable,
       onResize: this.handleResize,
       onResizeStop: this.handleResizeStop,

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 = "151.3.0";
+export const version = "153.0.1";
 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": "151.3.0",
+	"version": "153.0.1",
 	"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;
@@ -510,8 +515,30 @@ var ReactEditorView = /*#__PURE__*/function (_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(function () {
+            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(function () {
+              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
+              });
+            });
             var reliabilityEvent = {
               action: ACTION.UFO_SESSION_COMPLETE,
               actionSubject: ACTION_SUBJECT.EDITOR,
@@ -523,14 +550,6 @@ var ReactEditorView = /*#__PURE__*/function (_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
 
 
@@ -788,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/create-plugins-list.js

@@ -5,7 +5,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 { 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';
@@ -109,8 +109,6 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
  */
 
 export default function createPluginsList(props, prevProps, createAnalyticsEvent) {
-  var _props$featureFlags;
-
   var appearance = props.appearance;
   var isMobile = appearance === 'mobile';
   var isComment = appearance === 'comment';
@@ -278,8 +276,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
     }]);
   }
 
@@ -376,20 +374,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) {
+  var hasBeforePrimaryToolbar = function 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/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';

package/dist/esm/editor.js

@@ -22,11 +22,10 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 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';
@@ -178,7 +177,10 @@ var Editor = /*#__PURE__*/function (_React$Component) {
           extensionProviders = _this$props.extensionProviders,
           quickInsert = _this$props.quickInsert;
 
-      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) {
         var extensionProvider = this.prepareExtensionProvider(extensionProviders);
         var quickInsertProvider = this.prepareQuickInsertProvider(extensionProvider, quickInsert);
         this.setState({
@@ -597,9 +599,7 @@ var Editor = /*#__PURE__*/function (_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));
     }
   }]);
 
@@ -616,8 +616,7 @@ _defineProperty(Editor, "defaultProps", {
 });
 
 _defineProperty(Editor, "contextTypes", {
-  editorActions: PropTypes.object,
-  intl: intlShape
+  editorActions: PropTypes.object
 });
 
 export { Editor as default };

package/dist/esm/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/esm/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/esm/labs/next/internal/components/EditorInternal.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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';
@@ -9,7 +9,8 @@ import EditorActions from '../../../../actions';
 import { EditorSharedConfigProvider } from '../context/shared-config';
 import { useEditor } from '../hooks/use-editor';
 import { EditorContentProvider } from './EditorContent';
-export function EditorInternal(_ref, context) {
+
+function BaseEditorInternal(_ref, context) {
   var onAnalyticsEvent = _ref.onAnalyticsEvent,
       disabled = _ref.disabled,
       transformer = _ref.transformer,
@@ -22,7 +23,8 @@ export function EditorInternal(_ref, context) {
       onChange = _ref.onChange,
       onDestroy = _ref.onDestroy,
       onMount = _ref.onMount,
-      children = _ref.children;
+      children = _ref.children,
+      intl = _ref.intl;
   // Need to memoize editor actions otherwise in case when editor is not
   // wrapped with EditorContext every prop change triggers all hooks
   // that depend on editorActions
@@ -33,6 +35,10 @@ export function EditorInternal(_ref, context) {
 
   var providerFactory = useProviderFactory();
 
+  var getIntl = function getIntl() {
+    return intl;
+  };
+
   var _useEditor = useEditor({
     context: context,
     editorActions: editorActions,
@@ -49,7 +55,8 @@ export function EditorInternal(_ref, context) {
     onDestroy: onDestroy,
     onMount: onMount,
     providerFactory: providerFactory,
-    featureFlags: {}
+    featureFlags: {},
+    getIntl: getIntl
   }),
       _useEditor2 = _slicedToArray(_useEditor, 2),
       editorSharedConfig = _useEditor2[0],
@@ -63,7 +70,8 @@ export function EditorInternal(_ref, context) {
     value: mountEditor
   }, children))));
 }
-EditorInternal.contextTypes = {
-  editorActions: PropTypes.object,
-  intl: intlShape
-};
+
+BaseEditorInternal.contextTypes = {
+  editorActions: PropTypes.object
+};
+export var EditorInternal = injectIntl(BaseEditorInternal);

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

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

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

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

package/dist/esm/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/esm/nodeviews/ReactNodeView.js

@@ -19,8 +19,9 @@ var ReactNodeView = /*#__PURE__*/function () {
   function ReactNodeView(_node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent) {
     var _this = this;
 
-    var hasContext = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
+    var hasAnalyticsContext = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
     var viewShouldUpdate = arguments.length > 8 ? arguments[8] : undefined;
+    var hasIntlContext = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
 
     _classCallCheck(this, ReactNodeView);
 
@@ -43,9 +44,10 @@ var ReactNodeView = /*#__PURE__*/function () {
     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,
@@ -127,7 +129,7 @@ var ReactNodeView = /*#__PURE__*/function () {
         }, component());
       };
 
-      this.portalProviderAPI.render(componentWithErrorBoundary, this.domRef, this.hasContext);
+      this.portalProviderAPI.render(componentWithErrorBoundary, this.domRef, this.hasAnalyticsContext, this.hasIntlContext);
     }
   }, {
     key: "createDomRef",
@@ -173,10 +175,10 @@ var ReactNodeView = /*#__PURE__*/function () {
     }
   }, {
     key: "update",
-    value: function update(node, _decorations) {
+    value: function update(node, _decorations, _innerDecorations) {
       var _this4 = this;
 
-      var validUpdate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {
+      var validUpdate = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : function () {
         return true;
       };
       // @see https://github.com/ProseMirror/prosemirror/issues/648
@@ -256,8 +258,9 @@ var ReactNodeView = /*#__PURE__*/function () {
   }], [{
     key: "fromComponent",
     value: function fromComponent(component, portalProviderAPI, eventDispatcher, props, viewShouldUpdate) {
+      var hasIntlContext = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
       return function (node, view, getPos) {
-        return new ReactNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, props, component, false, viewShouldUpdate).init();
+        return new ReactNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, props, component, false, viewShouldUpdate, hasIntlContext).init();
       };
     }
   }]);