@atlaskit/editor-common 108.6.1 → 108.6.3

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-common
 
+## 108.6.3
+
+### Patch Changes
+
+- [`cb621391133f0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cb621391133f0) -
+  Fix the codeblock key issue
+- Updated dependencies
+
+## 108.6.2
+
+### Patch Changes
+
+- [`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.
+- [`7e2bd9dc6d5ca`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7e2bd9dc6d5ca) -
+  EDITOR-1531 Updated error message.
+- Updated dependencies
+
 ## 108.6.1
 
 ### Patch Changes

package/dist/cjs/ai-messages/ai-failed-state.js

@@ -65,7 +65,7 @@ var aiFailedStateMessages = exports.aiFailedStateMessages = (0, _reactIntlNext.d
   },
   adfStreamingError: {
     id: 'fabric.editor.ai.experience.adfStreamingError',
-    defaultMessage: "We couldn't get a response due to a parsing error.",
-    description: "We couldn't get a response due to a parsing error."
+    defaultMessage: "Our apologies, we couldn't get a response.",
+    description: "This error message is displayed when error(s) are encountered during processing of LLM response in ADF format."
   }
 });

package/dist/cjs/card/LinkToolbarButtonGroup.js

@@ -53,7 +53,8 @@ var LinkToolbarButtonGroup = exports.LinkToolbarButtonGroup = function LinkToolb
       tooltipContent = _ref3.tooltipContent,
       title = _ref3.title,
       icon = _ref3.icon,
-      iconFallback = _ref3.iconFallback;
+      iconFallback = _ref3.iconFallback,
+      areAnyNewToolbarFlagsEnabled = _ref3.areAnyNewToolbarFlagsEnabled;
     var ButtonIcon = icon;
     return (0, _react2.jsx)(DisallowedWrapper, {
       css: disabled ? disallowedWrapperStyle : defaultWrapperStyle,
@@ -72,7 +73,8 @@ var LinkToolbarButtonGroup = exports.LinkToolbarButtonGroup = function LinkToolb
       onClick: onClick,
       testId: testId,
       disabled: disabled,
-      tooltipContent: tooltipContent
+      tooltipContent: tooltipContent,
+      areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
     }));
   }));
 };

package/dist/cjs/card/link-toolbar-button-group-options.js

@@ -36,7 +36,7 @@ var appearancePropsMap = exports.appearancePropsMap = {
     iconFallback: _embed.IconEmbed
   }
 };
-var getButtonGroupOption = exports.getButtonGroupOption = function getButtonGroupOption(intl, dispatchCommand, _ref) {
+var getButtonGroupOption = exports.getButtonGroupOption = function getButtonGroupOption(intl, areAnyNewToolbarFlagsEnabled, dispatchCommand, _ref) {
   var disabled = _ref.disabled,
     _onClick = _ref.onClick,
     selected = _ref.selected,
@@ -57,6 +57,7 @@ var getButtonGroupOption = exports.getButtonGroupOption = function getButtonGrou
     disabled: Boolean(disabled),
     tooltipContent: tooltip || null,
     testId: testId,
-    selected: selected
+    selected: selected,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   };
 };

package/dist/cjs/floating-toolbar/DropdownMenuExtensionItems.js

@@ -12,7 +12,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _react = _interopRequireWildcard(require("react"));
 var _reactLoadable = _interopRequireDefault(require("react-loadable"));
 var _extensions = require("../extensions");
-var _toolbarFlagCheck = require("../toolbar-flag-check");
 var _utils = require("../utils");
 var _DropdownMenuItem = require("./DropdownMenuItem");
 var _DropdownSeparator = require("./DropdownSeparator");
@@ -133,7 +132,8 @@ var DropdownMenuExtensionItems = exports.DropdownMenuExtensionItems = function D
     editorView = props.editorView,
     extension = props.extension,
     disabled = props.disabled,
-    dropdownOptions = props.dropdownOptions;
+    dropdownOptions = props.dropdownOptions,
+    areAnyNewToolbarFlagsEnabled = props.areAnyNewToolbarFlagsEnabled;
 
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -200,5 +200,5 @@ var DropdownMenuExtensionItems = exports.DropdownMenuExtensionItems = function D
       extension: extension,
       dropdownOptions: dropdownOptions
     });
-  }), (0, _toolbarFlagCheck.areToolbarFlagsEnabled)() && /*#__PURE__*/_react.default.createElement(_DropdownSeparator.DropdownSeparator, null));
+  }), areAnyNewToolbarFlagsEnabled && /*#__PURE__*/_react.default.createElement(_DropdownSeparator.DropdownSeparator, null));
 };

package/dist/cjs/messages/block-menu.js

@@ -32,7 +32,7 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
     description: 'Change the selected block to a paragraph'
   },
   codeBlock: {
-    id: 'fabric.editor.block.menu.code.block',
+    id: 'fabric.editor.block.menu.codeblock',
     defaultMessage: 'Code block',
     description: 'Convert to a code block'
   },

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "108.6.0";
+var packageVersion = "108.6.2";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/toolbar-flag-check.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.areToolbarFlagsEnabled = void 0;
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
-var areToolbarFlagsEnabled = exports.areToolbarFlagsEnabled = function areToolbarFlagsEnabled() {
-  return (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_controls', 'cohort', 'variant1') || (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true);
+var areToolbarFlagsEnabled = exports.areToolbarFlagsEnabled = function areToolbarFlagsEnabled(isNewToolbarEnabled) {
+  return Boolean((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_controls', 'cohort', 'variant1') || isNewToolbarEnabled && (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true));
 };

package/dist/cjs/ui/DropList/index.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "108.6.0";
+var packageVersion = "108.6.2";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/cjs/ui/FloatingToolbar/Button.js

@@ -13,7 +13,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _customThemeButton = _interopRequireDefault(require("@atlaskit/button/custom-theme-button"));
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
-var _toolbarFlagCheck = require("../../toolbar-flag-check");
 var _Pulse = require("../Pulse/Pulse");
 var _ButtonSpotlightCard = require("./ButtonSpotlightCard");
 var _styles = require("./styles");
@@ -57,7 +56,8 @@ var _default = exports.default = function _default(_ref) {
     ariaLabel = _ref.ariaLabel,
     isRadioButton = _ref.isRadioButton,
     pulse = _ref.pulse,
-    spotlightConfig = _ref.spotlightConfig;
+    spotlightConfig = _ref.spotlightConfig,
+    areAnyNewToolbarFlagsEnabled = _ref.areAnyNewToolbarFlagsEnabled;
   // Check if there's only an icon and add additional styles
   var iconOnly = (icon || iconAfter) && !children;
   var customSpacing = iconOnly ? _styles.iconOnlySpacing : {};
@@ -111,7 +111,7 @@ var _default = exports.default = function _default(_ref) {
           appearance: appearance,
           state: themeProps.state,
           mode: themeProps.mode
-        })), (0, _toolbarFlagCheck.areToolbarFlagsEnabled)() ? customSizeAndPadding : {})
+        })), areAnyNewToolbarFlagsEnabled ? customSizeAndPadding : {})
       }, rest);
     },
     "aria-label": ariaLabel || title,
@@ -120,7 +120,7 @@ var _default = exports.default = function _default(_ref) {
     role: isRadioButton ? 'radio' : undefined,
     "aria-expanded": ariaHasPopup ? selected : undefined,
     "aria-controls": ariaHasPopup ? areaControls : undefined,
-    spacing: (0, _toolbarFlagCheck.areToolbarFlagsEnabled)() ? 'default' : 'compact',
+    spacing: areAnyNewToolbarFlagsEnabled ? 'default' : 'compact',
     href: href,
     target: target,
     appearance: appearance,

package/dist/cjs/ui/FloatingToolbar/Separator.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = require("@emotion/react");
-var _toolbarFlagCheck = require("../../toolbar-flag-check");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -29,9 +28,10 @@ var separatorFullHeight = (0, _react.css)({
   height: '40px'
 });
 var _default = exports.default = function _default(_ref) {
-  var fullHeight = _ref.fullHeight;
+  var fullHeight = _ref.fullHeight,
+    areAnyNewToolbarFlagsEnabled = _ref.areAnyNewToolbarFlagsEnabled;
   return (0, _react.jsx)("div", {
-    css: [(0, _toolbarFlagCheck.areToolbarFlagsEnabled)() ? separatorNew : separator, fullHeight && separatorFullHeight]
+    css: [areAnyNewToolbarFlagsEnabled ? separatorNew : separator, fullHeight && separatorFullHeight]
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
     className: "separator"

package/dist/es2019/ai-messages/ai-failed-state.js

@@ -58,7 +58,7 @@ export const aiFailedStateMessages = defineMessages({
   },
   adfStreamingError: {
     id: 'fabric.editor.ai.experience.adfStreamingError',
-    defaultMessage: `We couldn't get a response due to a parsing error.`,
-    description: `We couldn't get a response due to a parsing error.`
+    defaultMessage: `Our apologies, we couldn't get a response.`,
+    description: `This error message is displayed when error(s) are encountered during processing of LLM response in ADF format.`
   }
 });

package/dist/es2019/card/LinkToolbarButtonGroup.js

@@ -48,7 +48,8 @@ export const LinkToolbarButtonGroup = ({
     tooltipContent,
     title,
     icon,
-    iconFallback
+    iconFallback,
+    areAnyNewToolbarFlagsEnabled
   }) => {
     const ButtonIcon = icon;
     return jsx(DisallowedWrapper, {
@@ -68,7 +69,8 @@ export const LinkToolbarButtonGroup = ({
       onClick: onClick,
       testId: testId,
       disabled: disabled,
-      tooltipContent: tooltipContent
+      tooltipContent: tooltipContent,
+      areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
     }));
   }));
 };

package/dist/es2019/card/link-toolbar-button-group-options.js

@@ -29,7 +29,7 @@ export const appearancePropsMap = {
     iconFallback: IconEmbed
   }
 };
-export const getButtonGroupOption = (intl, dispatchCommand, {
+export const getButtonGroupOption = (intl, areAnyNewToolbarFlagsEnabled, dispatchCommand, {
   disabled,
   onClick,
   selected,
@@ -50,6 +50,7 @@ export const getButtonGroupOption = (intl, dispatchCommand, {
     disabled: Boolean(disabled),
     tooltipContent: tooltip || null,
     testId,
-    selected
+    selected,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   };
 };

package/dist/es2019/floating-toolbar/DropdownMenuExtensionItems.js

@@ -1,7 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import Loadable from 'react-loadable';
 import { getContextualToolbarItemsFromModule } from '../extensions';
-import { areToolbarFlagsEnabled } from '../toolbar-flag-check';
 import { nodeToJSON } from '../utils';
 import { DropdownMenuItem } from './DropdownMenuItem';
 import { DropdownSeparator } from './DropdownSeparator';
@@ -86,7 +85,8 @@ export const DropdownMenuExtensionItems = props => {
     editorView,
     extension,
     disabled,
-    dropdownOptions
+    dropdownOptions,
+    areAnyNewToolbarFlagsEnabled
   } = props;
 
   // Ignored via go/ees005
@@ -124,5 +124,5 @@ export const DropdownMenuExtensionItems = props => {
       extension: extension,
       dropdownOptions: dropdownOptions
     });
-  }), areToolbarFlagsEnabled() && /*#__PURE__*/React.createElement(DropdownSeparator, null));
+  }), areAnyNewToolbarFlagsEnabled && /*#__PURE__*/React.createElement(DropdownSeparator, null));
 };

package/dist/es2019/messages/block-menu.js

@@ -26,7 +26,7 @@ export const messages = defineMessages({
     description: 'Change the selected block to a paragraph'
   },
   codeBlock: {
-    id: 'fabric.editor.block.menu.code.block',
+    id: 'fabric.editor.block.menu.codeblock',
     defaultMessage: 'Code block',
     description: 'Convert to a code block'
   },

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "108.6.0";
+const packageVersion = "108.6.2";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/toolbar-flag-check.js

@@ -1,3 +1,3 @@
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-export const areToolbarFlagsEnabled = () => expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1') || editorExperiment('platform_editor_toolbar_aifc', true);
+export const areToolbarFlagsEnabled = isNewToolbarEnabled => Boolean(expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1') || isNewToolbarEnabled && editorExperiment('platform_editor_toolbar_aifc', true));

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "108.6.0";
+const packageVersion = "108.6.2";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/es2019/ui/FloatingToolbar/Button.js

@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useCallback, useEffect, useState } from 'react';
 import Button from '@atlaskit/button/custom-theme-button';
 import Tooltip from '@atlaskit/tooltip';
-import { areToolbarFlagsEnabled } from '../../toolbar-flag-check';
 import { Pulse } from '../Pulse/Pulse';
 import { ButtonSpotlightCard } from './ButtonSpotlightCard';
 import { getButtonStyles, iconOnlySpacing } from './styles';
@@ -40,7 +39,8 @@ export default (({
   ariaLabel,
   isRadioButton,
   pulse,
-  spotlightConfig
+  spotlightConfig,
+  areAnyNewToolbarFlagsEnabled
 }) => {
   // Check if there's only an icon and add additional styles
   const iconOnly = (icon || iconAfter) && !children;
@@ -93,7 +93,7 @@ export default (({
             state: themeProps.state,
             mode: themeProps.mode
           })),
-          ...(areToolbarFlagsEnabled() ? customSizeAndPadding : {})
+          ...(areAnyNewToolbarFlagsEnabled ? customSizeAndPadding : {})
         },
         ...rest
       };
@@ -104,7 +104,7 @@ export default (({
     role: isRadioButton ? 'radio' : undefined,
     "aria-expanded": ariaHasPopup ? selected : undefined,
     "aria-controls": ariaHasPopup ? areaControls : undefined,
-    spacing: areToolbarFlagsEnabled() ? 'default' : 'compact',
+    spacing: areAnyNewToolbarFlagsEnabled ? 'default' : 'compact',
     href: href,
     target: target,
     appearance: appearance,

package/dist/es2019/ui/FloatingToolbar/Separator.js

@@ -4,7 +4,6 @@
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { areToolbarFlagsEnabled } from '../../toolbar-flag-check';
 const separator = css({
   background: "var(--ds-border, #091E4224)",
   width: '1px',
@@ -22,9 +21,10 @@ const separatorFullHeight = css({
   height: '40px'
 });
 export default (({
-  fullHeight
+  fullHeight,
+  areAnyNewToolbarFlagsEnabled
 }) => jsx("div", {
-  css: [areToolbarFlagsEnabled() ? separatorNew : separator, fullHeight && separatorFullHeight]
+  css: [areAnyNewToolbarFlagsEnabled ? separatorNew : separator, fullHeight && separatorFullHeight]
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
   ,
   className: "separator"

package/dist/esm/ai-messages/ai-failed-state.js

@@ -58,7 +58,7 @@ export var aiFailedStateMessages = defineMessages({
   },
   adfStreamingError: {
     id: 'fabric.editor.ai.experience.adfStreamingError',
-    defaultMessage: "We couldn't get a response due to a parsing error.",
-    description: "We couldn't get a response due to a parsing error."
+    defaultMessage: "Our apologies, we couldn't get a response.",
+    description: "This error message is displayed when error(s) are encountered during processing of LLM response in ADF format."
   }
 });

package/dist/esm/card/LinkToolbarButtonGroup.js

@@ -48,7 +48,8 @@ export var LinkToolbarButtonGroup = function LinkToolbarButtonGroup(_ref2) {
       tooltipContent = _ref3.tooltipContent,
       title = _ref3.title,
       icon = _ref3.icon,
-      iconFallback = _ref3.iconFallback;
+      iconFallback = _ref3.iconFallback,
+      areAnyNewToolbarFlagsEnabled = _ref3.areAnyNewToolbarFlagsEnabled;
     var ButtonIcon = icon;
     return jsx(DisallowedWrapper, {
       css: disabled ? disallowedWrapperStyle : defaultWrapperStyle,
@@ -67,7 +68,8 @@ export var LinkToolbarButtonGroup = function LinkToolbarButtonGroup(_ref2) {
       onClick: onClick,
       testId: testId,
       disabled: disabled,
-      tooltipContent: tooltipContent
+      tooltipContent: tooltipContent,
+      areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
     }));
   }));
 };

package/dist/esm/card/link-toolbar-button-group-options.js

@@ -29,7 +29,7 @@ export var appearancePropsMap = {
     iconFallback: IconEmbed
   }
 };
-export var getButtonGroupOption = function getButtonGroupOption(intl, dispatchCommand, _ref) {
+export var getButtonGroupOption = function getButtonGroupOption(intl, areAnyNewToolbarFlagsEnabled, dispatchCommand, _ref) {
   var disabled = _ref.disabled,
     _onClick = _ref.onClick,
     selected = _ref.selected,
@@ -50,6 +50,7 @@ export var getButtonGroupOption = function getButtonGroupOption(intl, dispatchCo
     disabled: Boolean(disabled),
     tooltipContent: tooltip || null,
     testId: testId,
-    selected: selected
+    selected: selected,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   };
 };

package/dist/esm/floating-toolbar/DropdownMenuExtensionItems.js

@@ -4,7 +4,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useState } from 'react';
 import Loadable from 'react-loadable';
 import { getContextualToolbarItemsFromModule } from '../extensions';
-import { areToolbarFlagsEnabled } from '../toolbar-flag-check';
 import { nodeToJSON } from '../utils';
 import { DropdownMenuItem } from './DropdownMenuItem';
 import { DropdownSeparator } from './DropdownSeparator';
@@ -124,7 +123,8 @@ export var DropdownMenuExtensionItems = function DropdownMenuExtensionItems(prop
     editorView = props.editorView,
     extension = props.extension,
     disabled = props.disabled,
-    dropdownOptions = props.dropdownOptions;
+    dropdownOptions = props.dropdownOptions,
+    areAnyNewToolbarFlagsEnabled = props.areAnyNewToolbarFlagsEnabled;
 
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -191,5 +191,5 @@ export var DropdownMenuExtensionItems = function DropdownMenuExtensionItems(prop
       extension: extension,
       dropdownOptions: dropdownOptions
     });
-  }), areToolbarFlagsEnabled() && /*#__PURE__*/React.createElement(DropdownSeparator, null));
+  }), areAnyNewToolbarFlagsEnabled && /*#__PURE__*/React.createElement(DropdownSeparator, null));
 };

package/dist/esm/messages/block-menu.js

@@ -26,7 +26,7 @@ export var messages = defineMessages({
     description: 'Change the selected block to a paragraph'
   },
   codeBlock: {
-    id: 'fabric.editor.block.menu.code.block',
+    id: 'fabric.editor.block.menu.codeblock',
     defaultMessage: 'Code block',
     description: 'Convert to a code block'
   },

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "108.6.0";
+var packageVersion = "108.6.2";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/toolbar-flag-check.js

@@ -1,5 +1,5 @@
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-export var areToolbarFlagsEnabled = function areToolbarFlagsEnabled() {
-  return expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1') || editorExperiment('platform_editor_toolbar_aifc', true);
+export var areToolbarFlagsEnabled = function areToolbarFlagsEnabled(isNewToolbarEnabled) {
+  return Boolean(expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1') || isNewToolbarEnabled && editorExperiment('platform_editor_toolbar_aifc', true));
 };

package/dist/esm/ui/DropList/index.js

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "108.6.0";
+var packageVersion = "108.6.2";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/esm/ui/FloatingToolbar/Button.js

@@ -8,7 +8,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React, { useCallback, useEffect, useState } from 'react';
 import Button from '@atlaskit/button/custom-theme-button';
 import Tooltip from '@atlaskit/tooltip';
-import { areToolbarFlagsEnabled } from '../../toolbar-flag-check';
 import { Pulse } from '../Pulse/Pulse';
 import { ButtonSpotlightCard } from './ButtonSpotlightCard';
 import { getButtonStyles, iconOnlySpacing } from './styles';
@@ -48,7 +47,8 @@ export default (function (_ref) {
     ariaLabel = _ref.ariaLabel,
     isRadioButton = _ref.isRadioButton,
     pulse = _ref.pulse,
-    spotlightConfig = _ref.spotlightConfig;
+    spotlightConfig = _ref.spotlightConfig,
+    areAnyNewToolbarFlagsEnabled = _ref.areAnyNewToolbarFlagsEnabled;
   // Check if there's only an icon and add additional styles
   var iconOnly = (icon || iconAfter) && !children;
   var customSpacing = iconOnly ? iconOnlySpacing : {};
@@ -102,7 +102,7 @@ export default (function (_ref) {
           appearance: appearance,
           state: themeProps.state,
           mode: themeProps.mode
-        })), areToolbarFlagsEnabled() ? customSizeAndPadding : {})
+        })), areAnyNewToolbarFlagsEnabled ? customSizeAndPadding : {})
       }, rest);
     },
     "aria-label": ariaLabel || title,
@@ -111,7 +111,7 @@ export default (function (_ref) {
     role: isRadioButton ? 'radio' : undefined,
     "aria-expanded": ariaHasPopup ? selected : undefined,
     "aria-controls": ariaHasPopup ? areaControls : undefined,
-    spacing: areToolbarFlagsEnabled() ? 'default' : 'compact',
+    spacing: areAnyNewToolbarFlagsEnabled ? 'default' : 'compact',
     href: href,
     target: target,
     appearance: appearance,

package/dist/esm/ui/FloatingToolbar/Separator.js

@@ -4,7 +4,6 @@
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { areToolbarFlagsEnabled } from '../../toolbar-flag-check';
 var separator = css({
   background: "var(--ds-border, #091E4224)",
   width: '1px',
@@ -22,9 +21,10 @@ var separatorFullHeight = css({
   height: '40px'
 });
 export default (function (_ref) {
-  var fullHeight = _ref.fullHeight;
+  var fullHeight = _ref.fullHeight,
+    areAnyNewToolbarFlagsEnabled = _ref.areAnyNewToolbarFlagsEnabled;
   return jsx("div", {
-    css: [areToolbarFlagsEnabled() ? separatorNew : separator, fullHeight && separatorFullHeight]
+    css: [areAnyNewToolbarFlagsEnabled ? separatorNew : separator, fullHeight && separatorFullHeight]
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
     className: "separator"

package/dist/types/card/LinkToolbarButtonGroup.d.ts

@@ -1,6 +1,7 @@
 import { jsx } from '@emotion/react';
 import type { NewCoreIconProps, IconProps } from '@atlaskit/icon/types';
 export interface ButtonOptionProps {
+    areAnyNewToolbarFlagsEnabled: boolean;
     disabled: boolean;
     icon: (props: NewCoreIconProps) => JSX.Element;
     iconFallback: (props: IconProps) => JSX.Element;

package/dist/types/card/link-toolbar-button-group-options.d.ts

@@ -52,4 +52,4 @@ export declare const appearancePropsMap: {
         iconFallback: (props: import("@atlaskit/icon").IconProps) => import("react").JSX.Element;
     };
 };
-export declare const getButtonGroupOption: (intl: IntlShape, dispatchCommand: (command: Command) => void, { disabled, onClick, selected, appearance, testId, tooltip }: OptionConfig) => ButtonOptionProps;
+export declare const getButtonGroupOption: (intl: IntlShape, areAnyNewToolbarFlagsEnabled: boolean, dispatchCommand: (command: Command) => void, { disabled, onClick, selected, appearance, testId, tooltip }: OptionConfig) => ButtonOptionProps;

package/dist/types/floating-toolbar/DropdownMenuExtensionItems.d.ts

@@ -10,6 +10,7 @@ export interface DropdownMenuOptions {
     showSelected: boolean;
 }
 type OverflowExtensionPlaceholderProps = {
+    areAnyNewToolbarFlagsEnabled: boolean;
     disabled?: (key: string) => boolean;
     dropdownOptions?: DropdownMenuOptions;
     editorView: EditorView;

package/dist/types/toolbar-flag-check.d.ts

@@ -1 +1 @@
-export declare const areToolbarFlagsEnabled: () => boolean;
+export declare const areToolbarFlagsEnabled: (isNewToolbarEnabled?: boolean) => boolean;

package/dist/types/ui/FloatingToolbar/Button.d.ts

@@ -5,6 +5,7 @@ import type { FloatingToolbarButtonSpotlightConfig } from '../../types/floating-
 export interface Props {
     appearance?: ButtonAppearance;
     areaControls?: string;
+    areAnyNewToolbarFlagsEnabled: boolean;
     ariaHasPopup?: boolean | 'dialog' | 'menu' | 'listbox' | 'tree' | 'grid' | undefined;
     ariaLabel?: string;
     children?: React.ReactNode;
@@ -35,5 +36,5 @@ export interface Props {
     tooltipContent?: TooltipProps['content'];
     tooltipStyle?: React.ForwardRefExoticComponent<any> | React.ComponentType<any>;
 }
-declare const _default: ({ title, icon, iconAfter, onClick, onKeyDown, onMouseEnter, onMouseLeave, onFocus, onBlur, onMount, onUnmount, selected, disabled, href, target, appearance, children, className, tooltipContent, tooltipStyle, testId, interactionName, hideTooltipOnClick, ariaHasPopup, tabIndex, areaControls, ariaLabel, isRadioButton, pulse, spotlightConfig, }: Props) => React.JSX.Element;
+declare const _default: ({ title, icon, iconAfter, onClick, onKeyDown, onMouseEnter, onMouseLeave, onFocus, onBlur, onMount, onUnmount, selected, disabled, href, target, appearance, children, className, tooltipContent, tooltipStyle, testId, interactionName, hideTooltipOnClick, ariaHasPopup, tabIndex, areaControls, ariaLabel, isRadioButton, pulse, spotlightConfig, areAnyNewToolbarFlagsEnabled, }: Props) => React.JSX.Element;
 export default _default;

package/dist/types/ui/FloatingToolbar/Separator.d.ts

@@ -4,6 +4,7 @@
  */
 import { jsx } from '@emotion/react';
 type SeparatorProps = {
+    areAnyNewToolbarFlagsEnabled: boolean;
     /**
      * @private
      * @deprecated
@@ -12,5 +13,5 @@ type SeparatorProps = {
      */
     fullHeight?: boolean;
 };
-declare const _default: ({ fullHeight }: SeparatorProps) => jsx.JSX.Element;
+declare const _default: ({ fullHeight, areAnyNewToolbarFlagsEnabled }: SeparatorProps) => jsx.JSX.Element;
 export default _default;

package/dist/types-ts4.5/card/LinkToolbarButtonGroup.d.ts

@@ -1,6 +1,7 @@
 import { jsx } from '@emotion/react';
 import type { NewCoreIconProps, IconProps } from '@atlaskit/icon/types';
 export interface ButtonOptionProps {
+    areAnyNewToolbarFlagsEnabled: boolean;
     disabled: boolean;
     icon: (props: NewCoreIconProps) => JSX.Element;
     iconFallback: (props: IconProps) => JSX.Element;

package/dist/types-ts4.5/card/link-toolbar-button-group-options.d.ts

@@ -52,4 +52,4 @@ export declare const appearancePropsMap: {
         iconFallback: (props: import("@atlaskit/icon").IconProps) => import("react").JSX.Element;
     };
 };
-export declare const getButtonGroupOption: (intl: IntlShape, dispatchCommand: (command: Command) => void, { disabled, onClick, selected, appearance, testId, tooltip }: OptionConfig) => ButtonOptionProps;
+export declare const getButtonGroupOption: (intl: IntlShape, areAnyNewToolbarFlagsEnabled: boolean, dispatchCommand: (command: Command) => void, { disabled, onClick, selected, appearance, testId, tooltip }: OptionConfig) => ButtonOptionProps;

package/dist/types-ts4.5/floating-toolbar/DropdownMenuExtensionItems.d.ts

@@ -10,6 +10,7 @@ export interface DropdownMenuOptions {
     showSelected: boolean;
 }
 type OverflowExtensionPlaceholderProps = {
+    areAnyNewToolbarFlagsEnabled: boolean;
     disabled?: (key: string) => boolean;
     dropdownOptions?: DropdownMenuOptions;
     editorView: EditorView;

package/dist/types-ts4.5/toolbar-flag-check.d.ts

@@ -1 +1 @@
-export declare const areToolbarFlagsEnabled: () => boolean;
+export declare const areToolbarFlagsEnabled: (isNewToolbarEnabled?: boolean) => boolean;

package/dist/types-ts4.5/ui/FloatingToolbar/Button.d.ts

@@ -5,6 +5,7 @@ import type { FloatingToolbarButtonSpotlightConfig } from '../../types/floating-
 export interface Props {
     appearance?: ButtonAppearance;
     areaControls?: string;
+    areAnyNewToolbarFlagsEnabled: boolean;
     ariaHasPopup?: boolean | 'dialog' | 'menu' | 'listbox' | 'tree' | 'grid' | undefined;
     ariaLabel?: string;
     children?: React.ReactNode;
@@ -35,5 +36,5 @@ export interface Props {
     tooltipContent?: TooltipProps['content'];
     tooltipStyle?: React.ForwardRefExoticComponent<any> | React.ComponentType<any>;
 }
-declare const _default: ({ title, icon, iconAfter, onClick, onKeyDown, onMouseEnter, onMouseLeave, onFocus, onBlur, onMount, onUnmount, selected, disabled, href, target, appearance, children, className, tooltipContent, tooltipStyle, testId, interactionName, hideTooltipOnClick, ariaHasPopup, tabIndex, areaControls, ariaLabel, isRadioButton, pulse, spotlightConfig, }: Props) => React.JSX.Element;
+declare const _default: ({ title, icon, iconAfter, onClick, onKeyDown, onMouseEnter, onMouseLeave, onFocus, onBlur, onMount, onUnmount, selected, disabled, href, target, appearance, children, className, tooltipContent, tooltipStyle, testId, interactionName, hideTooltipOnClick, ariaHasPopup, tabIndex, areaControls, ariaLabel, isRadioButton, pulse, spotlightConfig, areAnyNewToolbarFlagsEnabled, }: Props) => React.JSX.Element;
 export default _default;

package/dist/types-ts4.5/ui/FloatingToolbar/Separator.d.ts

@@ -4,6 +4,7 @@
  */
 import { jsx } from '@emotion/react';
 type SeparatorProps = {
+    areAnyNewToolbarFlagsEnabled: boolean;
     /**
      * @private
      * @deprecated
@@ -12,5 +13,5 @@ type SeparatorProps = {
      */
     fullHeight?: boolean;
 };
-declare const _default: ({ fullHeight }: SeparatorProps) => jsx.JSX.Element;
+declare const _default: ({ fullHeight, areAnyNewToolbarFlagsEnabled }: SeparatorProps) => jsx.JSX.Element;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "108.6.1",
+	"version": "108.6.3",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -168,7 +168,7 @@
 		"@atlaskit/popper": "^7.1.0",
 		"@atlaskit/primitives": "^14.14.0",
 		"@atlaskit/profilecard": "^24.11.0",
-		"@atlaskit/react-ufo": "^4.5.0",
+		"@atlaskit/react-ufo": "^4.6.0",
 		"@atlaskit/section-message": "^8.7.0",
 		"@atlaskit/smart-card": "^40.21.0",
 		"@atlaskit/smart-user-picker": "^8.2.0",
@@ -177,7 +177,7 @@
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^20.0.0",
-		"@atlaskit/tmp-editor-statsig": "^12.7.0",
+		"@atlaskit/tmp-editor-statsig": "^12.8.0",
 		"@atlaskit/tokens": "^6.3.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@atlaskit/width-detector": "^5.0.0",