@atlaskit/editor-core 193.24.18 → 193.24.20

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @atlaskit/editor-core
 
+## 193.24.20
+
+### Patch Changes
+
+- [#105253](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105253)
+  [`a5f3cd26fbd6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a5f3cd26fbd6) -
+  Clean up platform.editor.enable-localid-for-paragraph-in-stage-0_cby7g FF
+- [#108295](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108295)
+  [`965a0e6c1088`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/965a0e6c1088) -
+  NO-ISSUE Condition adding primary toolbar plugin components based on their presence instead of on
+  the feature flag to avoid it not rendering in examples
+- [#106586](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/106586)
+  [`861ecd061c72`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/861ecd061c72) -
+  Increase the editor page guttering for full page appearance to support block drag and drop
+- [#105533](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105533)
+  [`ba448905afaf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ba448905afaf) -
+  ED-23459: Extracts example-helpers to editor-examples-helpers
+- [#100714](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/100714)
+  [`81849acfe13c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/81849acfe13c) -
+  ECA11Y-228: Added new shortcuts for insert column and row and added correct formatting for help
+  modal dialog
+- Updated dependencies
+
+## 193.24.19
+
+### Patch Changes
+
+- [#103607](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/103607)
+  [`104c7a82d1a7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/104c7a82d1a7) -
+  [ux] ED-23363 If you load a live page in view mode, an empty selection will be set.
+
 ## 193.24.18
 
 ### Patch Changes

package/create-editor-content-style/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@atlaskit/editor-core/create-editor-content-style",
+  "main": "../dist/cjs/ui/ContentStyles/index.js",
+  "module": "../dist/esm/ui/ContentStyles/index.js",
+  "module:es2019": "../dist/es2019/ui/ContentStyles/index.js",
+  "sideEffects": false,
+  "types": "../dist/types/ui/ContentStyles/index.d.ts",
+  "typesVersions": {
+    ">=4.5 <5.4": {
+      "*": [
+        "../dist/types-ts4.5/ui/ContentStyles/index.d.ts"
+      ]
+    }
+  }
+}

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

@@ -25,6 +25,7 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _eventDispatcher = require("../event-dispatcher");
 var _document = require("../utils/document");
 var _isFullPage = require("../utils/is-full-page");
@@ -45,7 +46,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-function handleEditorFocus(view, viewMode) {
+function handleEditorFocus(view) {
   if (view.hasFocus()) {
     return;
   }
@@ -57,12 +58,6 @@ function handleEditorFocus(view, viewMode) {
       view.focus();
       return;
     }
-    if (viewMode === 'view') {
-      var emptySelection = new _state2.TextSelection(view.state.doc.resolve(0));
-      var _tr = view.state.tr.setSelection(emptySelection);
-      view.dispatch(_tr);
-      return;
-    }
     var domSelection = window.getSelection();
     if (!domSelection || domSelection.rangeCount === 0) {
       view.focus();
@@ -119,11 +114,6 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getEditorView", function () {
       return _this.view;
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getViewMode", function () {
-      var _editorApi$editorView;
-      var editorApi = _this.pluginInjectionAPI.api();
-      return (_editorApi$editorView = editorApi.editorViewMode) === null || _editorApi$editorView === void 0 ? void 0 : _editorApi$editorView.sharedState.currentState().mode;
-    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "formatFullWidthAppearance", function (appearance) {
       if (appearance === 'full-width') {
         return _analytics.FULL_WIDTH_MODE.FULL_WIDTH;
@@ -176,6 +166,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "editorPlugins", []);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "createEditorState", function (options) {
+      var _api$editorViewMode;
       var schema;
       if (_this.view) {
         if (options.resetting) {
@@ -226,18 +217,44 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
       if (options.doc) {
         doc = (0, _utils.processRawValue)(schema, options.doc, options.props.providerFactory, options.props.editorProps.sanitizePrivateContent, _this.contentTransformer, _this.dispatchAnalyticsEvent);
       }
+      var api = _this.pluginInjectionAPI.api();
+      var isViewMode = (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState().mode) === 'view';
       var selection;
-      if (doc) {
-        selection = options.selectionAtStart ? _state2.Selection.atStart(doc) : _state2.Selection.atEnd(doc);
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.no-editor-selection-in-view-mode')) {
+        if (doc) {
+          if (isViewMode) {
+            var emptySelection = new _state2.TextSelection(doc.resolve(0));
+            return _state2.EditorState.create({
+              schema: schema,
+              plugins: plugins,
+              doc: doc,
+              selection: emptySelection
+            });
+          } else {
+            selection = options.selectionAtStart ? _state2.Selection.atStart(doc) : _state2.Selection.atEnd(doc);
+          }
+        }
+        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
+        var patchedSelection = selection ? _state2.Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
+        return _state2.EditorState.create({
+          schema: schema,
+          plugins: plugins,
+          doc: doc,
+          selection: patchedSelection
+        });
+      } else {
+        if (doc) {
+          selection = options.selectionAtStart ? _state2.Selection.atStart(doc) : _state2.Selection.atEnd(doc);
+        }
+        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
+        var _patchedSelection = selection ? _state2.Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
+        return _state2.EditorState.create({
+          schema: schema,
+          plugins: plugins,
+          doc: doc,
+          selection: _patchedSelection
+        });
       }
-      // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
-      var patchedSelection = selection ? _state2.Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
-      return _state2.EditorState.create({
-        schema: schema,
-        plugins: plugins,
-        doc: doc,
-        selection: patchedSelection
-      });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onEditorViewStateUpdated", function (_ref2) {
       var originalTransaction = _ref2.originalTransaction,
@@ -462,7 +479,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
           transformer: _this.contentTransformer
         });
         if (_this.props.editorProps.shouldFocus && view.props.editable && view.props.editable(view.state)) {
-          _this.focusTimeoutId = handleEditorFocus(view, _this.getViewMode());
+          _this.focusTimeoutId = handleEditorFocus(view);
         }
         if (_this.featureFlags.ufo) {
           _this.experienceStore = _ufo.ExperienceStore.getInstance(view);
@@ -548,11 +565,11 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
       getEditorState: _this.getEditorState,
       getEditorView: _this.getEditorView
     });
-    var api = _this.pluginInjectionAPI.api();
-    (_props$setEditorApi = props.setEditorApi) === null || _props$setEditorApi === void 0 || _props$setEditorApi.call(props, api);
+    var _api = _this.pluginInjectionAPI.api();
+    (_props$setEditorApi = props.setEditorApi) === null || _props$setEditorApi === void 0 || _props$setEditorApi.call(props, _api);
     if (props.editorProps.editorActions) {
       // @ts-expect-error
-      props.editorProps.editorActions.__EDITOR_INTERNALS_DO_NOT_USE__API = api;
+      props.editorProps.editorActions.__EDITOR_INTERNALS_DO_NOT_USE__API = _api;
     }
     _this.eventDispatcher = new _eventDispatcher.EventDispatcher();
     _this.dispatch = (0, _eventDispatcher.createDispatch)(_this.eventDispatcher);
@@ -642,7 +659,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
           }
         });
         if (!nextProps.editorProps.disabled && nextProps.editorProps.shouldFocus) {
-          this.focusTimeoutId = handleEditorFocus(this.view, this.getViewMode());
+          this.focusTimeoutId = handleEditorFocus(this.view);
         }
       }
       var appearance = this.props.editorProps.appearance;

package/dist/cjs/index.js

@@ -130,6 +130,12 @@ Object.defineProperty(exports, "WithHelpTrigger", {
     return _WithHelpTrigger.default;
   }
 });
+Object.defineProperty(exports, "createEditorContentStyle", {
+  enumerable: true,
+  get: function get() {
+    return _ContentStyles.createEditorContentStyle;
+  }
+});
 Object.defineProperty(exports, "getNodesCount", {
   enumerable: true,
   get: function get() {
@@ -178,6 +184,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("./utils");
 var _actions = _interopRequireDefault(require("./actions"));
 var _portalProvider = require("@atlaskit/editor-common/portal-provider");
+var _ContentStyles = require("./ui/ContentStyles");
 // [ED-22843] use FF in editor-core for sake of example
 
 // Used in products integration code

package/dist/cjs/keymaps/index.js

@@ -93,12 +93,24 @@ Object.defineProperty(exports, "addColumnAfter", {
     return _keymaps.addColumnAfter;
   }
 });
+Object.defineProperty(exports, "addColumnAfterVO", {
+  enumerable: true,
+  get: function get() {
+    return _keymaps.addColumnAfterVO;
+  }
+});
 Object.defineProperty(exports, "addColumnBefore", {
   enumerable: true,
   get: function get() {
     return _keymaps.addColumnBefore;
   }
 });
+Object.defineProperty(exports, "addColumnBeforeVO", {
+  enumerable: true,
+  get: function get() {
+    return _keymaps.addColumnBeforeVO;
+  }
+});
 Object.defineProperty(exports, "addInlineComment", {
   enumerable: true,
   get: function get() {
@@ -117,12 +129,24 @@ Object.defineProperty(exports, "addRowAfter", {
     return _keymaps.addRowAfter;
   }
 });
+Object.defineProperty(exports, "addRowAfterVO", {
+  enumerable: true,
+  get: function get() {
+    return _keymaps.addRowAfterVO;
+  }
+});
 Object.defineProperty(exports, "addRowBefore", {
   enumerable: true,
   get: function get() {
     return _keymaps.addRowBefore;
   }
 });
+Object.defineProperty(exports, "addRowBeforeVO", {
+  enumerable: true,
+  get: function get() {
+    return _keymaps.addRowBeforeVO;
+  }
+});
 Object.defineProperty(exports, "alignCenter", {
   enumerable: true,
   get: function get() {

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

@@ -145,10 +145,8 @@ var Editor = /*#__PURE__*/function (_React$Component) {
         event.stopPropagation();
       };
       var primaryToolbarComponents = primaryToolbarComponentsProp;
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.primary-toolbar-ordering')) {
-        if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
-          primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
-        }
+      if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
+        primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
       }
       return (0, _react2.jsx)(_WithFlash.default, {
         animate: maxContentSizeReached
@@ -342,10 +340,8 @@ var EditorNext = function EditorNext(props) {
     event.stopPropagation();
   }, [editorView]);
   var primaryToolbarComponents = primaryToolbarComponentsProp;
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.primary-toolbar-ordering')) {
-    if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
-      primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
-    }
+  if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
+    primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
   }
   return (0, _react2.jsx)(_WithFlash.default, {
     animate: maxContentSizeReached

package/dist/cjs/ui/Appearance/FullPage/FullPage.js

@@ -12,7 +12,6 @@ var _react2 = require("@emotion/react");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _context = require("../../../presets/context");
 var _FullPageContentArea = require("./FullPageContentArea");
 var _FullPageToolbar = require("./FullPageToolbar");
@@ -62,10 +61,8 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
     editorViewModeState = _useSharedPluginState.editorViewModeState,
     primaryToolbarState = _useSharedPluginState.primaryToolbarState;
   var primaryToolbarComponents = props.primaryToolbarComponents;
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.primary-toolbar-ordering')) {
-    if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
-      primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
-    }
+  if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
+    primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
   }
   var isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
   return (0, _react2.jsx)(_ui.ContextPanelWidthProvider, null, (0, _react2.jsx)("div", {

package/dist/cjs/ui/Appearance/FullPage/StyledComponents.js

@@ -11,11 +11,14 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _commonStyles = require("@atlaskit/editor-plugins/table/ui/common-styles");
 var _consts = require("@atlaskit/editor-plugins/table/ui/consts");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _ContentStyles = require("../../ContentStyles");
 var _styles = require("../../styles");
 var _ProseMirror;
 var SWOOP_ANIMATION = "0.5s ".concat(_editorSharedStyles.akEditorSwoopCubicBezier);
-var TOTAL_PADDING = _editorSharedStyles.akEditorGutterPadding * 2;
+var getTotalPadding = function getTotalPadding() {
+  return (0, _editorSharedStyles.akEditorGutterPaddingDynamic)() * 2;
+};
 var fullPageEditorWrapper = exports.fullPageEditorWrapper = (0, _react.css)({
   minWidth: '340px',
   height: '100%',
@@ -83,7 +86,7 @@ var editorContentAreaContainerStyle = function editorContentAreaContainerStyle(c
   return (0, _react.css)({
     '.fabric-editor--full-width-mode': {
       '.code-block, .extension-container': {
-        maxWidth: "".concat(containerWidth - TOTAL_PADDING - _consts.tableMarginFullWidthMode * 2, "px")
+        maxWidth: "".concat(containerWidth - getTotalPadding() - _consts.tableMarginFullWidthMode * 2, "px")
       },
       '.extension-container.inline': {
         maxWidth: '100%'
@@ -92,10 +95,10 @@ var editorContentAreaContainerStyle = function editorContentAreaContainerStyle(c
         maxWidth: 'inherit'
       },
       '.multiBodiedExtension--container': {
-        maxWidth: "".concat(containerWidth - TOTAL_PADDING - _consts.tableMarginFullWidthMode * 2, "px")
+        maxWidth: "".concat(containerWidth - getTotalPadding() - _consts.tableMarginFullWidthMode * 2, "px")
       },
       '[data-layout-section]': {
-        maxWidth: "".concat(containerWidth - TOTAL_PADDING + _editorSharedStyles.akLayoutGutterOffset * 2, "px")
+        maxWidth: "".concat(containerWidth - getTotalPadding() + _editorSharedStyles.akLayoutGutterOffset * 2, "px")
       }
     }
   });
@@ -108,7 +111,8 @@ var editorContentAreaStyle = exports.editorContentAreaStyle = function editorCon
 };
 var editorContentAreaWithLayoutWith = function editorContentAreaWithLayoutWith(layoutMaxWidth) {
   return (0, _react.css)({
-    maxWidth: "".concat(layoutMaxWidth + TOTAL_PADDING, "px")
+    // this restricts max width
+    maxWidth: "".concat(layoutMaxWidth + getTotalPadding(), "px")
   });
 };
 var editorContentArea = (0, _react.css)({
@@ -120,7 +124,7 @@ var editorContentArea = (0, _react.css)({
   margin: 'auto',
   flexDirection: 'column',
   flexGrow: 1,
-  maxWidth: "".concat(_editorSharedStyles.akEditorFullWidthLayoutWidth + TOTAL_PADDING, "px"),
+  maxWidth: "".concat(_editorSharedStyles.akEditorFullWidthLayoutWidth + getTotalPadding(), "px"),
   transition: "max-width ".concat(SWOOP_ANIMATION),
   '& .ProseMirror': (_ProseMirror = {
     flexGrow: 1,
@@ -147,5 +151,6 @@ var editorContentArea = (0, _react.css)({
 });
 var editorContentGutterStyle = exports.editorContentGutterStyle = (0, _react.css)({
   boxSizing: 'border-box',
-  padding: "0 ".concat("var(--ds-space-400, 32px)")
+  padding: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.core.increase-full-page-guttering') ? // there is no space token for 52px
+  "0 52px" : "0 ".concat("var(--ds-space-400, 32px)")
 });

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "193.24.18";
+var version = exports.version = "193.24.20";

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

@@ -11,6 +11,7 @@ import { EDIT_AREA_ID } from '@atlaskit/editor-common/ui';
 import { analyticsEventKey, browser, countNodes, getAnalyticsEventSeverity, getResponseEndTime, measureRender, processRawValue, shouldForceTracking, startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
 import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { createDispatch, EventDispatcher } from '../event-dispatcher';
 import { getNodesCount } from '../utils/document';
 import { isFullPage } from '../utils/is-full-page';
@@ -27,7 +28,7 @@ import { createSchema } from './create-schema';
 import { createFeatureFlagsFromProps } from './feature-flags-from-props';
 import { editorMessages } from './messages';
 import ReactEditorViewContext from './ReactEditorViewContext';
-function handleEditorFocus(view, viewMode) {
+function handleEditorFocus(view) {
   if (view.hasFocus()) {
     return;
   }
@@ -39,12 +40,6 @@ function handleEditorFocus(view, viewMode) {
       view.focus();
       return;
     }
-    if (viewMode === 'view') {
-      const emptySelection = new TextSelection(view.state.doc.resolve(0));
-      const tr = view.state.tr.setSelection(emptySelection);
-      view.dispatch(tr);
-      return;
-    }
     const domSelection = window.getSelection();
     if (!domSelection || domSelection.rangeCount === 0) {
       view.focus();
@@ -114,11 +109,6 @@ export class ReactEditorView extends React.Component {
       return (_this$view = this.view) === null || _this$view === void 0 ? void 0 : _this$view.state;
     });
     _defineProperty(this, "getEditorView", () => this.view);
-    _defineProperty(this, "getViewMode", () => {
-      var _editorApi$editorView;
-      const editorApi = this.pluginInjectionAPI.api();
-      return (_editorApi$editorView = editorApi.editorViewMode) === null || _editorApi$editorView === void 0 ? void 0 : _editorApi$editorView.sharedState.currentState().mode;
-    });
     _defineProperty(this, "formatFullWidthAppearance", appearance => {
       if (appearance === 'full-width') {
         return FULL_WIDTH_MODE.FULL_WIDTH;
@@ -172,6 +162,7 @@ export class ReactEditorView extends React.Component {
     });
     _defineProperty(this, "editorPlugins", []);
     _defineProperty(this, "createEditorState", options => {
+      var _api$editorViewMode;
       let schema;
       if (this.view) {
         if (options.resetting) {
@@ -220,18 +211,44 @@ export class ReactEditorView extends React.Component {
       if (options.doc) {
         doc = processRawValue(schema, options.doc, options.props.providerFactory, options.props.editorProps.sanitizePrivateContent, this.contentTransformer, this.dispatchAnalyticsEvent);
       }
+      const api = this.pluginInjectionAPI.api();
+      const isViewMode = (api === null || api === void 0 ? void 0 : (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState().mode) === 'view';
       let selection;
-      if (doc) {
-        selection = options.selectionAtStart ? Selection.atStart(doc) : Selection.atEnd(doc);
+      if (getBooleanFF('platform.editor.live-view.no-editor-selection-in-view-mode')) {
+        if (doc) {
+          if (isViewMode) {
+            const emptySelection = new TextSelection(doc.resolve(0));
+            return EditorState.create({
+              schema,
+              plugins: plugins,
+              doc,
+              selection: emptySelection
+            });
+          } else {
+            selection = options.selectionAtStart ? Selection.atStart(doc) : Selection.atEnd(doc);
+          }
+        }
+        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
+        const patchedSelection = selection ? Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
+        return EditorState.create({
+          schema,
+          plugins: plugins,
+          doc,
+          selection: patchedSelection
+        });
+      } else {
+        if (doc) {
+          selection = options.selectionAtStart ? Selection.atStart(doc) : Selection.atEnd(doc);
+        }
+        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
+        const patchedSelection = selection ? Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
+        return EditorState.create({
+          schema,
+          plugins: plugins,
+          doc,
+          selection: patchedSelection
+        });
       }
-      // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
-      const patchedSelection = selection ? Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
-      return EditorState.create({
-        schema,
-        plugins: plugins,
-        doc,
-        selection: patchedSelection
-      });
     });
     _defineProperty(this, "onEditorViewStateUpdated", ({
       originalTransaction,
@@ -458,7 +475,7 @@ export class ReactEditorView extends React.Component {
           transformer: this.contentTransformer
         });
         if (this.props.editorProps.shouldFocus && view.props.editable && view.props.editable(view.state)) {
-          this.focusTimeoutId = handleEditorFocus(view, this.getViewMode());
+          this.focusTimeoutId = handleEditorFocus(view);
         }
         if (this.featureFlags.ufo) {
           this.experienceStore = ExperienceStore.getInstance(view);
@@ -544,11 +561,11 @@ export class ReactEditorView extends React.Component {
       getEditorState: this.getEditorState,
       getEditorView: this.getEditorView
     });
-    const api = this.pluginInjectionAPI.api();
-    (_props$setEditorApi = props.setEditorApi) === null || _props$setEditorApi === void 0 ? void 0 : _props$setEditorApi.call(props, api);
+    const _api = this.pluginInjectionAPI.api();
+    (_props$setEditorApi = props.setEditorApi) === null || _props$setEditorApi === void 0 ? void 0 : _props$setEditorApi.call(props, _api);
     if (props.editorProps.editorActions) {
       // @ts-expect-error
-      props.editorProps.editorActions.__EDITOR_INTERNALS_DO_NOT_USE__API = api;
+      props.editorProps.editorActions.__EDITOR_INTERNALS_DO_NOT_USE__API = _api;
     }
     this.eventDispatcher = new EventDispatcher();
     this.dispatch = createDispatch(this.eventDispatcher);
@@ -594,7 +611,7 @@ export class ReactEditorView extends React.Component {
         editable: _state => !nextProps.editorProps.disabled
       });
       if (!nextProps.editorProps.disabled && nextProps.editorProps.shouldFocus) {
-        this.focusTimeoutId = handleEditorFocus(this.view, this.getViewMode());
+        this.focusTimeoutId = handleEditorFocus(this.view);
       }
     }
     const {

package/dist/es2019/index.js

@@ -59,4 +59,5 @@ const ignoreFunction = () => {
   // eslint-disable-next-line @atlaskit/platform/no-invalid-feature-flag-usage, @atlaskit/platform/ensure-feature-flag-prefix
   getBooleanFF('__live-view-toggle');
   return;
-};
+};
+export { createEditorContentStyle } from './ui/ContentStyles';

package/dist/es2019/keymaps/index.js

@@ -1 +1 @@
-export { addAltText, navToEditorToolbar, navToFloatingToolbar, toggleBold, toggleItalic, toggleUnderline, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleCode, pastePlainText, clearFormatting, setNormalText, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6, toggleOrderedList, toggleTaskItemCheckbox, ctrlBackSpace, toggleBulletList, toggleBlockQuote, insertNewLine, shiftBackspace, splitCodeBlock, splitListItem, insertRule, undo, moveUp, moveDown, moveLeft, moveRight, indentList, outdentList, redo, openHelp, addLink, addInlineComment, submit, enter, shiftEnter, tab, indent, outdent, backspace, deleteKey, forwardDelete, space, escape, nextCell, previousCell, shiftTab, toggleTable, addRowBefore, addRowAfter, addColumnAfter, addColumnBefore, deleteColumn, deleteRow, moveColumnLeft, moveColumnRight, moveRowDown, moveRowUp, cut, copy, paste, altPaste, find, alignCenter, alignLeft, alignRight, tooltip, ToolTipContent, findKeymapByDescription, findShortcutByDescription, findShortcutByKeymap, makeKeymap, makeKeyMapWithCommon, bindKeymapWithCommand, findKeyMapForBrowser, DOWN, HEADING_KEYS, KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, LEFT, RIGHT, UP } from '@atlaskit/editor-common/keymaps';
+export { addAltText, navToEditorToolbar, navToFloatingToolbar, toggleBold, toggleItalic, toggleUnderline, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleCode, pastePlainText, clearFormatting, setNormalText, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6, toggleOrderedList, toggleTaskItemCheckbox, ctrlBackSpace, toggleBulletList, toggleBlockQuote, insertNewLine, shiftBackspace, splitCodeBlock, splitListItem, insertRule, undo, moveUp, moveDown, moveLeft, moveRight, indentList, outdentList, redo, openHelp, addLink, addInlineComment, submit, enter, shiftEnter, tab, indent, outdent, backspace, deleteKey, forwardDelete, space, escape, nextCell, previousCell, shiftTab, toggleTable, addRowBefore, addRowAfter, addColumnAfter, addColumnBefore, addRowBeforeVO, addRowAfterVO, addColumnAfterVO, addColumnBeforeVO, deleteColumn, deleteRow, moveColumnLeft, moveColumnRight, moveRowDown, moveRowUp, cut, copy, paste, altPaste, find, alignCenter, alignLeft, alignRight, tooltip, ToolTipContent, findKeymapByDescription, findShortcutByDescription, findShortcutByKeymap, makeKeymap, makeKeyMapWithCommon, bindKeymapWithCommand, findKeyMapForBrowser, DOWN, HEADING_KEYS, KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, LEFT, RIGHT, UP } from '@atlaskit/editor-common/keymaps';

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

@@ -124,10 +124,8 @@ class Editor extends React.Component {
         event.stopPropagation();
       };
       let primaryToolbarComponents = primaryToolbarComponentsProp;
-      if (getBooleanFF('platform.editor.primary-toolbar-ordering')) {
-        if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
-          primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
-        }
+      if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
+        primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
       }
       return jsx(WithFlash, {
         animate: maxContentSizeReached
@@ -312,10 +310,8 @@ const EditorNext = props => {
     event.stopPropagation();
   }, [editorView]);
   let primaryToolbarComponents = primaryToolbarComponentsProp;
-  if (getBooleanFF('platform.editor.primary-toolbar-ordering')) {
-    if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
-      primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
-    }
+  if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
+    primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
   }
   return jsx(WithFlash, {
     animate: maxContentSizeReached

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

@@ -4,7 +4,6 @@ import { jsx } from '@emotion/react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { ContextPanelWidthProvider } from '@atlaskit/editor-common/ui';
 import { browser } from '@atlaskit/editor-common/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { usePresetContext } from '../../../presets/context';
 import { FullPageContentArea } from './FullPageContentArea';
 import { FullPageToolbar } from './FullPageToolbar';
@@ -44,10 +43,8 @@ export const FullPageEditor = props => {
     primaryToolbarState
   } = useSharedPluginState(editorAPI, ['editorViewMode', 'primaryToolbar']);
   let primaryToolbarComponents = props.primaryToolbarComponents;
-  if (getBooleanFF('platform.editor.primary-toolbar-ordering')) {
-    if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
-      primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
-    }
+  if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
+    primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
   }
   const isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
   return jsx(ContextPanelWidthProvider, null, jsx("div", {