@atlaskit/editor-core 205.3.1 → 205.4.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-core
 
+## 205.4.0
+
+### Minor Changes
+
+- [#141575](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/141575)
+  [`53faa261e39a6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/53faa261e39a6) -
+  Adds support for overriding language names in the code block language list.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 205.3.2
+
+### Patch Changes
+
+- [#140996](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/140996)
+  [`f24f59a665aaf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f24f59a665aaf) -
+  Added a temporary experiment to aid editor controls experiment set up
+- Updated dependencies
+
 ## 205.3.1
 
 ### Patch Changes

package/dist/cjs/actions/index.js

@@ -17,6 +17,7 @@ var _analytics2 = require("@atlaskit/editor-common/utils/analytics");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _action = require("../utils/action");
 var _deprecationWarnings = _interopRequireDefault(require("../utils/deprecation-warnings"));
 var _nodesByLocalIds = require("../utils/nodes-by-localIds");
@@ -188,11 +189,21 @@ var EditorActions = exports.default = /*#__PURE__*/function () {
   }, {
     key: "focus",
     value: function focus() {
+      var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+          scrollIntoView: true
+        },
+        scrollIntoView = _ref2.scrollIntoView;
       if (!this.editorView || this.editorView.hasFocus()) {
         return false;
       }
       this.editorView.focus();
-      this.editorView.dispatch(this.editorView.state.tr.scrollIntoView());
+      if ((0, _platformFeatureFlags.fg)('platform_editor_reduce_scroll_jump_on_editor_start')) {
+        if (scrollIntoView !== null && scrollIntoView !== void 0 ? scrollIntoView : true) {
+          this.editorView.dispatch(this.editorView.state.tr.scrollIntoView());
+        }
+      } else {
+        this.editorView.dispatch(this.editorView.state.tr.scrollIntoView());
+      }
       return true;
     }
   }, {

package/dist/cjs/composable-editor/core-editor.js

@@ -18,6 +18,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _performanceMeasures = require("@atlaskit/editor-common/performance-measures");
 var _analytics2 = require("@atlaskit/editor-common/utils/analytics");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _actions = _interopRequireDefault(require("../actions"));
 var _EditorContext = require("../ui/EditorContext");
 var _featureFlagsFromProps = require("../utils/feature-flags-from-props");
@@ -115,13 +116,17 @@ var useMemoEditorFeatureFlags = function useMemoEditorFeatureFlags(featureFlags)
 function CoreEditor(props) {
   var editorSessionId = (0, _react.useRef)((0, _v.default)());
   var data = (0, _react.useMemo)(function () {
-    return {
+    return _objectSpread({
       packageName: _versionWrapper.name,
       packageVersion: _versionWrapper.version,
       componentName: 'editorCore',
       appearance: (0, _analytics2.getAnalyticsAppearance)(props.appearance),
       editorSessionId: editorSessionId.current
-    };
+    }, (0, _experiments.editorExperiment)('platform_editor_controls_shadow', 'variant1', {
+      exposure: true
+    }) ? {
+      tmpControlsShadow: true
+    } : {});
   }, [props.appearance]);
   var memodEditorFeatureFlags = useMemoEditorFeatureFlags(props.featureFlags);
   return (0, _react2.jsx)(_analyticsNamespacedContext.FabricEditorAnalyticsContext

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

@@ -55,7 +55,7 @@ var focusElementOutsideEditor = function focusElementOutsideEditor() {
   }
 };
 function ReactEditorView(props) {
-  var _pluginInjectionAPI$c, _media, _linking, _props$render, _props$render2;
+  var _pluginInjectionAPI$c, _media, _linking, _document$querySelect, _props$render, _props$render2;
   var preset = props.preset,
     _props$editorProps = props.editorProps,
     nextAppearance = _props$editorProps.appearance,
@@ -497,20 +497,46 @@ function ReactEditorView(props) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     editorView = _useState4[0],
     setEditorView = _useState4[1];
+  var originalScrollToRestore = _react.default.useRef((0, _isFullPage.isFullPage)(props.editorProps.appearance) && (0, _platformFeatureFlags.fg)('platform_editor_reduce_scroll_jump_on_editor_start') ? (_document$querySelect = document.querySelector('[data-editor-scroll-container]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.scrollTop : undefined);
+  var mitigateScrollJump =
+  // The feature gate here is being used to avoid potential bugs with the scroll restoration code
+  // moving it to the end of the expression negates the point of the feature gate
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  (0, _isFullPage.isFullPage)(props.editorProps.appearance) && (0, _platformFeatureFlags.fg)('platform_editor_reduce_scroll_jump_on_editor_start') && originalScrollToRestore.current && originalScrollToRestore.current !== 0;
   (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')) {
-      var liveDocWithContent = __livePage && !(0, _document.isEmptyDocument)(editorView.state.doc);
-      if (liveDocWithContent && (0, _platformFeatureFlags.fg)('platform_editor_no_cursor_on_live_doc_init')) {
-        focusElementOutsideEditor();
+      if ((0, _platformFeatureFlags.fg)('platform_editor_reduce_scroll_jump_on_editor_start')) {
+        if (!mitigateScrollJump) {
+          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);
+          }
+        }
       } else {
-        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, __livePage]);
+  }, [editorView, shouldFocus, __livePage, mitigateScrollJump]);
   var handleEditorViewRef = (0, _react.useCallback)(function (node) {
     if (!viewRef.current && node) {
       var view = createEditorView(node);
+      if ((0, _platformFeatureFlags.fg)('platform_editor_reduce_scroll_jump_on_editor_start')) {
+        if (mitigateScrollJump) {
+          var scrollElement = document.querySelector('[data-editor-scroll-container]');
+          scrollElement === null || scrollElement === void 0 || scrollElement.scrollTo({
+            top: originalScrollToRestore.current,
+            behavior: 'instant'
+          });
+        }
+      }
       onEditorCreated({
         view: view,
         config: config.current,
@@ -532,9 +558,20 @@ function ReactEditorView(props) {
           setEditorView(view);
         });
       } else {
-        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);
+        if (shouldFocus && view.props.editable && view.props.editable(view.state)) {
+          if ((0, _platformFeatureFlags.fg)('platform_editor_reduce_scroll_jump_on_editor_start')) {
+            if (!mitigateScrollJump) {
+              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);
+              }
+            }
+          } else {
+            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
@@ -562,7 +599,7 @@ function ReactEditorView(props) {
       }
       viewRef.current = undefined;
     }
-  }, [createEditorView, onEditorCreated, eventDispatcher, shouldFocus, __livePage, onEditorDestroyed, handleAnalyticsEvent]);
+  }, [createEditorView, onEditorCreated, eventDispatcher, shouldFocus, __livePage, onEditorDestroyed, handleAnalyticsEvent, mitigateScrollJump]);
   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

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

package/dist/es2019/actions/index.js

@@ -6,6 +6,7 @@ import { analyticsEventKey } from '@atlaskit/editor-common/utils/analytics';
 import { Node } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getEditorValueWithMedia } from '../utils/action';
 import deprecationWarnings from '../utils/deprecation-warnings';
 import { findNodePosByFragmentLocalIds } from '../utils/nodes-by-localIds';
@@ -130,12 +131,22 @@ export default class EditorActions {
   }
   //#endregion
 
-  focus() {
+  focus({
+    scrollIntoView
+  } = {
+    scrollIntoView: true
+  }) {
     if (!this.editorView || this.editorView.hasFocus()) {
       return false;
     }
     this.editorView.focus();
-    this.editorView.dispatch(this.editorView.state.tr.scrollIntoView());
+    if (fg('platform_editor_reduce_scroll_jump_on_editor_start')) {
+      if (scrollIntoView !== null && scrollIntoView !== void 0 ? scrollIntoView : true) {
+        this.editorView.dispatch(this.editorView.state.tr.scrollIntoView());
+      }
+    } else {
+      this.editorView.dispatch(this.editorView.state.tr.scrollIntoView());
+    }
     return true;
   }
   blur() {

package/dist/es2019/composable-editor/core-editor.js

@@ -15,6 +15,7 @@ import { ACTION, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils/analytics';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import EditorActions from '../actions';
 import { useEditorContext } from '../ui/EditorContext';
 import { createFeatureFlagsFromProps } from '../utils/feature-flags-from-props';
@@ -118,7 +119,12 @@ export function CoreEditor(props) {
       packageVersion: version,
       componentName: 'editorCore',
       appearance: getAnalyticsAppearance(props.appearance),
-      editorSessionId: editorSessionId.current
+      editorSessionId: editorSessionId.current,
+      ...(editorExperiment('platform_editor_controls_shadow', 'variant1', {
+        exposure: true
+      }) ? {
+        tmpControlsShadow: true
+      } : {})
     };
   }, [props.appearance]);
   const memodEditorFeatureFlags = useMemoEditorFeatureFlags(props.featureFlags);

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

@@ -40,7 +40,7 @@ const focusElementOutsideEditor = () => {
   }
 };
 export function ReactEditorView(props) {
-  var _pluginInjectionAPI$c, _pluginInjectionAPI$c2, _pluginInjectionAPI$c3, _media, _linking, _linking$smartLinks, _props$render, _props$render2;
+  var _pluginInjectionAPI$c, _pluginInjectionAPI$c2, _pluginInjectionAPI$c3, _media, _linking, _linking$smartLinks, _document$querySelect, _props$render, _props$render2;
   const {
     preset,
     editorProps: {
@@ -467,20 +467,46 @@ export function ReactEditorView(props) {
     return view;
   }, [getDirectEditorProps, dispatchAnalyticsEvent]);
   const [editorView, setEditorView] = useState(undefined);
+  const originalScrollToRestore = React.useRef(isFullPage(props.editorProps.appearance) && fg('platform_editor_reduce_scroll_jump_on_editor_start') ? (_document$querySelect = document.querySelector('[data-editor-scroll-container]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.scrollTop : undefined);
+  const mitigateScrollJump =
+  // The feature gate here is being used to avoid potential bugs with the scroll restoration code
+  // moving it to the end of the expression negates the point of the feature gate
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  isFullPage(props.editorProps.appearance) && fg('platform_editor_reduce_scroll_jump_on_editor_start') && originalScrollToRestore.current && originalScrollToRestore.current !== 0;
   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')) {
-      const liveDocWithContent = __livePage && !isEmptyDocument(editorView.state.doc);
-      if (liveDocWithContent && fg('platform_editor_no_cursor_on_live_doc_init')) {
-        focusElementOutsideEditor();
+      if (fg('platform_editor_reduce_scroll_jump_on_editor_start')) {
+        if (!mitigateScrollJump) {
+          const liveDocWithContent = __livePage && !isEmptyDocument(editorView.state.doc);
+          if (liveDocWithContent && fg('platform_editor_no_cursor_on_live_doc_init')) {
+            focusElementOutsideEditor();
+          } else {
+            focusTimeoutId.current = handleEditorFocus(editorView);
+          }
+        }
       } else {
-        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, __livePage]);
+  }, [editorView, shouldFocus, __livePage, mitigateScrollJump]);
   const handleEditorViewRef = useCallback(node => {
     if (!viewRef.current && node) {
       const view = createEditorView(node);
+      if (fg('platform_editor_reduce_scroll_jump_on_editor_start')) {
+        if (mitigateScrollJump) {
+          const scrollElement = document.querySelector('[data-editor-scroll-container]');
+          scrollElement === null || scrollElement === void 0 ? void 0 : scrollElement.scrollTo({
+            top: originalScrollToRestore.current,
+            behavior: 'instant'
+          });
+        }
+      }
       onEditorCreated({
         view,
         config: config.current,
@@ -500,9 +526,20 @@ export function ReactEditorView(props) {
           setEditorView(view);
         });
       } else {
-        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);
+        if (shouldFocus && view.props.editable && view.props.editable(view.state)) {
+          if (fg('platform_editor_reduce_scroll_jump_on_editor_start')) {
+            if (!mitigateScrollJump) {
+              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);
+              }
+            }
+          } else {
+            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
@@ -530,7 +567,7 @@ export function ReactEditorView(props) {
       }
       viewRef.current = undefined;
     }
-  }, [createEditorView, onEditorCreated, eventDispatcher, shouldFocus, __livePage, onEditorDestroyed, handleAnalyticsEvent]);
+  }, [createEditorView, onEditorCreated, eventDispatcher, shouldFocus, __livePage, onEditorDestroyed, handleAnalyticsEvent, mitigateScrollJump]);
   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

package/dist/es2019/version-wrapper.js

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

package/dist/esm/actions/index.js

@@ -10,6 +10,7 @@ import { analyticsEventKey } from '@atlaskit/editor-common/utils/analytics';
 import { Node } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getEditorValueWithMedia } from '../utils/action';
 import deprecationWarnings from '../utils/deprecation-warnings';
 import { findNodePosByFragmentLocalIds } from '../utils/nodes-by-localIds';
@@ -182,11 +183,21 @@ var EditorActions = /*#__PURE__*/function () {
   }, {
     key: "focus",
     value: function focus() {
+      var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+          scrollIntoView: true
+        },
+        scrollIntoView = _ref2.scrollIntoView;
       if (!this.editorView || this.editorView.hasFocus()) {
         return false;
       }
       this.editorView.focus();
-      this.editorView.dispatch(this.editorView.state.tr.scrollIntoView());
+      if (fg('platform_editor_reduce_scroll_jump_on_editor_start')) {
+        if (scrollIntoView !== null && scrollIntoView !== void 0 ? scrollIntoView : true) {
+          this.editorView.dispatch(this.editorView.state.tr.scrollIntoView());
+        }
+      } else {
+        this.editorView.dispatch(this.editorView.state.tr.scrollIntoView());
+      }
       return true;
     }
   }, {

package/dist/esm/composable-editor/core-editor.js

@@ -18,6 +18,7 @@ import { ACTION, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils/analytics';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import EditorActions from '../actions';
 import { useEditorContext } from '../ui/EditorContext';
 import { createFeatureFlagsFromProps } from '../utils/feature-flags-from-props';
@@ -111,13 +112,17 @@ var useMemoEditorFeatureFlags = function useMemoEditorFeatureFlags(featureFlags)
 export function CoreEditor(props) {
   var editorSessionId = useRef(uuid());
   var data = useMemo(function () {
-    return {
+    return _objectSpread({
       packageName: name,
       packageVersion: version,
       componentName: 'editorCore',
       appearance: getAnalyticsAppearance(props.appearance),
       editorSessionId: editorSessionId.current
-    };
+    }, editorExperiment('platform_editor_controls_shadow', 'variant1', {
+      exposure: true
+    }) ? {
+      tmpControlsShadow: true
+    } : {});
   }, [props.appearance]);
   var memodEditorFeatureFlags = useMemoEditorFeatureFlags(props.featureFlags);
   return jsx(FabricEditorAnalyticsContext

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

@@ -44,7 +44,7 @@ var focusElementOutsideEditor = function focusElementOutsideEditor() {
   }
 };
 export function ReactEditorView(props) {
-  var _pluginInjectionAPI$c, _media, _linking, _props$render, _props$render2;
+  var _pluginInjectionAPI$c, _media, _linking, _document$querySelect, _props$render, _props$render2;
   var preset = props.preset,
     _props$editorProps = props.editorProps,
     nextAppearance = _props$editorProps.appearance,
@@ -486,20 +486,46 @@ export function ReactEditorView(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     editorView = _useState4[0],
     setEditorView = _useState4[1];
+  var originalScrollToRestore = React.useRef(isFullPage(props.editorProps.appearance) && fg('platform_editor_reduce_scroll_jump_on_editor_start') ? (_document$querySelect = document.querySelector('[data-editor-scroll-container]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.scrollTop : undefined);
+  var mitigateScrollJump =
+  // The feature gate here is being used to avoid potential bugs with the scroll restoration code
+  // moving it to the end of the expression negates the point of the feature gate
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  isFullPage(props.editorProps.appearance) && fg('platform_editor_reduce_scroll_jump_on_editor_start') && originalScrollToRestore.current && originalScrollToRestore.current !== 0;
   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')) {
-      var liveDocWithContent = __livePage && !isEmptyDocument(editorView.state.doc);
-      if (liveDocWithContent && fg('platform_editor_no_cursor_on_live_doc_init')) {
-        focusElementOutsideEditor();
+      if (fg('platform_editor_reduce_scroll_jump_on_editor_start')) {
+        if (!mitigateScrollJump) {
+          var liveDocWithContent = __livePage && !isEmptyDocument(editorView.state.doc);
+          if (liveDocWithContent && fg('platform_editor_no_cursor_on_live_doc_init')) {
+            focusElementOutsideEditor();
+          } else {
+            focusTimeoutId.current = handleEditorFocus(editorView);
+          }
+        }
       } else {
-        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, __livePage]);
+  }, [editorView, shouldFocus, __livePage, mitigateScrollJump]);
   var handleEditorViewRef = useCallback(function (node) {
     if (!viewRef.current && node) {
       var view = createEditorView(node);
+      if (fg('platform_editor_reduce_scroll_jump_on_editor_start')) {
+        if (mitigateScrollJump) {
+          var scrollElement = document.querySelector('[data-editor-scroll-container]');
+          scrollElement === null || scrollElement === void 0 || scrollElement.scrollTo({
+            top: originalScrollToRestore.current,
+            behavior: 'instant'
+          });
+        }
+      }
       onEditorCreated({
         view: view,
         config: config.current,
@@ -521,9 +547,20 @@ export function ReactEditorView(props) {
           setEditorView(view);
         });
       } else {
-        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);
+        if (shouldFocus && view.props.editable && view.props.editable(view.state)) {
+          if (fg('platform_editor_reduce_scroll_jump_on_editor_start')) {
+            if (!mitigateScrollJump) {
+              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);
+              }
+            }
+          } else {
+            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
@@ -551,7 +588,7 @@ export function ReactEditorView(props) {
       }
       viewRef.current = undefined;
     }
-  }, [createEditorView, onEditorCreated, eventDispatcher, shouldFocus, __livePage, onEditorDestroyed, handleAnalyticsEvent]);
+  }, [createEditorView, onEditorCreated, eventDispatcher, shouldFocus, __livePage, onEditorDestroyed, handleAnalyticsEvent, mitigateScrollJump]);
   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

package/dist/esm/version-wrapper.js

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

package/dist/types/actions/index.d.ts

@@ -26,7 +26,9 @@ export default class EditorActions<T = any> implements EditorActionsOptions<T> {
     _privateUnregisterEditor(): void;
     _privateSubscribe(cb: ContextUpdateHandler): void;
     _privateUnsubscribe(cb: ContextUpdateHandler): void;
-    focus(): boolean;
+    focus({ scrollIntoView }?: {
+        scrollIntoView: boolean;
+    }): boolean;
     blur(): boolean;
     clear(): boolean;
     /**

package/dist/types-ts4.5/actions/index.d.ts

@@ -26,7 +26,9 @@ export default class EditorActions<T = any> implements EditorActionsOptions<T> {
     _privateUnregisterEditor(): void;
     _privateSubscribe(cb: ContextUpdateHandler): void;
     _privateUnsubscribe(cb: ContextUpdateHandler): void;
-    focus(): boolean;
+    focus({ scrollIntoView }?: {
+        scrollIntoView: boolean;
+    }): boolean;
     blur(): boolean;
     clear(): boolean;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "205.3.1",
+	"version": "205.4.0",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -54,14 +54,14 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/emoji": "^69.0.0",
-		"@atlaskit/icon": "^25.5.0",
+		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/media-card": "^79.0.0",
 		"@atlaskit/mention": "^24.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.1.0",
 		"@atlaskit/react-ufo": "^3.5.0",
 		"@atlaskit/task-decision": "^19.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.6.0",
+		"@atlaskit/tmp-editor-statsig": "^4.8.0",
 		"@atlaskit/tokens": "^4.7.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -101,8 +101,8 @@
 		"@atlaskit/media-test-helpers": "^35.0.0",
 		"@atlaskit/modal-dialog": "^14.1.0",
 		"@atlaskit/primitives": "^14.4.0",
-		"@atlaskit/renderer": "^114.7.0",
-		"@atlaskit/smart-card": "^36.5.0",
+		"@atlaskit/renderer": "^114.9.0",
+		"@atlaskit/smart-card": "^36.6.0",
 		"@atlaskit/synchrony-test-helpers": "^3.1.0",
 		"@atlaskit/toggle": "^15.0.0",
 		"@atlaskit/util-data-test": "^18.0.0",
@@ -154,6 +154,9 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
+		"platform_editor_reduce_scroll_jump_on_editor_start": {
+			"type": "boolean"
+		},
 		"platform_editor_fe--performance_metrics": {
 			"type": "boolean"
 		},
@@ -262,10 +265,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"platform_editor_merge_unconfirmed_steps": {
-			"type": "boolean",
-			"referenceOnly": true
-		},
 		"platform_editor_catch_missing_injection_states": {
 			"type": "boolean"
 		},
@@ -565,10 +564,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"platform_editor_collab_text_selection_override": {
-			"type": "boolean",
-			"referenceOnly": true
-		},
 		"platform_editor_controls_patch_2": {
 			"type": "boolean",
 			"referenceOnly": true