@atlaskit/editor-core 211.2.7 → 211.2.9

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-core
 
+## 211.2.9
+
+### Patch Changes
+
+- [`0eac5a71c3834`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0eac5a71c3834) -
+  [ED-29037] Fix dynamic buttons (e.g. text style) in full page primary toolbar flickers during the
+  initial load
+- [`c0113eeccb2df`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c0113eeccb2df) -
+  [ux] ED-29120 add a new config option for default editor preset
+  (`toolbar.enableNewToolbarExperience`) which allows the new toolbar to be disabled. This is needed
+  for editors that can't be excluded at the experiment level.
+- Updated dependencies
+
+## 211.2.8
+
+### Patch Changes
+
+- [`e834d11aee625`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e834d11aee625) -
+  Add z-index to new main primary toolbar, to fix stacking issues
+- Updated dependencies
+
 ## 211.2.7
 
 ### Patch Changes

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

@@ -22,11 +22,9 @@ var _measureRender = require("@atlaskit/editor-common/performance/measure-render
 var _navigation = require("@atlaskit/editor-common/performance/navigation");
 var _preset = require("@atlaskit/editor-common/preset");
 var _processRawValue = require("@atlaskit/editor-common/process-raw-value");
-var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _analytics2 = require("@atlaskit/editor-common/utils/analytics");
 var _document = require("@atlaskit/editor-common/utils/document");
-var _model = require("@atlaskit/editor-prosemirror/model");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -56,39 +54,6 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var EDIT_AREA_ID = 'ak-editor-textarea';
-var injectNodeViewNodeTypeList = ['paragraph', 'heading'];
-var createNodeViewPlugin = function createNodeViewPlugin(schema) {
-  var nodeViewEntries = [];
-  schema.spec.nodes.forEach(function (nodeName, nodeSpec) {
-    if (injectNodeViewNodeTypeList.includes(nodeName)) {
-      if (nodeSpec.toDOM && typeof nodeSpec.toDOM === 'function') {
-        var toDOM = nodeSpec.toDOM.bind(nodeSpec);
-        nodeViewEntries.push([nodeName, function (node) {
-          return _model.DOMSerializer.renderSpec(document, toDOM(node));
-        }]);
-      }
-    }
-  });
-  return {
-    name: 'nodeViewInjectPlugin',
-    plugin: function plugin() {
-      return new _safePlugin.SafePlugin({
-        state: {
-          init: function init() {
-            return {};
-          },
-          apply: function apply(_tr, pluginState) {
-            return pluginState;
-          }
-        },
-        key: new _state2.PluginKey('nodeViewInjectPlugin'),
-        props: {
-          nodeViews: Object.fromEntries(nodeViewEntries)
-        }
-      });
-    }
-  };
-};
 function ReactEditorView(props) {
   var _pluginInjectionAPI$c, _media, _linking, _document$querySelect, _props$render, _props$render2;
   var preset = props.preset,
@@ -184,9 +149,6 @@ function ReactEditorView(props) {
       config.current = (0, _createEditor.processPluginsList)((0, _createPluginsList.default)(options.props.preset, props.editorProps, pluginInjectionAPI.current));
       schema = (0, _createSchema.createSchema)(config.current);
       setEditorAPI(pluginInjectionAPI.current.api());
-      if ((0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true)) {
-        config.current.pmPlugins.push(createNodeViewPlugin(schema));
-      }
     }
     var contentTransformerProvider = options.props.editorProps.contentTransformerProvider;
     var plugins = (0, _createEditor.createPMPlugins)({

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

@@ -12,6 +12,8 @@ exports.sortByRank = sortByRank;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _errorReporter = require("@atlaskit/editor-common/error-reporter");
 var _legacyRankPlugins = require("@atlaskit/editor-common/legacy-rank-plugins");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _editorNativeAnchorSupportPlugin = require("./editorNativeAnchorSupportPlugin");
 var _editorStateNotificationPlugin = require("./editorStateNotificationPlugin");
 function sortByRank(a, b) {
   return a.rank - b.rank;
@@ -114,6 +116,9 @@ function createPMPlugins(config) {
   }).filter(function (plugin) {
     return typeof plugin !== 'undefined';
   });
+  if ((0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true)) {
+    pmPlugins.push((0, _editorNativeAnchorSupportPlugin.createEditorNativeAnchorSupportPlugin)(config.schema));
+  }
   if (config.onEditorStateUpdated !== undefined) {
     return [(0, _editorStateNotificationPlugin.createEditorStateNotificationPlugin)(config.onEditorStateUpdated, config.editorConfig.onEditorViewStateUpdatedCallbacks)].concat((0, _toConsumableArray2.default)(pmPlugins));
   }

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

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createEditorNativeAnchorSupportPlugin = void 0;
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var injectNodeViewNodeTypeList = ['paragraph', 'heading', 'bulletList', 'orderedList', 'blockquote', 'rule', 'decisionList', 'taskList', 'layoutColumn', 'hardBreak'];
+var key = new _state.PluginKey('editorNativeAnchorSupportPlugin');
+
+// Internal plugin to enable native anchor support in the editor.
+// This plugin injects node views for specific node types (e.g., 'paragraph', 'heading')
+// that do not already have a nodeView, allowing them to be rendered with native anchors when needed.
+var createEditorNativeAnchorSupportPlugin = exports.createEditorNativeAnchorSupportPlugin = function createEditorNativeAnchorSupportPlugin(schema) {
+  var nodeViewEntries = [];
+  schema.spec.nodes.forEach(function (nodeName, nodeSpec) {
+    if (injectNodeViewNodeTypeList.includes(nodeName)) {
+      if (nodeSpec.toDOM && typeof nodeSpec.toDOM === 'function') {
+        var toDOM = nodeSpec.toDOM.bind(nodeSpec);
+        nodeViewEntries.push([nodeName, function (node) {
+          return _model.DOMSerializer.renderSpec(document, toDOM(node));
+        }]);
+      }
+    }
+  });
+  return new _safePlugin.SafePlugin({
+    key: key,
+    props: {
+      nodeViews: Object.fromEntries(nodeViewEntries)
+    }
+  });
+};

package/dist/cjs/presets/default.js

@@ -55,7 +55,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @example
  */
 function createDefaultPreset(options) {
-  var _options$featureFlags, _options$featureFlags2;
+  var _options$toolbar, _options$featureFlags, _options$featureFlags2;
   var isFullPage = (0, _isFullPage.isFullPage)(options.appearance);
   var preset = new _preset.EditorPresetBuilder().add([_featureFlags.featureFlagsPlugin, options.featureFlags || {}]).maybeAdd([_analytics.analyticsPlugin, {
     createAnalyticsEvent: options.createAnalyticsEvent,
@@ -70,9 +70,9 @@ function createDefaultPreset(options) {
     return (0, _platformFeatureFlags.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, {
     contextIdentifierProvider: options.contextIdentifierProvider
-  }]).add([_base.basePlugin, options.base]).add(_decorations.decorationsPlugin).add([_typeAhead.typeAheadPlugin, options.typeAhead]).maybeAdd(_history.historyPlugin, Boolean(options.allowUndoRedoButtons)).maybeAdd([_toolbar.toolbarPlugin, options.toolbar || {}], (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true, {
-    exposure: true
-  })).add([_primaryToolbar.primaryToolbarPlugin, {
+  }]).add([_base.basePlugin, options.base]).add(_decorations.decorationsPlugin).add([_typeAhead.typeAheadPlugin, options.typeAhead]).maybeAdd(_history.historyPlugin, Boolean(options.allowUndoRedoButtons)).maybeAdd([_toolbar.toolbarPlugin, options.toolbar || {}],
+  // if explicitly set to false, don't enable. If undefined treat as truthy and allow plugin to be enabled under experiment
+  Boolean((0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_exp_code_toggle', 'isEnabled', true) ? ((_options$toolbar = options.toolbar) === null || _options$toolbar === void 0 ? void 0 : _options$toolbar.enableNewToolbarExperience) !== false && (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) : (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true))).add([_primaryToolbar.primaryToolbarPlugin, {
     contextualFormattingEnabled: isFullPage
   }]).maybeAdd(_undoRedo.undoRedoPlugin, Boolean((_options$featureFlags = (_options$featureFlags2 = options.featureFlags) === null || _options$featureFlags2 === void 0 ? void 0 : _options$featureFlags2.undoRedoButtons) !== null && _options$featureFlags !== void 0 ? _options$featureFlags : options.allowUndoRedoButtons)).add([_blockType.blockTypePlugin, _objectSpread(_objectSpread({}, options.blockType), {}, {
     includeBlockQuoteAsTextstyleOption: isFullPage

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

@@ -210,6 +210,7 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
     css: (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarCustomComponentsSlotStyleNew, isTwoLineToolbarEnabled && mainToolbarCustomComponentsSlotStyleTwoLineToolbarNew] : /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766 */
     mainToolbarCustomComponentsSlotStyle(isTwoLineToolbarEnabled)
   }, customPrimaryToolbarComponents);
+  var isToolbarAIFCEnabled = Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar) && (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc', 'isEnabled', true);
   return (0, _react2.jsx)(_WithFlash.default, {
     animate: maxContentSizeReached
   }, (0, _react2.jsx)(_ui.WidthProvider, null, (0, _react2.jsx)("div", {
@@ -225,8 +226,9 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
     ref: wrapperElementRef
   }, (0, _react2.jsx)(_Toolbar.MainToolbar, {
     useStickyToolbar: useStickyToolbar,
-    twoLineEditorToolbar: isTwoLineToolbarEnabled
-  }, (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) ? (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_CommentToolbar.CommentToolbar, {
+    twoLineEditorToolbar: isTwoLineToolbarEnabled,
+    isNewToolbarEnabled: isToolbarAIFCEnabled
+  }, isToolbarAIFCEnabled ? (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_CommentToolbar.CommentToolbar, {
     editorAPI: editorAPI,
     editorView: editorView,
     editorAppearance: appearance

package/dist/cjs/ui/Appearance/Comment/Toolbar.js

@@ -15,7 +15,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _templateObject, _templateObject2;
 /**
  * @jsxRuntime classic
@@ -113,11 +112,11 @@ var StickyToolbar = function StickyToolbar(props) {
   return (
     // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
     (0, _react2.jsx)("div", {
-      css: (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) && mainToolbarWithoutLeftPadding] : [
+      css: (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding] : [
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
       mainToolbarWrapperStyle(props.twoLineEditorToolbar,
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-      (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true)), stickyToolbarWrapperStyle]
+      props.isNewToolbarEnabled), stickyToolbarWrapperStyle]
       // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
       ,
       style: {
@@ -134,11 +133,11 @@ var FixedToolbar = function FixedToolbar(props) {
   return (
     // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
     (0, _react2.jsx)("div", {
-      css: (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) && mainToolbarWithoutLeftPadding] :
+      css: (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding] :
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
       mainToolbarWrapperStyle(props.twoLineEditorToolbar,
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-      (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true)),
+      props.isNewToolbarEnabled),
       "data-testid": "ak-editor-main-toolbar"
     }, props.children)
   );
@@ -174,16 +173,19 @@ var getStickyParameters = function getStickyParameters(configuration) {
 var MainToolbar = exports.MainToolbar = function MainToolbar(_ref) {
   var useStickyToolbar = _ref.useStickyToolbar,
     twoLineEditorToolbar = _ref.twoLineEditorToolbar,
-    children = _ref.children;
+    children = _ref.children,
+    isNewToolbarEnabled = _ref.isNewToolbarEnabled;
   if (useStickyToolbar) {
     return (0, _react2.jsx)(StickyToolbar
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading
     , (0, _extends2.default)({}, getStickyParameters(useStickyToolbar), {
-      twoLineEditorToolbar: twoLineEditorToolbar
+      twoLineEditorToolbar: twoLineEditorToolbar,
+      isNewToolbarEnabled: isNewToolbarEnabled
     }), children);
   }
   return (0, _react2.jsx)(FixedToolbar, {
-    twoLineEditorToolbar: twoLineEditorToolbar
+    twoLineEditorToolbar: twoLineEditorToolbar,
+    isNewToolbarEnabled: isNewToolbarEnabled
   }, children);
 };

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

@@ -153,7 +153,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
       '--ak-editor-fullpage-toolbar-height': (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)()
     }
-  }, !isEditorToolbarHidden && ((0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) ? (0, _react2.jsx)(_reactIntlNext.IntlProvider, {
+  }, !isEditorToolbarHidden && (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar) && (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) ? (0, _react2.jsx)(_reactIntlNext.IntlProvider, {
     locale: "en"
   }, (0, _react2.jsx)(_FullPageToolbarNext.FullPageToolbarNext, {
     toolbarDockingPosition: toolbarDockingPosition !== null && toolbarDockingPosition !== void 0 ? toolbarDockingPosition : toolbarDocking,

package/dist/cjs/ui/Appearance/FullPage/FullPageToolbarNext.compiled.css

@@ -6,8 +6,10 @@
 ._19pkpxbi{margin-top:var(--ds-space-200,1pc)}
 ._1bahesu3{justify-content:flex-end}
 ._1e0c1txw{display:flex}
+._1pby16oo{z-index:510}
 ._1ul91ns9{min-width:-moz-fit-content;min-width:fit-content}
 ._2hwxpxbi{margin-right:var(--ds-space-200,1pc)}
 ._4cvr1h6o{align-items:center}
 ._4t3izwfg{height:2pc}
+._kqswh2mm{position:relative}
 ._otyrpxbi{margin-bottom:var(--ds-space-200,1pc)}

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

@@ -24,6 +24,7 @@ var styles = {
   mainToolbarIconBeforeNew: "_4cvr1h6o _1e0c1txw",
   mainToolbarWrapper: "_1rjc12x7 _18zrutpp _n7zl7r9e",
   mainToolbarNew: "_1e0c1txw _4t3izwfg",
+  mainToolbarZIndex: "_1pby16oo _kqswh2mm",
   mainToolbarWithKeyline: "_16qs9g9j",
   customToolbarWrapperStyle: "_4cvr1h6o _1e0c1txw",
   firstChildWrapperOneLine: "_1e0c1txw _16jlkb7n",
@@ -36,7 +37,7 @@ var MainToolbarWrapper = function MainToolbarWrapper(_ref) {
     showKeyline = _ref.showKeyline;
   return /*#__PURE__*/_react.default.createElement("div", {
     "data-testid": testId,
-    className: (0, _runtime.ax)([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline, (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarNew])
+    className: (0, _runtime.ax)([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline, (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarNew, (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) && styles.mainToolbarZIndex])
   }, children);
 };
 var FirstChildWrapper = function FirstChildWrapper(_ref2) {
@@ -110,7 +111,7 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
       showKeyline: showKeyline || ContextPanelWidth > 0
     }, beforeIcon && /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _runtime.ax)([styles.mainToolbarIconBefore, (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
-    }, beforeIcon), (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(FirstChildWrapper, null, toolbarDockingPosition !== 'none' && components && (0, _toolbar2.isToolbar)(toolbar) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
+    }, beforeIcon), (0, _expValEquals.expValEquals)('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(FirstChildWrapper, null, toolbarDockingPosition !== 'none' && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
       toolbar: toolbar,
       components: components,
       editorView: editorView,
@@ -122,7 +123,7 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
     }, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/_react.default.createElement("div", {
       "data-testid": 'before-primary-toolbar-components-plugin',
       className: (0, _runtime.ax)([styles.beforePrimaryToolbarComponents])
-    }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents))) : toolbarDockingPosition !== 'none' && components && (0, _toolbar2.isToolbar)(toolbar) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
+    }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents))) : toolbarDockingPosition !== 'none' && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
       toolbar: toolbar,
       components: components,
       editorView: editorView,

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

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

@@ -10,12 +10,10 @@ import { measureRender } from '@atlaskit/editor-common/performance/measure-rende
 import { getResponseEndTime } from '@atlaskit/editor-common/performance/navigation';
 import { EditorPluginInjectionAPI } from '@atlaskit/editor-common/preset';
 import { processRawValue, processRawValueWithoutValidation } from '@atlaskit/editor-common/process-raw-value';
-import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { ReactEditorViewContext } from '@atlaskit/editor-common/ui-react';
 import { analyticsEventKey, getAnalyticsEventSeverity } from '@atlaskit/editor-common/utils/analytics';
 import { isEmptyDocument } from '@atlaskit/editor-common/utils/document';
-import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
-import { EditorState, PluginKey, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { abortAll, getActiveInteraction } from '@atlaskit/react-ufo/interaction-metrics';
@@ -38,35 +36,6 @@ import { handleEditorFocus } from './ReactEditorView/handleEditorFocus';
 import { useDispatchTransaction } from './ReactEditorView/useDispatchTransaction';
 import { useFireFullWidthEvent } from './ReactEditorView/useFireFullWidthEvent';
 const EDIT_AREA_ID = 'ak-editor-textarea';
-const injectNodeViewNodeTypeList = ['paragraph', 'heading'];
-const createNodeViewPlugin = schema => {
-  const nodeViewEntries = [];
-  schema.spec.nodes.forEach((nodeName, nodeSpec) => {
-    if (injectNodeViewNodeTypeList.includes(nodeName)) {
-      if (nodeSpec.toDOM && typeof nodeSpec.toDOM === 'function') {
-        const toDOM = nodeSpec.toDOM.bind(nodeSpec);
-        nodeViewEntries.push([nodeName, node => DOMSerializer.renderSpec(document, toDOM(node))]);
-      }
-    }
-  });
-  return {
-    name: 'nodeViewInjectPlugin',
-    plugin: () => new SafePlugin({
-      state: {
-        init() {
-          return {};
-        },
-        apply(_tr, pluginState) {
-          return pluginState;
-        }
-      },
-      key: new PluginKey('nodeViewInjectPlugin'),
-      props: {
-        nodeViews: Object.fromEntries(nodeViewEntries)
-      }
-    })
-  };
-};
 export function ReactEditorView(props) {
   var _pluginInjectionAPI$c, _pluginInjectionAPI$c2, _pluginInjectionAPI$c3, _media, _linking, _linking$smartLinks, _document$querySelect, _props$render, _props$render2;
   const {
@@ -152,9 +121,6 @@ export function ReactEditorView(props) {
       config.current = processPluginsList(createPluginsList(options.props.preset, props.editorProps, pluginInjectionAPI.current));
       schema = createSchema(config.current);
       setEditorAPI(pluginInjectionAPI.current.api());
-      if (expValEquals('platform_editor_native_anchor_support', 'isEnabled', true)) {
-        config.current.pmPlugins.push(createNodeViewPlugin(schema));
-      }
     }
     const {
       contentTransformerProvider

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

@@ -1,5 +1,7 @@
 import { ErrorReporter } from '@atlaskit/editor-common/error-reporter';
 import { sortByOrder } from '@atlaskit/editor-common/legacy-rank-plugins';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { createEditorNativeAnchorSupportPlugin } from './editorNativeAnchorSupportPlugin';
 import { createEditorStateNotificationPlugin } from './editorStateNotificationPlugin';
 export function sortByRank(a, b) {
   return a.rank - b.rank;
@@ -94,6 +96,9 @@ export function createPMPlugins(config) {
     featureFlags: config.featureFlags || {},
     getIntl: config.getIntl
   })).filter(plugin => typeof plugin !== 'undefined');
+  if (expValEquals('platform_editor_native_anchor_support', 'isEnabled', true)) {
+    pmPlugins.push(createEditorNativeAnchorSupportPlugin(config.schema));
+  }
   if (config.onEditorStateUpdated !== undefined) {
     return [createEditorStateNotificationPlugin(config.onEditorStateUpdated, config.editorConfig.onEditorViewStateUpdatedCallbacks), ...pmPlugins];
   }

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

@@ -0,0 +1,26 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+const injectNodeViewNodeTypeList = ['paragraph', 'heading', 'bulletList', 'orderedList', 'blockquote', 'rule', 'decisionList', 'taskList', 'layoutColumn', 'hardBreak'];
+const key = new PluginKey('editorNativeAnchorSupportPlugin');
+
+// Internal plugin to enable native anchor support in the editor.
+// This plugin injects node views for specific node types (e.g., 'paragraph', 'heading')
+// that do not already have a nodeView, allowing them to be rendered with native anchors when needed.
+export const createEditorNativeAnchorSupportPlugin = schema => {
+  const nodeViewEntries = [];
+  schema.spec.nodes.forEach((nodeName, nodeSpec) => {
+    if (injectNodeViewNodeTypeList.includes(nodeName)) {
+      if (nodeSpec.toDOM && typeof nodeSpec.toDOM === 'function') {
+        const toDOM = nodeSpec.toDOM.bind(nodeSpec);
+        nodeViewEntries.push([nodeName, node => DOMSerializer.renderSpec(document, toDOM(node))]);
+      }
+    }
+  });
+  return new SafePlugin({
+    key,
+    props: {
+      nodeViews: Object.fromEntries(nodeViewEntries)
+    }
+  });
+};

package/dist/es2019/presets/default.js

@@ -47,7 +47,7 @@ import { isFullPage as fullPageCheck } from '../utils/is-full-page';
  * @example
  */
 export function createDefaultPreset(options) {
-  var _options$featureFlags, _options$featureFlags2;
+  var _options$toolbar, _options$featureFlags, _options$featureFlags2;
   const isFullPage = fullPageCheck(options.appearance);
   const preset = new EditorPresetBuilder().add([featureFlagsPlugin, options.featureFlags || {}]).maybeAdd([analyticsPlugin, {
     createAnalyticsEvent: options.createAnalyticsEvent,
@@ -61,9 +61,9 @@ export function createDefaultPreset(options) {
     }
   }], () => 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, {
     contextIdentifierProvider: options.contextIdentifierProvider
-  }]).add([basePlugin, options.base]).add(decorationsPlugin).add([typeAheadPlugin, options.typeAhead]).maybeAdd(historyPlugin, Boolean(options.allowUndoRedoButtons)).maybeAdd([toolbarPlugin, options.toolbar || {}], editorExperiment('platform_editor_toolbar_aifc', true, {
-    exposure: true
-  })).add([primaryToolbarPlugin, {
+  }]).add([basePlugin, options.base]).add(decorationsPlugin).add([typeAheadPlugin, options.typeAhead]).maybeAdd(historyPlugin, Boolean(options.allowUndoRedoButtons)).maybeAdd([toolbarPlugin, options.toolbar || {}],
+  // if explicitly set to false, don't enable. If undefined treat as truthy and allow plugin to be enabled under experiment
+  Boolean(expValEquals('platform_editor_toolbar_aifc_exp_code_toggle', 'isEnabled', true) ? ((_options$toolbar = options.toolbar) === null || _options$toolbar === void 0 ? void 0 : _options$toolbar.enableNewToolbarExperience) !== false && editorExperiment('platform_editor_toolbar_aifc', true) : editorExperiment('platform_editor_toolbar_aifc', true))).add([primaryToolbarPlugin, {
     contextualFormattingEnabled: isFullPage
   }]).maybeAdd(undoRedoPlugin, Boolean((_options$featureFlags = (_options$featureFlags2 = options.featureFlags) === null || _options$featureFlags2 === void 0 ? void 0 : _options$featureFlags2.undoRedoButtons) !== null && _options$featureFlags !== void 0 ? _options$featureFlags : options.allowUndoRedoButtons)).add([blockTypePlugin, {
     ...options.blockType,

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

@@ -211,6 +211,7 @@ export const CommentEditorWithIntl = props => {
     css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarCustomComponentsSlotStyleNew, isTwoLineToolbarEnabled && mainToolbarCustomComponentsSlotStyleTwoLineToolbarNew] : /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766 */
     mainToolbarCustomComponentsSlotStyle(isTwoLineToolbarEnabled)
   }, customPrimaryToolbarComponents);
+  const isToolbarAIFCEnabled = Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar) && expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true);
   return jsx(WithFlash, {
     animate: maxContentSizeReached
   }, jsx(WidthProvider, null, jsx("div", {
@@ -226,8 +227,9 @@ export const CommentEditorWithIntl = props => {
     ref: wrapperElementRef
   }, jsx(MainToolbar, {
     useStickyToolbar: useStickyToolbar,
-    twoLineEditorToolbar: isTwoLineToolbarEnabled
-  }, editorExperiment('platform_editor_toolbar_aifc', true) ? jsx(React.Fragment, null, jsx(CommentToolbar, {
+    twoLineEditorToolbar: isTwoLineToolbarEnabled,
+    isNewToolbarEnabled: isToolbarAIFCEnabled
+  }, isToolbarAIFCEnabled ? jsx(React.Fragment, null, jsx(CommentToolbar, {
     editorAPI: editorAPI,
     editorView: editorView,
     editorAppearance: appearance

package/dist/es2019/ui/Appearance/Comment/Toolbar.js

@@ -10,7 +10,6 @@ import React, { useEffect, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
 const akEditorMenuZIndex = 500;
 const akEditorToolbarKeylineHeight = 2;
@@ -158,11 +157,11 @@ const StickyToolbar = props => {
   return (
     // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
     jsx("div", {
-      css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, editorExperiment('platform_editor_toolbar_aifc', true) && mainToolbarWithoutLeftPadding] : [
+      css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding] : [
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
       mainToolbarWrapperStyle(props.twoLineEditorToolbar,
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-      editorExperiment('platform_editor_toolbar_aifc', true)), stickyToolbarWrapperStyle]
+      props.isNewToolbarEnabled), stickyToolbarWrapperStyle]
       // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
       ,
       style: {
@@ -178,11 +177,11 @@ const StickyToolbar = props => {
 const FixedToolbar = props =>
 // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
 jsx("div", {
-  css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, editorExperiment('platform_editor_toolbar_aifc', true) && mainToolbarWithoutLeftPadding] :
+  css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding] :
   // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
   mainToolbarWrapperStyle(props.twoLineEditorToolbar,
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-  editorExperiment('platform_editor_toolbar_aifc', true)),
+  props.isNewToolbarEnabled),
   "data-testid": "ak-editor-main-toolbar"
 }, props.children);
 
@@ -216,17 +215,20 @@ const getStickyParameters = configuration => {
 export const MainToolbar = ({
   useStickyToolbar,
   twoLineEditorToolbar,
-  children
+  children,
+  isNewToolbarEnabled
 }) => {
   if (useStickyToolbar) {
     return jsx(StickyToolbar
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading
     , _extends({}, getStickyParameters(useStickyToolbar), {
-      twoLineEditorToolbar: twoLineEditorToolbar
+      twoLineEditorToolbar: twoLineEditorToolbar,
+      isNewToolbarEnabled: isNewToolbarEnabled
     }), children);
   }
   return jsx(FixedToolbar, {
-    twoLineEditorToolbar: twoLineEditorToolbar
+    twoLineEditorToolbar: twoLineEditorToolbar,
+    isNewToolbarEnabled: isNewToolbarEnabled
   }, children);
 };

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

@@ -138,7 +138,7 @@ export const FullPageEditor = props => {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
       '--ak-editor-fullpage-toolbar-height': FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()
     }
-  }, !isEditorToolbarHidden && (editorExperiment('platform_editor_toolbar_aifc', true) ? jsx(IntlProvider, {
+  }, !isEditorToolbarHidden && (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true) ? jsx(IntlProvider, {
     locale: "en"
   }, jsx(FullPageToolbarNext, {
     toolbarDockingPosition: (_toolbarDockingPositi = toolbarDockingPosition) !== null && _toolbarDockingPositi !== void 0 ? _toolbarDockingPositi : toolbarDocking,

package/dist/es2019/ui/Appearance/FullPage/FullPageToolbarNext.compiled.css

@@ -6,8 +6,10 @@
 ._19pkpxbi{margin-top:var(--ds-space-200,1pc)}
 ._1bahesu3{justify-content:flex-end}
 ._1e0c1txw{display:flex}
+._1pby16oo{z-index:510}
 ._1ul91ns9{min-width:-moz-fit-content;min-width:fit-content}
 ._2hwxpxbi{margin-right:var(--ds-space-200,1pc)}
 ._4cvr1h6o{align-items:center}
 ._4t3izwfg{height:2pc}
+._kqswh2mm{position:relative}
 ._otyrpxbi{margin-bottom:var(--ds-space-200,1pc)}

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

@@ -16,6 +16,7 @@ const styles = {
   mainToolbarIconBeforeNew: "_4cvr1h6o _1e0c1txw",
   mainToolbarWrapper: "_1rjc12x7 _18zrutpp _n7zl7r9e",
   mainToolbarNew: "_1e0c1txw _4t3izwfg",
+  mainToolbarZIndex: "_1pby16oo _kqswh2mm",
   mainToolbarWithKeyline: "_16qs9g9j",
   customToolbarWrapperStyle: "_4cvr1h6o _1e0c1txw",
   firstChildWrapperOneLine: "_1e0c1txw _16jlkb7n",
@@ -29,7 +30,7 @@ const MainToolbarWrapper = ({
 }) => {
   return /*#__PURE__*/React.createElement("div", {
     "data-testid": testId,
-    className: ax([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarNew])
+    className: ax([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarNew, expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) && styles.mainToolbarZIndex])
   }, children);
 };
 const FirstChildWrapper = ({
@@ -105,7 +106,7 @@ export const FullPageToolbarNext = ({
     showKeyline: showKeyline || ContextPanelWidth > 0
   }, beforeIcon && /*#__PURE__*/React.createElement("div", {
     className: ax([styles.mainToolbarIconBefore, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
-  }, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && /*#__PURE__*/React.createElement(ToolbarNext, {
+  }, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView) && /*#__PURE__*/React.createElement(ToolbarNext, {
     toolbar: toolbar,
     components: components,
     editorView: editorView,
@@ -117,7 +118,7 @@ export const FullPageToolbarNext = ({
   }, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/React.createElement("div", {
     "data-testid": 'before-primary-toolbar-components-plugin',
     className: ax([styles.beforePrimaryToolbarComponents])
-  }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents))) : toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && /*#__PURE__*/React.createElement(ToolbarNext, {
+  }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents))) : toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView) && /*#__PURE__*/React.createElement(ToolbarNext, {
     toolbar: toolbar,
     components: components,
     editorView: editorView,

package/dist/es2019/version-wrapper.js

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