@atlaskit/editor-core 187.15.0 → 187.16.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-core
 
+## 187.16.0
+
+### Minor Changes
+
+- [`3413f770f2b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3413f770f2b) - Moving references to floating-toolbar types to `editor-common`
+
+### Patch Changes
+
+- [`3a43f854e59`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3a43f854e59) - [ux] ED-18841: When cursor inside panel, at start of content, is backspaced, it should lift panel line of content out of panel, instead of only selecting the node above it (such as an expand or table node).
+- Updated dependencies
+
+## 187.15.1
+
+### Patch Changes
+
+- [`3df14c86161`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3df14c86161) - Cleaning up better typeahead feature flag.
+
 ## 187.15.0
 
 ### Minor Changes

package/dist/cjs/create-editor/create-plugins-list.js

@@ -44,21 +44,16 @@ function getScrollGutterOptions(props) {
   return undefined;
 }
 function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEvent) {
-  var _props$performanceTra, _props$linking, _ref, _props$featureFlags$u, _props$featureFlags, _props$featureFlags2, _props$performanceTra2, _props$textFormatting, _props$linking2;
+  var _props$performanceTra, _props$linking, _props$performanceTra2, _props$textFormatting, _props$linking2;
   var appearance = props.appearance;
   var isMobile = appearance === 'mobile';
   var inputTracking = (_props$performanceTra = props.performanceTracking) === null || _props$performanceTra === void 0 ? void 0 : _props$performanceTra.inputTracking;
   var cardOptions = ((_props$linking = props.linking) === null || _props$linking === void 0 ? void 0 : _props$linking.smartLinks) || props.smartLinks || props.UNSAFE_cards;
-
-  // duplicated logic from `feature-flags-from-props.ts` due to presets not being finalised
-  var pseudoNormalisedUseBetterTypeaheadNavigation = (_ref = (_props$featureFlags$u = (_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags['use-better-typeahead-navigation']) !== null && _props$featureFlags$u !== void 0 ? _props$featureFlags$u : (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.useBetterTypeaheadNavigation) !== null && _ref !== void 0 ? _ref : null;
-  var useBetterTypeaheadNavigation = Boolean(typeof pseudoNormalisedUseBetterTypeaheadNavigation === 'boolean' ? !!pseudoNormalisedUseBetterTypeaheadNavigation : true);
   return _objectSpread(_objectSpread({}, props), {}, {
     createAnalyticsEvent: createAnalyticsEvent,
     typeAhead: {
       createAnalyticsEvent: createAnalyticsEvent,
-      isMobile: isMobile,
-      useBetterTypeaheadNavigation: useBetterTypeaheadNavigation
+      isMobile: isMobile
     },
     featureFlags: (0, _featureFlagsFromProps.createFeatureFlagsFromProps)(props),
     paste: {

package/dist/cjs/create-editor/feature-flags-from-props.js

@@ -32,12 +32,9 @@ function getSpellCheck(featureFlags) {
  * which is used by both current and archv3 editors.
  */
 function createFeatureFlagsFromProps(props) {
-  var _props$featureFlags, _ref, _props$featureFlags$u, _props$featureFlags2, _props$featureFlags3, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags4, _props$featureFlags5, _props$allowTables, _props$featureFlags6, _props$featureFlags7, _props$allowTables2, _props$featureFlags8, _props$featureFlags9, _props$allowTables3, _props$featureFlags10, _props$featureFlags11, _props$allowTables4, _props$allowTables5, _props$featureFlags12, _props$featureFlags13, _props$allowTables6, _props$allowExtension, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$collabEdit, _props$collabEdit2, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39, _props$featureFlags40, _props$featureFlags41, _props$featureFlags42, _props$featureFlags43, _props$featureFlags44;
+  var _props$featureFlags, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags2, _props$featureFlags3, _props$allowTables, _props$featureFlags4, _props$featureFlags5, _props$allowTables2, _props$featureFlags6, _props$featureFlags7, _props$allowTables3, _props$featureFlags8, _props$featureFlags9, _props$allowTables4, _props$allowTables5, _props$featureFlags10, _props$featureFlags11, _props$allowTables6, _props$allowExtension, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$collabEdit, _props$collabEdit2, _props$featureFlags30, _props$featureFlags31, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39, _props$featureFlags40, _props$featureFlags41, _props$featureFlags42;
   var normalizedFeatureFlags = (0, _normalizeFeatureFlags.normalizeFeatureFlags)(props.featureFlags);
   var tableCellOptionsInFloatingToolbar = normalizedFeatureFlags.tableCellOptionsInFloatingToolbar || ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.tableCellOptionsInFloatingToolbar) || undefined;
-
-  // duplicated logic from `feature-flags-from-props.ts` due to presets not being finalised
-  var pseudoNormalisedUseBetterTypeaheadNavigation = (_ref = (_props$featureFlags$u = (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2['use-better-typeahead-navigation']) !== null && _props$featureFlags$u !== void 0 ? _props$featureFlags$u : (_props$featureFlags3 = props.featureFlags) === null || _props$featureFlags3 === void 0 ? void 0 : _props$featureFlags3.useBetterTypeaheadNavigation) !== null && _ref !== void 0 ? _ref : null;
   return _objectSpread(_objectSpread({}, normalizedFeatureFlags), {}, {
     newInsertionBehaviour: props.allowNewInsertionBehaviour,
     interactiveExpand: typeof props.allowExpand === 'boolean' ? props.allowExpand : Boolean(props.allowExpand && props.allowExpand.allowInteractiveExpand !== false),
@@ -48,36 +45,34 @@ function createFeatureFlagsFromProps(props) {
     singleLayout: (0, _typeof2.default)(props.allowLayouts) === 'object' && !!((_props$allowLayouts = props.allowLayouts) !== null && _props$allowLayouts !== void 0 && _props$allowLayouts.UNSAFE_allowSingleColumnLayout),
     undoRedoButtons: props.allowUndoRedoButtons,
     catchAllTracking: (_props$performanceTra = props.performanceTracking) === null || _props$performanceTra === void 0 ? void 0 : (_props$performanceTra2 = _props$performanceTra.catchAllTracking) === null || _props$performanceTra2 === void 0 ? void 0 : _props$performanceTra2.enabled,
-    stickyHeadersOptimization: typeof ((_props$featureFlags4 = props.featureFlags) === null || _props$featureFlags4 === void 0 ? void 0 : _props$featureFlags4.stickyHeadersOptimization) === 'boolean' ? !!((_props$featureFlags5 = props.featureFlags) !== null && _props$featureFlags5 !== void 0 && _props$featureFlags5.stickyHeadersOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables = props.allowTables) !== null && _props$allowTables !== void 0 && _props$allowTables.stickyHeadersOptimization),
-    initialRenderOptimization: typeof ((_props$featureFlags6 = props.featureFlags) === null || _props$featureFlags6 === void 0 ? void 0 : _props$featureFlags6.initialRenderOptimization) === 'boolean' ? !!((_props$featureFlags7 = props.featureFlags) !== null && _props$featureFlags7 !== void 0 && _props$featureFlags7.initialRenderOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables2 = props.allowTables) !== null && _props$allowTables2 !== void 0 && _props$allowTables2.initialRenderOptimization),
-    mouseMoveOptimization: typeof ((_props$featureFlags8 = props.featureFlags) === null || _props$featureFlags8 === void 0 ? void 0 : _props$featureFlags8.mouseMoveOptimization) === 'boolean' ? !!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.mouseMoveOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables3 = props.allowTables) !== null && _props$allowTables3 !== void 0 && _props$allowTables3.mouseMoveOptimization),
-    tableRenderOptimization: typeof ((_props$featureFlags10 = props.featureFlags) === null || _props$featureFlags10 === void 0 ? void 0 : _props$featureFlags10.tableRenderOptimization) === 'boolean' ? !!((_props$featureFlags11 = props.featureFlags) !== null && _props$featureFlags11 !== void 0 && _props$featureFlags11.tableRenderOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && typeof ((_props$allowTables4 = props.allowTables) === null || _props$allowTables4 === void 0 ? void 0 : _props$allowTables4.tableRenderOptimization) === 'boolean' ? (_props$allowTables5 = props.allowTables) === null || _props$allowTables5 === void 0 ? void 0 : _props$allowTables5.tableRenderOptimization : true,
-    tableOverflowShadowsOptimization: typeof ((_props$featureFlags12 = props.featureFlags) === null || _props$featureFlags12 === void 0 ? void 0 : _props$featureFlags12.tableOverflowShadowsOptimization) === 'boolean' ? !!((_props$featureFlags13 = props.featureFlags) !== null && _props$featureFlags13 !== void 0 && _props$featureFlags13.tableOverflowShadowsOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables6 = props.allowTables) !== null && _props$allowTables6 !== void 0 && _props$allowTables6.tableOverflowShadowsOptimization),
+    stickyHeadersOptimization: typeof ((_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.stickyHeadersOptimization) === 'boolean' ? !!((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.stickyHeadersOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables = props.allowTables) !== null && _props$allowTables !== void 0 && _props$allowTables.stickyHeadersOptimization),
+    initialRenderOptimization: typeof ((_props$featureFlags4 = props.featureFlags) === null || _props$featureFlags4 === void 0 ? void 0 : _props$featureFlags4.initialRenderOptimization) === 'boolean' ? !!((_props$featureFlags5 = props.featureFlags) !== null && _props$featureFlags5 !== void 0 && _props$featureFlags5.initialRenderOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables2 = props.allowTables) !== null && _props$allowTables2 !== void 0 && _props$allowTables2.initialRenderOptimization),
+    mouseMoveOptimization: typeof ((_props$featureFlags6 = props.featureFlags) === null || _props$featureFlags6 === void 0 ? void 0 : _props$featureFlags6.mouseMoveOptimization) === 'boolean' ? !!((_props$featureFlags7 = props.featureFlags) !== null && _props$featureFlags7 !== void 0 && _props$featureFlags7.mouseMoveOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables3 = props.allowTables) !== null && _props$allowTables3 !== void 0 && _props$allowTables3.mouseMoveOptimization),
+    tableRenderOptimization: typeof ((_props$featureFlags8 = props.featureFlags) === null || _props$featureFlags8 === void 0 ? void 0 : _props$featureFlags8.tableRenderOptimization) === 'boolean' ? !!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.tableRenderOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && typeof ((_props$allowTables4 = props.allowTables) === null || _props$allowTables4 === void 0 ? void 0 : _props$allowTables4.tableRenderOptimization) === 'boolean' ? (_props$allowTables5 = props.allowTables) === null || _props$allowTables5 === void 0 ? void 0 : _props$allowTables5.tableRenderOptimization : true,
+    tableOverflowShadowsOptimization: typeof ((_props$featureFlags10 = props.featureFlags) === null || _props$featureFlags10 === void 0 ? void 0 : _props$featureFlags10.tableOverflowShadowsOptimization) === 'boolean' ? !!((_props$featureFlags11 = props.featureFlags) !== null && _props$featureFlags11 !== void 0 && _props$featureFlags11.tableOverflowShadowsOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables6 = props.allowTables) !== null && _props$allowTables6 !== void 0 && _props$allowTables6.tableOverflowShadowsOptimization),
     extendFloatingToolbar: Boolean((0, _typeof2.default)(props.allowExtension) === 'object' && ((_props$allowExtension = props.allowExtension) === null || _props$allowExtension === void 0 ? void 0 : _props$allowExtension.allowExtendFloatingToolbars)),
-    showAvatarGroupAsPlugin: Boolean(typeof ((_props$featureFlags14 = props.featureFlags) === null || _props$featureFlags14 === void 0 ? void 0 : _props$featureFlags14.showAvatarGroupAsPlugin) === 'boolean' ? !!((_props$featureFlags15 = props.featureFlags) !== null && _props$featureFlags15 !== void 0 && _props$featureFlags15.showAvatarGroupAsPlugin) : false),
-    errorBoundaryDocStructure: Boolean(typeof ((_props$featureFlags16 = props.featureFlags) === null || _props$featureFlags16 === void 0 ? void 0 : _props$featureFlags16.useErrorBoundaryDocStructure) === 'boolean' ? !!((_props$featureFlags17 = props.featureFlags) !== null && _props$featureFlags17 !== void 0 && _props$featureFlags17.useErrorBoundaryDocStructure) : false),
-    synchronyErrorDocStructure: Boolean(typeof ((_props$featureFlags18 = props.featureFlags) === null || _props$featureFlags18 === void 0 ? void 0 : _props$featureFlags18.synchronyErrorDocStructure) === 'boolean' ? !!((_props$featureFlags19 = props.featureFlags) !== null && _props$featureFlags19 !== void 0 && _props$featureFlags19.synchronyErrorDocStructure) : false),
-    enableViewUpdateSubscription: Boolean(typeof ((_props$featureFlags20 = props.featureFlags) === null || _props$featureFlags20 === void 0 ? void 0 : _props$featureFlags20.enableViewUpdateSubscription) === 'boolean' ? !!((_props$featureFlags21 = props.featureFlags) !== null && _props$featureFlags21 !== void 0 && _props$featureFlags21.enableViewUpdateSubscription) : false),
-    collabAvatarScroll: Boolean(typeof ((_props$featureFlags22 = props.featureFlags) === null || _props$featureFlags22 === void 0 ? void 0 : _props$featureFlags22.collabAvatarScroll) === 'boolean' ? !!((_props$featureFlags23 = props.featureFlags) !== null && _props$featureFlags23 !== void 0 && _props$featureFlags23.collabAvatarScroll) : false),
-    ufo: Boolean(typeof ((_props$featureFlags24 = props.featureFlags) === null || _props$featureFlags24 === void 0 ? void 0 : _props$featureFlags24.ufo) === 'boolean' ? !!((_props$featureFlags25 = props.featureFlags) !== null && _props$featureFlags25 !== void 0 && _props$featureFlags25.ufo) : false),
-    twoLineEditorToolbar: Boolean(typeof ((_props$featureFlags26 = props.featureFlags) === null || _props$featureFlags26 === void 0 ? void 0 : _props$featureFlags26.twoLineEditorToolbar) === 'boolean' ? !!((_props$featureFlags27 = props.featureFlags) !== null && _props$featureFlags27 !== void 0 && _props$featureFlags27.twoLineEditorToolbar) : false),
-    saferDispatchedTransactions: Boolean(typeof normalizedFeatureFlags.saferDispatchedTransactions === 'boolean' && !!normalizedFeatureFlags.saferDispatchedTransactions || (typeof ((_props$featureFlags28 = props.featureFlags) === null || _props$featureFlags28 === void 0 ? void 0 : _props$featureFlags28.saferDispatchedTransactions) === 'boolean' ? !!((_props$featureFlags29 = props.featureFlags) !== null && _props$featureFlags29 !== void 0 && _props$featureFlags29.saferDispatchedTransactions) : false)),
-    saferDispatchedTransactionsAnalyticsOnly: Boolean(typeof normalizedFeatureFlags.saferDispatchedTransactionsAnalyticsOnly === 'boolean' && !!normalizedFeatureFlags.saferDispatchedTransactionsAnalyticsOnly || (typeof ((_props$featureFlags30 = props.featureFlags) === null || _props$featureFlags30 === void 0 ? void 0 : _props$featureFlags30.saferDispatchedTransactionsAnalyticsOnly) === 'boolean' ? !!((_props$featureFlags31 = props.featureFlags) !== null && _props$featureFlags31 !== void 0 && _props$featureFlags31.saferDispatchedTransactionsAnalyticsOnly) : false)),
+    showAvatarGroupAsPlugin: Boolean(typeof ((_props$featureFlags12 = props.featureFlags) === null || _props$featureFlags12 === void 0 ? void 0 : _props$featureFlags12.showAvatarGroupAsPlugin) === 'boolean' ? !!((_props$featureFlags13 = props.featureFlags) !== null && _props$featureFlags13 !== void 0 && _props$featureFlags13.showAvatarGroupAsPlugin) : false),
+    errorBoundaryDocStructure: Boolean(typeof ((_props$featureFlags14 = props.featureFlags) === null || _props$featureFlags14 === void 0 ? void 0 : _props$featureFlags14.useErrorBoundaryDocStructure) === 'boolean' ? !!((_props$featureFlags15 = props.featureFlags) !== null && _props$featureFlags15 !== void 0 && _props$featureFlags15.useErrorBoundaryDocStructure) : false),
+    synchronyErrorDocStructure: Boolean(typeof ((_props$featureFlags16 = props.featureFlags) === null || _props$featureFlags16 === void 0 ? void 0 : _props$featureFlags16.synchronyErrorDocStructure) === 'boolean' ? !!((_props$featureFlags17 = props.featureFlags) !== null && _props$featureFlags17 !== void 0 && _props$featureFlags17.synchronyErrorDocStructure) : false),
+    enableViewUpdateSubscription: Boolean(typeof ((_props$featureFlags18 = props.featureFlags) === null || _props$featureFlags18 === void 0 ? void 0 : _props$featureFlags18.enableViewUpdateSubscription) === 'boolean' ? !!((_props$featureFlags19 = props.featureFlags) !== null && _props$featureFlags19 !== void 0 && _props$featureFlags19.enableViewUpdateSubscription) : false),
+    collabAvatarScroll: Boolean(typeof ((_props$featureFlags20 = props.featureFlags) === null || _props$featureFlags20 === void 0 ? void 0 : _props$featureFlags20.collabAvatarScroll) === 'boolean' ? !!((_props$featureFlags21 = props.featureFlags) !== null && _props$featureFlags21 !== void 0 && _props$featureFlags21.collabAvatarScroll) : false),
+    ufo: Boolean(typeof ((_props$featureFlags22 = props.featureFlags) === null || _props$featureFlags22 === void 0 ? void 0 : _props$featureFlags22.ufo) === 'boolean' ? !!((_props$featureFlags23 = props.featureFlags) !== null && _props$featureFlags23 !== void 0 && _props$featureFlags23.ufo) : false),
+    twoLineEditorToolbar: Boolean(typeof ((_props$featureFlags24 = props.featureFlags) === null || _props$featureFlags24 === void 0 ? void 0 : _props$featureFlags24.twoLineEditorToolbar) === 'boolean' ? !!((_props$featureFlags25 = props.featureFlags) !== null && _props$featureFlags25 !== void 0 && _props$featureFlags25.twoLineEditorToolbar) : false),
+    saferDispatchedTransactions: Boolean(typeof normalizedFeatureFlags.saferDispatchedTransactions === 'boolean' && !!normalizedFeatureFlags.saferDispatchedTransactions || (typeof ((_props$featureFlags26 = props.featureFlags) === null || _props$featureFlags26 === void 0 ? void 0 : _props$featureFlags26.saferDispatchedTransactions) === 'boolean' ? !!((_props$featureFlags27 = props.featureFlags) !== null && _props$featureFlags27 !== void 0 && _props$featureFlags27.saferDispatchedTransactions) : false)),
+    saferDispatchedTransactionsAnalyticsOnly: Boolean(typeof normalizedFeatureFlags.saferDispatchedTransactionsAnalyticsOnly === 'boolean' && !!normalizedFeatureFlags.saferDispatchedTransactionsAnalyticsOnly || (typeof ((_props$featureFlags28 = props.featureFlags) === null || _props$featureFlags28 === void 0 ? void 0 : _props$featureFlags28.saferDispatchedTransactionsAnalyticsOnly) === 'boolean' ? !!((_props$featureFlags29 = props.featureFlags) !== null && _props$featureFlags29 !== void 0 && _props$featureFlags29.saferDispatchedTransactionsAnalyticsOnly) : false)),
     useNativeCollabPlugin: Boolean(typeof ((_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.useNativePlugin) === 'boolean' ? !!((_props$collabEdit2 = props.collabEdit) !== null && _props$collabEdit2 !== void 0 && _props$collabEdit2.useNativePlugin) : false),
-    chromeCursorHandlerFixedVersion: typeof ((_props$featureFlags32 = props.featureFlags) === null || _props$featureFlags32 === void 0 ? void 0 : _props$featureFlags32.chromeCursorHandlerFixedVersion) === 'string' ? Number(props.featureFlags.chromeCursorHandlerFixedVersion) || undefined : undefined,
+    chromeCursorHandlerFixedVersion: typeof ((_props$featureFlags30 = props.featureFlags) === null || _props$featureFlags30 === void 0 ? void 0 : _props$featureFlags30.chromeCursorHandlerFixedVersion) === 'string' ? Number(props.featureFlags.chromeCursorHandlerFixedVersion) || undefined : undefined,
     tableCellOptionsInFloatingToolbar: typeof tableCellOptionsInFloatingToolbar === 'boolean' ? tableCellOptionsInFloatingToolbar : false,
-    showHoverPreview: Boolean(typeof ((_props$featureFlags33 = props.featureFlags) === null || _props$featureFlags33 === void 0 ? void 0 : _props$featureFlags33.showHoverPreview) === 'boolean' ? !!((_props$featureFlags34 = props.featureFlags) !== null && _props$featureFlags34 !== void 0 && _props$featureFlags34.showHoverPreview) : false),
-    indentationButtonsInTheToolbar: Boolean(typeof normalizedFeatureFlags.indentationButtonsInTheToolbar === 'boolean' && !!normalizedFeatureFlags.indentationButtonsInTheToolbar || (typeof ((_props$featureFlags35 = props.featureFlags) === null || _props$featureFlags35 === void 0 ? void 0 : _props$featureFlags35.indentationButtonsInTheToolbar) === 'boolean' ? !!((_props$featureFlags36 = props.featureFlags) !== null && _props$featureFlags36 !== void 0 && _props$featureFlags36.indentationButtonsInTheToolbar) : false)),
-    floatingToolbarCopyButton: Boolean(typeof normalizedFeatureFlags.floatingToolbarCopyButton === 'boolean' && !!normalizedFeatureFlags.floatingToolbarCopyButton || (typeof ((_props$featureFlags37 = props.featureFlags) === null || _props$featureFlags37 === void 0 ? void 0 : _props$featureFlags37.floatingToolbarCopyButton) === 'boolean' ? !!((_props$featureFlags38 = props.featureFlags) !== null && _props$featureFlags38 !== void 0 && _props$featureFlags38.floatingToolbarCopyButton) : false)),
-    floatingToolbarLinkSettingsButton: typeof ((_props$featureFlags39 = props.featureFlags) === null || _props$featureFlags39 === void 0 ? void 0 : _props$featureFlags39['floating-toolbar-link-settings-button']) === 'string' ? props.featureFlags['floating-toolbar-link-settings-button'] || undefined : undefined,
+    showHoverPreview: Boolean(typeof ((_props$featureFlags31 = props.featureFlags) === null || _props$featureFlags31 === void 0 ? void 0 : _props$featureFlags31.showHoverPreview) === 'boolean' ? !!((_props$featureFlags32 = props.featureFlags) !== null && _props$featureFlags32 !== void 0 && _props$featureFlags32.showHoverPreview) : false),
+    indentationButtonsInTheToolbar: Boolean(typeof normalizedFeatureFlags.indentationButtonsInTheToolbar === 'boolean' && !!normalizedFeatureFlags.indentationButtonsInTheToolbar || (typeof ((_props$featureFlags33 = props.featureFlags) === null || _props$featureFlags33 === void 0 ? void 0 : _props$featureFlags33.indentationButtonsInTheToolbar) === 'boolean' ? !!((_props$featureFlags34 = props.featureFlags) !== null && _props$featureFlags34 !== void 0 && _props$featureFlags34.indentationButtonsInTheToolbar) : false)),
+    floatingToolbarCopyButton: Boolean(typeof normalizedFeatureFlags.floatingToolbarCopyButton === 'boolean' && !!normalizedFeatureFlags.floatingToolbarCopyButton || (typeof ((_props$featureFlags35 = props.featureFlags) === null || _props$featureFlags35 === void 0 ? void 0 : _props$featureFlags35.floatingToolbarCopyButton) === 'boolean' ? !!((_props$featureFlags36 = props.featureFlags) !== null && _props$featureFlags36 !== void 0 && _props$featureFlags36.floatingToolbarCopyButton) : false)),
+    floatingToolbarLinkSettingsButton: typeof ((_props$featureFlags37 = props.featureFlags) === null || _props$featureFlags37 === void 0 ? void 0 : _props$featureFlags37['floating-toolbar-link-settings-button']) === 'string' ? props.featureFlags['floating-toolbar-link-settings-button'] || undefined : undefined,
     disableSpellcheckByBrowser: getSpellCheck(props.featureFlags),
     // Including fallback to props.featureFlags so that mobile feature flags
     // are included (they are not kebab cased)
-    restartNumberedLists: normalizedFeatureFlags.restartNumberedLists === true || ((_props$featureFlags40 = props.featureFlags) === null || _props$featureFlags40 === void 0 ? void 0 : _props$featureFlags40.restartNumberedLists) === true,
-    useSomewhatSemanticTextColorNames: Boolean(typeof normalizedFeatureFlags.useSomewhatSemanticTextColorNames === 'boolean' && !!normalizedFeatureFlags.useSomewhatSemanticTextColorNames || (typeof ((_props$featureFlags41 = props.featureFlags) === null || _props$featureFlags41 === void 0 ? void 0 : _props$featureFlags41.useSomewhatSemanticTextColorNames) === 'boolean' ? !!((_props$featureFlags42 = props.featureFlags) !== null && _props$featureFlags42 !== void 0 && _props$featureFlags42.useSomewhatSemanticTextColorNames) : false)),
+    restartNumberedLists: normalizedFeatureFlags.restartNumberedLists === true || ((_props$featureFlags38 = props.featureFlags) === null || _props$featureFlags38 === void 0 ? void 0 : _props$featureFlags38.restartNumberedLists) === true,
+    useSomewhatSemanticTextColorNames: Boolean(typeof normalizedFeatureFlags.useSomewhatSemanticTextColorNames === 'boolean' && !!normalizedFeatureFlags.useSomewhatSemanticTextColorNames || (typeof ((_props$featureFlags39 = props.featureFlags) === null || _props$featureFlags39 === void 0 ? void 0 : _props$featureFlags39.useSomewhatSemanticTextColorNames) === 'boolean' ? !!((_props$featureFlags40 = props.featureFlags) !== null && _props$featureFlags40 !== void 0 && _props$featureFlags40.useSomewhatSemanticTextColorNames) : false)),
     lpLinkPickerFocusTrap: Boolean(normalizedFeatureFlags.lpLinkPickerFocusTrap),
-    preventPopupOverflow: Boolean(typeof ((_props$featureFlags43 = props.featureFlags) === null || _props$featureFlags43 === void 0 ? void 0 : _props$featureFlags43['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags44 = props.featureFlags) !== null && _props$featureFlags44 !== void 0 && _props$featureFlags44['prevent-popup-overflow']) : false),
-    // duplicated logic from `create-plugins-list.ts` due to presets not being finalised
-    useBetterTypeaheadNavigation: Boolean(typeof pseudoNormalisedUseBetterTypeaheadNavigation === 'boolean' ? !!pseudoNormalisedUseBetterTypeaheadNavigation : true)
+    preventPopupOverflow: Boolean(typeof ((_props$featureFlags41 = props.featureFlags) === null || _props$featureFlags41 === void 0 ? void 0 : _props$featureFlags41['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags42 = props.featureFlags) !== null && _props$featureFlags42 !== void 0 && _props$featureFlags42['prevent-popup-overflow']) : false)
   });
 }

package/dist/cjs/index.js

@@ -263,12 +263,6 @@ Object.defineProperty(exports, "deleteDate", {
     return _actions.deleteDate;
   }
 });
-Object.defineProperty(exports, "floatingToolbarPluginKey", {
-  enumerable: true,
-  get: function get() {
-    return _floatingToolbar.pluginKey;
-  }
-});
 Object.defineProperty(exports, "getDefaultPresetOptionsFromEditorProps", {
   enumerable: true,
   get: function get() {
@@ -556,7 +550,6 @@ var _gapCursorSelection = require("./plugins/selection/gap-cursor-selection");
 var _mobileSelection = require("./plugins/mobile-selection");
 var _commands7 = require("./plugins/expand/commands");
 var _WithPluginState = _interopRequireDefault(require("./ui/WithPluginState"));
-var _floatingToolbar = require("./plugins/floating-toolbar");
 var _statusColorPalette = require("./ui/ColorPalette/Palettes/statusColorPalette");
 var _common = require("./ui/ColorPalette/Palettes/common");
 var _messages = _interopRequireWildcard(require("./messages"));

package/dist/cjs/plugins/media/toolbar/alt-text.js

@@ -14,7 +14,6 @@ var _messages = require("../pm-plugins/alt-text/messages");
 var _AltTextEdit = _interopRequireWildcard(require("../pm-plugins/alt-text/ui/AltTextEdit"));
 var _mediaCommon = require("../utils/media-common");
 var _style = require("../pm-plugins/alt-text/style");
-var _forceFocus = require("../../floating-toolbar/pm-plugins/force-focus");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -55,9 +54,13 @@ var altTextEditComponent = function altTextEditComponent(options) {
        * and not close the floating toolbar.
        */
       var handleEsc = function handleEsc() {
+        var _options$forceFocusSe;
         var tr = view.state.tr,
           dispatch = view.dispatch;
-        dispatch((0, _forceFocus.forceFocusSelector)("[data-testid=\"".concat(testId, "\"]"))(tr));
+        var newTr = options === null || options === void 0 ? void 0 : (_options$forceFocusSe = options.forceFocusSelector) === null || _options$forceFocusSe === void 0 ? void 0 : _options$forceFocusSe.call(options, "[data-testid=\"".concat(testId, "\"]"))(tr);
+        if (newTr) {
+          dispatch(newTr);
+        }
       };
       return /*#__PURE__*/_react.default.createElement(_AltTextEdit.default, {
         view: view,

package/dist/cjs/plugins/media/toolbar/index.js

@@ -425,8 +425,10 @@ var floatingToolbar = function floatingToolbar(state, intl) {
   if (allowAltTextOnImages) {
     var mediaAltTextPluginState = (0, _altText.getPluginState)(state);
     if (mediaAltTextPluginState.isAltTextEditorOpen) {
+      var _pluginInjectionApi$d9;
       return (0, _altText2.getAltTextToolbar)(baseToolbar, {
-        altTextValidator: altTextValidator
+        altTextValidator: altTextValidator,
+        forceFocusSelector: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d9 = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d9 === void 0 ? void 0 : _pluginInjectionApi$d9.forceFocusSelector
       });
     }
   }
@@ -437,22 +439,22 @@ var floatingToolbar = function floatingToolbar(state, intl) {
     selectedNodeType = state.selection.node.type;
   }
   if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {
-    var _pluginInjectionApi$d9, _pluginInjectionApi$d10;
+    var _pluginInjectionApi$d10, _pluginInjectionApi$d11;
     var mediaOffset = state.selection.$from.parentOffset + 1;
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele;
       var selector = (0, _mediaFilmstrip.mediaFilmstripItemDOMSelector)(mediaOffset);
       return (_mediaPluginState$ele = mediaPluginState.element) === null || _mediaPluginState$ele === void 0 ? void 0 : _mediaPluginState$ele.querySelector(selector);
     };
-    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d9 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d9 === void 0 ? void 0 : (_pluginInjectionApi$d10 = _pluginInjectionApi$d9.analytics) === null || _pluginInjectionApi$d10 === void 0 ? void 0 : _pluginInjectionApi$d10.actions);
+    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d10 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d10 === void 0 ? void 0 : (_pluginInjectionApi$d11 = _pluginInjectionApi$d10.analytics) === null || _pluginInjectionApi$d11 === void 0 ? void 0 : _pluginInjectionApi$d11.actions);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
-    var _pluginInjectionApi$d11, _pluginInjectionApi$d12;
+    var _pluginInjectionApi$d12, _pluginInjectionApi$d13;
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele2;
       var element = (_mediaPluginState$ele2 = mediaPluginState.element) === null || _mediaPluginState$ele2 === void 0 ? void 0 : _mediaPluginState$ele2.querySelector(".".concat(_styles.MediaInlineNodeSelector));
       return element || mediaPluginState.element;
     };
-    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d11 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d11 === void 0 ? void 0 : (_pluginInjectionApi$d12 = _pluginInjectionApi$d11.analytics) === null || _pluginInjectionApi$d12 === void 0 ? void 0 : _pluginInjectionApi$d12.actions);
+    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d12 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d12 === void 0 ? void 0 : (_pluginInjectionApi$d13 = _pluginInjectionApi$d12.analytics) === null || _pluginInjectionApi$d13 === void 0 ? void 0 : _pluginInjectionApi$d13.actions);
   } else {
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele3;

package/dist/cjs/plugins/media/toolbar/linking-toolbar-appearance.js

@@ -15,7 +15,6 @@ var _shortcut = _interopRequireDefault(require("@atlaskit/icon/glyph/shortcut"))
 var _adfSchema = require("@atlaskit/adf-schema");
 var _checkMediaType = require("../utils/check-media-type");
 var _ui = require("@atlaskit/editor-common/ui");
-var _Separator = _interopRequireDefault(require("../../floating-toolbar/ui/Separator"));
 var _messages = require("../../../messages");
 var _messages2 = require("@atlaskit/editor-common/messages");
 var _keymaps = require("../../../keymaps");
@@ -73,7 +72,7 @@ var LinkToolbarAppearance = function LinkToolbarAppearance(_ref) {
       testId: "edit-link-button"
     }, title)), (0, _react2.jsx)("div", {
       css: wrapper
-    }, (0, _react2.jsx)(_Separator.default, null)), (0, _react2.jsx)(_ui.FloatingToolbarButton, {
+    }, (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null)), (0, _react2.jsx)(_ui.FloatingToolbarButton, {
       target: "_blank",
       href: isValidUrl ? mediaLinkingState.link : undefined,
       disabled: !isValidUrl,
@@ -83,7 +82,7 @@ var LinkToolbarAppearance = function LinkToolbarAppearance(_ref) {
         label: linkTitle
       }),
       className: "hyperlink-open-link"
-    }), (0, _react2.jsx)(_Separator.default, null));
+    }), (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
   } else {
     var _title = intl.formatMessage(_messages2.linkToolbarMessages.addLink);
     return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_ui.FloatingToolbarButton, {
@@ -97,7 +96,7 @@ var LinkToolbarAppearance = function LinkToolbarAppearance(_ref) {
       icon: (0, _react2.jsx)(_link.default, {
         label: _title
       })
-    }), (0, _react2.jsx)(_Separator.default, null));
+    }), (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
   }
 };
 exports.LinkToolbarAppearance = LinkToolbarAppearance;

package/dist/cjs/plugins/media/ui/MediaLinkingToolbar.js

@@ -19,7 +19,6 @@ var _react2 = require("@emotion/react");
 var _ui = require("@atlaskit/editor-common/ui");
 var _chevronLeftLarge = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-left-large"));
 var _unlink = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/unlink"));
-var _Separator = _interopRequireDefault(require("../../floating-toolbar/ui/Separator"));
 var _link = require("@atlaskit/editor-common/link");
 var _messages = require("@atlaskit/editor-common/messages");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -143,7 +142,7 @@ var LinkAddToolbar = /*#__PURE__*/function (_React$PureComponent) {
           _onChange(value);
         },
         onKeyDown: onKeyDown
-      }), (0, _utils.normalizeUrl)(displayUrl) && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_Separator.default, null), (0, _react2.jsx)(_ui.FloatingToolbarButton, {
+      }), (0, _utils.normalizeUrl)(displayUrl) && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null), (0, _react2.jsx)(_ui.FloatingToolbarButton, {
         title: formatUnlinkText,
         icon: (0, _react2.jsx)(_unlink.default, {
           label: formatUnlinkText

package/dist/cjs/plugins/panel/pm-plugins/keymaps.js

@@ -27,6 +27,7 @@ function keymapPlugin() {
   };
   var keymaps = {
     Backspace: function Backspace(state, dispatch) {
+      var _nodeBeforePanel$type, _nodeBeforePanel$type2;
       var selection = state.selection,
         nodes = state.schema.nodes,
         tr = state.tr;
@@ -43,17 +44,25 @@ function keymapPlugin() {
       if ($from.parentOffset !== 0) {
         return false;
       }
-      var previousPos = tr.doc.resolve(Math.max(0, $from.before($from.depth) - 1));
-      var previousNodeType = previousPos.pos > 0 && previousPos.parent && previousPos.parent.type;
+      var $previousPos = tr.doc.resolve(Math.max(0, $from.before($from.depth) - 1));
+      var previousNodeType = $previousPos.pos > 0 && $previousPos.parent && $previousPos.parent.type;
       var parentNodeType = $from.parent.type;
       var isPreviousNodeAPanel = previousNodeType === panel;
       var isParentNodeAPanel = parentNodeType === panel;
+      var nodeBeforePanel = $previousPos === null || $previousPos === void 0 ? void 0 : $previousPos.nodeBefore;
 
       // Stops merging panels when deleting empty paragraph in between
       // Stops merging blockquotes with panels when deleting from start of blockquote
-      if (isPreviousNodeAPanel && !isParentNodeAPanel || isInsideAnEmptyNode(selection, panel, state.schema) || (0, _utils.hasParentNodeOfType)(blockquote)(selection)) {
+
+      if (isPreviousNodeAPanel && !isParentNodeAPanel || isInsideAnEmptyNode(selection, panel, state.schema) || (0, _utils.hasParentNodeOfType)(blockquote)(selection) ||
+      // Lift line of panel content up and out of the panel, when backspacing
+      // at the start of a panel, if the node before the panel is an 'isolating' node
+      // (for e.g. a table, or an expand), otherwise the default prosemirror backspace
+      // behaviour will fallback to 'select node backward' logic because the node
+      // before is an isolating node.
+      nodeBeforePanel !== null && nodeBeforePanel !== void 0 && (_nodeBeforePanel$type = nodeBeforePanel.type) !== null && _nodeBeforePanel$type !== void 0 && (_nodeBeforePanel$type2 = _nodeBeforePanel$type.spec) !== null && _nodeBeforePanel$type2 !== void 0 && _nodeBeforePanel$type2.isolating && (0, _utils.hasParentNodeOfType)(panel)(selection)) {
         var content = $from.node($from.depth).content;
-        var insertPos = previousPos.pos;
+        var insertPos = $previousPos.pos;
         deleteCurrentItem($from, tr).insert(insertPos, content);
         if (dispatch) {
           dispatch((0, _utils.setTextSelection)(insertPos)(tr).scrollIntoView());

package/dist/cjs/plugins/type-ahead/index.js

@@ -127,8 +127,6 @@ var TypeAheadMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
  *
  */
 var typeAheadPlugin = function typeAheadPlugin(options) {
-  var _options$useBetterTyp;
-  var useBetterTypeaheadNavigation = (_options$useBetterTyp = options === null || options === void 0 ? void 0 : options.useBetterTypeaheadNavigation) !== null && _options$useBetterTyp !== void 0 ? _options$useBetterTyp : true;
   var fireAnalyticsCallback = (0, _analytics.fireAnalyticsEvent)(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
   var popupMountRef = {
     current: null
@@ -155,8 +153,7 @@ var typeAheadPlugin = function typeAheadPlugin(options) {
             popupMountRef: popupMountRef,
             reactDispatch: dispatch,
             typeAheadHandlers: typeAhead,
-            createAnalyticsEvent: options === null || options === void 0 ? void 0 : options.createAnalyticsEvent,
-            useBetterTypeaheadNavigation: useBetterTypeaheadNavigation
+            createAnalyticsEvent: options === null || options === void 0 ? void 0 : options.createAnalyticsEvent
           });
         }
       }, {

package/dist/cjs/plugins/type-ahead/pm-plugins/decorations.js

@@ -22,8 +22,7 @@ var _closeTypeAhead = require("../transforms/close-type-ahead");
 var factoryDecorations = function factoryDecorations(_ref) {
   var intl = _ref.intl,
     popupMountRef = _ref.popupMountRef,
-    createAnalyticsEvent = _ref.createAnalyticsEvent,
-    useBetterTypeaheadNavigation = _ref.useBetterTypeaheadNavigation;
+    createAnalyticsEvent = _ref.createAnalyticsEvent;
   var createDecorations = function createDecorations(tr, _ref2) {
     var triggerHandler = _ref2.triggerHandler,
       inputMethod = _ref2.inputMethod,
@@ -95,8 +94,7 @@ var factoryDecorations = function factoryDecorations(_ref) {
         popupsBoundariesElement: (_popupMountRef$curren2 = popupMountRef.current) === null || _popupMountRef$curren2 === void 0 ? void 0 : _popupMountRef$curren2.popupsBoundariesElement,
         popupsScrollableElement: (_popupMountRef$curren3 = popupMountRef.current) === null || _popupMountRef$curren3 === void 0 ? void 0 : _popupMountRef$curren3.popupsScrollableElement,
         onUndoRedo: onUndoRedo,
-        reopenQuery: reopenQuery,
-        useBetterTypeaheadNavigation: useBetterTypeaheadNavigation
+        reopenQuery: reopenQuery
       })), typeaheadComponent);
       shouldFocusCursorInsideQuery = false;
       return typeaheadComponent;

package/dist/cjs/plugins/type-ahead/pm-plugins/main.js

@@ -31,14 +31,12 @@ function createPlugin(_ref) {
     popupMountRef = _ref.popupMountRef,
     createAnalyticsEvent = _ref.createAnalyticsEvent,
     typeAheadHandlers = _ref.typeAheadHandlers,
-    getIntl = _ref.getIntl,
-    useBetterTypeaheadNavigation = _ref.useBetterTypeaheadNavigation;
+    getIntl = _ref.getIntl;
   var intl = getIntl();
   var _factoryDecorations = (0, _decorations.factoryDecorations)({
       intl: intl,
       popupMountRef: popupMountRef,
-      createAnalyticsEvent: createAnalyticsEvent,
-      useBetterTypeaheadNavigation: useBetterTypeaheadNavigation
+      createAnalyticsEvent: createAnalyticsEvent
     }),
     createDecorations = _factoryDecorations.createDecorations,
     removeDecorations = _factoryDecorations.removeDecorations;

package/dist/cjs/plugins/type-ahead/ui/InputQuery.js

@@ -76,8 +76,7 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
     onQueryFocus = _ref.onQueryFocus,
     onUndoRedo = _ref.onUndoRedo,
     editorView = _ref.editorView,
-    items = _ref.items,
-    useBetterTypeaheadNavigation = _ref.useBetterTypeaheadNavigation;
+    items = _ref.items;
   var ref = (0, _react.useRef)(document.createElement('span'));
   var inputRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(null),
@@ -150,27 +149,6 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
         // Some suggested the other workaround maybe listen on`keypress` instead of `keydown`
         if (!event.isComposing && event.which !== 229 && event.keyCode !== 229) {
           if (selectedIndex === -1) {
-            if (useBetterTypeaheadNavigation) {
-              /**
-               * TODO DTR-1401: (also see ED-17200) There are two options
-               * here, either
-               * - set the index directly to 1 in WrapperTypeAhead.tsx's
-               *   `insertSelectedItem` at the cost of breaking some of the a11y
-               *   focus changes,
-               * - or do this jank at the cost of some small analytics noise.
-               *
-               * The focus behaviour still needs cleanup
-               */
-              selectPreviousItem();
-            }
-            selectNextItem();
-          }
-          onItemSelect(event.shiftKey ? _typeAhead.SelectItemMode.SHIFT_ENTER : _typeAhead.SelectItemMode.ENTER);
-        }
-        break;
-      case 'Tab':
-        if (selectedIndex === -1) {
-          if (useBetterTypeaheadNavigation) {
             /**
              * TODO DTR-1401: (also see ED-17200) There are two options
              * here, either
@@ -179,33 +157,36 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
              *   focus changes,
              * - or do this jank at the cost of some small analytics noise.
              *
+             * The focus behaviour still needs cleanup
              */
             selectPreviousItem();
+            selectNextItem();
           }
+          onItemSelect(event.shiftKey ? _typeAhead.SelectItemMode.SHIFT_ENTER : _typeAhead.SelectItemMode.ENTER);
+        }
+        break;
+      case 'Tab':
+        if (selectedIndex === -1) {
+          /**
+           * TODO DTR-1401: (also see ED-17200) There are two options
+           * here, either
+           * - set the index directly to 1 in WrapperTypeAhead.tsx's
+           *   `insertSelectedItem` at the cost of breaking some of the a11y
+           *   focus changes,
+           * - or do this jank at the cost of some small analytics noise.
+           *
+           */
+          selectPreviousItem();
           selectNextItem();
         }
         // TODO DTR-1401: why is this calling select item when hitting tab? fix this in DTR-1401
         onItemSelect(_typeAhead.SelectItemMode.TAB);
         break;
       case 'ArrowDown':
-        if (useBetterTypeaheadNavigation) {
-          selectNextItem();
-        } else {
-          // TODO DTR-1401: why were we preventing selection?
-          if (selectedIndex === -1) {
-            selectNextItem();
-          }
-        }
+        selectNextItem();
         break;
       case 'ArrowUp':
-        if (useBetterTypeaheadNavigation) {
-          selectPreviousItem();
-        } else {
-          // TODO DTR-1401: why were we preventing selection?
-          if (selectedIndex === -1) {
-            selectPreviousItem();
-          }
-        }
+        selectPreviousItem();
         break;
     }
     var undoRedoType = isUndoRedoShortcut(event);
@@ -217,7 +198,7 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
       event.preventDefault();
       return false;
     }
-  }, [useBetterTypeaheadNavigation, onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, cleanedInputContent, editorView.state]);
+  }, [onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, cleanedInputContent, editorView.state]);
   var onClick = (0, _react.useCallback)(function (event) {
     var _inputRef$current;
     event.stopPropagation();

package/dist/cjs/plugins/type-ahead/ui/WrapperTypeAhead.js

@@ -29,8 +29,7 @@ var WrapperTypeAhead = /*#__PURE__*/_react.default.memo(function (_ref) {
     inputMethod = _ref.inputMethod,
     getDecorationPosition = _ref.getDecorationPosition,
     reopenQuery = _ref.reopenQuery,
-    onUndoRedo = _ref.onUndoRedo,
-    useBetterTypeaheadNavigation = _ref.useBetterTypeaheadNavigation;
+    onUndoRedo = _ref.onUndoRedo;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     closed = _useState2[0],
@@ -52,17 +51,15 @@ var WrapperTypeAhead = /*#__PURE__*/_react.default.memo(function (_ref) {
   var selectNextItem = (0, _react.useMemo)(function () {
     return (0, _utils.moveSelectedIndex)({
       editorView: editorView,
-      direction: 'next',
-      useBetterTypeaheadNavigation: useBetterTypeaheadNavigation
+      direction: 'next'
     });
-  }, [editorView, useBetterTypeaheadNavigation]);
+  }, [editorView]);
   var selectPreviousItem = (0, _react.useMemo)(function () {
     return (0, _utils.moveSelectedIndex)({
       editorView: editorView,
-      direction: 'previous',
-      useBetterTypeaheadNavigation: useBetterTypeaheadNavigation
+      direction: 'previous'
     });
-  }, [editorView, useBetterTypeaheadNavigation]);
+  }, [editorView]);
   var cancel = (0, _react.useCallback)(function (_ref2) {
     var setSelectionAt = _ref2.setSelectionAt,
       addPrefixTrigger = _ref2.addPrefixTrigger,
@@ -113,7 +110,6 @@ var WrapperTypeAhead = /*#__PURE__*/_react.default.memo(function (_ref) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement(_InputQuery.InputQuery, {
-    useBetterTypeaheadNavigation: useBetterTypeaheadNavigation,
     triggerQueryPrefix: triggerHandler.trigger,
     onQueryChange: setQuery,
     onItemSelect: insertSelectedItem,

package/dist/cjs/plugins/type-ahead/utils.js

@@ -67,8 +67,7 @@ var findHandlerByTrigger = function findHandlerByTrigger(_ref) {
 exports.findHandlerByTrigger = findHandlerByTrigger;
 var moveSelectedIndex = function moveSelectedIndex(_ref2) {
   var editorView = _ref2.editorView,
-    direction = _ref2.direction,
-    useBetterTypeaheadNavigation = _ref2.useBetterTypeaheadNavigation;
+    direction = _ref2.direction;
   return function () {
     var typeAheadState = getPluginState(editorView.state);
     if (!typeAheadState) {
@@ -80,23 +79,20 @@ var moveSelectedIndex = function moveSelectedIndex(_ref2) {
     var nextIndex;
     if (direction === 'next') {
       stats.increaseArrowDown();
-      if (useBetterTypeaheadNavigation) {
-        /**
-         * See: https://product-fabric.atlassian.net/browse/ED-17200
-         * `selectedIndex` is forced to -1 now to not immediately focus the typeahead
-         * and only do so when there is explicit logic to focus into the typeahead
-         * options.
-         *
-         * This check for "set index to 1 when -1"
-         * - is a temporary workaround to get back the previous behaviour without
-         *    entirely reverting the a11y improvements
-         *
-         */
-        if (selectedIndex === -1 && items.length > 1) {
-          nextIndex = 1;
-        } else {
-          nextIndex = selectedIndex >= items.length - 1 ? 0 : selectedIndex + 1;
-        }
+
+      /**
+       * See: https://product-fabric.atlassian.net/browse/ED-17200
+       * `selectedIndex` is forced to -1 now to not immediately focus the typeahead
+       * and only do so when there is explicit logic to focus into the typeahead
+       * options.
+       *
+       * This check for "set index to 1 when -1"
+       * - is a temporary workaround to get back the previous behaviour without
+       *    entirely reverting the a11y improvements
+       *
+       */
+      if (selectedIndex === -1 && items.length > 1) {
+        nextIndex = 1;
       } else {
         nextIndex = selectedIndex >= items.length - 1 ? 0 : selectedIndex + 1;
       }

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.15.0";
+var version = "187.16.0";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "187.15.0",
+	"version": "187.16.0",
 	"sideEffects": false
 }