@atlaskit/editor-core 229.1.6 → 229.1.8

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-core
 
+## 229.1.8
+
+### Patch Changes
+
+- Updated dependencies
+
+## 229.1.7
+
+### Patch Changes
+
+- [`1ee5ac1d4338d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1ee5ac1d4338d) -
+  Cleaning up cc_editor_focus_before_editor_on_load and platform_editor_no_cursor_on_edit_page_init
+
+  Cursor suppression on load is now driven by the presence of the interaction plugin rather than the
+  experiment, so only editors that opt into that plugin skip focus on a document with content.
+  `cc_editor_focus_before_editor_on_load` shipped disabled, so the pre-editor focus element has been
+  removed.
+
+- Updated dependencies
+
 ## 229.1.6
 
 ### Patch Changes

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

@@ -36,7 +36,6 @@ var _editorSsrRenderer = require("@atlaskit/editor-ssr-renderer");
 var _createSsrEditorState = require("@atlaskit/editor-ssr-renderer/create-ssr-editor-state");
 var _createSsrPmPlugins = require("@atlaskit/editor-ssr-renderer/create-ssr-pm-plugins");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _addUfoCustomData = require("@atlaskit/react-ufo/add-ufo-custom-data");
 var _getInteractionId = require("@atlaskit/react-ufo/get-interaction-id");
 var _interactionMetrics = require("@atlaskit/react-ufo/interaction-metrics");
@@ -58,7 +57,6 @@ var _createErrorReporter = require("./createErrorReporter");
 var _createPMPlugins = require("./createPMPlugins");
 var _filterPluginsForReconfigure = require("./filter-plugins-for-reconfigure");
 var _messages = require("./messages");
-var _focusEditorElement = require("./ReactEditorView/focusEditorElement");
 var _getUAPrefix = require("./ReactEditorView/getUAPrefix");
 var _handleEditorFocus = require("./ReactEditorView/handleEditorFocus");
 var _useDispatchTransaction = require("./ReactEditorView/useDispatchTransaction");
@@ -116,7 +114,6 @@ function ReactEditorView(props) {
     errorReporterHandler = _props$editorProps.errorReporterHandler,
     defaultValue = _props$editorProps.defaultValue,
     shouldFocus = _props$editorProps.shouldFocus,
-    __livePage = _props$editorProps.__livePage,
     onEditorCreated = props.onEditorCreated,
     onEditorDestroyed = props.onEditorDestroyed;
 
@@ -820,21 +817,14 @@ function ReactEditorView(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)) {
       if (!mitigateScrollJump) {
-        var liveDocWithContent = (__livePage || (0, _expValEquals.expValEquals)('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)) && !(0, _document.isEmptyDocument)(editorView.state.doc);
-        if (!liveDocWithContent) {
+        var _pluginInjectionAPI$c3;
+        var focusesImmediately = (0, _isChromeless.isChromeless)(props.editorProps.appearance) || (0, _document.isEmptyDocument)(editorView.state.doc) || ((_pluginInjectionAPI$c3 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c3 === void 0 ? void 0 : _pluginInjectionAPI$c3.interaction) === undefined;
+        if (focusesImmediately) {
           focusTimeoutId.current = (0, _handleEditorFocus.handleEditorFocus)(editorView);
         }
-        if ((0, _isChromeless.isChromeless)(props.editorProps.appearance)) {
-          focusTimeoutId.current = (0, _handleEditorFocus.handleEditorFocus)(editorView);
-        }
-        if ((0, _expValEquals.expValEquals)('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true) && (0, _fg.fg)('cc_editor_focus_before_editor_on_load')) {
-          if (!disabled && shouldFocus && !(0, _document.isEmptyDocument)(editorView.state.doc)) {
-            (0, _focusEditorElement.focusEditorElement)(editorId.current);
-          }
-        }
       }
     }
-  }, [editorView, shouldFocus, __livePage, mitigateScrollJump, disabled, props.editorProps.appearance]);
+  }, [editorView, shouldFocus, mitigateScrollJump, disabled, props.editorProps.appearance]);
   var scrollElement = _react.default.useRef();
   var possibleListeners = _react.default.useRef([]);
   (0, _react.useEffect)(function () {
@@ -961,11 +951,7 @@ function ReactEditorView(props) {
   }, [createEditorView, onEditorCreated, eventDispatcher, onEditorDestroyed, handleAnalyticsEvent, mitigateScrollJump, scrollRestorePerfEnabled]);
   var isPageAppearance = (0, _isFullPage.isFullPage)(nextAppearance) || nextAppearance === 'max';
   var createEditor = (0, _react.useCallback)(function (assistiveLabel, assistiveDescribedBy) {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _fg.fg)('cc_editor_focus_before_editor_on_load') && /*#__PURE__*/_react.default.createElement("div", {
-      tabIndex: -1,
-      "data-focus-id": editorId.current,
-      "data-testid": "react-editor-view-inital-focus-element"
-    }), /*#__PURE__*/_react.default.createElement("div", {
+    return /*#__PURE__*/_react.default.createElement("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       className: "ProseMirror ".concat((0, _getUAPrefix.getUAPrefix)()),
       key: "ProseMirror",
@@ -990,7 +976,7 @@ function ReactEditorView(props) {
       dangerouslySetInnerHTML: {
         __html: ''
       }
-    }));
+    });
   }, [handleEditorViewRef, isPageAppearance, props.intl]);
   var previousPreset = (0, _hooks.usePreviousState)(preset);
   (0, _react.useLayoutEffect)(function () {
@@ -1009,26 +995,22 @@ function ReactEditorView(props) {
       return;
     }
     if (viewRef.current && previousDisabledState !== disabled) {
+      var _pluginInjectionAPI$c4;
       // Disables the contentEditable attribute of the editor if the editor is disabled
       viewRef.current.setProps({
         editable: function editable(_state) {
           return !disabled;
         }
       });
-      var isLivePageWithContent = (__livePage || (0, _expValEquals.expValEquals)('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)) && !(0, _document.isEmptyDocument)(viewRef.current.state.doc);
-      if (!disabled && shouldFocus && !isLivePageWithContent) {
+      var focusesImmediately = (0, _document.isEmptyDocument)(viewRef.current.state.doc) || ((_pluginInjectionAPI$c4 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c4 === void 0 ? void 0 : _pluginInjectionAPI$c4.interaction) === undefined;
+      if (!disabled && shouldFocus && focusesImmediately) {
         focusTimeoutId.current = (0, _handleEditorFocus.handleEditorFocus)(viewRef.current);
       }
-      if ((0, _expValEquals.expValEquals)('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true) && (0, _fg.fg)('cc_editor_focus_before_editor_on_load')) {
-        if (!disabled && shouldFocus && !(0, _document.isEmptyDocument)(viewRef.current.state.doc)) {
-          (0, _focusEditorElement.focusEditorElement)(editorId.current);
-        }
-      }
     }
-  }, [disabled, shouldFocus, previousDisabledState, __livePage]);
+  }, [disabled, shouldFocus, previousDisabledState]);
   (0, _react.useLayoutEffect)(function () {
-    var _pluginInjectionAPI$c3;
-    (_pluginInjectionAPI$c3 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c3 === void 0 || (_pluginInjectionAPI$c3 = _pluginInjectionAPI$c3.core) === null || _pluginInjectionAPI$c3 === void 0 || (_pluginInjectionAPI$c3 = _pluginInjectionAPI$c3.actions) === null || _pluginInjectionAPI$c3 === void 0 || _pluginInjectionAPI$c3.updateAppearance(nextAppearance);
+    var _pluginInjectionAPI$c5;
+    (_pluginInjectionAPI$c5 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c5 === void 0 || (_pluginInjectionAPI$c5 = _pluginInjectionAPI$c5.core) === null || _pluginInjectionAPI$c5 === void 0 || (_pluginInjectionAPI$c5 = _pluginInjectionAPI$c5.actions) === null || _pluginInjectionAPI$c5 === void 0 || _pluginInjectionAPI$c5.updateAppearance(nextAppearance);
   }, [nextAppearance]);
   (0, _useFireFullWidthEvent.useFireFullWidthEvent)(nextAppearance, dispatchAnalyticsEvent);
 
@@ -1057,7 +1039,7 @@ function ReactEditorView(props) {
   // In separate memo, because some props like `props.intl` that need only for rendering
   // changes many times, but we don't want to process plugins and ADF document for each unnecessary changes.
   var ssrDeps = (0, _react.useMemo)(function () {
-    var _pluginInjectionAPI$c4;
+    var _pluginInjectionAPI$c6;
     if (!(0, _coreUtils.isSSR)()) {
       return null;
     }
@@ -1078,7 +1060,7 @@ function ReactEditorView(props) {
       return buildDoc(schema);
     };
     var doc = (0, _ssrMeasures.profileSSROperation)("".concat(SSR_TRACE_SEGMENT_NAME, "/buildDoc"), doBuildDoc, onSSRMeasure);
-    var isViewMode = ((_pluginInjectionAPI$c4 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c4 === void 0 || (_pluginInjectionAPI$c4 = _pluginInjectionAPI$c4.editorViewMode) === null || _pluginInjectionAPI$c4 === void 0 || (_pluginInjectionAPI$c4 = _pluginInjectionAPI$c4.sharedState.currentState()) === null || _pluginInjectionAPI$c4 === void 0 ? void 0 : _pluginInjectionAPI$c4.mode) === 'view';
+    var isViewMode = ((_pluginInjectionAPI$c6 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c6 === void 0 || (_pluginInjectionAPI$c6 = _pluginInjectionAPI$c6.editorViewMode) === null || _pluginInjectionAPI$c6 === void 0 || (_pluginInjectionAPI$c6 = _pluginInjectionAPI$c6.sharedState.currentState()) === null || _pluginInjectionAPI$c6 === void 0 ? void 0 : _pluginInjectionAPI$c6.mode) === 'view';
     var ariaReadonly = isViewMode && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_viewmode_aria_readonly_a11y') ? 'true' : undefined;
 
     // When the platform_editor_ssr_toolbar_optimistic is on, we create SSR-safe PM plugins and EditorState

package/dist/cjs/presets/default.js

@@ -44,7 +44,6 @@ var _unsupportedContent = require("@atlaskit/editor-plugins/unsupported-content"
 var _userIntent = require("@atlaskit/editor-plugins/user-intent");
 var _width = require("@atlaskit/editor-plugins/width");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _isFullPage = require("../utils/is-full-page");
 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; }
@@ -69,7 +68,7 @@ function createDefaultPreset(options) {
     initialUserPreferences: {
       toolbarDockingPosition: isFullPage ? 'none' : 'top'
     }
-  }]).maybeAdd(_interaction.interactionPlugin, Boolean(options === null || options === void 0 ? void 0 : options.__livePage) || (0, _expValEquals.expValEquals)('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)).add(_composition.compositionPlugin).add([_contextIdentifier.contextIdentifierPlugin, {
+  }]).maybeAdd(_interaction.interactionPlugin, Boolean(options === null || options === void 0 ? void 0 : options.__livePage)).add(_composition.compositionPlugin).add([_contextIdentifier.contextIdentifierPlugin, {
     contextIdentifierProvider: options.contextIdentifierProvider
   }]).add([_base.basePlugin, options.base]).add(_decorations.decorationsPlugin).add([_typeAhead.typeAheadPlugin, options.typeAhead]).maybeAdd(_history.historyPlugin, Boolean(options.allowUndoRedoButtons)).add(_userIntent.userIntentPlugin).maybeAdd([_toolbar.toolbarPlugin, options.toolbar || {}], Boolean((_options$toolbar = options.toolbar) === null || _options$toolbar === void 0 ? void 0 : _options$toolbar.enableNewToolbarExperience)).add([_primaryToolbar.primaryToolbarPlugin, {
     contextualFormattingEnabled: isFullPage

package/dist/cjs/version-wrapper.js

@@ -6,4 +6,4 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
-var version = exports.version = "229.1.5";
+var version = exports.version = "229.1.7";

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

@@ -25,7 +25,6 @@ import { EditorSSRRenderer } from '@atlaskit/editor-ssr-renderer';
 import { createSSREditorState } from '@atlaskit/editor-ssr-renderer/create-ssr-editor-state';
 import { createSSRPMPlugins } from '@atlaskit/editor-ssr-renderer/create-ssr-pm-plugins';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { addUFOCustomData } from '@atlaskit/react-ufo/add-ufo-custom-data';
 import { getInteractionId } from '@atlaskit/react-ufo/get-interaction-id';
 import { abortAll, getActiveInteraction } from '@atlaskit/react-ufo/interaction-metrics';
@@ -47,7 +46,6 @@ import { createErrorReporter } from './createErrorReporter';
 import { createPMPlugins } from './createPMPlugins';
 import { filterPluginsForReconfigure } from './filter-plugins-for-reconfigure';
 import { editorMessages } from './messages';
-import { focusEditorElement } from './ReactEditorView/focusEditorElement';
 import { getUAPrefix } from './ReactEditorView/getUAPrefix';
 import { handleEditorFocus } from './ReactEditorView/handleEditorFocus';
 import { useDispatchTransaction } from './ReactEditorView/useDispatchTransaction';
@@ -86,8 +84,7 @@ export function ReactEditorView(props) {
       featureFlags: editorPropFeatureFlags,
       errorReporterHandler,
       defaultValue,
-      shouldFocus,
-      __livePage
+      shouldFocus
     },
     onEditorCreated,
     onEditorDestroyed
@@ -768,21 +765,14 @@ export function ReactEditorView(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)) {
       if (!mitigateScrollJump) {
-        const liveDocWithContent = (__livePage || expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)) && !isEmptyDocument(editorView.state.doc);
-        if (!liveDocWithContent) {
+        var _pluginInjectionAPI$c5;
+        const focusesImmediately = isChromeless(props.editorProps.appearance) || isEmptyDocument(editorView.state.doc) || ((_pluginInjectionAPI$c5 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c5 === void 0 ? void 0 : _pluginInjectionAPI$c5.interaction) === undefined;
+        if (focusesImmediately) {
           focusTimeoutId.current = handleEditorFocus(editorView);
         }
-        if (isChromeless(props.editorProps.appearance)) {
-          focusTimeoutId.current = handleEditorFocus(editorView);
-        }
-        if (expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true) && fg('cc_editor_focus_before_editor_on_load')) {
-          if (!disabled && shouldFocus && !isEmptyDocument(editorView.state.doc)) {
-            focusEditorElement(editorId.current);
-          }
-        }
       }
     }
-  }, [editorView, shouldFocus, __livePage, mitigateScrollJump, disabled, props.editorProps.appearance]);
+  }, [editorView, shouldFocus, mitigateScrollJump, disabled, props.editorProps.appearance]);
   const scrollElement = React.useRef();
   const possibleListeners = React.useRef([]);
   useEffect(() => {
@@ -891,11 +881,7 @@ export function ReactEditorView(props) {
   }, [createEditorView, onEditorCreated, eventDispatcher, onEditorDestroyed, handleAnalyticsEvent, mitigateScrollJump, scrollRestorePerfEnabled]);
   const isPageAppearance = isFullPage(nextAppearance) || nextAppearance === 'max';
   const createEditor = useCallback((assistiveLabel, assistiveDescribedBy) => {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, fg('cc_editor_focus_before_editor_on_load') && /*#__PURE__*/React.createElement("div", {
-      tabIndex: -1,
-      "data-focus-id": editorId.current,
-      "data-testid": "react-editor-view-inital-focus-element"
-    }), /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       className: `ProseMirror ${getUAPrefix()}`,
       key: "ProseMirror",
@@ -920,7 +906,7 @@ export function ReactEditorView(props) {
       dangerouslySetInnerHTML: {
         __html: ''
       }
-    }));
+    });
   }, [handleEditorViewRef, isPageAppearance, props.intl]);
   const previousPreset = usePreviousState(preset);
   useLayoutEffect(() => {
@@ -939,24 +925,20 @@ export function ReactEditorView(props) {
       return;
     }
     if (viewRef.current && previousDisabledState !== disabled) {
+      var _pluginInjectionAPI$c6;
       // Disables the contentEditable attribute of the editor if the editor is disabled
       viewRef.current.setProps({
         editable: _state => !disabled
       });
-      const isLivePageWithContent = (__livePage || expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)) && !isEmptyDocument(viewRef.current.state.doc);
-      if (!disabled && shouldFocus && !isLivePageWithContent) {
+      const focusesImmediately = isEmptyDocument(viewRef.current.state.doc) || ((_pluginInjectionAPI$c6 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c6 === void 0 ? void 0 : _pluginInjectionAPI$c6.interaction) === undefined;
+      if (!disabled && shouldFocus && focusesImmediately) {
         focusTimeoutId.current = handleEditorFocus(viewRef.current);
       }
-      if (expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true) && fg('cc_editor_focus_before_editor_on_load')) {
-        if (!disabled && shouldFocus && !isEmptyDocument(viewRef.current.state.doc)) {
-          focusEditorElement(editorId.current);
-        }
-      }
     }
-  }, [disabled, shouldFocus, previousDisabledState, __livePage]);
+  }, [disabled, shouldFocus, previousDisabledState]);
   useLayoutEffect(() => {
-    var _pluginInjectionAPI$c5, _pluginInjectionAPI$c6, _pluginInjectionAPI$c7;
-    (_pluginInjectionAPI$c5 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c5 === void 0 ? void 0 : (_pluginInjectionAPI$c6 = _pluginInjectionAPI$c5.core) === null || _pluginInjectionAPI$c6 === void 0 ? void 0 : (_pluginInjectionAPI$c7 = _pluginInjectionAPI$c6.actions) === null || _pluginInjectionAPI$c7 === void 0 ? void 0 : _pluginInjectionAPI$c7.updateAppearance(nextAppearance);
+    var _pluginInjectionAPI$c7, _pluginInjectionAPI$c8, _pluginInjectionAPI$c9;
+    (_pluginInjectionAPI$c7 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c7 === void 0 ? void 0 : (_pluginInjectionAPI$c8 = _pluginInjectionAPI$c7.core) === null || _pluginInjectionAPI$c8 === void 0 ? void 0 : (_pluginInjectionAPI$c9 = _pluginInjectionAPI$c8.actions) === null || _pluginInjectionAPI$c9 === void 0 ? void 0 : _pluginInjectionAPI$c9.updateAppearance(nextAppearance);
   }, [nextAppearance]);
   useFireFullWidthEvent(nextAppearance, dispatchAnalyticsEvent);
 
@@ -986,7 +968,7 @@ export function ReactEditorView(props) {
   // In separate memo, because some props like `props.intl` that need only for rendering
   // changes many times, but we don't want to process plugins and ADF document for each unnecessary changes.
   const ssrDeps = useMemo(() => {
-    var _pluginInjectionAPI$c8, _pluginInjectionAPI$c9, _pluginInjectionAPI$c0;
+    var _pluginInjectionAPI$c0, _pluginInjectionAPI$c1, _pluginInjectionAPI$c10;
     if (!isSSR()) {
       return null;
     }
@@ -1001,7 +983,7 @@ export function ReactEditorView(props) {
     const schema = profileSSROperation(`${SSR_TRACE_SEGMENT_NAME}/createSchema`, doCreateSchema, onSSRMeasure);
     const doBuildDoc = () => buildDoc(schema);
     const doc = profileSSROperation(`${SSR_TRACE_SEGMENT_NAME}/buildDoc`, doBuildDoc, onSSRMeasure);
-    const isViewMode = ((_pluginInjectionAPI$c8 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c8 === void 0 ? void 0 : (_pluginInjectionAPI$c9 = _pluginInjectionAPI$c8.editorViewMode) === null || _pluginInjectionAPI$c9 === void 0 ? void 0 : (_pluginInjectionAPI$c0 = _pluginInjectionAPI$c9.sharedState.currentState()) === null || _pluginInjectionAPI$c0 === void 0 ? void 0 : _pluginInjectionAPI$c0.mode) === 'view';
+    const isViewMode = ((_pluginInjectionAPI$c0 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c0 === void 0 ? void 0 : (_pluginInjectionAPI$c1 = _pluginInjectionAPI$c0.editorViewMode) === null || _pluginInjectionAPI$c1 === void 0 ? void 0 : (_pluginInjectionAPI$c10 = _pluginInjectionAPI$c1.sharedState.currentState()) === null || _pluginInjectionAPI$c10 === void 0 ? void 0 : _pluginInjectionAPI$c10.mode) === 'view';
     const ariaReadonly = isViewMode && isExperimentEnabled('platform_editor_viewmode_aria_readonly_a11y') ? 'true' : undefined;
 
     // When the platform_editor_ssr_toolbar_optimistic is on, we create SSR-safe PM plugins and EditorState

package/dist/es2019/presets/default.js

@@ -37,7 +37,6 @@ import { unsupportedContentPlugin } from '@atlaskit/editor-plugins/unsupported-c
 import { userIntentPlugin } from '@atlaskit/editor-plugins/user-intent';
 import { widthPlugin } from '@atlaskit/editor-plugins/width';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { isFullPage as fullPageCheck } from '../utils/is-full-page';
 
@@ -62,7 +61,7 @@ export function createDefaultPreset(options) {
     initialUserPreferences: {
       toolbarDockingPosition: isFullPage ? 'none' : 'top'
     }
-  }]).maybeAdd(interactionPlugin, Boolean(options === null || options === void 0 ? void 0 : options.__livePage) || expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)).add(compositionPlugin).add([contextIdentifierPlugin, {
+  }]).maybeAdd(interactionPlugin, Boolean(options === null || options === void 0 ? void 0 : options.__livePage)).add(compositionPlugin).add([contextIdentifierPlugin, {
     contextIdentifierProvider: options.contextIdentifierProvider
   }]).add([basePlugin, options.base]).add(decorationsPlugin).add([typeAheadPlugin, options.typeAhead]).maybeAdd(historyPlugin, Boolean(options.allowUndoRedoButtons)).add(userIntentPlugin).maybeAdd([toolbarPlugin, options.toolbar || {}], Boolean((_options$toolbar = options.toolbar) === null || _options$toolbar === void 0 ? void 0 : _options$toolbar.enableNewToolbarExperience)).add([primaryToolbarPlugin, {
     contextualFormattingEnabled: isFullPage

package/dist/es2019/version-wrapper.js

@@ -1,3 +1,3 @@
 export const name = "@atlaskit/editor-core";
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
-export const version = "229.1.5";
+export const version = "229.1.7";

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

@@ -33,7 +33,6 @@ import { EditorSSRRenderer } from '@atlaskit/editor-ssr-renderer';
 import { createSSREditorState } from '@atlaskit/editor-ssr-renderer/create-ssr-editor-state';
 import { createSSRPMPlugins } from '@atlaskit/editor-ssr-renderer/create-ssr-pm-plugins';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { addUFOCustomData } from '@atlaskit/react-ufo/add-ufo-custom-data';
 import { getInteractionId } from '@atlaskit/react-ufo/get-interaction-id';
 import { abortAll, getActiveInteraction } from '@atlaskit/react-ufo/interaction-metrics';
@@ -55,7 +54,6 @@ import { createErrorReporter } from './createErrorReporter';
 import { createPMPlugins } from './createPMPlugins';
 import { filterPluginsForReconfigure } from './filter-plugins-for-reconfigure';
 import { editorMessages } from './messages';
-import { focusEditorElement } from './ReactEditorView/focusEditorElement';
 import { getUAPrefix } from './ReactEditorView/getUAPrefix';
 import { handleEditorFocus } from './ReactEditorView/handleEditorFocus';
 import { useDispatchTransaction } from './ReactEditorView/useDispatchTransaction';
@@ -107,7 +105,6 @@ export function ReactEditorView(props) {
     errorReporterHandler = _props$editorProps.errorReporterHandler,
     defaultValue = _props$editorProps.defaultValue,
     shouldFocus = _props$editorProps.shouldFocus,
-    __livePage = _props$editorProps.__livePage,
     onEditorCreated = props.onEditorCreated,
     onEditorDestroyed = props.onEditorDestroyed;
 
@@ -811,21 +808,14 @@ export function ReactEditorView(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)) {
       if (!mitigateScrollJump) {
-        var liveDocWithContent = (__livePage || expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)) && !isEmptyDocument(editorView.state.doc);
-        if (!liveDocWithContent) {
+        var _pluginInjectionAPI$c3;
+        var focusesImmediately = isChromeless(props.editorProps.appearance) || isEmptyDocument(editorView.state.doc) || ((_pluginInjectionAPI$c3 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c3 === void 0 ? void 0 : _pluginInjectionAPI$c3.interaction) === undefined;
+        if (focusesImmediately) {
           focusTimeoutId.current = handleEditorFocus(editorView);
         }
-        if (isChromeless(props.editorProps.appearance)) {
-          focusTimeoutId.current = handleEditorFocus(editorView);
-        }
-        if (expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true) && fg('cc_editor_focus_before_editor_on_load')) {
-          if (!disabled && shouldFocus && !isEmptyDocument(editorView.state.doc)) {
-            focusEditorElement(editorId.current);
-          }
-        }
       }
     }
-  }, [editorView, shouldFocus, __livePage, mitigateScrollJump, disabled, props.editorProps.appearance]);
+  }, [editorView, shouldFocus, mitigateScrollJump, disabled, props.editorProps.appearance]);
   var scrollElement = React.useRef();
   var possibleListeners = React.useRef([]);
   useEffect(function () {
@@ -952,11 +942,7 @@ export function ReactEditorView(props) {
   }, [createEditorView, onEditorCreated, eventDispatcher, onEditorDestroyed, handleAnalyticsEvent, mitigateScrollJump, scrollRestorePerfEnabled]);
   var isPageAppearance = isFullPage(nextAppearance) || nextAppearance === 'max';
   var createEditor = useCallback(function (assistiveLabel, assistiveDescribedBy) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, fg('cc_editor_focus_before_editor_on_load') && /*#__PURE__*/React.createElement("div", {
-      tabIndex: -1,
-      "data-focus-id": editorId.current,
-      "data-testid": "react-editor-view-inital-focus-element"
-    }), /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       className: "ProseMirror ".concat(getUAPrefix()),
       key: "ProseMirror",
@@ -981,7 +967,7 @@ export function ReactEditorView(props) {
       dangerouslySetInnerHTML: {
         __html: ''
       }
-    }));
+    });
   }, [handleEditorViewRef, isPageAppearance, props.intl]);
   var previousPreset = usePreviousState(preset);
   useLayoutEffect(function () {
@@ -1000,26 +986,22 @@ export function ReactEditorView(props) {
       return;
     }
     if (viewRef.current && previousDisabledState !== disabled) {
+      var _pluginInjectionAPI$c4;
       // Disables the contentEditable attribute of the editor if the editor is disabled
       viewRef.current.setProps({
         editable: function editable(_state) {
           return !disabled;
         }
       });
-      var isLivePageWithContent = (__livePage || expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)) && !isEmptyDocument(viewRef.current.state.doc);
-      if (!disabled && shouldFocus && !isLivePageWithContent) {
+      var focusesImmediately = isEmptyDocument(viewRef.current.state.doc) || ((_pluginInjectionAPI$c4 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c4 === void 0 ? void 0 : _pluginInjectionAPI$c4.interaction) === undefined;
+      if (!disabled && shouldFocus && focusesImmediately) {
         focusTimeoutId.current = handleEditorFocus(viewRef.current);
       }
-      if (expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true) && fg('cc_editor_focus_before_editor_on_load')) {
-        if (!disabled && shouldFocus && !isEmptyDocument(viewRef.current.state.doc)) {
-          focusEditorElement(editorId.current);
-        }
-      }
     }
-  }, [disabled, shouldFocus, previousDisabledState, __livePage]);
+  }, [disabled, shouldFocus, previousDisabledState]);
   useLayoutEffect(function () {
-    var _pluginInjectionAPI$c3;
-    (_pluginInjectionAPI$c3 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c3 === void 0 || (_pluginInjectionAPI$c3 = _pluginInjectionAPI$c3.core) === null || _pluginInjectionAPI$c3 === void 0 || (_pluginInjectionAPI$c3 = _pluginInjectionAPI$c3.actions) === null || _pluginInjectionAPI$c3 === void 0 || _pluginInjectionAPI$c3.updateAppearance(nextAppearance);
+    var _pluginInjectionAPI$c5;
+    (_pluginInjectionAPI$c5 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c5 === void 0 || (_pluginInjectionAPI$c5 = _pluginInjectionAPI$c5.core) === null || _pluginInjectionAPI$c5 === void 0 || (_pluginInjectionAPI$c5 = _pluginInjectionAPI$c5.actions) === null || _pluginInjectionAPI$c5 === void 0 || _pluginInjectionAPI$c5.updateAppearance(nextAppearance);
   }, [nextAppearance]);
   useFireFullWidthEvent(nextAppearance, dispatchAnalyticsEvent);
 
@@ -1048,7 +1030,7 @@ export function ReactEditorView(props) {
   // In separate memo, because some props like `props.intl` that need only for rendering
   // changes many times, but we don't want to process plugins and ADF document for each unnecessary changes.
   var ssrDeps = useMemo(function () {
-    var _pluginInjectionAPI$c4;
+    var _pluginInjectionAPI$c6;
     if (!isSSR()) {
       return null;
     }
@@ -1069,7 +1051,7 @@ export function ReactEditorView(props) {
       return buildDoc(schema);
     };
     var doc = profileSSROperation("".concat(SSR_TRACE_SEGMENT_NAME, "/buildDoc"), doBuildDoc, onSSRMeasure);
-    var isViewMode = ((_pluginInjectionAPI$c4 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c4 === void 0 || (_pluginInjectionAPI$c4 = _pluginInjectionAPI$c4.editorViewMode) === null || _pluginInjectionAPI$c4 === void 0 || (_pluginInjectionAPI$c4 = _pluginInjectionAPI$c4.sharedState.currentState()) === null || _pluginInjectionAPI$c4 === void 0 ? void 0 : _pluginInjectionAPI$c4.mode) === 'view';
+    var isViewMode = ((_pluginInjectionAPI$c6 = pluginInjectionAPI.current.api()) === null || _pluginInjectionAPI$c6 === void 0 || (_pluginInjectionAPI$c6 = _pluginInjectionAPI$c6.editorViewMode) === null || _pluginInjectionAPI$c6 === void 0 || (_pluginInjectionAPI$c6 = _pluginInjectionAPI$c6.sharedState.currentState()) === null || _pluginInjectionAPI$c6 === void 0 ? void 0 : _pluginInjectionAPI$c6.mode) === 'view';
     var ariaReadonly = isViewMode && isExperimentEnabled('platform_editor_viewmode_aria_readonly_a11y') ? 'true' : undefined;
 
     // When the platform_editor_ssr_toolbar_optimistic is on, we create SSR-safe PM plugins and EditorState

package/dist/esm/presets/default.js

@@ -40,7 +40,6 @@ import { unsupportedContentPlugin } from '@atlaskit/editor-plugins/unsupported-c
 import { userIntentPlugin } from '@atlaskit/editor-plugins/user-intent';
 import { widthPlugin } from '@atlaskit/editor-plugins/width';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { isFullPage as fullPageCheck } from '../utils/is-full-page';
 
@@ -64,7 +63,7 @@ export function createDefaultPreset(options) {
     initialUserPreferences: {
       toolbarDockingPosition: isFullPage ? 'none' : 'top'
     }
-  }]).maybeAdd(interactionPlugin, Boolean(options === null || options === void 0 ? void 0 : options.__livePage) || expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)).add(compositionPlugin).add([contextIdentifierPlugin, {
+  }]).maybeAdd(interactionPlugin, Boolean(options === null || options === void 0 ? void 0 : options.__livePage)).add(compositionPlugin).add([contextIdentifierPlugin, {
     contextIdentifierProvider: options.contextIdentifierProvider
   }]).add([basePlugin, options.base]).add(decorationsPlugin).add([typeAheadPlugin, options.typeAhead]).maybeAdd(historyPlugin, Boolean(options.allowUndoRedoButtons)).add(userIntentPlugin).maybeAdd([toolbarPlugin, options.toolbar || {}], Boolean((_options$toolbar = options.toolbar) === null || _options$toolbar === void 0 ? void 0 : _options$toolbar.enableNewToolbarExperience)).add([primaryToolbarPlugin, {
     contextualFormattingEnabled: isFullPage

package/dist/esm/version-wrapper.js

@@ -1,3 +1,3 @@
 export var name = "@atlaskit/editor-core";
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
-export var version = "229.1.5";
+export var version = "229.1.7";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "229.1.6",
+	"version": "229.1.8",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -77,8 +77,8 @@
 		"@atlaskit/react-compiler-gating": "^0.2.0",
 		"@atlaskit/react-ufo": "^7.13.0",
 		"@atlaskit/task-decision": "^21.10.0",
-		"@atlaskit/tmp-editor-statsig": "^202.0.0",
-		"@atlaskit/tokens": "^18.2.0",
+		"@atlaskit/tmp-editor-statsig": "^203.0.0",
+		"@atlaskit/tokens": "^19.0.0",
 		"@atlaskit/tooltip": "^24.3.0",
 		"@atlaskit/width-detector": "^7.2.0",
 		"@babel/runtime": "^7.0.0",
@@ -96,7 +96,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^123.5.0",
+		"@atlaskit/editor-common": "^123.8.0",
 		"@atlaskit/link-provider": "^5.7.0",
 		"@atlaskit/media-core": "^38.2.0",
 		"react": "^18.2.0 || ^19.2.0",
@@ -116,7 +116,7 @@
 		"@atlaskit/docs": "^12.2.0",
 		"@atlaskit/drawer": "^14.3.0",
 		"@atlaskit/editor-plugin-alignment": "^20.0.0",
-		"@atlaskit/editor-plugin-annotation": "^19.0.0",
+		"@atlaskit/editor-plugin-annotation": "^19.2.0",
 		"@atlaskit/editor-plugin-base": "^20.0.0",
 		"@atlaskit/editor-plugin-card": "^25.0.0",
 		"@atlaskit/editor-plugin-code-block-advanced": "^19.0.0",
@@ -141,7 +141,7 @@
 		"@atlaskit/editor-plugin-text-color": "^19.0.0",
 		"@atlaskit/editor-plugin-toolbar-lists-indentation": "^20.0.0",
 		"@atlaskit/editor-plugin-track-changes": "^18.0.0",
-		"@atlaskit/editor-synced-block-provider": "^15.0.0",
+		"@atlaskit/editor-synced-block-provider": "^15.1.0",
 		"@atlaskit/editor-synced-block-renderer": "^17.0.0",
 		"@atlaskit/editor-test-helpers": "workspace:^",
 		"@atlaskit/form": "^17.2.0",
@@ -157,9 +157,9 @@
 		"@atlaskit/navigation-system": "^10.17.0",
 		"@atlaskit/popper": "^9.4.0",
 		"@atlaskit/portal": "^7.0.0",
-		"@atlaskit/profilecard": "^26.24.0",
+		"@atlaskit/profilecard": "^26.25.0",
 		"@atlaskit/radio": "^10.2.0",
-		"@atlaskit/renderer": "^141.0.0",
+		"@atlaskit/renderer": "^142.1.0",
 		"@atlaskit/section-message": "^10.2.0",
 		"@atlaskit/spinner": "^20.4.0",
 		"@atlaskit/synchrony-test-helpers": "workspace:^",
@@ -177,7 +177,7 @@
 		"@atlassian/search-provider": "^20.0.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"@atlassian/testing-library": "^0.11.0",
-		"@atlassian/user-profile-card": "^1.40.0",
+		"@atlassian/user-profile-card": "^1.41.0",
 		"@emotion/jest": "^11.8.0",
 		"@testing-library/react": "^16.3.0",
 		"@types/diff": "^5.0.2",
@@ -266,9 +266,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"cc_editor_focus_before_editor_on_load": {
-			"type": "boolean"
-		},
 		"platform_editor_adf_with_localid": {
 			"type": "boolean",
 			"referenceOnly": true

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

@@ -1,15 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.focusEditorElement = focusEditorElement;
-function focusEditorElement(editorId) {
-  var parentElement = document.querySelector("[data-focus-id=\"".concat(editorId, "\"]"));
-  if (!(parentElement instanceof HTMLElement)) {
-    return;
-  }
-  parentElement.focus({
-    preventScroll: true
-  });
-}

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

@@ -1,9 +0,0 @@
-export function focusEditorElement(editorId) {
-  const parentElement = document.querySelector(`[data-focus-id="${editorId}"]`);
-  if (!(parentElement instanceof HTMLElement)) {
-    return;
-  }
-  parentElement.focus({
-    preventScroll: true
-  });
-}

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

@@ -1,9 +0,0 @@
-export function focusEditorElement(editorId) {
-  var parentElement = document.querySelector("[data-focus-id=\"".concat(editorId, "\"]"));
-  if (!(parentElement instanceof HTMLElement)) {
-    return;
-  }
-  parentElement.focus({
-    preventScroll: true
-  });
-}

package/dist/types/create-editor/ReactEditorView/focusEditorElement.d.ts

@@ -1 +0,0 @@
-export declare function focusEditorElement(editorId: string): void;