@atlaskit/editor-core 221.3.0 → 221.3.2

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.textHighlightPaddingStyles = exports.backgroundColorStyles = void 0;
+exports.textHighlightPaddingStyles = exports.highlightLinksUnsetStyles = exports.backgroundColorStyles = void 0;
 var _react = require("@emotion/react");
 /* eslint-disable @atlaskit/ui-styling-standard/use-compiled,
 	@repo/internal/deprecations/deprecation-ticket-required,
@@ -46,14 +46,25 @@ var backgroundColorStyles = exports.backgroundColorStyles = (0, _react.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
+var highlightLinksUnsetStyles = exports.highlightLinksUnsetStyles = (0, _react.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/cjs/ui/EditorContentContainer/styles/expandStyles.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDenseExpandTitleStyles = exports.expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes = exports.expandStylesMixin_fg_platform_visual_refresh_icons = exports.expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes = exports.expandStylesMixin_experiment_platform_editor_chromeless_expand_fix = exports.expandStylesBase = exports.expandStyles = void 0;
+exports.getDenseExpandTitleStyles = exports.expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes = exports.expandStylesMixin_fg_platform_visual_refresh_icons = exports.expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes = exports.expandStylesMixin_chromeless_expand_fix = exports.expandStylesBase = exports.expandStyles = void 0;
 var _react = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 /* eslint-disable @atlaskit/ui-styling-standard/use-compiled,
@@ -347,7 +347,7 @@ var expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes = exports.exp
  * 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
-var expandStylesMixin_experiment_platform_editor_chromeless_expand_fix = exports.expandStylesMixin_experiment_platform_editor_chromeless_expand_fix = (0, _react.css)({
+var expandStylesMixin_chromeless_expand_fix = exports.expandStylesMixin_chromeless_expand_fix = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ProseMirror > .ak-editor-expand': {
     marginLeft: 0,

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

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

@@ -21,6 +21,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';
@@ -87,7 +89,12 @@ export function ReactEditorView(props) {
     onEditorCreated,
     onEditorDestroyed
   } = props;
-  const 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.
+  const preMountEditorStateRef = useRef(undefined);
   const editorRef = useRef(null);
   const viewRef = useRef();
   const focusTimeoutId = useRef();
@@ -111,8 +118,8 @@ export function ReactEditorView(props) {
   const contentTransformer = useRef(undefined);
   const featureFlags = useMemo(() => createFeatureFlagsFromProps(editorPropFeatureFlags), [editorPropFeatureFlags]);
   const getEditorState = useCallback(() => {
-    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;
   }, []);
   const getEditorView = useCallback(() => viewRef.current, []);
   const dispatch = useMemo(() => createDispatch(eventDispatcher), [eventDispatcher]);
@@ -228,12 +235,17 @@ export function ReactEditorView(props) {
       // so we can save some CPU time here.
       return undefined;
     }
-    return createEditorState({
+    const state = createEditorState({
       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
@@ -622,6 +634,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, ({
       duration,
       startTime,
@@ -960,18 +976,51 @@ export function ReactEditorView(props) {
     const schema = profileSSROperation(`${SSR_TRACE_SEGMENT_NAME}/createSchema`, doCreateSchema, onSSRMeasure);
     const doBuildDoc = () => buildDoc(schema);
     const doc = profileSSROperation(`${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)) {
+      const ssrPMPlugins = profileSSROperation(`${SSR_TRACE_SEGMENT_NAME}/createSSRPMPlugins`, () => createSSRPMPlugins({
+        plugins,
+        schema,
+        portalProviderAPI: props.portalProviderAPI,
+        getIntl: () => props.intl
+      }), onSSRMeasure);
+      const ssrState = profileSSROperation(`${SSR_TRACE_SEGMENT_NAME}/createSSREditorState`, () => createSSREditorState({
+        doc,
+        schema,
+        pmPlugins: ssrPMPlugins
+      }), onSSRMeasure);
+      return {
+        plugins,
+        schema,
+        doc,
+        ssrPMPlugins,
+        ssrEditorState: ssrState
+      };
+    }
     return {
       plugins,
       schema,
-      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;
+  }
   const {
     assistiveLabel,
     assistiveDescribedBy
   } = props.editorProps;
   const handleSsrEditorStateChanged = useCallback(state => {
-    ssrEditorStateRef.current = state;
+    preMountEditorStateRef.current = state;
     // Notify listeners about the initial SSR state
     pluginInjectionAPI.current.onEditorViewUpdated({
       newEditorState: state,
@@ -1016,11 +1065,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 : state => {
-        ssrEditorStateRef.current = state;
+        preMountEditorStateRef.current = state;
         // Notify listeners about the initial SSR state
         pluginInjectionAPI.current.onEditorViewUpdated({
           newEditorState: state,

package/dist/es2019/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/es2019/ui/Appearance/Comment/Comment-compiled.js

@@ -0,0 +1,262 @@
+/* Comment-compiled.tsx generated by @compiled/babel-plugin v0.39.1 */
+/**
+ * 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 "./Comment-compiled.compiled.css";
+import { ax, ix } from "@compiled/react/runtime";
+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';
+const 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"
+};
+const appearance = 'comment';
+export const CommentEditorWithIntlCompiled = props => {
+  var _editorAPI$blockMenu$, _editorAPI$blockMenu, _editorAPI$blockMenu$2, _editorAPI$blockMenu$3;
+  const {
+    editorAPI
+  } = props;
+
+  // Get useStandardNodeWidth from block menu plugin shared state
+  // Only access editorAPI when the experiment is enabled to avoid performance impact
+  const useStandardNodeWidth = editorExperiment('platform_editor_controls', 'variant1') && ((_editorAPI$blockMenu$ = editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$blockMenu = editorAPI.blockMenu) === null || _editorAPI$blockMenu === void 0 ? void 0 : (_editorAPI$blockMenu$2 = _editorAPI$blockMenu.sharedState) === null || _editorAPI$blockMenu$2 === void 0 ? void 0 : (_editorAPI$blockMenu$3 = _editorAPI$blockMenu$2.currentState()) === null || _editorAPI$blockMenu$3 === void 0 ? void 0 : _editorAPI$blockMenu$3.useStandardNodeWidth) !== null && _editorAPI$blockMenu$ !== void 0 ? _editorAPI$blockMenu$ : false);
+  const {
+    editorViewMode,
+    primaryToolbarComponentsState,
+    maxContentSizeReached
+  } = useSharedPluginStateWithSelector(editorAPI, ['maxContentSize', 'primaryToolbar', 'editorViewMode'], 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
+    };
+  });
+  const primaryToolbarState = getPrimaryToolbarComponents(editorAPI, primaryToolbarComponentsState);
+  const {
+    mediaState
+  } = useSharedPluginState(editorAPI, ['media']);
+  const intl = useIntl();
+  const {
+    editorDOMElement,
+    editorView,
+    editorActions,
+    eventDispatcher,
+    providerFactory,
+    contentComponents,
+    customContentComponents,
+    customPrimaryToolbarComponents,
+    primaryToolbarComponents: primaryToolbarComponentsProp,
+    customSecondaryToolbarComponents,
+    popupsMountPoint,
+    popupsBoundariesElement,
+    popupsScrollableElement,
+    maxHeight,
+    minHeight = 150,
+    onSave,
+    onCancel,
+    disabled,
+    dispatchAnalyticsEvent,
+    useStickyToolbar,
+    pluginHooks,
+    featureFlags,
+    innerRef,
+    isEditorModernisationEnabled
+  } = props;
+  const showSecondaryToolbar = !!onSave || !!onCancel || !!customSecondaryToolbarComponents;
+  const containerElement = React.useRef(null);
+
+  // Wrapper container for toolbar and content area
+  const wrapperElementRef = useMemo(() => innerRef || /*#__PURE__*/React.createRef(), [innerRef]);
+  const [saveButtonDisabled, setSaveButtonDisabled] = useState(false);
+  useEffect(() => {
+    if (mediaState) {
+      mediaState.subscribeToUploadInProgressState(setSaveButtonDisabled);
+    }
+    return () => mediaState === null || mediaState === void 0 ? void 0 : mediaState.unsubscribeFromUploadInProgressState(setSaveButtonDisabled);
+  }, [mediaState]);
+  const handleSave = useCallback(() => {
+    if (editorView && onSave) {
+      onSave(editorView);
+    }
+  }, [editorView, onSave]);
+  const handleCancel = useCallback(() => {
+    if (editorView && onCancel) {
+      onCancel(editorView);
+    }
+  }, [editorView, onCancel]);
+  const isShortcutToFocusToolbar = useCallback(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
+  const isTwoLineToolbarEnabled = !!customPrimaryToolbarComponents;
+  const handleEscape = useCallback(event => {
+    if (!(editorView !== null && editorView !== void 0 && editorView.hasFocus())) {
+      editorView === null || editorView === void 0 ? void 0 : editorView.focus();
+    }
+    event.preventDefault();
+    event.stopPropagation();
+  }, [editorView]);
+  let primaryToolbarComponents = primaryToolbarComponentsProp;
+  if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
+    primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
+  }
+  const isToolbarAIFCEnabled = Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar);
+  const wrapperStyle = useMemo(() => ({
+    minHeight: `${minHeight}px`,
+    ...(maxHeight ? {
+      '--comment-editor-max-height': `${maxHeight}px`
+    } : {})
+  }), [minHeight, maxHeight]);
+  const 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, ({
+    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';