@atlaskit/editor-core 205.1.1 → 205.1.3

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-core
 
+## 205.1.3
+
+### Patch Changes
+
+- [#132362](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/132362)
+  [`2e90b51d52288`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2e90b51d52288) -
+  [ux] [ED-26841] Do not autofocus editor when it is a live page with content. Additionally hide
+  cursor marks and ensure cursor starts at the very start of document to prevent selection
+  appearance and toolbars.
+- Updated dependencies
+
+## 205.1.2
+
+### Patch Changes
+
+- [#134683](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/134683)
+  [`92c5bd796d74f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/92c5bd796d74f) -
+  [ux] ED-27348 ED-27448 remove toolbar header spacing
+- Updated dependencies
+
 ## 205.1.1
 
 ### Patch Changes

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

@@ -22,6 +22,7 @@ var _preset = require("@atlaskit/editor-common/preset");
 var _processRawValue = require("@atlaskit/editor-common/process-raw-value");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _analytics2 = require("@atlaskit/editor-common/utils/analytics");
+var _document = require("@atlaskit/editor-common/utils/document");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -45,6 +46,14 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 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; }
 var EDIT_AREA_ID = 'ak-editor-textarea';
+var focusElementOutsideEditor = function focusElementOutsideEditor() {
+  // TODO: ED-26841 - This is an awful way of selecting this, would love a
+  // better way be that a ref or even an id or data attibute.
+  var aiButton = document.querySelector('[data-testid="platform-ai-button"]');
+  if (aiButton && aiButton instanceof HTMLElement) {
+    aiButton.focus();
+  }
+};
 function ReactEditorView(props) {
   var _pluginInjectionAPI$c, _media, _linking, _props$render, _props$render2;
   var preset = props.preset,
@@ -53,7 +62,11 @@ function ReactEditorView(props) {
     disabled = _props$editorProps.disabled,
     editorPropFeatureFlags = _props$editorProps.featureFlags,
     errorReporterHandler = _props$editorProps.errorReporterHandler,
-    defaultValue = _props$editorProps.defaultValue;
+    defaultValue = _props$editorProps.defaultValue,
+    shouldFocus = _props$editorProps.shouldFocus,
+    __livePage = _props$editorProps.__livePage,
+    onEditorCreated = props.onEditorCreated,
+    onEditorDestroyed = props.onEditorDestroyed;
   var _useState = (0, _react.useState)(undefined),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     editorAPI = _useState2[0],
@@ -185,6 +198,30 @@ function ReactEditorView(props) {
         selection = options.selectionAtStart ? _state2.Selection.atStart(doc) : _state2.Selection.atEnd(doc);
       }
     }
+    if ((0, _platformFeatureFlags.fg)('platform_editor_no_cursor_on_live_doc_init')) {
+      if (!options.selectionAtStart) {
+        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
+        selection = selection ? _state2.Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
+      }
+
+      // When in live mode, unless the document is empty we do not focus the editor and
+      // want to avoid placing the cursor inside any nodes which may show selection states
+      // or toolbar based on the cursor being inside them. As such we hard set the
+      // selection to the very start of the document regardless of whether that is a
+      // gapCursor or not.
+      // __livePage necessary because editorViewMode still thinks it is in 'edit' mode
+      // when this is called
+      if (doc && options.selectionAtStart && __livePage) {
+        selection = _state2.NodeSelection.create(doc, 0);
+      }
+      return _state2.EditorState.create({
+        schema: schema,
+        plugins: plugins,
+        doc: doc,
+        selection: selection
+      });
+    }
+
     // 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({
@@ -193,7 +230,7 @@ function ReactEditorView(props) {
       doc: doc,
       selection: patchedSelection
     });
-  }, [errorReporter, featureFlags, props.intl, props.portalProviderAPI, props.nodeViewPortalProviderAPI, props.editorProps, dispatchAnalyticsEvent, eventDispatcher, dispatch]);
+  }, [__livePage, errorReporter, featureFlags, props.intl, props.portalProviderAPI, props.nodeViewPortalProviderAPI, props.editorProps, dispatchAnalyticsEvent, eventDispatcher, dispatch]);
   var initialEditorState = (0, _react.useMemo)(function () {
     return createEditorState({
       props: props,
@@ -460,15 +497,17 @@ function ReactEditorView(props) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     editorView = _useState4[0],
     setEditorView = _useState4[1];
-  var onEditorCreated = props.onEditorCreated,
-    onEditorDestroyed = props.onEditorDestroyed,
-    shouldFocus = props.editorProps.shouldFocus;
   (0, _react.useLayoutEffect)(function () {
     var _editorView$props$edi, _editorView$props;
     if (shouldFocus && editorView !== null && editorView !== void 0 && (_editorView$props$edi = (_editorView$props = editorView.props).editable) !== null && _editorView$props$edi !== void 0 && _editorView$props$edi.call(_editorView$props, editorView.state) && (0, _platformFeatureFlags.fg)('platform_editor_react_18_autofocus_fix')) {
-      focusTimeoutId.current = (0, _handleEditorFocus.handleEditorFocus)(editorView);
+      var liveDocWithContent = __livePage && !(0, _document.isEmptyDocument)(editorView.state.doc);
+      if (liveDocWithContent && (0, _platformFeatureFlags.fg)('platform_editor_no_cursor_on_live_doc_init')) {
+        focusElementOutsideEditor();
+      } else {
+        focusTimeoutId.current = (0, _handleEditorFocus.handleEditorFocus)(editorView);
+      }
     }
-  }, [editorView, shouldFocus]);
+  }, [editorView, shouldFocus, __livePage]);
   var handleEditorViewRef = (0, _react.useCallback)(function (node) {
     if (!viewRef.current && node) {
       var view = createEditorView(node);
@@ -493,9 +532,11 @@ function ReactEditorView(props) {
           setEditorView(view);
         });
       } else {
-        if (shouldFocus && view.props.editable && view.props.editable(view.state)) {
+        var isLivePageWithContent = __livePage && !(0, _document.isEmptyDocument)(view.state.doc) && (0, _platformFeatureFlags.fg)('platform_editor_no_cursor_on_live_doc_init');
+        if (!isLivePageWithContent && shouldFocus && view.props.editable && view.props.editable(view.state)) {
           focusTimeoutId.current = (0, _handleEditorFocus.handleEditorFocus)(view);
         }
+
         // Force React to re-render so consumers get a reference to the editor view
         setEditorView(view);
       }
@@ -521,7 +562,7 @@ function ReactEditorView(props) {
       }
       viewRef.current = undefined;
     }
-  }, [createEditorView, handleAnalyticsEvent, onEditorDestroyed, onEditorCreated, shouldFocus, eventDispatcher]);
+  }, [createEditorView, onEditorCreated, eventDispatcher, shouldFocus, __livePage, onEditorDestroyed, handleAnalyticsEvent]);
   var createEditor = (0, _react.useCallback)(function (assistiveLabel, assistiveDescribedBy) {
     return /*#__PURE__*/_react.default.createElement("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -557,11 +598,12 @@ function ReactEditorView(props) {
           return !disabled;
         }
       });
-      if (!disabled && shouldFocus) {
+      var isLivePageWithContent = __livePage && !(0, _document.isEmptyDocument)(viewRef.current.state.doc) && (0, _platformFeatureFlags.fg)('platform_editor_no_cursor_on_live_doc_init');
+      if (!disabled && shouldFocus && !isLivePageWithContent) {
         focusTimeoutId.current = (0, _handleEditorFocus.handleEditorFocus)(viewRef.current);
       }
     }
-  }, [disabled, shouldFocus, previousDisabledState]);
+  }, [disabled, shouldFocus, previousDisabledState, __livePage]);
   (0, _useFireFullWidthEvent.useFireFullWidthEvent)(nextAppearance, dispatchAnalyticsEvent);
   var editor = (0, _react.useMemo)(function () {
     return createEditor(props.editorProps.assistiveLabel, props.editorProps.assistiveDescribedBy);

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.sidebarArea = exports.fullPageEditorWrapper = exports.editorContentGutterStyle = exports.editorContentAreaStyle = exports.editorContentAreaHideContainer = exports.contentAreaWrapper = exports.contentAreaHeightNoToolbar = exports.contentArea = exports.ScrollContainer = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = require("@emotion/react");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _commonStyles = require("@atlaskit/editor-plugins/table/ui/common-styles");
@@ -151,13 +152,11 @@ var editorContentAreaStyle = exports.editorContentAreaStyle = function editorCon
   var layoutMaxWidth = _ref.layoutMaxWidth,
     fullWidthMode = _ref.fullWidthMode,
     isEditorToolbarHidden = _ref.isEditorToolbarHidden;
-  return [editorContentArea, !fullWidthMode && editorContentAreaWithLayoutWith(layoutMaxWidth), editorContentAreaContainerStyle(), (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1', {
-    exposure: true
-  }) &&
+  return [editorContentArea, !fullWidthMode && editorContentAreaWithLayoutWith(layoutMaxWidth), editorContentAreaContainerStyle()].concat((0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_editor_controls_no_toolbar_space') ? [] : [(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') &&
   // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
   contentAreaReducedHeaderSpace, isEditorToolbarHidden && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') &&
   // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-  contentAreaReservedPrimaryToolbarSpace];
+  contentAreaReservedPrimaryToolbarSpace]));
 };
 var editorContentAreaWithLayoutWith = function editorContentAreaWithLayoutWith(layoutMaxWidth) {
   return (0, _react.css)({

package/dist/cjs/ui/EditorContext/index.js

@@ -33,7 +33,7 @@ var LegacyEditorContext = exports.LegacyEditorContext = /*#__PURE__*/function (_
   return (0, _createClass2.default)(LegacyEditorContext, [{
     key: "render",
     value: function render() {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2_v2')) {
+      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2_v2') || (0, _platformFeatureFlags.fg)('platform_editor_react18_phase2_v2_extended')) {
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         return /*#__PURE__*/_react.default.createElement(LegacyEditorContextNew, this.props, this.props.children);

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 = "205.1.1";
+var version = exports.version = "205.1.3";

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

@@ -11,7 +11,8 @@ import { EditorPluginInjectionAPI } from '@atlaskit/editor-common/preset';
 import { processRawValue, processRawValueWithoutValidation } from '@atlaskit/editor-common/process-raw-value';
 import { ReactEditorViewContext } from '@atlaskit/editor-common/ui-react';
 import { analyticsEventKey, getAnalyticsEventSeverity } from '@atlaskit/editor-common/utils/analytics';
-import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { isEmptyDocument } from '@atlaskit/editor-common/utils/document';
+import { EditorState, NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useProviders } from '../composable-editor/hooks/useProviders';
@@ -30,6 +31,14 @@ import { handleEditorFocus } from './ReactEditorView/handleEditorFocus';
 import { useDispatchTransaction } from './ReactEditorView/useDispatchTransaction';
 import { useFireFullWidthEvent } from './ReactEditorView/useFireFullWidthEvent';
 const EDIT_AREA_ID = 'ak-editor-textarea';
+const focusElementOutsideEditor = () => {
+  // TODO: ED-26841 - This is an awful way of selecting this, would love a
+  // better way be that a ref or even an id or data attibute.
+  const aiButton = document.querySelector('[data-testid="platform-ai-button"]');
+  if (aiButton && aiButton instanceof HTMLElement) {
+    aiButton.focus();
+  }
+};
 export function ReactEditorView(props) {
   var _pluginInjectionAPI$c, _pluginInjectionAPI$c2, _pluginInjectionAPI$c3, _media, _linking, _linking$smartLinks, _props$render, _props$render2;
   const {
@@ -39,8 +48,12 @@ export function ReactEditorView(props) {
       disabled,
       featureFlags: editorPropFeatureFlags,
       errorReporterHandler,
-      defaultValue
-    }
+      defaultValue,
+      shouldFocus,
+      __livePage
+    },
+    onEditorCreated,
+    onEditorDestroyed
   } = props;
   const [editorAPI, setEditorAPI] = useState(undefined);
   const editorRef = useRef(null);
@@ -160,6 +173,30 @@ export function ReactEditorView(props) {
         selection = options.selectionAtStart ? Selection.atStart(doc) : Selection.atEnd(doc);
       }
     }
+    if (fg('platform_editor_no_cursor_on_live_doc_init')) {
+      if (!options.selectionAtStart) {
+        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
+        selection = selection ? Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
+      }
+
+      // When in live mode, unless the document is empty we do not focus the editor and
+      // want to avoid placing the cursor inside any nodes which may show selection states
+      // or toolbar based on the cursor being inside them. As such we hard set the
+      // selection to the very start of the document regardless of whether that is a
+      // gapCursor or not.
+      // __livePage necessary because editorViewMode still thinks it is in 'edit' mode
+      // when this is called
+      if (doc && options.selectionAtStart && __livePage) {
+        selection = NodeSelection.create(doc, 0);
+      }
+      return EditorState.create({
+        schema,
+        plugins: plugins,
+        doc,
+        selection
+      });
+    }
+
     // 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({
@@ -168,7 +205,7 @@ export function ReactEditorView(props) {
       doc,
       selection: patchedSelection
     });
-  }, [errorReporter, featureFlags, props.intl, props.portalProviderAPI, props.nodeViewPortalProviderAPI, props.editorProps, dispatchAnalyticsEvent, eventDispatcher, dispatch]);
+  }, [__livePage, errorReporter, featureFlags, props.intl, props.portalProviderAPI, props.nodeViewPortalProviderAPI, props.editorProps, dispatchAnalyticsEvent, eventDispatcher, dispatch]);
   const initialEditorState = useMemo(() => createEditorState({
     props,
     doc: defaultValue,
@@ -430,19 +467,17 @@ export function ReactEditorView(props) {
     return view;
   }, [getDirectEditorProps, dispatchAnalyticsEvent]);
   const [editorView, setEditorView] = useState(undefined);
-  const {
-    onEditorCreated,
-    onEditorDestroyed,
-    editorProps: {
-      shouldFocus
-    }
-  } = props;
   useLayoutEffect(() => {
     var _editorView$props$edi, _editorView$props;
     if (shouldFocus && editorView !== null && editorView !== void 0 && (_editorView$props$edi = (_editorView$props = editorView.props).editable) !== null && _editorView$props$edi !== void 0 && _editorView$props$edi.call(_editorView$props, editorView.state) && fg('platform_editor_react_18_autofocus_fix')) {
-      focusTimeoutId.current = handleEditorFocus(editorView);
+      const liveDocWithContent = __livePage && !isEmptyDocument(editorView.state.doc);
+      if (liveDocWithContent && fg('platform_editor_no_cursor_on_live_doc_init')) {
+        focusElementOutsideEditor();
+      } else {
+        focusTimeoutId.current = handleEditorFocus(editorView);
+      }
     }
-  }, [editorView, shouldFocus]);
+  }, [editorView, shouldFocus, __livePage]);
   const handleEditorViewRef = useCallback(node => {
     if (!viewRef.current && node) {
       const view = createEditorView(node);
@@ -465,9 +500,11 @@ export function ReactEditorView(props) {
           setEditorView(view);
         });
       } else {
-        if (shouldFocus && view.props.editable && view.props.editable(view.state)) {
+        const isLivePageWithContent = __livePage && !isEmptyDocument(view.state.doc) && fg('platform_editor_no_cursor_on_live_doc_init');
+        if (!isLivePageWithContent && shouldFocus && view.props.editable && view.props.editable(view.state)) {
           focusTimeoutId.current = handleEditorFocus(view);
         }
+
         // Force React to re-render so consumers get a reference to the editor view
         setEditorView(view);
       }
@@ -493,7 +530,7 @@ export function ReactEditorView(props) {
       }
       viewRef.current = undefined;
     }
-  }, [createEditorView, handleAnalyticsEvent, onEditorDestroyed, onEditorCreated, shouldFocus, eventDispatcher]);
+  }, [createEditorView, onEditorCreated, eventDispatcher, shouldFocus, __livePage, onEditorDestroyed, handleAnalyticsEvent]);
   const createEditor = useCallback((assistiveLabel, assistiveDescribedBy) => {
     return /*#__PURE__*/React.createElement("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -527,11 +564,12 @@ export function ReactEditorView(props) {
       viewRef.current.setProps({
         editable: _state => !disabled
       });
-      if (!disabled && shouldFocus) {
+      const isLivePageWithContent = __livePage && !isEmptyDocument(viewRef.current.state.doc) && fg('platform_editor_no_cursor_on_live_doc_init');
+      if (!disabled && shouldFocus && !isLivePageWithContent) {
         focusTimeoutId.current = handleEditorFocus(viewRef.current);
       }
     }
-  }, [disabled, shouldFocus, previousDisabledState]);
+  }, [disabled, shouldFocus, previousDisabledState, __livePage]);
   useFireFullWidthEvent(nextAppearance, dispatchAnalyticsEvent);
   const editor = useMemo(() => createEditor(props.editorProps.assistiveLabel, props.editorProps.assistiveDescribedBy),
   // `createEditor` changes a little too frequently - we don't want to recreate the editor view in this case

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

@@ -139,13 +139,11 @@ export const editorContentAreaStyle = ({
   layoutMaxWidth,
   fullWidthMode,
   isEditorToolbarHidden
-}) => [editorContentArea, !fullWidthMode && editorContentAreaWithLayoutWith(layoutMaxWidth), editorContentAreaContainerStyle(), editorExperiment('platform_editor_controls', 'variant1', {
-  exposure: true
-}) &&
+}) => [editorContentArea, !fullWidthMode && editorContentAreaWithLayoutWith(layoutMaxWidth), editorContentAreaContainerStyle(), ...(fg('platform_editor_controls_no_toolbar_space') ? [] : [editorExperiment('platform_editor_controls', 'variant1') &&
 // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
 contentAreaReducedHeaderSpace, isEditorToolbarHidden && editorExperiment('platform_editor_controls', 'variant1') &&
 // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-contentAreaReservedPrimaryToolbarSpace];
+contentAreaReservedPrimaryToolbarSpace])];
 const editorContentAreaWithLayoutWith = layoutMaxWidth => css({
   // this restricts max width
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766

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

@@ -13,7 +13,7 @@ export class LegacyEditorContext extends React.Component {
     super(props);
   }
   render() {
-    if (fg('platform_editor_react18_phase2_v2')) {
+    if (fg('platform_editor_react18_phase2_v2') || fg('platform_editor_react18_phase2_v2_extended')) {
       // Ignored via go/ees005
       // eslint-disable-next-line react/jsx-props-no-spreading
       return /*#__PURE__*/React.createElement(LegacyEditorContextNew, this.props, this.props.children);

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "205.1.1";
+export const version = "205.1.3";

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

@@ -15,7 +15,8 @@ import { EditorPluginInjectionAPI } from '@atlaskit/editor-common/preset';
 import { processRawValue, processRawValueWithoutValidation } from '@atlaskit/editor-common/process-raw-value';
 import { ReactEditorViewContext } from '@atlaskit/editor-common/ui-react';
 import { analyticsEventKey, getAnalyticsEventSeverity } from '@atlaskit/editor-common/utils/analytics';
-import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { isEmptyDocument } from '@atlaskit/editor-common/utils/document';
+import { EditorState, NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useProviders } from '../composable-editor/hooks/useProviders';
@@ -34,6 +35,14 @@ import { handleEditorFocus } from './ReactEditorView/handleEditorFocus';
 import { useDispatchTransaction } from './ReactEditorView/useDispatchTransaction';
 import { useFireFullWidthEvent } from './ReactEditorView/useFireFullWidthEvent';
 var EDIT_AREA_ID = 'ak-editor-textarea';
+var focusElementOutsideEditor = function focusElementOutsideEditor() {
+  // TODO: ED-26841 - This is an awful way of selecting this, would love a
+  // better way be that a ref or even an id or data attibute.
+  var aiButton = document.querySelector('[data-testid="platform-ai-button"]');
+  if (aiButton && aiButton instanceof HTMLElement) {
+    aiButton.focus();
+  }
+};
 export function ReactEditorView(props) {
   var _pluginInjectionAPI$c, _media, _linking, _props$render, _props$render2;
   var preset = props.preset,
@@ -42,7 +51,11 @@ export function ReactEditorView(props) {
     disabled = _props$editorProps.disabled,
     editorPropFeatureFlags = _props$editorProps.featureFlags,
     errorReporterHandler = _props$editorProps.errorReporterHandler,
-    defaultValue = _props$editorProps.defaultValue;
+    defaultValue = _props$editorProps.defaultValue,
+    shouldFocus = _props$editorProps.shouldFocus,
+    __livePage = _props$editorProps.__livePage,
+    onEditorCreated = props.onEditorCreated,
+    onEditorDestroyed = props.onEditorDestroyed;
   var _useState = useState(undefined),
     _useState2 = _slicedToArray(_useState, 2),
     editorAPI = _useState2[0],
@@ -174,6 +187,30 @@ export function ReactEditorView(props) {
         selection = options.selectionAtStart ? Selection.atStart(doc) : Selection.atEnd(doc);
       }
     }
+    if (fg('platform_editor_no_cursor_on_live_doc_init')) {
+      if (!options.selectionAtStart) {
+        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
+        selection = selection ? Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
+      }
+
+      // When in live mode, unless the document is empty we do not focus the editor and
+      // want to avoid placing the cursor inside any nodes which may show selection states
+      // or toolbar based on the cursor being inside them. As such we hard set the
+      // selection to the very start of the document regardless of whether that is a
+      // gapCursor or not.
+      // __livePage necessary because editorViewMode still thinks it is in 'edit' mode
+      // when this is called
+      if (doc && options.selectionAtStart && __livePage) {
+        selection = NodeSelection.create(doc, 0);
+      }
+      return EditorState.create({
+        schema: schema,
+        plugins: plugins,
+        doc: doc,
+        selection: selection
+      });
+    }
+
     // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
     var patchedSelection = selection ? Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
     return EditorState.create({
@@ -182,7 +219,7 @@ export function ReactEditorView(props) {
       doc: doc,
       selection: patchedSelection
     });
-  }, [errorReporter, featureFlags, props.intl, props.portalProviderAPI, props.nodeViewPortalProviderAPI, props.editorProps, dispatchAnalyticsEvent, eventDispatcher, dispatch]);
+  }, [__livePage, errorReporter, featureFlags, props.intl, props.portalProviderAPI, props.nodeViewPortalProviderAPI, props.editorProps, dispatchAnalyticsEvent, eventDispatcher, dispatch]);
   var initialEditorState = useMemo(function () {
     return createEditorState({
       props: props,
@@ -449,15 +486,17 @@ export function ReactEditorView(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     editorView = _useState4[0],
     setEditorView = _useState4[1];
-  var onEditorCreated = props.onEditorCreated,
-    onEditorDestroyed = props.onEditorDestroyed,
-    shouldFocus = props.editorProps.shouldFocus;
   useLayoutEffect(function () {
     var _editorView$props$edi, _editorView$props;
     if (shouldFocus && editorView !== null && editorView !== void 0 && (_editorView$props$edi = (_editorView$props = editorView.props).editable) !== null && _editorView$props$edi !== void 0 && _editorView$props$edi.call(_editorView$props, editorView.state) && fg('platform_editor_react_18_autofocus_fix')) {
-      focusTimeoutId.current = handleEditorFocus(editorView);
+      var liveDocWithContent = __livePage && !isEmptyDocument(editorView.state.doc);
+      if (liveDocWithContent && fg('platform_editor_no_cursor_on_live_doc_init')) {
+        focusElementOutsideEditor();
+      } else {
+        focusTimeoutId.current = handleEditorFocus(editorView);
+      }
     }
-  }, [editorView, shouldFocus]);
+  }, [editorView, shouldFocus, __livePage]);
   var handleEditorViewRef = useCallback(function (node) {
     if (!viewRef.current && node) {
       var view = createEditorView(node);
@@ -482,9 +521,11 @@ export function ReactEditorView(props) {
           setEditorView(view);
         });
       } else {
-        if (shouldFocus && view.props.editable && view.props.editable(view.state)) {
+        var isLivePageWithContent = __livePage && !isEmptyDocument(view.state.doc) && fg('platform_editor_no_cursor_on_live_doc_init');
+        if (!isLivePageWithContent && shouldFocus && view.props.editable && view.props.editable(view.state)) {
           focusTimeoutId.current = handleEditorFocus(view);
         }
+
         // Force React to re-render so consumers get a reference to the editor view
         setEditorView(view);
       }
@@ -510,7 +551,7 @@ export function ReactEditorView(props) {
       }
       viewRef.current = undefined;
     }
-  }, [createEditorView, handleAnalyticsEvent, onEditorDestroyed, onEditorCreated, shouldFocus, eventDispatcher]);
+  }, [createEditorView, onEditorCreated, eventDispatcher, shouldFocus, __livePage, onEditorDestroyed, handleAnalyticsEvent]);
   var createEditor = useCallback(function (assistiveLabel, assistiveDescribedBy) {
     return /*#__PURE__*/React.createElement("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -546,11 +587,12 @@ export function ReactEditorView(props) {
           return !disabled;
         }
       });
-      if (!disabled && shouldFocus) {
+      var isLivePageWithContent = __livePage && !isEmptyDocument(viewRef.current.state.doc) && fg('platform_editor_no_cursor_on_live_doc_init');
+      if (!disabled && shouldFocus && !isLivePageWithContent) {
         focusTimeoutId.current = handleEditorFocus(viewRef.current);
       }
     }
-  }, [disabled, shouldFocus, previousDisabledState]);
+  }, [disabled, shouldFocus, previousDisabledState, __livePage]);
   useFireFullWidthEvent(nextAppearance, dispatchAnalyticsEvent);
   var editor = useMemo(function () {
     return createEditor(props.editorProps.assistiveLabel, props.editorProps.assistiveDescribedBy);

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

@@ -1,4 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 import { decisionListSelector, taskListSelector } from '@atlaskit/adf-schema';
@@ -144,13 +145,11 @@ export var editorContentAreaStyle = function editorContentAreaStyle(_ref) {
   var layoutMaxWidth = _ref.layoutMaxWidth,
     fullWidthMode = _ref.fullWidthMode,
     isEditorToolbarHidden = _ref.isEditorToolbarHidden;
-  return [editorContentArea, !fullWidthMode && editorContentAreaWithLayoutWith(layoutMaxWidth), editorContentAreaContainerStyle(), editorExperiment('platform_editor_controls', 'variant1', {
-    exposure: true
-  }) &&
+  return [editorContentArea, !fullWidthMode && editorContentAreaWithLayoutWith(layoutMaxWidth), editorContentAreaContainerStyle()].concat(_toConsumableArray(fg('platform_editor_controls_no_toolbar_space') ? [] : [editorExperiment('platform_editor_controls', 'variant1') &&
   // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
   contentAreaReducedHeaderSpace, isEditorToolbarHidden && editorExperiment('platform_editor_controls', 'variant1') &&
   // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-  contentAreaReservedPrimaryToolbarSpace];
+  contentAreaReservedPrimaryToolbarSpace]));
 };
 var editorContentAreaWithLayoutWith = function editorContentAreaWithLayoutWith(layoutMaxWidth) {
   return css({

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

@@ -26,7 +26,7 @@ export var LegacyEditorContext = /*#__PURE__*/function (_React$Component) {
   return _createClass(LegacyEditorContext, [{
     key: "render",
     value: function render() {
-      if (fg('platform_editor_react18_phase2_v2')) {
+      if (fg('platform_editor_react18_phase2_v2') || fg('platform_editor_react18_phase2_v2_extended')) {
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         return /*#__PURE__*/React.createElement(LegacyEditorContextNew, this.props, this.props.children);

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "205.1.1";
+export var version = "205.1.3";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "205.1.1",
+	"version": "205.1.3",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
 		"@atlaskit/analytics-next-stable-react-context": "1.0.1",
 		"@atlaskit/button": "^23.0.0",
 		"@atlaskit/css": "^0.10.0",
-		"@atlaskit/editor-common": "^102.16.0",
+		"@atlaskit/editor-common": "^102.17.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-performance-metrics": "^2.0.0",
 		"@atlaskit/editor-plugin-quick-insert": "^2.2.0",
@@ -240,6 +240,10 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
+		"platform_editor_react18_phase2_v2_extended": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"platform_editor_vs_code_block_paste": {
 			"type": "boolean",
 			"referenceOnly": true
@@ -532,6 +536,10 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
+		"editor_a11y_remove_redundant_wrap_icon_label": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"platform_editor_tables_numbered_column_correction": {
 			"type": "boolean",
 			"referenceOnly": true
@@ -550,6 +558,13 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
+		"platform_editor_no_cursor_on_live_doc_init": {
+			"type": "boolean"
+		},
+		"platform_editor_controls_no_toolbar_space": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"platform_editor_collab_text_selection_override": {
 			"type": "boolean",
 			"referenceOnly": true
@@ -574,10 +589,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"platform_editor_dnd_handle_highlight_fix_firefox": {
-			"type": "boolean",
-			"referenceOnly": true
-		},
 		"platform_editor_elements_dnd_multi_select_patch_3": {
 			"type": "boolean",
 			"referenceOnly": true