@atlaskit/editor-core 205.3.2 → 205.4.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-core
 
+## 205.4.1
+
+### Patch Changes
+
+- [#142098](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/142098)
+  [`e84b542ba2d44`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e84b542ba2d44) -
+  [ED-27614] Put quick insert placeholder behind a separate
+  FGplatform_editor_quick_insert_placeholder
+- Updated dependencies
+
+## 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

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

@@ -156,7 +156,7 @@ var akEditorBreakpointForSmallDevice = "1266px";
 var contentStyles = function contentStyles(props) {
   return (0, _react2.css)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2.default)(["\n\t--ak-editor--default-gutter-padding: ", "px;\n\t/* 52 is from akEditorGutterPaddingDynamic via editor-shared-styles */\n\t--ak-editor--large-gutter-padding: ", "px;\n\t--ak-editor--default-layout-width: ", "px;\n\t--ak-editor--full-width-layout-width: ", "px;\n\t/* calculate editor line length, 100cqw is the editor container width */\n\t--ak-editor--line-length: min(\n\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\tvar(--ak-editor--default-layout-width)\n\t);\n\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t--ak-editor--breakout-full-page-guttering-padding: calc(\n\t\tvar(--ak-editor--large-gutter-padding) * 2 + var(--ak-editor--default-gutter-padding)\n\t);\n\n\t.fabric-editor--full-width-mode {\n\t\t--ak-editor--line-length: min(\n\t\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\t\tvar(--ak-editor--full-width-layout-width)\n\t\t);\n\t}\n\n\t.ProseMirror {\n\t\t--ak-editor-max-container-width: calc(100cqw - var(--ak-editor--large-gutter-padding));\n\t}\n\n\t/* We can't allow nodes that are inside other nodes to bleed from the parent container */\n\t.ProseMirror > div[data-prosemirror-node-block] [data-prosemirror-node-block] {\n\t\t--ak-editor-max-container-width: 100%;\n\t}\n\n\t/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */\n\t@container editor-area (width >= ", ") {\n\t\t.ProseMirror {\n\t\t\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t\t}\n\t}\n\n\t.ProseMirror {\n\t\toutline: none;\n\t\tfont-size: ", "px;\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t}\n\n\t", "\n\n\t.ProseMirror-hideselection *::selection {\n\t\tbackground: transparent;\n\t}\n\n\t.ProseMirror-hideselection *::-moz-selection {\n\t\tbackground: transparent;\n\t}\n\n\t/**\n\t * This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24\n\t *\n\t * 1. Merge and Release platform_editor_hide_cursor_when_pm_hideselection\n\t * 2. Cleanup duplicated style from platform_editor_advanced_code_blocks\n\t *    https://product-fabric.atlassian.net/browse/ED-26331\n\t */\n\t", "\n\n\t/* This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24 */\n\t", "\n\n\t.ProseMirror-selectednode {\n\t\toutline: none;\n\t}\n\n\t.ProseMirror-selectednode:empty {\n\t\toutline: 2px solid ", ";\n\t}\n\n\t.ProseMirror.ProseMirror-focused:has(.ProseMirror-mark-boundary-cursor) {\n\t\tcaret-color: transparent;\n\t}\n\t.ProseMirror:not(.ProseMirror-focused) .ProseMirror-mark-boundary-cursor {\n\t\tdisplay: none;\n\t}\n\n\t", "\n\t", "\n\t", "\n\t", "\n\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  // Switch between the two icons based on the visual refresh feature gate\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\t", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n\t\tbox-sizing: border-box;\n\t}\n\n\t.mediaGroupView-content-wrap ul {\n\t\tpadding: 0;\n\t}\n\n\t/** Needed to override any cleared floats, e.g. image wrapping */\n\n\tdiv.fabric-editor-block-mark[class^='fabric-editor-align'] {\n\t\tclear: none !important;\n\t}\n\n\t.fabric-editor-align-end {\n\t\ttext-align: right;\n\t}\n\n\t.fabric-editor-align-start {\n\t\ttext-align: left;\n\t}\n\n\t.fabric-editor-align-center {\n\t\ttext-align: center;\n\t}\n\n\t// For FullPage only when inside a table\n\t// Related code all lives inside: packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts\n\t// In the \"editorContentAreaContainerStyle\" function\n\t.fabric-editor--full-width-mode {\n\t\t.pm-table-container {\n\t\t\t.code-block,\n\t\t\t.extension-container,\n\t\t\t.multiBodiedExtension--container {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t}\n\t}\n\n\t.pm-table-header-content-wrap :not(.fabric-editor-alignment),\n\t.pm-table-header-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark,\n\t.pm-table-cell-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark {\n\t\tp:first-of-type {\n\t\t\tmargin-top: 0;\n\t\t}\n\t}\n\t.pm-table-cell-content-wrap .mediaGroupView-content-wrap {\n\t\tclear: both;\n\t}\n\n\t.hyperlink-floating-toolbar,\n\t.", " {\n\t\tpadding: 0;\n\t}\n\n\t/* Legacy Link icon in the Atlaskit package\n     is bigger than the others, new ADS icon does not have this issue\n  */\n\t", "\n"])), _editorSharedStyles.akEditorGutterPadding, (0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), _editorSharedStyles.akEditorDefaultLayoutWidth, _editorSharedStyles.akEditorFullWidthLayoutWidth, _editorSharedStyles.akEditorCalculatedWideLayoutWidthSmallViewport, akEditorBreakpointForSmallDevice, _editorSharedStyles.akEditorCalculatedWideLayoutWidth, (0, _editorSharedStyles.editorFontSize)({
     theme: props.theme
-  }), _styles.whitespaceSharedStyles, (0, _styles.paragraphSharedStyles)(props.typographyTheme), _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, (0, _platformFeatureFlags.fg)('editor_request_to_edit_task') ? null : (0, _react2.css)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n\t\t\t\t\tpointer-events: none;\n\t\t\t\t\topacity: 0.7;\n\t\t\t\t}\n\t\t\t"]))), (0, _platformFeatureFlags.fg)('platform_editor_hide_cursor_when_pm_hideselection') ? (0, _react2.css)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, (0, _experiments.editorExperiment)('platform_editor_advanced_code_blocks', true) ? (0, _react2.css)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, "var(--ds-border-focused, #8cf)", _styles5.placeholderTextStyles, placeholderStyles, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? placeholderOverflowStyles : null, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_3') ? placeholderWrapStyles : null, (0, _codeBlock.codeBlockStyles)(), (0, _styles2.blocktypeStyles)(props.typographyTheme), (0, _styles.codeMarkSharedStyles)(), _styles.textColorStyles, (0, _styles.backgroundColorStyles)(), listsStyles, ruleStyles(), (0, _media.mediaStyles)(), (0, _layout.layoutStyles)(props.viewMode), _collab.telepointerStyle, _selection.gapCursorStyles, (0, _panel2.panelStyles)(), mentionsStyles, (0, _experiments.editorExperiment)('platform_editor_vanilla_dom', true, {
+  }), _styles.whitespaceSharedStyles, (0, _styles.paragraphSharedStyles)(props.typographyTheme), _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, (0, _platformFeatureFlags.fg)('editor_request_to_edit_task') ? null : (0, _react2.css)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n\t\t\t\t\tpointer-events: none;\n\t\t\t\t\topacity: 0.7;\n\t\t\t\t}\n\t\t\t"]))), (0, _platformFeatureFlags.fg)('platform_editor_hide_cursor_when_pm_hideselection') ? (0, _react2.css)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, (0, _experiments.editorExperiment)('platform_editor_advanced_code_blocks', true) ? (0, _react2.css)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, "var(--ds-border-focused, #8cf)", _styles5.placeholderTextStyles, placeholderStyles, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? placeholderOverflowStyles : null, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_quick_insert_placeholder') ? placeholderWrapStyles : null, (0, _codeBlock.codeBlockStyles)(), (0, _styles2.blocktypeStyles)(props.typographyTheme), (0, _styles.codeMarkSharedStyles)(), _styles.textColorStyles, (0, _styles.backgroundColorStyles)(), listsStyles, ruleStyles(), (0, _media.mediaStyles)(), (0, _layout.layoutStyles)(props.viewMode), _collab.telepointerStyle, _selection.gapCursorStyles, (0, _panel2.panelStyles)(), mentionsStyles, (0, _experiments.editorExperiment)('platform_editor_vanilla_dom', true, {
     exposure: false
   }) && vanillaMentionsStyles, (0, _experiments.editorExperiment)('platform_editor_vanilla_dom', true, {
     exposure: false

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

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

@@ -407,7 +407,7 @@ const contentStyles = props => css`
 	${placeholderTextStyles}
 	${placeholderStyles}
 	${editorExperiment('platform_editor_controls', 'variant1') ? placeholderOverflowStyles : null}
-	${editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_3') ? placeholderWrapStyles : null}
+	${editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_quick_insert_placeholder') ? placeholderWrapStyles : null}
 
   ${codeBlockStyles()}
 

package/dist/es2019/version-wrapper.js

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

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

@@ -148,7 +148,7 @@ var akEditorBreakpointForSmallDevice = "1266px";
 var contentStyles = function contentStyles(props) {
   return css(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n\t--ak-editor--default-gutter-padding: ", "px;\n\t/* 52 is from akEditorGutterPaddingDynamic via editor-shared-styles */\n\t--ak-editor--large-gutter-padding: ", "px;\n\t--ak-editor--default-layout-width: ", "px;\n\t--ak-editor--full-width-layout-width: ", "px;\n\t/* calculate editor line length, 100cqw is the editor container width */\n\t--ak-editor--line-length: min(\n\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\tvar(--ak-editor--default-layout-width)\n\t);\n\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t--ak-editor--breakout-full-page-guttering-padding: calc(\n\t\tvar(--ak-editor--large-gutter-padding) * 2 + var(--ak-editor--default-gutter-padding)\n\t);\n\n\t.fabric-editor--full-width-mode {\n\t\t--ak-editor--line-length: min(\n\t\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\t\tvar(--ak-editor--full-width-layout-width)\n\t\t);\n\t}\n\n\t.ProseMirror {\n\t\t--ak-editor-max-container-width: calc(100cqw - var(--ak-editor--large-gutter-padding));\n\t}\n\n\t/* We can't allow nodes that are inside other nodes to bleed from the parent container */\n\t.ProseMirror > div[data-prosemirror-node-block] [data-prosemirror-node-block] {\n\t\t--ak-editor-max-container-width: 100%;\n\t}\n\n\t/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */\n\t@container editor-area (width >= ", ") {\n\t\t.ProseMirror {\n\t\t\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t\t}\n\t}\n\n\t.ProseMirror {\n\t\toutline: none;\n\t\tfont-size: ", "px;\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t}\n\n\t", "\n\n\t.ProseMirror-hideselection *::selection {\n\t\tbackground: transparent;\n\t}\n\n\t.ProseMirror-hideselection *::-moz-selection {\n\t\tbackground: transparent;\n\t}\n\n\t/**\n\t * This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24\n\t *\n\t * 1. Merge and Release platform_editor_hide_cursor_when_pm_hideselection\n\t * 2. Cleanup duplicated style from platform_editor_advanced_code_blocks\n\t *    https://product-fabric.atlassian.net/browse/ED-26331\n\t */\n\t", "\n\n\t/* This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24 */\n\t", "\n\n\t.ProseMirror-selectednode {\n\t\toutline: none;\n\t}\n\n\t.ProseMirror-selectednode:empty {\n\t\toutline: 2px solid ", ";\n\t}\n\n\t.ProseMirror.ProseMirror-focused:has(.ProseMirror-mark-boundary-cursor) {\n\t\tcaret-color: transparent;\n\t}\n\t.ProseMirror:not(.ProseMirror-focused) .ProseMirror-mark-boundary-cursor {\n\t\tdisplay: none;\n\t}\n\n\t", "\n\t", "\n\t", "\n\t", "\n\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  // Switch between the two icons based on the visual refresh feature gate\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\t", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n\t\tbox-sizing: border-box;\n\t}\n\n\t.mediaGroupView-content-wrap ul {\n\t\tpadding: 0;\n\t}\n\n\t/** Needed to override any cleared floats, e.g. image wrapping */\n\n\tdiv.fabric-editor-block-mark[class^='fabric-editor-align'] {\n\t\tclear: none !important;\n\t}\n\n\t.fabric-editor-align-end {\n\t\ttext-align: right;\n\t}\n\n\t.fabric-editor-align-start {\n\t\ttext-align: left;\n\t}\n\n\t.fabric-editor-align-center {\n\t\ttext-align: center;\n\t}\n\n\t// For FullPage only when inside a table\n\t// Related code all lives inside: packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts\n\t// In the \"editorContentAreaContainerStyle\" function\n\t.fabric-editor--full-width-mode {\n\t\t.pm-table-container {\n\t\t\t.code-block,\n\t\t\t.extension-container,\n\t\t\t.multiBodiedExtension--container {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t}\n\t}\n\n\t.pm-table-header-content-wrap :not(.fabric-editor-alignment),\n\t.pm-table-header-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark,\n\t.pm-table-cell-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark {\n\t\tp:first-of-type {\n\t\t\tmargin-top: 0;\n\t\t}\n\t}\n\t.pm-table-cell-content-wrap .mediaGroupView-content-wrap {\n\t\tclear: both;\n\t}\n\n\t.hyperlink-floating-toolbar,\n\t.", " {\n\t\tpadding: 0;\n\t}\n\n\t/* Legacy Link icon in the Atlaskit package\n     is bigger than the others, new ADS icon does not have this issue\n  */\n\t", "\n"])), akEditorGutterPadding, akEditorGutterPaddingDynamic(), akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport, akEditorBreakpointForSmallDevice, akEditorCalculatedWideLayoutWidth, editorFontSize({
     theme: props.theme
-  }), whitespaceSharedStyles, paragraphSharedStyles(props.typographyTheme), listsSharedStyles, indentationSharedStyles, shadowSharedStyle, InlineNodeViewSharedStyles, fg('editor_request_to_edit_task') ? null : css(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n\t\t\t\t.ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n\t\t\t\t\tpointer-events: none;\n\t\t\t\t\topacity: 0.7;\n\t\t\t\t}\n\t\t\t"]))), fg('platform_editor_hide_cursor_when_pm_hideselection') ? css(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, editorExperiment('platform_editor_advanced_code_blocks', true) ? css(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, "var(--ds-border-focused, #8cf)", placeholderTextStyles, placeholderStyles, editorExperiment('platform_editor_controls', 'variant1') ? placeholderOverflowStyles : null, editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_3') ? placeholderWrapStyles : null, codeBlockStyles(), blocktypeStyles(props.typographyTheme), codeMarkSharedStyles(), textColorStyles, backgroundColorStyles(), listsStyles, ruleStyles(), mediaStyles(), layoutStyles(props.viewMode), telepointerStyle, gapCursorStyles, panelStyles(), mentionsStyles, editorExperiment('platform_editor_vanilla_dom', true, {
+  }), whitespaceSharedStyles, paragraphSharedStyles(props.typographyTheme), listsSharedStyles, indentationSharedStyles, shadowSharedStyle, InlineNodeViewSharedStyles, fg('editor_request_to_edit_task') ? null : css(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n\t\t\t\t.ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n\t\t\t\t\tpointer-events: none;\n\t\t\t\t\topacity: 0.7;\n\t\t\t\t}\n\t\t\t"]))), fg('platform_editor_hide_cursor_when_pm_hideselection') ? css(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, editorExperiment('platform_editor_advanced_code_blocks', true) ? css(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, "var(--ds-border-focused, #8cf)", placeholderTextStyles, placeholderStyles, editorExperiment('platform_editor_controls', 'variant1') ? placeholderOverflowStyles : null, editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_quick_insert_placeholder') ? placeholderWrapStyles : null, codeBlockStyles(), blocktypeStyles(props.typographyTheme), codeMarkSharedStyles(), textColorStyles, backgroundColorStyles(), listsStyles, ruleStyles(), mediaStyles(), layoutStyles(props.viewMode), telepointerStyle, gapCursorStyles, panelStyles(), mentionsStyles, editorExperiment('platform_editor_vanilla_dom', true, {
     exposure: false
   }) && vanillaMentionsStyles, editorExperiment('platform_editor_vanilla_dom', true, {
     exposure: false

package/dist/esm/version-wrapper.js

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

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/create-editor/create-universal-preset.d.ts

@@ -610,11 +610,31 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
                 sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
             }, import("@atlaskit/editor-common/types").FeatureFlags>>];
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
-        }, import("@atlaskit/editor-plugins/analytics").AnalyticsPluginOptions>>];
+        }, import("@atlaskit/editor-plugins/analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"blockControls", {
+            dependencies: import("packages/editor/editor-plugin-block-controls/dist/types/blockControlsPluginType").BlockControlsPluginDependencies;
+            sharedState: import("@atlaskit/editor-plugins/block-controls").BlockControlsSharedState;
+            commands: {
+                moveToLayout: (start: number, to: number, options?: {
+                    moveToEnd?: boolean | undefined;
+                    selectMovedNode?: boolean | undefined;
+                    moveNodeAtCursorPos?: boolean | undefined;
+                } | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+                moveNode: import("packages/editor/editor-plugin-block-controls/dist/types/blockControlsPluginType").MoveNode;
+                showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: import("@atlaskit/editor-plugins/block-controls").HandleOptions, rootPos?: number | undefined, rootAnchorName?: string | undefined, rootNodeType?: string | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+                toggleBlockMenu: (options?: {
+                    closeMenu?: boolean | undefined;
+                    anchorName?: string | undefined;
+                } | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+                setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => import("@atlaskit/editor-common/types").EditorCommand;
+                setMultiSelectPositions: (anchor?: number | undefined, head?: number | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+                setSelectedViaDragHandle: (isSelectedViaDragHandle?: boolean | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+            };
+        }, undefined>>];
         actions?: {
             suppressToolbar?: (() => boolean) | undefined;
             unsuppressToolbar?: (() => boolean) | undefined;
             setToolbarDocking?: ((toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking) => boolean) | undefined;
+            refreshToolbarDocking?: (() => boolean) | undefined;
         } | undefined;
     }, import("packages/editor/editor-plugin-selection-toolbar/dist/types").SelectionToolbarPluginOptions>>];
     commands: {
@@ -671,11 +691,31 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
             sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
         }, import("@atlaskit/editor-common/types").FeatureFlags>>];
         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
-    }, import("@atlaskit/editor-plugins/analytics").AnalyticsPluginOptions>>];
+    }, import("@atlaskit/editor-plugins/analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"blockControls", {
+        dependencies: import("packages/editor/editor-plugin-block-controls/dist/types/blockControlsPluginType").BlockControlsPluginDependencies;
+        sharedState: import("@atlaskit/editor-plugins/block-controls").BlockControlsSharedState;
+        commands: {
+            moveToLayout: (start: number, to: number, options?: {
+                moveToEnd?: boolean | undefined;
+                selectMovedNode?: boolean | undefined;
+                moveNodeAtCursorPos?: boolean | undefined;
+            } | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+            moveNode: import("packages/editor/editor-plugin-block-controls/dist/types/blockControlsPluginType").MoveNode;
+            showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: import("@atlaskit/editor-plugins/block-controls").HandleOptions, rootPos?: number | undefined, rootAnchorName?: string | undefined, rootNodeType?: string | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+            toggleBlockMenu: (options?: {
+                closeMenu?: boolean | undefined;
+                anchorName?: string | undefined;
+            } | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+            setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => import("@atlaskit/editor-common/types").EditorCommand;
+            setMultiSelectPositions: (anchor?: number | undefined, head?: number | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+            setSelectedViaDragHandle: (isSelectedViaDragHandle?: boolean | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+        };
+    }, undefined>>];
     actions?: {
         suppressToolbar?: (() => boolean) | undefined;
         unsuppressToolbar?: (() => boolean) | undefined;
         setToolbarDocking?: ((toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking) => boolean) | undefined;
+        refreshToolbarDocking?: (() => boolean) | undefined;
     } | undefined;
 }, import("packages/editor/editor-plugin-selection-toolbar/dist/types").SelectionToolbarPluginOptions>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"clearMarksOnEmptyDoc", {}, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"blockType", {
     pluginConfiguration: import("@atlaskit/editor-plugins/block-type").BlockTypePluginOptions | undefined;
@@ -734,11 +774,31 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
                 sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
             }, import("@atlaskit/editor-common/types").FeatureFlags>>];
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
-        }, import("@atlaskit/editor-plugins/analytics").AnalyticsPluginOptions>>];
+        }, import("@atlaskit/editor-plugins/analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"blockControls", {
+            dependencies: import("packages/editor/editor-plugin-block-controls/dist/types/blockControlsPluginType").BlockControlsPluginDependencies;
+            sharedState: import("@atlaskit/editor-plugins/block-controls").BlockControlsSharedState;
+            commands: {
+                moveToLayout: (start: number, to: number, options?: {
+                    moveToEnd?: boolean | undefined;
+                    selectMovedNode?: boolean | undefined;
+                    moveNodeAtCursorPos?: boolean | undefined;
+                } | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+                moveNode: import("packages/editor/editor-plugin-block-controls/dist/types/blockControlsPluginType").MoveNode;
+                showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: import("@atlaskit/editor-plugins/block-controls").HandleOptions, rootPos?: number | undefined, rootAnchorName?: string | undefined, rootNodeType?: string | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+                toggleBlockMenu: (options?: {
+                    closeMenu?: boolean | undefined;
+                    anchorName?: string | undefined;
+                } | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+                setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => import("@atlaskit/editor-common/types").EditorCommand;
+                setMultiSelectPositions: (anchor?: number | undefined, head?: number | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+                setSelectedViaDragHandle: (isSelectedViaDragHandle?: boolean | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
+            };
+        }, undefined>>];
         actions?: {
             suppressToolbar?: (() => boolean) | undefined;
             unsuppressToolbar?: (() => boolean) | undefined;
             setToolbarDocking?: ((toolbarDocking: import("packages/editor/editor-plugin-selection-toolbar/dist/types/types").ToolbarDocking) => boolean) | undefined;
+            refreshToolbarDocking?: (() => boolean) | undefined;
         } | undefined;
     }, import("packages/editor/editor-plugin-selection-toolbar/dist/types").SelectionToolbarPluginOptions>>];
     sharedState: import("@atlaskit/editor-plugins/block-type").BlockTypeState | undefined;