@atlaskit/editor-core 228.1.12 → 228.1.13

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-core
 
+## 228.1.13
+
+### Patch Changes
+
+- [`0920715a6b9fc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0920715a6b9fc) -
+  Clean up feature gate `platform_editor_use_preferences_plugin`
+- [`df3b4a62decdd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/df3b4a62decdd) -
+  Replace the `fix_editor_blur_issue` feature gate with the `fix_editor_blur_issue_exp` experiment
+  for blur selection clearing, including updated experiment-based unit test coverage.
+- Updated dependencies
+
 ## 228.1.12
 
 ### Patch Changes

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

@@ -307,7 +307,7 @@ function ReactEditorView(props) {
     // @ts-expect-error
     var sel = viewRef.current.root.getSelection();
     if (sel) {
-      if (!(0, _fg.fg)('fix_editor_blur_issue')) {
+      if (!(0, _isExperimentEnabled.isExperimentEnabled)('fix_editor_blur_issue_exp')) {
         sel.removeAllRanges();
         return;
       }

package/dist/cjs/presets/default.js

@@ -44,7 +44,6 @@ var _unsupportedContent = require("@atlaskit/editor-plugins/unsupported-content"
 var _userIntent = require("@atlaskit/editor-plugins/user-intent");
 var _width = require("@atlaskit/editor-plugins/width");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _isFullPage = require("../utils/is-full-page");
@@ -66,13 +65,11 @@ function createDefaultPreset(options) {
     performanceTracking: options.performanceTracking
   }], Boolean(options.allowAnalyticsGASV3)).add(_betterTypeHistory.betterTypeHistoryPlugin).add([_paste.pastePlugin, _objectSpread(_objectSpread({}, options === null || options === void 0 ? void 0 : options.paste), {}, {
     isFullPage: isFullPage
-  })]).add(_clipboard.clipboardPlugin).add(_focus.focusPlugin).maybeAdd([_editorPluginUserPreferences.userPreferencesPlugin, {
+  })]).add(_clipboard.clipboardPlugin).add(_focus.focusPlugin).add([_editorPluginUserPreferences.userPreferencesPlugin, {
     initialUserPreferences: {
       toolbarDockingPosition: isFullPage ? 'none' : 'top'
     }
-  }], function () {
-    return (0, _fg.fg)('platform_editor_use_preferences_plugin');
-  }).maybeAdd(_interaction.interactionPlugin, Boolean(options === null || options === void 0 ? void 0 : options.__livePage) || (0, _expValEquals.expValEquals)('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)).add(_composition.compositionPlugin).add([_contextIdentifier.contextIdentifierPlugin, {
+  }]).maybeAdd(_interaction.interactionPlugin, Boolean(options === null || options === void 0 ? void 0 : options.__livePage) || (0, _expValEquals.expValEquals)('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)).add(_composition.compositionPlugin).add([_contextIdentifier.contextIdentifierPlugin, {
     contextIdentifierProvider: options.contextIdentifierProvider
   }]).add([_base.basePlugin, options.base]).add(_decorations.decorationsPlugin).add([_typeAhead.typeAheadPlugin, options.typeAhead]).maybeAdd(_history.historyPlugin, Boolean(options.allowUndoRedoButtons)).add(_userIntent.userIntentPlugin).maybeAdd([_toolbar.toolbarPlugin, options.toolbar || {}], Boolean((_options$toolbar = options.toolbar) === null || _options$toolbar === void 0 ? void 0 : _options$toolbar.enableNewToolbarExperience)).add([_primaryToolbar.primaryToolbarPlugin, {
     contextualFormattingEnabled: isFullPage

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

@@ -15,7 +15,6 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _componentWithCondition = require("@atlaskit/platform-feature-flags-react/component-with-condition");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
@@ -96,33 +95,16 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
   var interactionState = state.interactionState;
   var primaryToolbarState = (0, _getPrimaryToolbarComponents.getPrimaryToolbarComponents)(editorAPI, state.primaryToolbarComponents);
   var hasHadInteraction = interactionState !== 'hasNotHadInteraction';
-  var toolbarDocking = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(editorAPI, 'selectionToolbar.toolbarDocking', {
-    disabled: (0, _fg.fg)('platform_editor_use_preferences_plugin')
-  });
-  if (!(0, _fg.fg)('platform_editor_use_preferences_plugin')) {
-    if (!toolbarDocking) {
-      var _editorAPI$selectionT, _editorAPI$selectionT2;
-      // This is a workaround for the rendering issue with the selection toolbar
-      // where using useSharedPluginStateSelector or useSharedPluginState the state are not
-      // available when the editor is first loaded. and cause the toolbar to blink.
-      var defaultDocking = props.__livePage ? 'none' : 'top';
-      toolbarDocking = (_editorAPI$selectionT = editorAPI === null || editorAPI === void 0 || (_editorAPI$selectionT2 = editorAPI.selectionToolbar) === null || _editorAPI$selectionT2 === void 0 || (_editorAPI$selectionT2 = _editorAPI$selectionT2.sharedState.currentState()) === null || _editorAPI$selectionT2 === void 0 ? void 0 : _editorAPI$selectionT2.toolbarDocking) !== null && _editorAPI$selectionT !== void 0 ? _editorAPI$selectionT : defaultDocking;
-    }
-  }
-  var _ref3 = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(editorAPI, 'userPreferences.preferences', {
-      disabled: !(0, _fg.fg)('platform_editor_use_preferences_plugin')
-    }) || {},
+  var _ref3 = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(editorAPI, 'userPreferences.preferences') || {},
     toolbarDockingPosition = _ref3.toolbarDockingPosition;
-  if ((0, _fg.fg)('platform_editor_use_preferences_plugin')) {
-    if (!toolbarDockingPosition) {
-      var _editorAPI$userPrefer, _editorAPI$userPrefer2;
-      // This is a workaround for the rendering issue with the selection toolbar
-      // when using useSharedPluginStateWithSelector the state is not yet
-      // available when the editor is first loaded.
-      // This causes the toolbar to blink creating a layout shift.
-      var defaultDockingPosition = props.__livePage ? 'none' : 'top';
-      toolbarDockingPosition = (_editorAPI$userPrefer = editorAPI === null || editorAPI === void 0 || (_editorAPI$userPrefer2 = editorAPI.userPreferences) === null || _editorAPI$userPrefer2 === void 0 || (_editorAPI$userPrefer2 = _editorAPI$userPrefer2.actions.getUserPreferences()) === null || _editorAPI$userPrefer2 === void 0 ? void 0 : _editorAPI$userPrefer2.toolbarDockingPosition) !== null && _editorAPI$userPrefer !== void 0 ? _editorAPI$userPrefer : defaultDockingPosition;
-    }
+  if (!toolbarDockingPosition) {
+    var _editorAPI$userPrefer, _editorAPI$userPrefer2;
+    // This is a workaround for the rendering issue with the selection toolbar
+    // when using useSharedPluginStateWithSelector the state is not yet
+    // available when the editor is first loaded.
+    // This causes the toolbar to blink creating a layout shift.
+    var defaultDockingPosition = props.__livePage ? 'none' : 'top';
+    toolbarDockingPosition = (_editorAPI$userPrefer = editorAPI === null || editorAPI === void 0 || (_editorAPI$userPrefer2 = editorAPI.userPreferences) === null || _editorAPI$userPrefer2 === void 0 || (_editorAPI$userPrefer2 = _editorAPI$userPrefer2.actions.getUserPreferences()) === null || _editorAPI$userPrefer2 === void 0 ? void 0 : _editorAPI$userPrefer2.toolbarDockingPosition) !== null && _editorAPI$userPrefer !== void 0 ? _editorAPI$userPrefer : defaultDockingPosition;
   }
   var primaryToolbarComponents = props.primaryToolbarComponents;
   if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
@@ -133,20 +115,11 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
   if ((0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1', {
     exposure: true
   })) {
-    if ((0, _fg.fg)('platform_editor_use_preferences_plugin')) {
-      // need to check if the toolbarDockingPosition is set to 'none' or 'top'
-      if (toolbarDockingPosition === 'none' && !forcePrimaryToolbarPinned) {
-        primaryToolbarComponents = [];
-        if (!hasCustomComponents(customPrimaryToolbarComponents)) {
-          isEditorToolbarHidden = true;
-        }
-      }
-    } else {
-      if (toolbarDocking === 'none' && !forcePrimaryToolbarPinned) {
-        primaryToolbarComponents = [];
-        if (!hasCustomComponents(customPrimaryToolbarComponents)) {
-          isEditorToolbarHidden = true;
-        }
+    // need to check if the toolbarDockingPosition is set to 'none' or 'top'
+    if (toolbarDockingPosition === 'none' && !forcePrimaryToolbarPinned) {
+      primaryToolbarComponents = [];
+      if (!hasCustomComponents(customPrimaryToolbarComponents)) {
+        isEditorToolbarHidden = true;
       }
     }
   }
@@ -173,7 +146,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
   }, !isEditorToolbarHidden && (isToolbarAIFCEnabled ? /*#__PURE__*/_react.default.createElement(_FullPageToolbarNext.FullPageToolbarNext, {
     disabled: (0, _expValEquals.expValEquals)('platform_editor_ssr_toolbar_optimistic', 'isEnabled', true) ? !hasHadInteraction ? false : !!props.disabled : !!props.disabled || !hasHadInteraction && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_default_toolbar_state'),
     disabledWithoutInteractionLogic: !!props.disabled,
-    toolbarDockingPosition: toolbarDockingPosition !== null && toolbarDockingPosition !== void 0 ? toolbarDockingPosition : toolbarDocking,
+    toolbarDockingPosition: toolbarDockingPosition,
     beforeIcon: props.primaryToolbarIconBefore,
     editorAPI: editorAPI,
     editorView: props.editorView,

package/dist/cjs/version-wrapper.js

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

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

@@ -269,7 +269,7 @@ export function ReactEditorView(props) {
     // @ts-expect-error
     const sel = viewRef.current.root.getSelection();
     if (sel) {
-      if (!fg('fix_editor_blur_issue')) {
+      if (!isExperimentEnabled('fix_editor_blur_issue_exp')) {
         sel.removeAllRanges();
         return;
       }

package/dist/es2019/presets/default.js

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

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

@@ -6,7 +6,6 @@ import { ContextPanelWidthProvider } from '@atlaskit/editor-common/ui';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { componentWithCondition } from '@atlaskit/platform-feature-flags-react/component-with-condition';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
@@ -53,7 +52,7 @@ const hasCustomComponents = components => {
   return true;
 };
 export const FullPageEditor = props => {
-  var _scrollContentContain, _toolbarDockingPositi, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
+  var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
   // Should be always the first statement in the component
   const firstRenderStartTimestampRef = useRef(performance.now());
   const wrapperElementRef = useMemo(() => props.innerRef, [props.innerRef]);
@@ -77,34 +76,17 @@ export const FullPageEditor = props => {
   const interactionState = state.interactionState;
   const primaryToolbarState = getPrimaryToolbarComponents(editorAPI, state.primaryToolbarComponents);
   const hasHadInteraction = interactionState !== 'hasNotHadInteraction';
-  let toolbarDocking = useSharedPluginStateSelector(editorAPI, 'selectionToolbar.toolbarDocking', {
-    disabled: fg('platform_editor_use_preferences_plugin')
-  });
-  if (!fg('platform_editor_use_preferences_plugin')) {
-    if (!toolbarDocking) {
-      var _editorAPI$selectionT, _editorAPI$selectionT2, _editorAPI$selectionT3;
-      // This is a workaround for the rendering issue with the selection toolbar
-      // where using useSharedPluginStateSelector or useSharedPluginState the state are not
-      // available when the editor is first loaded. and cause the toolbar to blink.
-      const defaultDocking = props.__livePage ? 'none' : 'top';
-      toolbarDocking = (_editorAPI$selectionT = editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$selectionT2 = editorAPI.selectionToolbar) === null || _editorAPI$selectionT2 === void 0 ? void 0 : (_editorAPI$selectionT3 = _editorAPI$selectionT2.sharedState.currentState()) === null || _editorAPI$selectionT3 === void 0 ? void 0 : _editorAPI$selectionT3.toolbarDocking) !== null && _editorAPI$selectionT !== void 0 ? _editorAPI$selectionT : defaultDocking;
-    }
-  }
   let {
     toolbarDockingPosition
-  } = useSharedPluginStateSelector(editorAPI, 'userPreferences.preferences', {
-    disabled: !fg('platform_editor_use_preferences_plugin')
-  }) || {};
-  if (fg('platform_editor_use_preferences_plugin')) {
-    if (!toolbarDockingPosition) {
-      var _editorAPI$userPrefer, _editorAPI$userPrefer2, _editorAPI$userPrefer3;
-      // This is a workaround for the rendering issue with the selection toolbar
-      // when using useSharedPluginStateWithSelector the state is not yet
-      // available when the editor is first loaded.
-      // This causes the toolbar to blink creating a layout shift.
-      const defaultDockingPosition = props.__livePage ? 'none' : 'top';
-      toolbarDockingPosition = (_editorAPI$userPrefer = editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$userPrefer2 = editorAPI.userPreferences) === null || _editorAPI$userPrefer2 === void 0 ? void 0 : (_editorAPI$userPrefer3 = _editorAPI$userPrefer2.actions.getUserPreferences()) === null || _editorAPI$userPrefer3 === void 0 ? void 0 : _editorAPI$userPrefer3.toolbarDockingPosition) !== null && _editorAPI$userPrefer !== void 0 ? _editorAPI$userPrefer : defaultDockingPosition;
-    }
+  } = useSharedPluginStateSelector(editorAPI, 'userPreferences.preferences') || {};
+  if (!toolbarDockingPosition) {
+    var _editorAPI$userPrefer, _editorAPI$userPrefer2, _editorAPI$userPrefer3;
+    // This is a workaround for the rendering issue with the selection toolbar
+    // when using useSharedPluginStateWithSelector the state is not yet
+    // available when the editor is first loaded.
+    // This causes the toolbar to blink creating a layout shift.
+    const defaultDockingPosition = props.__livePage ? 'none' : 'top';
+    toolbarDockingPosition = (_editorAPI$userPrefer = editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$userPrefer2 = editorAPI.userPreferences) === null || _editorAPI$userPrefer2 === void 0 ? void 0 : (_editorAPI$userPrefer3 = _editorAPI$userPrefer2.actions.getUserPreferences()) === null || _editorAPI$userPrefer3 === void 0 ? void 0 : _editorAPI$userPrefer3.toolbarDockingPosition) !== null && _editorAPI$userPrefer !== void 0 ? _editorAPI$userPrefer : defaultDockingPosition;
   }
   let primaryToolbarComponents = props.primaryToolbarComponents;
   if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
@@ -117,20 +99,11 @@ export const FullPageEditor = props => {
   if (editorExperiment('platform_editor_controls', 'variant1', {
     exposure: true
   })) {
-    if (fg('platform_editor_use_preferences_plugin')) {
-      // need to check if the toolbarDockingPosition is set to 'none' or 'top'
-      if (toolbarDockingPosition === 'none' && !forcePrimaryToolbarPinned) {
-        primaryToolbarComponents = [];
-        if (!hasCustomComponents(customPrimaryToolbarComponents)) {
-          isEditorToolbarHidden = true;
-        }
-      }
-    } else {
-      if (toolbarDocking === 'none' && !forcePrimaryToolbarPinned) {
-        primaryToolbarComponents = [];
-        if (!hasCustomComponents(customPrimaryToolbarComponents)) {
-          isEditorToolbarHidden = true;
-        }
+    // need to check if the toolbarDockingPosition is set to 'none' or 'top'
+    if (toolbarDockingPosition === 'none' && !forcePrimaryToolbarPinned) {
+      primaryToolbarComponents = [];
+      if (!hasCustomComponents(customPrimaryToolbarComponents)) {
+        isEditorToolbarHidden = true;
       }
     }
   }
@@ -157,7 +130,7 @@ export const FullPageEditor = props => {
   }, !isEditorToolbarHidden && (isToolbarAIFCEnabled ? /*#__PURE__*/React.createElement(FullPageToolbarNext, {
     disabled: expValEquals('platform_editor_ssr_toolbar_optimistic', 'isEnabled', true) ? !hasHadInteraction ? false : !!props.disabled : !!props.disabled || !hasHadInteraction && isExperimentEnabled('platform_editor_default_toolbar_state'),
     disabledWithoutInteractionLogic: !!props.disabled,
-    toolbarDockingPosition: (_toolbarDockingPositi = toolbarDockingPosition) !== null && _toolbarDockingPositi !== void 0 ? _toolbarDockingPositi : toolbarDocking,
+    toolbarDockingPosition: toolbarDockingPosition,
     beforeIcon: props.primaryToolbarIconBefore,
     editorAPI: editorAPI,
     editorView: props.editorView,

package/dist/es2019/version-wrapper.js

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

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

@@ -298,7 +298,7 @@ export function ReactEditorView(props) {
     // @ts-expect-error
     var sel = viewRef.current.root.getSelection();
     if (sel) {
-      if (!fg('fix_editor_blur_issue')) {
+      if (!isExperimentEnabled('fix_editor_blur_issue_exp')) {
         sel.removeAllRanges();
         return;
       }

package/dist/esm/presets/default.js

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

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

@@ -7,7 +7,6 @@ import { ContextPanelWidthProvider } from '@atlaskit/editor-common/ui';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { componentWithCondition } from '@atlaskit/platform-feature-flags-react/component-with-condition';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
@@ -87,33 +86,16 @@ export var FullPageEditor = function FullPageEditor(props) {
   var interactionState = state.interactionState;
   var primaryToolbarState = getPrimaryToolbarComponents(editorAPI, state.primaryToolbarComponents);
   var hasHadInteraction = interactionState !== 'hasNotHadInteraction';
-  var toolbarDocking = useSharedPluginStateSelector(editorAPI, 'selectionToolbar.toolbarDocking', {
-    disabled: fg('platform_editor_use_preferences_plugin')
-  });
-  if (!fg('platform_editor_use_preferences_plugin')) {
-    if (!toolbarDocking) {
-      var _editorAPI$selectionT, _editorAPI$selectionT2;
-      // This is a workaround for the rendering issue with the selection toolbar
-      // where using useSharedPluginStateSelector or useSharedPluginState the state are not
-      // available when the editor is first loaded. and cause the toolbar to blink.
-      var defaultDocking = props.__livePage ? 'none' : 'top';
-      toolbarDocking = (_editorAPI$selectionT = editorAPI === null || editorAPI === void 0 || (_editorAPI$selectionT2 = editorAPI.selectionToolbar) === null || _editorAPI$selectionT2 === void 0 || (_editorAPI$selectionT2 = _editorAPI$selectionT2.sharedState.currentState()) === null || _editorAPI$selectionT2 === void 0 ? void 0 : _editorAPI$selectionT2.toolbarDocking) !== null && _editorAPI$selectionT !== void 0 ? _editorAPI$selectionT : defaultDocking;
-    }
-  }
-  var _ref3 = useSharedPluginStateSelector(editorAPI, 'userPreferences.preferences', {
-      disabled: !fg('platform_editor_use_preferences_plugin')
-    }) || {},
+  var _ref3 = useSharedPluginStateSelector(editorAPI, 'userPreferences.preferences') || {},
     toolbarDockingPosition = _ref3.toolbarDockingPosition;
-  if (fg('platform_editor_use_preferences_plugin')) {
-    if (!toolbarDockingPosition) {
-      var _editorAPI$userPrefer, _editorAPI$userPrefer2;
-      // This is a workaround for the rendering issue with the selection toolbar
-      // when using useSharedPluginStateWithSelector the state is not yet
-      // available when the editor is first loaded.
-      // This causes the toolbar to blink creating a layout shift.
-      var defaultDockingPosition = props.__livePage ? 'none' : 'top';
-      toolbarDockingPosition = (_editorAPI$userPrefer = editorAPI === null || editorAPI === void 0 || (_editorAPI$userPrefer2 = editorAPI.userPreferences) === null || _editorAPI$userPrefer2 === void 0 || (_editorAPI$userPrefer2 = _editorAPI$userPrefer2.actions.getUserPreferences()) === null || _editorAPI$userPrefer2 === void 0 ? void 0 : _editorAPI$userPrefer2.toolbarDockingPosition) !== null && _editorAPI$userPrefer !== void 0 ? _editorAPI$userPrefer : defaultDockingPosition;
-    }
+  if (!toolbarDockingPosition) {
+    var _editorAPI$userPrefer, _editorAPI$userPrefer2;
+    // This is a workaround for the rendering issue with the selection toolbar
+    // when using useSharedPluginStateWithSelector the state is not yet
+    // available when the editor is first loaded.
+    // This causes the toolbar to blink creating a layout shift.
+    var defaultDockingPosition = props.__livePage ? 'none' : 'top';
+    toolbarDockingPosition = (_editorAPI$userPrefer = editorAPI === null || editorAPI === void 0 || (_editorAPI$userPrefer2 = editorAPI.userPreferences) === null || _editorAPI$userPrefer2 === void 0 || (_editorAPI$userPrefer2 = _editorAPI$userPrefer2.actions.getUserPreferences()) === null || _editorAPI$userPrefer2 === void 0 ? void 0 : _editorAPI$userPrefer2.toolbarDockingPosition) !== null && _editorAPI$userPrefer !== void 0 ? _editorAPI$userPrefer : defaultDockingPosition;
   }
   var primaryToolbarComponents = props.primaryToolbarComponents;
   if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
@@ -124,20 +106,11 @@ export var FullPageEditor = function FullPageEditor(props) {
   if (editorExperiment('platform_editor_controls', 'variant1', {
     exposure: true
   })) {
-    if (fg('platform_editor_use_preferences_plugin')) {
-      // need to check if the toolbarDockingPosition is set to 'none' or 'top'
-      if (toolbarDockingPosition === 'none' && !forcePrimaryToolbarPinned) {
-        primaryToolbarComponents = [];
-        if (!hasCustomComponents(customPrimaryToolbarComponents)) {
-          isEditorToolbarHidden = true;
-        }
-      }
-    } else {
-      if (toolbarDocking === 'none' && !forcePrimaryToolbarPinned) {
-        primaryToolbarComponents = [];
-        if (!hasCustomComponents(customPrimaryToolbarComponents)) {
-          isEditorToolbarHidden = true;
-        }
+    // need to check if the toolbarDockingPosition is set to 'none' or 'top'
+    if (toolbarDockingPosition === 'none' && !forcePrimaryToolbarPinned) {
+      primaryToolbarComponents = [];
+      if (!hasCustomComponents(customPrimaryToolbarComponents)) {
+        isEditorToolbarHidden = true;
       }
     }
   }
@@ -164,7 +137,7 @@ export var FullPageEditor = function FullPageEditor(props) {
   }, !isEditorToolbarHidden && (isToolbarAIFCEnabled ? /*#__PURE__*/React.createElement(FullPageToolbarNext, {
     disabled: expValEquals('platform_editor_ssr_toolbar_optimistic', 'isEnabled', true) ? !hasHadInteraction ? false : !!props.disabled : !!props.disabled || !hasHadInteraction && isExperimentEnabled('platform_editor_default_toolbar_state'),
     disabledWithoutInteractionLogic: !!props.disabled,
-    toolbarDockingPosition: toolbarDockingPosition !== null && toolbarDockingPosition !== void 0 ? toolbarDockingPosition : toolbarDocking,
+    toolbarDockingPosition: toolbarDockingPosition,
     beforeIcon: props.primaryToolbarIconBefore,
     editorAPI: editorAPI,
     editorView: props.editorView,

package/dist/esm/version-wrapper.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "228.1.12",
+	"version": "228.1.13",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -27,6 +27,9 @@
 		"team": "Editor: Lego",
 		"singleton": true,
 		"website": {
+			"tags": [
+				"platform-labs"
+			],
 			"name": "Editor Core"
 		},
 		"integrationTests": {
@@ -49,7 +52,7 @@
 		"@atlaskit/editor-json-transformer": "^9.8.0",
 		"@atlaskit/editor-plugin-block-menu": "^17.0.0",
 		"@atlaskit/editor-plugin-connectivity": "^18.0.0",
-		"@atlaskit/editor-plugin-quick-insert": "^18.0.0",
+		"@atlaskit/editor-plugin-quick-insert": "^18.1.0",
 		"@atlaskit/editor-plugin-selection-extension": "^21.0.0",
 		"@atlaskit/editor-plugin-user-preferences": "^16.0.0",
 		"@atlaskit/editor-plugins": "^16.1.0",
@@ -92,7 +95,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^122.10.0",
+		"@atlaskit/editor-common": "^122.11.0",
 		"@atlaskit/link-provider": "^5.7.0",
 		"@atlaskit/media-core": "^38.2.0",
 		"react": "^18.2.0 || ^19.2.0",
@@ -150,7 +153,7 @@
 		"@atlaskit/media-test-helpers": "^42.4.0",
 		"@atlaskit/media-ui": "^30.16.0",
 		"@atlaskit/modal-dialog": "^16.6.0",
-		"@atlaskit/navigation-system": "^10.16.0",
+		"@atlaskit/navigation-system": "^10.17.0",
 		"@atlaskit/popper": "^9.4.0",
 		"@atlaskit/portal": "^7.0.0",
 		"@atlaskit/profilecard": "^26.24.0",
@@ -215,10 +218,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"platform_editor_use_preferences_plugin": {
-			"type": "boolean",
-			"referenceOnly": true
-		},
 		"platform_editor_media_block_default": {
 			"type": "boolean",
 			"referenceOnly": true
@@ -288,9 +287,6 @@
 		},
 		"platform_editor_lovability_resize_exts_gracefully": {
 			"type": "boolean"
-		},
-		"fix_editor_blur_issue": {
-			"type": "boolean"
 		}
 	}
 }