@atlaskit/editor-core 221.3.0 → 221.3.2

package/dist/es2019/ui/EditorContentContainer/styles/backgroundColorStyles.js

@@ -39,14 +39,25 @@ export const backgroundColorStyles = css({
     paddingBottom: 2,
     boxDecorationBreak: 'clone'
   },
-  // Don't show text highlight styling when there is a hyperlink
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  'a .fabric-background-color-mark': {
-    backgroundColor: 'unset'
-  },
   // Don't show text highlight styling when there is an inline comment
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '.fabric-background-color-mark .ak-editor-annotation': {
     backgroundColor: 'unset'
   }
+});
+
+/**
+ * @deprecated This style has been migrated to Compiled CSS, under experiment platform_editor_core_static_css
+ * If you need to make changes here, also update the corresponding style in
+ * packages/editor/editor-core/src/ui/EditorContentContainer/EditorContentContainer-compiled.tsx
+ * See EDITOR-7600 for more details: https://hello.jira.atlassian.cloud/jira/browse/EDITOR-7600
+ */
+// Don't show text highlight styling when there is a hyperlink.
+// Conditionally applied when the highlight-on-links experiment is off.
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/volt-strict-mode/no-multiple-exports
+export const highlightLinksUnsetStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  'a .fabric-background-color-mark': {
+    backgroundColor: 'unset'
+  }
 });

package/dist/es2019/ui/EditorContentContainer/styles/expandStyles.js

@@ -340,7 +340,7 @@ export const expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes = cs
  * See EDITOR-7600 for more details: https://hello.jira.atlassian.cloud/jira/browse/EDITOR-7600
  */
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
-export const expandStylesMixin_experiment_platform_editor_chromeless_expand_fix = css({
+export const expandStylesMixin_chromeless_expand_fix = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ProseMirror > .ak-editor-expand': {
     marginLeft: 0,

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 = "221.2.1";
+export const version = "221.3.1";

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

@@ -29,6 +29,8 @@ import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { EditorSSRRenderer } from '@atlaskit/editor-ssr-renderer';
+import { createSSREditorState } from '@atlaskit/editor-ssr-renderer/create-ssr-editor-state';
+import { createSSRPMPlugins } from '@atlaskit/editor-ssr-renderer/create-ssr-pm-plugins';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { getInteractionId } from '@atlaskit/react-ufo/interaction-id-context';
 import { abortAll, getActiveInteraction } from '@atlaskit/react-ufo/interaction-metrics';
@@ -105,7 +107,12 @@ export function ReactEditorView(props) {
     __livePage = _props$editorProps.__livePage,
     onEditorCreated = props.onEditorCreated,
     onEditorDestroyed = props.onEditorDestroyed;
-  var ssrEditorStateRef = useRef(undefined);
+
+  // Holds the best available EditorState before the ProseMirror EditorView has mounted.
+  // On SSR: set to the SSR-rendered state so toolbar plugins can read it via getEditorState().
+  // On client first render: set to initialEditorState for the same reason.
+  // Cleared to undefined once createEditorView runs and viewRef.current becomes available.
+  var preMountEditorStateRef = useRef(undefined);
   var editorRef = useRef(null);
   var viewRef = useRef();
   var focusTimeoutId = useRef();
@@ -133,8 +140,8 @@ export function ReactEditorView(props) {
     return createFeatureFlagsFromProps(editorPropFeatureFlags);
   }, [editorPropFeatureFlags]);
   var getEditorState = useCallback(function () {
-    var _ssrEditorStateRef$cu, _viewRef$current;
-    return (_ssrEditorStateRef$cu = ssrEditorStateRef.current) !== null && _ssrEditorStateRef$cu !== void 0 ? _ssrEditorStateRef$cu : (_viewRef$current = viewRef.current) === null || _viewRef$current === void 0 ? void 0 : _viewRef$current.state;
+    var _preMountEditorStateR, _viewRef$current;
+    return (_preMountEditorStateR = preMountEditorStateRef.current) !== null && _preMountEditorStateR !== void 0 ? _preMountEditorStateR : (_viewRef$current = viewRef.current) === null || _viewRef$current === void 0 ? void 0 : _viewRef$current.state;
   }, []);
   var getEditorView = useCallback(function () {
     return viewRef.current;
@@ -257,12 +264,17 @@ export function ReactEditorView(props) {
       // so we can save some CPU time here.
       return undefined;
     }
-    return createEditorState({
+    var state = createEditorState({
       props: props,
       doc: defaultValue,
       // ED-4759: Don't set selection at end for full-page editor - should be at start.
       selectionAtStart: isFullPage(nextAppearance)
     });
+    if (expValEquals('platform_editor_ssr_toolbar_optimistic', 'isEnabled', true)) {
+      // CSR only, synchronously set preMountEditorStateRef so it's ready to be consumed by children including toolbar
+      preMountEditorStateRef.current = state;
+    }
+    return state;
   },
   // This is only used for the initial state - afterwards we will have `viewRef` available for use
   // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -663,6 +675,10 @@ export function ReactEditorView(props) {
       mount: node
     }, getDirectEditorProps());
     viewRef.current = view;
+    if (expValEquals('platform_editor_ssr_toolbar_optimistic', 'isEnabled', true)) {
+      // clears pre-mount state as soon as the final view is mounted
+      preMountEditorStateRef.current = undefined;
+    }
     measureRender(measurements.PROSEMIRROR_RENDERED, function (_ref3) {
       var duration = _ref3.duration,
         startTime = _ref3.startTime,
@@ -1028,17 +1044,56 @@ export function ReactEditorView(props) {
       return buildDoc(schema);
     };
     var doc = profileSSROperation("".concat(SSR_TRACE_SEGMENT_NAME, "/buildDoc"), doBuildDoc, onSSRMeasure);
+
+    // When the platform_editor_ssr_toolbar_optimistic is on, we create SSR-safe PM plugins and EditorState
+    // HERE in ssrDeps — before any children render — so that FullPageToolbarNext can read correct
+    // plugin state via useSharedPluginStateWithSelector → currentState() → getEditorState().
+    //
+    // We also pass these pre-built pmPlugins and editorState to EditorSSRRenderer so it can
+    // skip redundant creation (avoids double createPluginsList + EditorState.create).
+    if (expValEquals('platform_editor_ssr_toolbar_optimistic', 'isEnabled', true)) {
+      var ssrPMPlugins = profileSSROperation("".concat(SSR_TRACE_SEGMENT_NAME, "/createSSRPMPlugins"), function () {
+        return createSSRPMPlugins({
+          plugins: plugins,
+          schema: schema,
+          portalProviderAPI: props.portalProviderAPI,
+          getIntl: function getIntl() {
+            return props.intl;
+          }
+        });
+      }, onSSRMeasure);
+      var ssrState = profileSSROperation("".concat(SSR_TRACE_SEGMENT_NAME, "/createSSREditorState"), function () {
+        return createSSREditorState({
+          doc: doc,
+          schema: schema,
+          pmPlugins: ssrPMPlugins
+        });
+      }, onSSRMeasure);
+      return {
+        plugins: plugins,
+        schema: schema,
+        doc: doc,
+        ssrPMPlugins: ssrPMPlugins,
+        ssrEditorState: ssrState
+      };
+    }
     return {
       plugins: plugins,
       schema: schema,
-      doc: doc
+      doc: doc,
+      ssrPMPlugins: undefined,
+      ssrEditorState: undefined
     };
-  }, [allowBlockType, buildDoc, props.preset, onSSRMeasure]);
+  }, [allowBlockType, buildDoc, props.preset, onSSRMeasure, props.portalProviderAPI, props.intl]);
+  // SSR only, synchronously set preMountEditorStateRef so it's ready to be consumed by children including toolbar
+  if (ssrDeps !== null && ssrDeps !== void 0 && ssrDeps.ssrEditorState) {
+    preMountEditorStateRef.current = ssrDeps.ssrEditorState;
+  }
   var _props$editorProps3 = props.editorProps,
     assistiveLabel = _props$editorProps3.assistiveLabel,
     assistiveDescribedBy = _props$editorProps3.assistiveDescribedBy;
   var handleSsrEditorStateChanged = useCallback(function (state) {
-    ssrEditorStateRef.current = state;
+    preMountEditorStateRef.current = state;
     // Notify listeners about the initial SSR state
     pluginInjectionAPI.current.onEditorViewUpdated({
       newEditorState: state,
@@ -1085,11 +1140,13 @@ export function ReactEditorView(props) {
       id: EDIT_AREA_ID,
       "aria-describedby": assistiveDescribedBy,
       "data-editor-id": editorId.current,
-      onSSRMeasure: onSSRMeasure
+      onSSRMeasure: onSSRMeasure,
+      prebuiltPMPlugins: ssrDeps.ssrPMPlugins,
+      prebuiltEditorState: ssrDeps.ssrEditorState
       // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
       ,
       onEditorStateChanged: expValEquals('platform_editor_perf_lint_cleanup', 'isEnabled', true) ? handleSsrEditorStateChanged : function (state) {
-        ssrEditorStateRef.current = state;
+        preMountEditorStateRef.current = state;
         // Notify listeners about the initial SSR state
         pluginInjectionAPI.current.onEditorViewUpdated({
           newEditorState: state,

package/dist/esm/ui/Appearance/Comment/Comment-compiled.compiled.css

@@ -0,0 +1,30 @@
+
+._19itno8c{border:var(--ds-border-width,1px) solid var(--ds-border-input,#8c8f97)}
+._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}
+._2rkofajl{border-radius:var(--ds-radius-small,3px)}
+._2rkopb1k{border-radius:var(--ds-radius-xlarge,9pt)}._13dfutpp .less-margin>.ProseMirror{margin-top:var(--ds-space-150,9pt)}
+._16jlkb7n{flex-grow:1}
+._18m91wug{overflow-y:auto}
+._19bvv77o{padding-left:var(--ds-space-025,2px)}
+._1bahesu3{justify-content:flex-end}
+._1e0c1txw{display:flex}
+._1ul9clpc{min-width:17pc}
+._2lx21bp4{flex-direction:column}
+._4cvr1h6o{align-items:center}
+._4t3i1wug{height:auto}
+._bfhk1j9a{background-color:var(--ds-background-input,#fff)}
+._c71lmz22{max-height:var(--comment-editor-max-height)}
+._ca0qutpp{padding-top:var(--ds-space-150,9pt)}
+._ghozu2gc .less-margin>.ProseMirror{margin-bottom:var(--ds-space-100,8px)}
+._gzr8u2gc .less-margin>.ProseMirror{margin-right:var(--ds-space-100,8px)}
+._n3tdutpp{padding-bottom:var(--ds-space-150,9pt)}
+._oafwu2gc .less-margin>.ProseMirror{margin-left:var(--ds-space-100,8px)}
+._p12f1kw7{max-width:inherit}
+._p7r11txw >div{display:flex}
+._slp31hna{word-wrap:break-word}
+._t1edidpf >div{flex-shrink:0}
+._u5f3idpf{padding-right:0}
+._u5f3v47k{padding-right:var(--ds-space-250,20px)}
+._u5f3v77o{padding-right:var(--ds-space-025,2px)}
+._vchhusvi{box-sizing:border-box}
+@media (max-width:490px){._xugcidpf{padding-right:0}}

package/dist/esm/ui/Appearance/Comment/Comment-compiled.js

@@ -0,0 +1,268 @@
+/* Comment-compiled.tsx generated by @compiled/babel-plugin v0.39.1 */
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import "./Comment-compiled.compiled.css";
+import { ax, ix } from "@compiled/react/runtime";
+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) { _defineProperty(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; }
+/**
+ * Compiled branch of the `platform_editor_core_non_ecc_static_css` experiment.
+ * Used via `componentWithCondition` in `Comment.tsx`.
+ *
+ * Cleanup: delete this file once the experiment has shipped.
+ */
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import classnames from 'classnames';
+import { useIntl } from 'react-intl';
+import ButtonGroup from '@atlaskit/button/button-group';
+import Button from '@atlaskit/button/new';
+import { useSharedPluginState, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import messages from '@atlaskit/editor-common/messages';
+import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
+import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
+import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-named-as-default
+import ClickAreaBlock from '../../Addon/ClickAreaBlock';
+import { contentComponentClickWrapper } from '../../Addon/ClickAreaBlock/contentComponentWrapper';
+import EditorContentContainer from '../../EditorContentContainer/EditorContentContainer';
+import PluginSlot from '../../PluginSlot';
+import { getPrimaryToolbarComponents } from '../../Toolbar/getPrimaryToolbarComponents';
+import { ToolbarWithSizeDetector as Toolbar } from '../../Toolbar/ToolbarWithSizeDetector';
+import WithFlash from '../../WithFlash';
+import { CommentToolbar } from './CommentToolbar';
+import { MainToolbar } from './Toolbar';
+var commentEditorCompiledStyles = {
+  commentEditorOld: "_19itno8c _2rkofajl _1e0c1txw _2lx21bp4 _1ul9clpc _4t3i1wug _bfhk1j9a _vchhusvi _p12f1kw7 _slp31hna _13dfutpp _gzr8u2gc _ghozu2gc _oafwu2gc",
+  commentEditor: "_19itno8c _2rko1qi0 _1e0c1txw _2lx21bp4 _1ul9clpc _4t3i1wug _bfhk1j9a _vchhusvi _p12f1kw7 _slp31hna _13dfutpp _gzr8u2gc _ghozu2gc _oafwu2gc",
+  modernisedEditor: "_2rkopb1k",
+  secondaryToolbar: "_vchhusvi _1bahesu3 _4cvr1h6o _1e0c1txw _ca0qutpp _u5f3v77o _n3tdutpp _19bvv77o",
+  mainToolbarCustomComponentsSlotNew: "_1e0c1txw _1bahesu3 _4cvr1h6o _16jlkb7n _u5f3v47k _p7r11txw _t1edidpf",
+  mainToolbarCustomComponentsSlotPaddingOverride: "_u5f3idpf",
+  mainToolbarCustomComponentsSlotTwoLineToolbar: "_xugcidpf",
+  contentAreaMaxHeight: "_c71lmz22 _18m91wug"
+};
+var appearance = 'comment';
+export var CommentEditorWithIntlCompiled = function CommentEditorWithIntlCompiled(props) {
+  var _editorAPI$blockMenu$, _editorAPI$blockMenu;
+  var editorAPI = props.editorAPI;
+
+  // Get useStandardNodeWidth from block menu plugin shared state
+  // Only access editorAPI when the experiment is enabled to avoid performance impact
+  var useStandardNodeWidth = editorExperiment('platform_editor_controls', 'variant1') && ((_editorAPI$blockMenu$ = editorAPI === null || editorAPI === void 0 || (_editorAPI$blockMenu = editorAPI.blockMenu) === null || _editorAPI$blockMenu === void 0 || (_editorAPI$blockMenu = _editorAPI$blockMenu.sharedState) === null || _editorAPI$blockMenu === void 0 || (_editorAPI$blockMenu = _editorAPI$blockMenu.currentState()) === null || _editorAPI$blockMenu === void 0 ? void 0 : _editorAPI$blockMenu.useStandardNodeWidth) !== null && _editorAPI$blockMenu$ !== void 0 ? _editorAPI$blockMenu$ : false);
+  var _useSharedPluginState = useSharedPluginStateWithSelector(editorAPI, ['maxContentSize', 'primaryToolbar', 'editorViewMode'], function (states) {
+      var _states$maxContentSiz, _states$primaryToolba, _states$editorViewMod;
+      return {
+        maxContentSizeReached: !!((_states$maxContentSiz = states.maxContentSizeState) !== null && _states$maxContentSiz !== void 0 && _states$maxContentSiz.maxContentSizeReached),
+        primaryToolbarComponentsState: (_states$primaryToolba = states.primaryToolbarState) === null || _states$primaryToolba === void 0 ? void 0 : _states$primaryToolba.components,
+        editorViewMode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode
+      };
+    }),
+    editorViewMode = _useSharedPluginState.editorViewMode,
+    primaryToolbarComponentsState = _useSharedPluginState.primaryToolbarComponentsState,
+    maxContentSizeReached = _useSharedPluginState.maxContentSizeReached;
+  var primaryToolbarState = getPrimaryToolbarComponents(editorAPI, primaryToolbarComponentsState);
+  var _useSharedPluginState2 = useSharedPluginState(editorAPI, ['media']),
+    mediaState = _useSharedPluginState2.mediaState;
+  var intl = useIntl();
+  var editorDOMElement = props.editorDOMElement,
+    editorView = props.editorView,
+    editorActions = props.editorActions,
+    eventDispatcher = props.eventDispatcher,
+    providerFactory = props.providerFactory,
+    contentComponents = props.contentComponents,
+    customContentComponents = props.customContentComponents,
+    customPrimaryToolbarComponents = props.customPrimaryToolbarComponents,
+    primaryToolbarComponentsProp = props.primaryToolbarComponents,
+    customSecondaryToolbarComponents = props.customSecondaryToolbarComponents,
+    popupsMountPoint = props.popupsMountPoint,
+    popupsBoundariesElement = props.popupsBoundariesElement,
+    popupsScrollableElement = props.popupsScrollableElement,
+    maxHeight = props.maxHeight,
+    _props$minHeight = props.minHeight,
+    minHeight = _props$minHeight === void 0 ? 150 : _props$minHeight,
+    onSave = props.onSave,
+    onCancel = props.onCancel,
+    disabled = props.disabled,
+    dispatchAnalyticsEvent = props.dispatchAnalyticsEvent,
+    useStickyToolbar = props.useStickyToolbar,
+    pluginHooks = props.pluginHooks,
+    featureFlags = props.featureFlags,
+    innerRef = props.innerRef,
+    isEditorModernisationEnabled = props.isEditorModernisationEnabled;
+  var showSecondaryToolbar = !!onSave || !!onCancel || !!customSecondaryToolbarComponents;
+  var containerElement = React.useRef(null);
+
+  // Wrapper container for toolbar and content area
+  var wrapperElementRef = useMemo(function () {
+    return innerRef || /*#__PURE__*/React.createRef();
+  }, [innerRef]);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    saveButtonDisabled = _useState2[0],
+    setSaveButtonDisabled = _useState2[1];
+  useEffect(function () {
+    if (mediaState) {
+      mediaState.subscribeToUploadInProgressState(setSaveButtonDisabled);
+    }
+    return function () {
+      return mediaState === null || mediaState === void 0 ? void 0 : mediaState.unsubscribeFromUploadInProgressState(setSaveButtonDisabled);
+    };
+  }, [mediaState]);
+  var handleSave = useCallback(function () {
+    if (editorView && onSave) {
+      onSave(editorView);
+    }
+  }, [editorView, onSave]);
+  var handleCancel = useCallback(function () {
+    if (editorView && onCancel) {
+      onCancel(editorView);
+    }
+  }, [editorView, onCancel]);
+  var isShortcutToFocusToolbar = useCallback(function (event) {
+    //Alt + F9 to reach first element in this main toolbar
+    return event.altKey && (event.key === 'F9' || event.keyCode === 120);
+  }, []);
+
+  // When primary toolbar components is undefined, do not show two line editor toolbar
+  var isTwoLineToolbarEnabled = !!customPrimaryToolbarComponents;
+  var handleEscape = useCallback(function (event) {
+    if (!(editorView !== null && editorView !== void 0 && editorView.hasFocus())) {
+      editorView === null || editorView === void 0 || editorView.focus();
+    }
+    event.preventDefault();
+    event.stopPropagation();
+  }, [editorView]);
+  var primaryToolbarComponents = primaryToolbarComponentsProp;
+  if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
+    primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
+  }
+  var isToolbarAIFCEnabled = Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar);
+  var wrapperStyle = useMemo(function () {
+    return _objectSpread({
+      minHeight: "".concat(minHeight, "px")
+    }, maxHeight ? {
+      '--comment-editor-max-height': "".concat(maxHeight, "px")
+    } : {});
+  }, [minHeight, maxHeight]);
+  var customToolbarSlot = /*#__PURE__*/React.createElement("div", {
+    className: ax([commentEditorCompiledStyles.mainToolbarCustomComponentsSlotNew, isTwoLineToolbarEnabled && commentEditorCompiledStyles.mainToolbarCustomComponentsSlotTwoLineToolbar, isToolbarAIFCEnabled && commentEditorCompiledStyles.mainToolbarCustomComponentsSlotPaddingOverride])
+  }, customPrimaryToolbarComponents);
+  return /*#__PURE__*/React.createElement(WithFlash, {
+    animate: maxContentSizeReached
+  }, /*#__PURE__*/React.createElement(WidthProvider, null, /*#__PURE__*/React.createElement("div", {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- dynamic minHeight/maxHeight from props
+    style: wrapperStyle
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+    ,
+    className: ax([expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) ? commentEditorCompiledStyles.commentEditor : commentEditorCompiledStyles.commentEditorOld, isEditorModernisationEnabled && commentEditorCompiledStyles.modernisedEditor, "akEditor"]),
+    ref: wrapperElementRef
+  }, /*#__PURE__*/React.createElement(MainToolbar, {
+    isEditorModernisationEnabled: isEditorModernisationEnabled,
+    useStickyToolbar: useStickyToolbar,
+    twoLineEditorToolbar: isTwoLineToolbarEnabled,
+    isNewToolbarEnabled: isToolbarAIFCEnabled
+  }, isToolbarAIFCEnabled ? /*#__PURE__*/React.createElement(ToolbarArrowKeyNavigationProvider, {
+    editorView: editorView,
+    childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
+    isShortcutToFocusToolbar: isShortcutToFocusToolbar,
+    handleEscape: handleEscape,
+    editorAppearance: appearance,
+    useStickyToolbar: useStickyToolbar,
+    intl: intl
+  }, /*#__PURE__*/React.createElement(CommentToolbar, {
+    editorAPI: editorAPI,
+    editorView: editorView,
+    editorAppearance: appearance,
+    disabled: !!disabled,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
+  }), customPrimaryToolbarComponents ? customToolbarSlot : null) : /*#__PURE__*/React.createElement(ToolbarArrowKeyNavigationProvider, {
+    editorView: editorView,
+    childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
+    isShortcutToFocusToolbar: isShortcutToFocusToolbar,
+    handleEscape: handleEscape,
+    editorAppearance: appearance,
+    useStickyToolbar: useStickyToolbar,
+    intl: intl
+  }, /*#__PURE__*/React.createElement(Toolbar
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  , {
+    editorView: editorView,
+    editorActions: editorActions
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ,
+    eventDispatcher: eventDispatcher
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ,
+    providerFactory: providerFactory,
+    appearance: appearance,
+    items: primaryToolbarComponents,
+    popupsMountPoint: popupsMountPoint,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    disabled: !!disabled,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    containerElement: containerElement.current,
+    twoLineEditorToolbar: isTwoLineToolbarEnabled
+  }), customToolbarSlot)), /*#__PURE__*/React.createElement(ClickAreaBlock, {
+    editorView: editorView,
+    editorDisabled: disabled
+  }, /*#__PURE__*/React.createElement(WidthConsumer, null, function (_ref) {
+    var width = _ref.width;
+    return /*#__PURE__*/React.createElement(EditorContentContainer, {
+      ref: containerElement,
+      isScrollable: maxHeight ? true : undefined
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+      ,
+      className: ax([maxHeight && commentEditorCompiledStyles.contentAreaMaxHeight, classnames('ak-editor-content-area', {
+        'less-margin': width < akEditorMobileBreakoutPoint
+      })]),
+      featureFlags: featureFlags,
+      viewMode: editorViewMode,
+      appearance: appearance,
+      useStandardNodeWidth: useStandardNodeWidth
+    }, customContentComponents && 'before' in customContentComponents ? contentComponentClickWrapper(customContentComponents.before) : contentComponentClickWrapper(customContentComponents), /*#__PURE__*/React.createElement(PluginSlot, {
+      editorView: editorView,
+      editorActions: editorActions,
+      eventDispatcher: eventDispatcher,
+      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+      providerFactory: providerFactory,
+      appearance: appearance,
+      items: contentComponents,
+      popupsMountPoint: popupsMountPoint,
+      popupsBoundariesElement: popupsBoundariesElement,
+      popupsScrollableElement: popupsScrollableElement,
+      containerElement: containerElement.current,
+      disabled: !!disabled,
+      wrapperElement: wrapperElementRef.current,
+      pluginHooks: pluginHooks
+    }), editorDOMElement, customContentComponents && 'after' in customContentComponents ? contentComponentClickWrapper(customContentComponents.after) : null);
+  }))), showSecondaryToolbar && /*#__PURE__*/React.createElement("div", {
+    "data-testid": "ak-editor-secondary-toolbar",
+    className: ax([commentEditorCompiledStyles.secondaryToolbar])
+  }, /*#__PURE__*/React.createElement(ButtonGroup, null, !!onSave && /*#__PURE__*/React.createElement(Button, {
+    appearance: "primary",
+    onClick: handleSave,
+    testId: "comment-save-button",
+    isDisabled: disabled || saveButtonDisabled,
+    interactionName: "editor-comment-save-button"
+  }, intl.formatMessage(messages.saveButton)), !!onCancel && /*#__PURE__*/React.createElement(Button, {
+    appearance: "subtle",
+    onClick: handleCancel,
+    testId: "comment-cancel-button",
+    isDisabled: disabled,
+    interactionName: "editor-comment-cancel-button"
+  }, intl.formatMessage(messages.cancelButton))), /*#__PURE__*/React.createElement("span", {
+    style: {
+      flexGrow: 1
+    }
+  }), customSecondaryToolbarComponents)));
+};
+CommentEditorWithIntlCompiled.displayName = 'CommentEditorAppearance';