@atlaskit/editor-core 193.31.0 → 194.0.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-core
 
+## 194.0.1
+
+### Patch Changes
+
+- [#117063](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117063)
+  [`dbb832d0b1929`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/dbb832d0b1929) -
+  clean up FF platform.editor.media.alluploadsfinished-dispatch-update_ivtow
+
+## 194.0.0
+
+### Major Changes
+
+- [`d9b562bd66f8e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d9b562bd66f8e) -
+  [ux] [ED-23947] restoring the original order of the typeahead menu so that actions, media,
+  mentions and emojis are above the fold (in the top 5 results). this change is a major because it
+  removes the `getEditorFeatureFlags prop` for plugins. if any consumers who have adopted these
+  changes to the public API, they should remove them on their side too.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 193.31.0
 
 ### Minor Changes

package/dist/cjs/presets/universal.js

@@ -85,10 +85,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     hyperlinkOptions: _objectSpread({
       lpLinkPicker: (_featureFlags$lpLinkP = featureFlags.lpLinkPicker) !== null && _featureFlags$lpLinkP !== void 0 ? _featureFlags$lpLinkP : false
     }, props.hyperlinkOptions),
-    __livePage: props.__livePage,
-    codeBlock: _objectSpread(_objectSpread({}, props.codeBlock), {}, {
-      getEditorFeatureFlags: getEditorFeatureFlags
-    })
+    __livePage: props.__livePage
   }));
   var statusMenuDisabled = !props.allowStatus ? true : (0, _typeof2.default)(props.allowStatus) === 'object' ? Boolean(props.allowStatus.menuDisabled) : false;
   var hasBeforePrimaryToolbar = function hasBeforePrimaryToolbar(components) {
@@ -104,8 +101,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     useLongPressSelection: false,
     appearance: appearance,
     allowInteractiveExpand: typeof props.allowExpand === 'boolean' ? props.allowExpand : Boolean(props.allowExpand && props.allowExpand.allowInteractiveExpand !== false),
-    __livePage: props.__livePage,
-    getEditorFeatureFlags: getEditorFeatureFlags
+    __livePage: props.__livePage
   }], Boolean(props.allowExpand)).maybeAdd(_guideline.guidelinePlugin, Boolean(!isMobile && !isComment && !isChromeless && (props.media || props.allowTables))).maybeAdd([_grid.gridPlugin, {
     shouldCalcBreakoutGridLines: isFullPage
   }], Boolean(props.media)).maybeAdd([_annotation.annotationPlugin, props.annotationProviders], Boolean(props.annotationProviders)).maybeAdd([_media.mediaPlugin, _objectSpread(_objectSpread({}, props.media), {}, {
@@ -129,11 +125,8 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     insertDisplayName: (_props$mention$insert = (_props$mention = props.mention) === null || _props$mention === void 0 ? void 0 : _props$mention.insertDisplayName) !== null && _props$mention$insert !== void 0 ? _props$mention$insert : props.mentionInsertDisplayName,
     allowZeroWidthSpaceAfter: !isMobile,
     HighlightComponent: (_props$mention2 = props.mention) === null || _props$mention2 === void 0 ? void 0 : _props$mention2.HighlightComponent,
-    profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider,
-    getEditorFeatureFlags: getEditorFeatureFlags
-  }], Boolean(props.mentionProvider)).maybeAdd([_emoji.emojiPlugin, {
-    getEditorFeatureFlags: getEditorFeatureFlags
-  }], Boolean(props.emojiProvider)).maybeAdd([_table.tablesPlugin, {
+    profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider
+  }], Boolean(props.mentionProvider)).maybeAdd(_emoji.emojiPlugin, Boolean(props.emojiProvider)).maybeAdd([_table.tablesPlugin, {
     tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
     tableResizingEnabled: isFullPage,
     dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && isFullPage,
@@ -147,8 +140,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
   }], Boolean(props.allowTables)).maybeAdd([_tasksAndDecisions.tasksAndDecisionsPlugin, {
     allowNestedTasks: props.allowNestedTasks,
     consumeTabs: isFullPage,
-    useLongPressSelection: false,
-    getEditorFeatureFlags: getEditorFeatureFlags
+    useLongPressSelection: false
   }], Boolean(props.allowTasksAndDecisions || props.taskDecisionProvider)).maybeAdd([_feedbackDialog.feedbackDialogPlugin, _objectSpread({
     coreVersion: _versionWrapper.version
   }, props.feedbackInfo)], Boolean(props.feedbackInfo)).maybeAdd([_helpDialog.helpDialogPlugin, !!props.legacyImageUploadProvider], Boolean(props.allowHelpDialog)).maybeAdd([_saveOnEnter.saveOnEnterPlugin, props.onSave], Boolean(props.saveOnEnter && props.onSave)).maybeAdd(_imageUpload.imageUploadPlugin, Boolean(props.legacyImageUploadProvider)).maybeAdd(
@@ -167,8 +159,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
   })], Boolean(props.collabEdit || props.collabEditProvider)).maybeAdd([_maxContentSize.maxContentSizePlugin, props.maxContentSize], Boolean(props.maxContentSize)).maybeAdd([_panel.panelPlugin, {
     useLongPressSelection: false,
     allowCustomPanel: (0, _typeof2.default)(props.allowPanel) === 'object' ? props.allowPanel.allowCustomPanel : false,
-    allowCustomPanelEdit: (0, _typeof2.default)(props.allowPanel) === 'object' ? props.allowPanel.allowCustomPanelEdit : false,
-    getEditorFeatureFlags: getEditorFeatureFlags
+    allowCustomPanelEdit: (0, _typeof2.default)(props.allowPanel) === 'object' ? props.allowPanel.allowCustomPanelEdit : false
   }], Boolean(props.allowPanel)).maybeAdd(_contextPanel.contextPanelPlugin, Boolean(isFullPage)).maybeAdd([_extension.extensionPlugin, {
     breakoutEnabled: appearance === 'full-page' && ((0, _typeof2.default)(props.allowExtension) === 'object' ? props.allowExtension.allowBreakout : true) !== false,
     extensionHandlers: props.extensionHandlers,
@@ -181,8 +172,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
   // long term this and media should be consolidated into adding both only once
   // @ts-expect-error
   [_annotation.annotationPlugin, undefined], Boolean(!props.annotationProviders && props.allowConfluenceInlineComment)).maybeAdd([_date.datePlugin, {
-    weekStartDay: (0, _typeof2.default)(props.allowDate) === 'object' ? props.allowDate.weekStartDay : undefined,
-    getEditorFeatureFlags: getEditorFeatureFlags
+    weekStartDay: (0, _typeof2.default)(props.allowDate) === 'object' ? props.allowDate.weekStartDay : undefined
   }], Boolean(props.allowDate)).maybeAdd([_placeholderText.placeholderTextPlugin,
   // @ts-expect-error 2322: Type 'false | PlaceholderTextOptions | undefined'
   props.allowTemplatePlaceholders !== true ? props.allowTemplatePlaceholders : {}], Boolean(props.allowTemplatePlaceholders)).maybeAdd([_layout.layoutPlugin, _objectSpread(_objectSpread({}, (0, _typeof2.default)(props.allowLayouts) === 'object' ? props.allowLayouts : {}), {}, {
@@ -196,8 +186,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     editorAppearance: appearance
   })], Boolean(((_props$linking3 = props.linking) === null || _props$linking3 === void 0 ? void 0 : _props$linking3.smartLinks) || props.smartLinks || props.UNSAFE_cards)).maybeAdd(_customAutoformat.customAutoformatPlugin, Boolean(props.autoformattingProvider)).maybeAdd([_status.statusPlugin, {
     menuDisabled: statusMenuDisabled,
-    allowZeroWidthSpaceAfter: !isMobile,
-    getEditorFeatureFlags: getEditorFeatureFlags
+    allowZeroWidthSpaceAfter: !isMobile
   }], Boolean(props.allowStatus)).maybeAdd(_indentation.indentationPlugin, Boolean(props.allowIndentation)).maybeAdd(_scrollIntoView.scrollIntoViewPlugin, Boolean(props.autoScrollIntoView !== false)).add([_toolbarListsIndentation.toolbarListsIndentationPlugin, {
     showIndentationButtons: !!props.showIndentationButtons,
     allowHeadingAndParagraphIndentation: !!props.allowIndentation

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

@@ -7,13 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CommentEditorWithIntl = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -39,8 +32,10 @@ var _WithFlash = _interopRequireDefault(require("../../WithFlash"));
 var _Toolbar2 = require("./Toolbar");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /** @jsx jsx */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+/** @jsx jsx */
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+
 var CommentEditorMargin = 14;
 var commentEditorStyles = (0, _react2.css)({
   display: 'flex',
@@ -62,7 +57,7 @@ var commentEditorStyles = (0, _react2.css)({
 var ContentArea = (0, _ContentStyles.createEditorContentStyle)((0, _react2.css)({
   flexGrow: 1,
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  overflowX: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table-sticky-scrollbar') ? 'clip' : 'hidden',
+  overflowX: (0, _platformFeatureFlags.fg)('platform.editor.table-sticky-scrollbar') ? 'clip' : 'hidden',
   lineHeight: '24px',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '.ProseMirror': {
@@ -88,204 +83,12 @@ var secondaryToolbarStyles = (0, _react2.css)({
   padding: "var(--ds-space-150, 12px)".concat(" ", "var(--ds-space-025, 2px)")
 });
 var appearance = 'comment';
-var Editor = /*#__PURE__*/function (_React$Component) {
-  (0, _inherits2.default)(Editor, _React$Component);
-  var _super = _createSuper(Editor);
-  function Editor(props) {
-    var _this;
-    (0, _classCallCheck2.default)(this, Editor);
-    _this = _super.call(this, props);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "appearance", 'comment');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "containerElement", null);
-    // Wrapper container for toolbar and content area
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "wrapperElementRef", /*#__PURE__*/_react.default.createRef());
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleSave", function () {
-      if (_this.props.editorView && _this.props.onSave) {
-        _this.props.onSave(_this.props.editorView);
-      }
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleCancel", function () {
-      if (_this.props.editorView && _this.props.onCancel) {
-        _this.props.onCancel(_this.props.editorView);
-      }
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderChrome", function (_ref) {
-      var maxContentSize = _ref.maxContentSize,
-        mediaState = _ref.mediaState,
-        primaryToolbarState = _ref.primaryToolbarState;
-      var _this$props = _this.props,
-        editorDOMElement = _this$props.editorDOMElement,
-        editorView = _this$props.editorView,
-        editorActions = _this$props.editorActions,
-        eventDispatcher = _this$props.eventDispatcher,
-        providerFactory = _this$props.providerFactory,
-        contentComponents = _this$props.contentComponents,
-        customContentComponents = _this$props.customContentComponents,
-        customPrimaryToolbarComponents = _this$props.customPrimaryToolbarComponents,
-        primaryToolbarComponentsProp = _this$props.primaryToolbarComponents,
-        customSecondaryToolbarComponents = _this$props.customSecondaryToolbarComponents,
-        popupsMountPoint = _this$props.popupsMountPoint,
-        popupsBoundariesElement = _this$props.popupsBoundariesElement,
-        popupsScrollableElement = _this$props.popupsScrollableElement,
-        maxHeight = _this$props.maxHeight,
-        _this$props$minHeight = _this$props.minHeight,
-        minHeight = _this$props$minHeight === void 0 ? 150 : _this$props$minHeight,
-        onSave = _this$props.onSave,
-        onCancel = _this$props.onCancel,
-        disabled = _this$props.disabled,
-        dispatchAnalyticsEvent = _this$props.dispatchAnalyticsEvent,
-        intl = _this$props.intl,
-        useStickyToolbar = _this$props.useStickyToolbar,
-        pluginHooks = _this$props.pluginHooks,
-        featureFlags = _this$props.featureFlags;
-      var maxContentSizeReached = Boolean(maxContentSize === null || maxContentSize === void 0 ? void 0 : maxContentSize.maxContentSizeReached);
-      var showSecondaryToolbar = !!onSave || !!onCancel || !!customSecondaryToolbarComponents;
-      var isShortcutToFocusToolbar = function isShortcutToFocusToolbar(event) {
-        //Alt + F9 to reach first element in this main toolbar
-        return event.altKey && (event.key === 'F9' || event.keyCode === 120);
-      };
-      var isTwoLineToolbarEnabled = !!customPrimaryToolbarComponents && !!(featureFlags !== null && featureFlags !== void 0 && featureFlags.twoLineEditorToolbar);
-      var handleEscape = function handleEscape(event) {
-        if (!(editorView !== null && editorView !== void 0 && editorView.hasFocus())) {
-          editorView === null || editorView === void 0 || editorView.focus();
-        }
-        event.preventDefault();
-        event.stopPropagation();
-      };
-      var primaryToolbarComponents = primaryToolbarComponentsProp;
-      if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
-        primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
-      }
-      return (0, _react2.jsx)(_WithFlash.default, {
-        animate: maxContentSizeReached
-      }, (0, _react2.jsx)("div", {
-        css: [commentEditorStyles,
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-        (0, _react2.css)({
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-          minHeight: "".concat(minHeight, "px")
-        })]
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-        ,
-        className: "akEditor",
-        ref: _this.wrapperElementRef
-      }, (0, _react2.jsx)(_Toolbar2.MainToolbar, {
-        useStickyToolbar: useStickyToolbar,
-        twoLineEditorToolbar: isTwoLineToolbarEnabled
-      }, (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
-        editorView: editorView,
-        childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
-        isShortcutToFocusToolbar: isShortcutToFocusToolbar,
-        handleEscape: handleEscape,
-        editorAppearance: _this.appearance,
-        useStickyToolbar: useStickyToolbar,
-        intl: intl
-      }, (0, _react2.jsx)(_Toolbar.default, {
-        editorView: editorView,
-        editorActions: editorActions,
-        eventDispatcher: eventDispatcher,
-        providerFactory: providerFactory,
-        appearance: _this.appearance,
-        items: primaryToolbarComponents,
-        popupsMountPoint: popupsMountPoint,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsScrollableElement: popupsScrollableElement,
-        disabled: !!disabled,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        containerElement: _this.containerElement,
-        twoLineEditorToolbar: isTwoLineToolbarEnabled
-      }), (0, _react2.jsx)("div", {
-        css: (0, _Toolbar2.mainToolbarCustomComponentsSlotStyle)(isTwoLineToolbarEnabled)
-      }, customPrimaryToolbarComponents))), (0, _react2.jsx)(_Addon.ClickAreaBlock, {
-        editorView: editorView,
-        editorDisabled: disabled
-      }, (0, _react2.jsx)(_ui.WidthConsumer, null, function (_ref2) {
-        var width = _ref2.width;
-        return (0, _react2.jsx)(ContentArea, {
-          ref: function ref(_ref3) {
-            return _this.containerElement = _ref3;
-          },
-          css: maxHeight ?
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-          (0, _react2.css)({
-            // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-            maxHeight: "".concat(maxHeight, "px")
-          }) : null
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-          ,
-          className: (0, _classnames.default)('ak-editor-content-area', {
-            'less-margin': width < _editorSharedStyles.akEditorMobileBreakoutPoint
-          }),
-          featureFlags: featureFlags
-        }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, (0, _react2.jsx)(_PluginSlot.default, {
-          editorView: editorView,
-          editorActions: editorActions,
-          eventDispatcher: eventDispatcher,
-          dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-          providerFactory: providerFactory,
-          appearance: _this.appearance,
-          items: contentComponents,
-          popupsMountPoint: popupsMountPoint,
-          popupsBoundariesElement: popupsBoundariesElement,
-          popupsScrollableElement: popupsScrollableElement,
-          containerElement: _this.containerElement,
-          disabled: !!disabled,
-          wrapperElement: _this.wrapperElementRef.current,
-          pluginHooks: pluginHooks
-        }), editorDOMElement, customContentComponents && 'after' in customContentComponents ? customContentComponents.after : null);
-      }))), showSecondaryToolbar && (0, _react2.jsx)("div", {
-        css: secondaryToolbarStyles,
-        "data-testid": "ak-editor-secondary-toolbar"
-      }, (0, _react2.jsx)(_buttonGroup.default, null, !!onSave && (0, _react2.jsx)(_new.default, {
-        appearance: "primary",
-        onClick: _this.handleSave,
-        testId: "comment-save-button",
-        isDisabled: disabled || mediaState && !mediaState.allUploadsFinished
-      }, intl.formatMessage(_messages.default.saveButton)), !!onCancel && (0, _react2.jsx)(_new.default, {
-        appearance: "subtle",
-        onClick: _this.handleCancel,
-        isDisabled: disabled
-      }, intl.formatMessage(_messages.default.cancelButton))), (0, _react2.jsx)("span", {
-        style: {
-          flexGrow: 1
-        }
-      }), customSecondaryToolbarComponents));
-    });
-    if (props.innerRef) {
-      _this.wrapperElementRef = props.innerRef;
-    }
-    return _this;
-  }
-  (0, _createClass2.default)(Editor, [{
-    key: "render",
-    value: function render() {
-      return (0, _react2.jsx)(RenderWithPluginState, {
-        renderChrome: this.renderChrome
-      });
-    }
-  }]);
-  return Editor;
-}(_react.default.Component);
-(0, _defineProperty2.default)(Editor, "displayName", 'CommentEditorAppearance');
-function RenderWithPluginState(_ref4) {
-  var renderChrome = _ref4.renderChrome;
+var Editor = function Editor(props) {
   var api = (0, _context.usePresetContext)();
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['media', 'maxContentSize', 'primaryToolbar']),
     mediaState = _useSharedPluginState.mediaState,
     maxContentSizeState = _useSharedPluginState.maxContentSizeState,
     primaryToolbarState = _useSharedPluginState.primaryToolbarState;
-  return (0, _react2.jsx)(_react.Fragment, null, renderChrome({
-    maxContentSize: maxContentSizeState,
-    mediaState: mediaState !== null && mediaState !== void 0 ? mediaState : undefined,
-    primaryToolbarState: primaryToolbarState
-  }));
-}
-var EditorNext = function EditorNext(props) {
-  var api = (0, _context.usePresetContext)();
-  var _useSharedPluginState2 = (0, _hooks.useSharedPluginState)(api, ['media', 'maxContentSize', 'primaryToolbar']),
-    mediaState = _useSharedPluginState2.mediaState,
-    maxContentSizeState = _useSharedPluginState2.maxContentSizeState,
-    primaryToolbarState = _useSharedPluginState2.primaryToolbarState;
   var editorDOMElement = props.editorDOMElement,
     editorView = props.editorView,
     editorActions = props.editorActions,
@@ -400,8 +203,8 @@ var EditorNext = function EditorNext(props) {
   }, customPrimaryToolbarComponents))), (0, _react2.jsx)(_Addon.ClickAreaBlock, {
     editorView: editorView,
     editorDisabled: disabled
-  }, (0, _react2.jsx)(_ui.WidthConsumer, null, function (_ref5) {
-    var width = _ref5.width;
+  }, (0, _react2.jsx)(_ui.WidthConsumer, null, function (_ref) {
+    var width = _ref.width;
     return (0, _react2.jsx)(ContentArea, {
       ref: containerElement,
       css: maxHeight ?
@@ -450,8 +253,5 @@ var EditorNext = function EditorNext(props) {
     }
   }), customSecondaryToolbarComponents));
 };
-EditorNext.displayName = 'CommentEditorAppearance';
-var CommentEditorNextWithIntl = (0, _reactIntlNext.injectIntl)(EditorNext);
-var CommentEditorOldWithIntl = (0, _reactIntlNext.injectIntl)(Editor);
-var ExportComp = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.alluploadsfinished-dispatch-update_ivtow') ? CommentEditorNextWithIntl : CommentEditorOldWithIntl;
-var CommentEditorWithIntl = exports.CommentEditorWithIntl = ExportComp;
+Editor.displayName = 'CommentEditorAppearance';
+var CommentEditorWithIntl = exports.CommentEditorWithIntl = (0, _reactIntlNext.injectIntl)(Editor);

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

package/dist/es2019/presets/universal.js

@@ -73,11 +73,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       lpLinkPicker: (_featureFlags$lpLinkP = featureFlags.lpLinkPicker) !== null && _featureFlags$lpLinkP !== void 0 ? _featureFlags$lpLinkP : false,
       ...props.hyperlinkOptions
     },
-    __livePage: props.__livePage,
-    codeBlock: {
-      ...props.codeBlock,
-      getEditorFeatureFlags
-    }
+    __livePage: props.__livePage
   });
   const statusMenuDisabled = !props.allowStatus ? true : typeof props.allowStatus === 'object' ? Boolean(props.allowStatus.menuDisabled) : false;
   const hasBeforePrimaryToolbar = components => {
@@ -93,8 +89,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     useLongPressSelection: false,
     appearance: appearance,
     allowInteractiveExpand: typeof props.allowExpand === 'boolean' ? props.allowExpand : Boolean(props.allowExpand && props.allowExpand.allowInteractiveExpand !== false),
-    __livePage: props.__livePage,
-    getEditorFeatureFlags
+    __livePage: props.__livePage
   }], Boolean(props.allowExpand)).maybeAdd(guidelinePlugin, Boolean(!isMobile && !isComment && !isChromeless && (props.media || props.allowTables))).maybeAdd([gridPlugin, {
     shouldCalcBreakoutGridLines: isFullPage
   }], Boolean(props.media)).maybeAdd([annotationPlugin, props.annotationProviders], Boolean(props.annotationProviders)).maybeAdd([mediaPlugin, {
@@ -119,11 +114,8 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     insertDisplayName: (_props$mention$insert = (_props$mention = props.mention) === null || _props$mention === void 0 ? void 0 : _props$mention.insertDisplayName) !== null && _props$mention$insert !== void 0 ? _props$mention$insert : props.mentionInsertDisplayName,
     allowZeroWidthSpaceAfter: !isMobile,
     HighlightComponent: (_props$mention2 = props.mention) === null || _props$mention2 === void 0 ? void 0 : _props$mention2.HighlightComponent,
-    profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider,
-    getEditorFeatureFlags
-  }], Boolean(props.mentionProvider)).maybeAdd([emojiPlugin, {
-    getEditorFeatureFlags
-  }], Boolean(props.emojiProvider)).maybeAdd([tablesPlugin, {
+    profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider
+  }], Boolean(props.mentionProvider)).maybeAdd(emojiPlugin, Boolean(props.emojiProvider)).maybeAdd([tablesPlugin, {
     tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
     tableResizingEnabled: isFullPage,
     dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && isFullPage,
@@ -137,8 +129,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
   }], Boolean(props.allowTables)).maybeAdd([tasksAndDecisionsPlugin, {
     allowNestedTasks: props.allowNestedTasks,
     consumeTabs: isFullPage,
-    useLongPressSelection: false,
-    getEditorFeatureFlags
+    useLongPressSelection: false
   }], Boolean(props.allowTasksAndDecisions || props.taskDecisionProvider)).maybeAdd([feedbackDialogPlugin, {
     coreVersion,
     ...props.feedbackInfo
@@ -159,8 +150,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
   }], Boolean(props.collabEdit || props.collabEditProvider)).maybeAdd([maxContentSizePlugin, props.maxContentSize], Boolean(props.maxContentSize)).maybeAdd([panelPlugin, {
     useLongPressSelection: false,
     allowCustomPanel: typeof props.allowPanel === 'object' ? props.allowPanel.allowCustomPanel : false,
-    allowCustomPanelEdit: typeof props.allowPanel === 'object' ? props.allowPanel.allowCustomPanelEdit : false,
-    getEditorFeatureFlags
+    allowCustomPanelEdit: typeof props.allowPanel === 'object' ? props.allowPanel.allowCustomPanelEdit : false
   }], Boolean(props.allowPanel)).maybeAdd(contextPanelPlugin, Boolean(isFullPage)).maybeAdd([extensionPlugin, {
     breakoutEnabled: appearance === 'full-page' && (typeof props.allowExtension === 'object' ? props.allowExtension.allowBreakout : true) !== false,
     extensionHandlers: props.extensionHandlers,
@@ -173,8 +163,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
   // long term this and media should be consolidated into adding both only once
   // @ts-expect-error
   [annotationPlugin, undefined], Boolean(!props.annotationProviders && props.allowConfluenceInlineComment)).maybeAdd([datePlugin, {
-    weekStartDay: typeof props.allowDate === 'object' ? props.allowDate.weekStartDay : undefined,
-    getEditorFeatureFlags
+    weekStartDay: typeof props.allowDate === 'object' ? props.allowDate.weekStartDay : undefined
   }], Boolean(props.allowDate)).maybeAdd([placeholderTextPlugin,
   // @ts-expect-error 2322: Type 'false | PlaceholderTextOptions | undefined'
   props.allowTemplatePlaceholders !== true ? props.allowTemplatePlaceholders : {}], Boolean(props.allowTemplatePlaceholders)).maybeAdd([layoutPlugin, {
@@ -192,8 +181,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     editorAppearance: appearance
   }], Boolean(((_props$linking3 = props.linking) === null || _props$linking3 === void 0 ? void 0 : _props$linking3.smartLinks) || props.smartLinks || props.UNSAFE_cards)).maybeAdd(customAutoformatPlugin, Boolean(props.autoformattingProvider)).maybeAdd([statusPlugin, {
     menuDisabled: statusMenuDisabled,
-    allowZeroWidthSpaceAfter: !isMobile,
-    getEditorFeatureFlags
+    allowZeroWidthSpaceAfter: !isMobile
   }], Boolean(props.allowStatus)).maybeAdd(indentationPlugin, Boolean(props.allowIndentation)).maybeAdd(scrollIntoViewPlugin, Boolean(props.autoScrollIntoView !== false)).add([toolbarListsIndentationPlugin, {
     showIndentationButtons: !!props.showIndentationButtons,
     allowHeadingAndParagraphIndentation: !!props.allowIndentation

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

@@ -1,6 +1,5 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /** @jsx jsx */
-import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
@@ -14,7 +13,7 @@ import { WidthConsumer } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { tableCommentEditorStyles } from '@atlaskit/editor-plugins/table/ui/common-styles';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { N100 } from '@atlaskit/theme/colors';
 import { borderRadius } from '@atlaskit/theme/constants';
 import messages from '../../../messages';
@@ -46,7 +45,7 @@ const commentEditorStyles = css({
 const ContentArea = createEditorContentStyle(css({
   flexGrow: 1,
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  overflowX: getBooleanFF('platform.editor.table-sticky-scrollbar') ? 'clip' : 'hidden',
+  overflowX: fg('platform.editor.table-sticky-scrollbar') ? 'clip' : 'hidden',
   lineHeight: '24px',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '.ProseMirror': {
@@ -72,192 +71,7 @@ const secondaryToolbarStyles = css({
   padding: `${"var(--ds-space-150, 12px)"} ${"var(--ds-space-025, 2px)"}`
 });
 const appearance = 'comment';
-class Editor extends React.Component {
-  constructor(props) {
-    super(props);
-    _defineProperty(this, "appearance", 'comment');
-    _defineProperty(this, "containerElement", null);
-    // Wrapper container for toolbar and content area
-    _defineProperty(this, "wrapperElementRef", /*#__PURE__*/React.createRef());
-    _defineProperty(this, "handleSave", () => {
-      if (this.props.editorView && this.props.onSave) {
-        this.props.onSave(this.props.editorView);
-      }
-    });
-    _defineProperty(this, "handleCancel", () => {
-      if (this.props.editorView && this.props.onCancel) {
-        this.props.onCancel(this.props.editorView);
-      }
-    });
-    _defineProperty(this, "renderChrome", ({
-      maxContentSize,
-      mediaState,
-      primaryToolbarState
-    }) => {
-      const {
-        editorDOMElement,
-        editorView,
-        editorActions,
-        eventDispatcher,
-        providerFactory,
-        contentComponents,
-        customContentComponents,
-        customPrimaryToolbarComponents,
-        primaryToolbarComponents: primaryToolbarComponentsProp,
-        customSecondaryToolbarComponents,
-        popupsMountPoint,
-        popupsBoundariesElement,
-        popupsScrollableElement,
-        maxHeight,
-        minHeight = 150,
-        onSave,
-        onCancel,
-        disabled,
-        dispatchAnalyticsEvent,
-        intl,
-        useStickyToolbar,
-        pluginHooks,
-        featureFlags
-      } = this.props;
-      const maxContentSizeReached = Boolean(maxContentSize === null || maxContentSize === void 0 ? void 0 : maxContentSize.maxContentSizeReached);
-      const showSecondaryToolbar = !!onSave || !!onCancel || !!customSecondaryToolbarComponents;
-      const isShortcutToFocusToolbar = event => {
-        //Alt + F9 to reach first element in this main toolbar
-        return event.altKey && (event.key === 'F9' || event.keyCode === 120);
-      };
-      const isTwoLineToolbarEnabled = !!customPrimaryToolbarComponents && !!(featureFlags !== null && featureFlags !== void 0 && featureFlags.twoLineEditorToolbar);
-      const handleEscape = event => {
-        if (!(editorView !== null && editorView !== void 0 && editorView.hasFocus())) {
-          editorView === null || editorView === void 0 ? void 0 : editorView.focus();
-        }
-        event.preventDefault();
-        event.stopPropagation();
-      };
-      let primaryToolbarComponents = primaryToolbarComponentsProp;
-      if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
-        primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
-      }
-      return jsx(WithFlash, {
-        animate: maxContentSizeReached
-      }, jsx("div", {
-        css: [commentEditorStyles,
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-        css({
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-          minHeight: `${minHeight}px`
-        })]
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-        ,
-        className: "akEditor",
-        ref: this.wrapperElementRef
-      }, jsx(MainToolbar, {
-        useStickyToolbar: useStickyToolbar,
-        twoLineEditorToolbar: isTwoLineToolbarEnabled
-      }, jsx(ToolbarArrowKeyNavigationProvider, {
-        editorView: editorView,
-        childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
-        isShortcutToFocusToolbar: isShortcutToFocusToolbar,
-        handleEscape: handleEscape,
-        editorAppearance: this.appearance,
-        useStickyToolbar: useStickyToolbar,
-        intl: intl
-      }, jsx(Toolbar, {
-        editorView: editorView,
-        editorActions: editorActions,
-        eventDispatcher: eventDispatcher,
-        providerFactory: providerFactory,
-        appearance: this.appearance,
-        items: primaryToolbarComponents,
-        popupsMountPoint: popupsMountPoint,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsScrollableElement: popupsScrollableElement,
-        disabled: !!disabled,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        containerElement: this.containerElement,
-        twoLineEditorToolbar: isTwoLineToolbarEnabled
-      }), jsx("div", {
-        css: mainToolbarCustomComponentsSlotStyle(isTwoLineToolbarEnabled)
-      }, customPrimaryToolbarComponents))), jsx(ClickAreaBlock, {
-        editorView: editorView,
-        editorDisabled: disabled
-      }, jsx(WidthConsumer, null, ({
-        width
-      }) => {
-        return jsx(ContentArea, {
-          ref: ref => this.containerElement = ref,
-          css: maxHeight ?
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-          css({
-            // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-            maxHeight: `${maxHeight}px`
-          }) : null
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-          ,
-          className: classnames('ak-editor-content-area', {
-            'less-margin': width < akEditorMobileBreakoutPoint
-          }),
-          featureFlags: featureFlags
-        }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
-          editorView: editorView,
-          editorActions: editorActions,
-          eventDispatcher: eventDispatcher,
-          dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-          providerFactory: providerFactory,
-          appearance: this.appearance,
-          items: contentComponents,
-          popupsMountPoint: popupsMountPoint,
-          popupsBoundariesElement: popupsBoundariesElement,
-          popupsScrollableElement: popupsScrollableElement,
-          containerElement: this.containerElement,
-          disabled: !!disabled,
-          wrapperElement: this.wrapperElementRef.current,
-          pluginHooks: pluginHooks
-        }), editorDOMElement, customContentComponents && 'after' in customContentComponents ? customContentComponents.after : null);
-      }))), showSecondaryToolbar && jsx("div", {
-        css: secondaryToolbarStyles,
-        "data-testid": "ak-editor-secondary-toolbar"
-      }, jsx(ButtonGroup, null, !!onSave && jsx(Button, {
-        appearance: "primary",
-        onClick: this.handleSave,
-        testId: "comment-save-button",
-        isDisabled: disabled || mediaState && !mediaState.allUploadsFinished
-      }, intl.formatMessage(messages.saveButton)), !!onCancel && jsx(Button, {
-        appearance: "subtle",
-        onClick: this.handleCancel,
-        isDisabled: disabled
-      }, intl.formatMessage(messages.cancelButton))), jsx("span", {
-        style: {
-          flexGrow: 1
-        }
-      }), customSecondaryToolbarComponents));
-    });
-    if (props.innerRef) {
-      this.wrapperElementRef = props.innerRef;
-    }
-  }
-  render() {
-    return jsx(RenderWithPluginState, {
-      renderChrome: this.renderChrome
-    });
-  }
-}
-_defineProperty(Editor, "displayName", 'CommentEditorAppearance');
-function RenderWithPluginState({
-  renderChrome
-}) {
-  const api = usePresetContext();
-  const {
-    mediaState,
-    maxContentSizeState,
-    primaryToolbarState
-  } = useSharedPluginState(api, ['media', 'maxContentSize', 'primaryToolbar']);
-  return jsx(Fragment, null, renderChrome({
-    maxContentSize: maxContentSizeState,
-    mediaState: mediaState !== null && mediaState !== void 0 ? mediaState : undefined,
-    primaryToolbarState
-  }));
-}
-const EditorNext = props => {
+const Editor = props => {
   const api = usePresetContext();
   const {
     mediaState,
@@ -423,8 +237,5 @@ const EditorNext = props => {
     }
   }), customSecondaryToolbarComponents));
 };
-EditorNext.displayName = 'CommentEditorAppearance';
-const CommentEditorNextWithIntl = injectIntl(EditorNext);
-const CommentEditorOldWithIntl = injectIntl(Editor);
-const ExportComp = getBooleanFF('platform.editor.media.alluploadsfinished-dispatch-update_ivtow') ? CommentEditorNextWithIntl : CommentEditorOldWithIntl;
-export const CommentEditorWithIntl = ExportComp;
+Editor.displayName = 'CommentEditorAppearance';
+export const CommentEditorWithIntl = injectIntl(Editor);

package/dist/es2019/version-wrapper.js

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

package/dist/esm/presets/universal.js

@@ -77,10 +77,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     hyperlinkOptions: _objectSpread({
       lpLinkPicker: (_featureFlags$lpLinkP = featureFlags.lpLinkPicker) !== null && _featureFlags$lpLinkP !== void 0 ? _featureFlags$lpLinkP : false
     }, props.hyperlinkOptions),
-    __livePage: props.__livePage,
-    codeBlock: _objectSpread(_objectSpread({}, props.codeBlock), {}, {
-      getEditorFeatureFlags: getEditorFeatureFlags
-    })
+    __livePage: props.__livePage
   }));
   var statusMenuDisabled = !props.allowStatus ? true : _typeof(props.allowStatus) === 'object' ? Boolean(props.allowStatus.menuDisabled) : false;
   var hasBeforePrimaryToolbar = function hasBeforePrimaryToolbar(components) {
@@ -96,8 +93,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     useLongPressSelection: false,
     appearance: appearance,
     allowInteractiveExpand: typeof props.allowExpand === 'boolean' ? props.allowExpand : Boolean(props.allowExpand && props.allowExpand.allowInteractiveExpand !== false),
-    __livePage: props.__livePage,
-    getEditorFeatureFlags: getEditorFeatureFlags
+    __livePage: props.__livePage
   }], Boolean(props.allowExpand)).maybeAdd(guidelinePlugin, Boolean(!isMobile && !isComment && !isChromeless && (props.media || props.allowTables))).maybeAdd([gridPlugin, {
     shouldCalcBreakoutGridLines: isFullPage
   }], Boolean(props.media)).maybeAdd([annotationPlugin, props.annotationProviders], Boolean(props.annotationProviders)).maybeAdd([mediaPlugin, _objectSpread(_objectSpread({}, props.media), {}, {
@@ -121,11 +117,8 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     insertDisplayName: (_props$mention$insert = (_props$mention = props.mention) === null || _props$mention === void 0 ? void 0 : _props$mention.insertDisplayName) !== null && _props$mention$insert !== void 0 ? _props$mention$insert : props.mentionInsertDisplayName,
     allowZeroWidthSpaceAfter: !isMobile,
     HighlightComponent: (_props$mention2 = props.mention) === null || _props$mention2 === void 0 ? void 0 : _props$mention2.HighlightComponent,
-    profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider,
-    getEditorFeatureFlags: getEditorFeatureFlags
-  }], Boolean(props.mentionProvider)).maybeAdd([emojiPlugin, {
-    getEditorFeatureFlags: getEditorFeatureFlags
-  }], Boolean(props.emojiProvider)).maybeAdd([tablesPlugin, {
+    profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider
+  }], Boolean(props.mentionProvider)).maybeAdd(emojiPlugin, Boolean(props.emojiProvider)).maybeAdd([tablesPlugin, {
     tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
     tableResizingEnabled: isFullPage,
     dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && isFullPage,
@@ -139,8 +132,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
   }], Boolean(props.allowTables)).maybeAdd([tasksAndDecisionsPlugin, {
     allowNestedTasks: props.allowNestedTasks,
     consumeTabs: isFullPage,
-    useLongPressSelection: false,
-    getEditorFeatureFlags: getEditorFeatureFlags
+    useLongPressSelection: false
   }], Boolean(props.allowTasksAndDecisions || props.taskDecisionProvider)).maybeAdd([feedbackDialogPlugin, _objectSpread({
     coreVersion: coreVersion
   }, props.feedbackInfo)], Boolean(props.feedbackInfo)).maybeAdd([helpDialogPlugin, !!props.legacyImageUploadProvider], Boolean(props.allowHelpDialog)).maybeAdd([saveOnEnterPlugin, props.onSave], Boolean(props.saveOnEnter && props.onSave)).maybeAdd(imageUploadPlugin, Boolean(props.legacyImageUploadProvider)).maybeAdd(
@@ -159,8 +151,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
   })], Boolean(props.collabEdit || props.collabEditProvider)).maybeAdd([maxContentSizePlugin, props.maxContentSize], Boolean(props.maxContentSize)).maybeAdd([panelPlugin, {
     useLongPressSelection: false,
     allowCustomPanel: _typeof(props.allowPanel) === 'object' ? props.allowPanel.allowCustomPanel : false,
-    allowCustomPanelEdit: _typeof(props.allowPanel) === 'object' ? props.allowPanel.allowCustomPanelEdit : false,
-    getEditorFeatureFlags: getEditorFeatureFlags
+    allowCustomPanelEdit: _typeof(props.allowPanel) === 'object' ? props.allowPanel.allowCustomPanelEdit : false
   }], Boolean(props.allowPanel)).maybeAdd(contextPanelPlugin, Boolean(isFullPage)).maybeAdd([extensionPlugin, {
     breakoutEnabled: appearance === 'full-page' && (_typeof(props.allowExtension) === 'object' ? props.allowExtension.allowBreakout : true) !== false,
     extensionHandlers: props.extensionHandlers,
@@ -173,8 +164,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
   // long term this and media should be consolidated into adding both only once
   // @ts-expect-error
   [annotationPlugin, undefined], Boolean(!props.annotationProviders && props.allowConfluenceInlineComment)).maybeAdd([datePlugin, {
-    weekStartDay: _typeof(props.allowDate) === 'object' ? props.allowDate.weekStartDay : undefined,
-    getEditorFeatureFlags: getEditorFeatureFlags
+    weekStartDay: _typeof(props.allowDate) === 'object' ? props.allowDate.weekStartDay : undefined
   }], Boolean(props.allowDate)).maybeAdd([placeholderTextPlugin,
   // @ts-expect-error 2322: Type 'false | PlaceholderTextOptions | undefined'
   props.allowTemplatePlaceholders !== true ? props.allowTemplatePlaceholders : {}], Boolean(props.allowTemplatePlaceholders)).maybeAdd([layoutPlugin, _objectSpread(_objectSpread({}, _typeof(props.allowLayouts) === 'object' ? props.allowLayouts : {}), {}, {
@@ -188,8 +178,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     editorAppearance: appearance
   })], Boolean(((_props$linking3 = props.linking) === null || _props$linking3 === void 0 ? void 0 : _props$linking3.smartLinks) || props.smartLinks || props.UNSAFE_cards)).maybeAdd(customAutoformatPlugin, Boolean(props.autoformattingProvider)).maybeAdd([statusPlugin, {
     menuDisabled: statusMenuDisabled,
-    allowZeroWidthSpaceAfter: !isMobile,
-    getEditorFeatureFlags: getEditorFeatureFlags
+    allowZeroWidthSpaceAfter: !isMobile
   }], Boolean(props.allowStatus)).maybeAdd(indentationPlugin, Boolean(props.allowIndentation)).maybeAdd(scrollIntoViewPlugin, Boolean(props.autoScrollIntoView !== false)).add([toolbarListsIndentationPlugin, {
     showIndentationButtons: !!props.showIndentationButtons,
     allowHeadingAndParagraphIndentation: !!props.allowIndentation

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

@@ -1,15 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /** @jsx jsx */
-import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
@@ -23,7 +14,7 @@ import { WidthConsumer } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { tableCommentEditorStyles } from '@atlaskit/editor-plugins/table/ui/common-styles';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { N100 } from '@atlaskit/theme/colors';
 import { borderRadius } from '@atlaskit/theme/constants';
 import messages from '../../../messages';
@@ -55,7 +46,7 @@ var commentEditorStyles = css({
 var ContentArea = createEditorContentStyle(css({
   flexGrow: 1,
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  overflowX: getBooleanFF('platform.editor.table-sticky-scrollbar') ? 'clip' : 'hidden',
+  overflowX: fg('platform.editor.table-sticky-scrollbar') ? 'clip' : 'hidden',
   lineHeight: '24px',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '.ProseMirror': {
@@ -81,204 +72,12 @@ var secondaryToolbarStyles = css({
   padding: "var(--ds-space-150, 12px)".concat(" ", "var(--ds-space-025, 2px)")
 });
 var appearance = 'comment';
-var Editor = /*#__PURE__*/function (_React$Component) {
-  _inherits(Editor, _React$Component);
-  var _super = _createSuper(Editor);
-  function Editor(props) {
-    var _this;
-    _classCallCheck(this, Editor);
-    _this = _super.call(this, props);
-    _defineProperty(_assertThisInitialized(_this), "appearance", 'comment');
-    _defineProperty(_assertThisInitialized(_this), "containerElement", null);
-    // Wrapper container for toolbar and content area
-    _defineProperty(_assertThisInitialized(_this), "wrapperElementRef", /*#__PURE__*/React.createRef());
-    _defineProperty(_assertThisInitialized(_this), "handleSave", function () {
-      if (_this.props.editorView && _this.props.onSave) {
-        _this.props.onSave(_this.props.editorView);
-      }
-    });
-    _defineProperty(_assertThisInitialized(_this), "handleCancel", function () {
-      if (_this.props.editorView && _this.props.onCancel) {
-        _this.props.onCancel(_this.props.editorView);
-      }
-    });
-    _defineProperty(_assertThisInitialized(_this), "renderChrome", function (_ref) {
-      var maxContentSize = _ref.maxContentSize,
-        mediaState = _ref.mediaState,
-        primaryToolbarState = _ref.primaryToolbarState;
-      var _this$props = _this.props,
-        editorDOMElement = _this$props.editorDOMElement,
-        editorView = _this$props.editorView,
-        editorActions = _this$props.editorActions,
-        eventDispatcher = _this$props.eventDispatcher,
-        providerFactory = _this$props.providerFactory,
-        contentComponents = _this$props.contentComponents,
-        customContentComponents = _this$props.customContentComponents,
-        customPrimaryToolbarComponents = _this$props.customPrimaryToolbarComponents,
-        primaryToolbarComponentsProp = _this$props.primaryToolbarComponents,
-        customSecondaryToolbarComponents = _this$props.customSecondaryToolbarComponents,
-        popupsMountPoint = _this$props.popupsMountPoint,
-        popupsBoundariesElement = _this$props.popupsBoundariesElement,
-        popupsScrollableElement = _this$props.popupsScrollableElement,
-        maxHeight = _this$props.maxHeight,
-        _this$props$minHeight = _this$props.minHeight,
-        minHeight = _this$props$minHeight === void 0 ? 150 : _this$props$minHeight,
-        onSave = _this$props.onSave,
-        onCancel = _this$props.onCancel,
-        disabled = _this$props.disabled,
-        dispatchAnalyticsEvent = _this$props.dispatchAnalyticsEvent,
-        intl = _this$props.intl,
-        useStickyToolbar = _this$props.useStickyToolbar,
-        pluginHooks = _this$props.pluginHooks,
-        featureFlags = _this$props.featureFlags;
-      var maxContentSizeReached = Boolean(maxContentSize === null || maxContentSize === void 0 ? void 0 : maxContentSize.maxContentSizeReached);
-      var showSecondaryToolbar = !!onSave || !!onCancel || !!customSecondaryToolbarComponents;
-      var isShortcutToFocusToolbar = function isShortcutToFocusToolbar(event) {
-        //Alt + F9 to reach first element in this main toolbar
-        return event.altKey && (event.key === 'F9' || event.keyCode === 120);
-      };
-      var isTwoLineToolbarEnabled = !!customPrimaryToolbarComponents && !!(featureFlags !== null && featureFlags !== void 0 && featureFlags.twoLineEditorToolbar);
-      var handleEscape = function handleEscape(event) {
-        if (!(editorView !== null && editorView !== void 0 && editorView.hasFocus())) {
-          editorView === null || editorView === void 0 || editorView.focus();
-        }
-        event.preventDefault();
-        event.stopPropagation();
-      };
-      var primaryToolbarComponents = primaryToolbarComponentsProp;
-      if (Array.isArray(primaryToolbarState === null || primaryToolbarState === void 0 ? void 0 : primaryToolbarState.components) && Array.isArray(primaryToolbarComponents)) {
-        primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
-      }
-      return jsx(WithFlash, {
-        animate: maxContentSizeReached
-      }, jsx("div", {
-        css: [commentEditorStyles,
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-        css({
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-          minHeight: "".concat(minHeight, "px")
-        })]
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-        ,
-        className: "akEditor",
-        ref: _this.wrapperElementRef
-      }, jsx(MainToolbar, {
-        useStickyToolbar: useStickyToolbar,
-        twoLineEditorToolbar: isTwoLineToolbarEnabled
-      }, jsx(ToolbarArrowKeyNavigationProvider, {
-        editorView: editorView,
-        childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
-        isShortcutToFocusToolbar: isShortcutToFocusToolbar,
-        handleEscape: handleEscape,
-        editorAppearance: _this.appearance,
-        useStickyToolbar: useStickyToolbar,
-        intl: intl
-      }, jsx(Toolbar, {
-        editorView: editorView,
-        editorActions: editorActions,
-        eventDispatcher: eventDispatcher,
-        providerFactory: providerFactory,
-        appearance: _this.appearance,
-        items: primaryToolbarComponents,
-        popupsMountPoint: popupsMountPoint,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsScrollableElement: popupsScrollableElement,
-        disabled: !!disabled,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        containerElement: _this.containerElement,
-        twoLineEditorToolbar: isTwoLineToolbarEnabled
-      }), jsx("div", {
-        css: mainToolbarCustomComponentsSlotStyle(isTwoLineToolbarEnabled)
-      }, customPrimaryToolbarComponents))), jsx(ClickAreaBlock, {
-        editorView: editorView,
-        editorDisabled: disabled
-      }, jsx(WidthConsumer, null, function (_ref2) {
-        var width = _ref2.width;
-        return jsx(ContentArea, {
-          ref: function ref(_ref3) {
-            return _this.containerElement = _ref3;
-          },
-          css: maxHeight ?
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-          css({
-            // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-            maxHeight: "".concat(maxHeight, "px")
-          }) : null
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-          ,
-          className: classnames('ak-editor-content-area', {
-            'less-margin': width < akEditorMobileBreakoutPoint
-          }),
-          featureFlags: featureFlags
-        }, customContentComponents && 'before' in customContentComponents ? customContentComponents.before : customContentComponents, jsx(PluginSlot, {
-          editorView: editorView,
-          editorActions: editorActions,
-          eventDispatcher: eventDispatcher,
-          dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-          providerFactory: providerFactory,
-          appearance: _this.appearance,
-          items: contentComponents,
-          popupsMountPoint: popupsMountPoint,
-          popupsBoundariesElement: popupsBoundariesElement,
-          popupsScrollableElement: popupsScrollableElement,
-          containerElement: _this.containerElement,
-          disabled: !!disabled,
-          wrapperElement: _this.wrapperElementRef.current,
-          pluginHooks: pluginHooks
-        }), editorDOMElement, customContentComponents && 'after' in customContentComponents ? customContentComponents.after : null);
-      }))), showSecondaryToolbar && jsx("div", {
-        css: secondaryToolbarStyles,
-        "data-testid": "ak-editor-secondary-toolbar"
-      }, jsx(ButtonGroup, null, !!onSave && jsx(Button, {
-        appearance: "primary",
-        onClick: _this.handleSave,
-        testId: "comment-save-button",
-        isDisabled: disabled || mediaState && !mediaState.allUploadsFinished
-      }, intl.formatMessage(messages.saveButton)), !!onCancel && jsx(Button, {
-        appearance: "subtle",
-        onClick: _this.handleCancel,
-        isDisabled: disabled
-      }, intl.formatMessage(messages.cancelButton))), jsx("span", {
-        style: {
-          flexGrow: 1
-        }
-      }), customSecondaryToolbarComponents));
-    });
-    if (props.innerRef) {
-      _this.wrapperElementRef = props.innerRef;
-    }
-    return _this;
-  }
-  _createClass(Editor, [{
-    key: "render",
-    value: function render() {
-      return jsx(RenderWithPluginState, {
-        renderChrome: this.renderChrome
-      });
-    }
-  }]);
-  return Editor;
-}(React.Component);
-_defineProperty(Editor, "displayName", 'CommentEditorAppearance');
-function RenderWithPluginState(_ref4) {
-  var renderChrome = _ref4.renderChrome;
+var Editor = function Editor(props) {
   var api = usePresetContext();
   var _useSharedPluginState = useSharedPluginState(api, ['media', 'maxContentSize', 'primaryToolbar']),
     mediaState = _useSharedPluginState.mediaState,
     maxContentSizeState = _useSharedPluginState.maxContentSizeState,
     primaryToolbarState = _useSharedPluginState.primaryToolbarState;
-  return jsx(Fragment, null, renderChrome({
-    maxContentSize: maxContentSizeState,
-    mediaState: mediaState !== null && mediaState !== void 0 ? mediaState : undefined,
-    primaryToolbarState: primaryToolbarState
-  }));
-}
-var EditorNext = function EditorNext(props) {
-  var api = usePresetContext();
-  var _useSharedPluginState2 = useSharedPluginState(api, ['media', 'maxContentSize', 'primaryToolbar']),
-    mediaState = _useSharedPluginState2.mediaState,
-    maxContentSizeState = _useSharedPluginState2.maxContentSizeState,
-    primaryToolbarState = _useSharedPluginState2.primaryToolbarState;
   var editorDOMElement = props.editorDOMElement,
     editorView = props.editorView,
     editorActions = props.editorActions,
@@ -393,8 +192,8 @@ var EditorNext = function EditorNext(props) {
   }, customPrimaryToolbarComponents))), jsx(ClickAreaBlock, {
     editorView: editorView,
     editorDisabled: disabled
-  }, jsx(WidthConsumer, null, function (_ref5) {
-    var width = _ref5.width;
+  }, jsx(WidthConsumer, null, function (_ref) {
+    var width = _ref.width;
     return jsx(ContentArea, {
       ref: containerElement,
       css: maxHeight ?
@@ -443,8 +242,5 @@ var EditorNext = function EditorNext(props) {
     }
   }), customSecondaryToolbarComponents));
 };
-EditorNext.displayName = 'CommentEditorAppearance';
-var CommentEditorNextWithIntl = injectIntl(EditorNext);
-var CommentEditorOldWithIntl = injectIntl(Editor);
-var ExportComp = getBooleanFF('platform.editor.media.alluploadsfinished-dispatch-update_ivtow') ? CommentEditorNextWithIntl : CommentEditorOldWithIntl;
-export var CommentEditorWithIntl = ExportComp;
+Editor.displayName = 'CommentEditorAppearance';
+export var CommentEditorWithIntl = injectIntl(Editor);

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "193.31.0";
+export var version = "194.0.1";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "193.31.0",
+	"version": "194.0.1",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -45,7 +45,7 @@
 		"@atlaskit/analytics-next": "^9.3.0",
 		"@atlaskit/analytics-next-stable-react-context": "1.0.1",
 		"@atlaskit/button": "^18.1.0",
-		"@atlaskit/editor-common": "^83.6.0",
+		"@atlaskit/editor-common": "^84.0.0",
 		"@atlaskit/editor-plugins": "^3.3.0",
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/editor-shared-styles": "^2.12.0",
@@ -80,14 +80,14 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"devDependencies": {
-		"@af/editor-examples-helpers": "0.0.11",
+		"@af/editor-examples-helpers": "0.0.13",
 		"@af/editor-libra": "*",
 		"@af/visual-regression": "*",
 		"@atlaskit/adf-utils": "^19.4.0",
 		"@atlaskit/analytics-listeners": "^8.10.0",
-		"@atlaskit/collab-provider": "9.32.2",
+		"@atlaskit/collab-provider": "9.32.3",
 		"@atlaskit/editor-json-transformer": "^8.15.0",
-		"@atlaskit/editor-plugin-annotation": "1.14.0",
+		"@atlaskit/editor-plugin-annotation": "1.14.1",
 		"@atlaskit/editor-plugin-card": "^2.3.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.0.0",
 		"@atlaskit/editor-plugin-list": "^3.5.0",
@@ -107,7 +107,7 @@
 		"@atlaskit/util-data-test": "^17.9.0",
 		"@atlaskit/visual-regression": "*",
 		"@atlassian/adf-schema-json": "^1.16.0",
-		"@atlassian/search-provider": "2.4.88",
+		"@atlassian/search-provider": "2.4.89",
 		"@emotion/jest": "^11.8.0",
 		"@storybook/addon-knobs": "^5.3.18",
 		"@testing-library/react": "^12.1.5",
@@ -217,9 +217,6 @@
 		"platform.editor.media.preview-in-full-page": {
 			"type": "boolean"
 		},
-		"platform.editor.media.alluploadsfinished-dispatch-update_ivtow": {
-			"type": "boolean"
-		},
 		"platform.editor.inline_extension.extended_lcqdn": {
 			"type": "boolean",
 			"referenceOnly": "true"