@atlaskit/editor-plugin-status 26.0.2 → 27.0.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-status
 
+## 27.0.0
+
+### Patch Changes
+
+- [`9b9cc5f762d4a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9b9cc5f762d4a) -
+  Clean up feature gate `platform_editor_status_popup_suggestions_patch_1`
+- Updated dependencies
+
+## 26.0.3
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 26.0.2
 
 ### Patch Changes

package/dist/cjs/ui/ContentComponent.js

@@ -95,7 +95,6 @@ function ContentComponent(_ref) {
         text: text
       },
       doc: editorView.state.doc,
-      limit: (0, _fg.fg)('platform_editor_status_popup_suggestions_patch_1') ? _getSuggestedStatuses.MAX_SUGGESTED_STATUSES : _getSuggestedStatuses.MAX_SUGGESTED_STATUSES_OLD,
       shouldUppercaseText: (0, _fg.fg)('platform-dst-lozenge-tag-badge-visual-uplifts')
     });
   }, [showStatusPickerAt, editorView.state.doc]);

package/dist/cjs/ui/getSuggestedStatuses.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSuggestedStatuses = exports.MAX_SUGGESTED_STATUSES_OLD = exports.MAX_SUGGESTED_STATUSES = void 0;
+exports.getSuggestedStatuses = exports.MAX_SUGGESTED_STATUSES = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _statusColors = require("@atlaskit/status/status-colors");
@@ -12,8 +12,6 @@ var _excluded = ["distance"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MAX_SUGGESTED_STATUSES = exports.MAX_SUGGESTED_STATUSES = 20;
-// Remove when cleaning up `platform_editor_status_popup_suggestions_patch_1`.
-var MAX_SUGGESTED_STATUSES_OLD = exports.MAX_SUGGESTED_STATUSES_OLD = 7;
 
 // `color` may be a legacy name or a hex value that render the same hue (e.g. `green` and
 // `#D3F1A7` both resolve to `accent-lime`), so the key is built from the resolved appearance

package/dist/cjs/ui/statusPicker.js

@@ -92,9 +92,10 @@ var suggestedStatusesContainerAlignedBottomPaddingStyles = (0, _react2.css)({
 var suggestedStatusesContainerStyles = (0, _react2.css)({
   display: 'flex',
   flexDirection: 'column',
-  gap: "var(--ds-space-100, 8px)",
+  gap: "var(--ds-space-050, 4px)",
   margin: 0,
-  padding: "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-150, 12px)", " ", "var(--ds-space-050, 4px)")
+  padding: "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-150, 12px)", " ", "var(--ds-space-050, 4px)"),
+  paddingLeft: "var(--ds-space-100, 8px)"
 });
 
 // Fixed input plus capped scrolling color controls and suggestions. The ten-color picker is
@@ -113,31 +114,20 @@ var statusPickerWidthStylesOld = (0, _react2.css)({
 var statusPickerWidthStyles = (0, _react2.css)({
   width: "".concat(STATUS_PICKER_TEN_COLOR_CONTENT_WIDTH, "px")
 });
-
-// When cleaning up `platform_editor_status_popup_suggestions_patch_1`, merge this into
-// `suggestedStatusesContainerStyles` and remove its conditional style array.
-var suggestedStatusesContainerPatchStyles = (0, _react2.css)({
-  gap: "var(--ds-space-050, 4px)",
-  paddingLeft: "var(--ds-space-100, 8px)"
-});
 var suggestedStatusButtonStyles = (0, _react2.css)({
   background: 'transparent',
   border: 0,
   borderRadius: "var(--ds-radius-small, 3px)",
   cursor: 'pointer',
   justifyContent: 'flex-start',
+  // Allow this flex item to shrink so long statuses can truncate.
+  minWidth: 0,
   padding: 0,
   '&:focus-visible': {
     outline: "2px solid ".concat("var(--ds-border-focused, #0C66E4)"),
     outlineOffset: "var(--ds-space-025, 2px)"
   }
 });
-
-// Remove when cleaning up `platform_editor_status_popup_suggestions_patch_1`.
-var suggestedStatusButtonOldStyles = (0, _react2.css)({
-  display: 'flex',
-  width: '100%'
-});
 var suggestedStatusButtonWrapperStyles = (0, _react2.css)({
   alignSelf: 'flex-start',
   borderWidth: "var(--ds-border-width, 1px)",
@@ -157,13 +147,6 @@ var suggestedStatusButtonWrapperStyles = (0, _react2.css)({
   }
 });
 
-// When cleaning up `platform_editor_status_popup_suggestions_patch_1`, merge this into
-// `suggestedStatusButtonStyles` and remove its conditional style array.
-var suggestedStatusButtonPatchStyles = (0, _react2.css)({
-  // Allow this flex item to shrink so long statuses can truncate.
-  minWidth: 0
-});
-
 // eslint-disable-next-line @repo/internal/react/no-class-components
 var StatusPickerWithIntl = /*#__PURE__*/function (_React$Component) {
   function StatusPickerWithIntl(props) {
@@ -473,18 +456,18 @@ var StatusPickerWithIntl = /*#__PURE__*/function (_React$Component) {
       var _this$state3 = this.state,
         color = _this$state3.color,
         text = _this$state3.text;
-      var suggestionsPatchEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_status_popup_suggestions') && (0, _fg.fg)('platform_editor_status_popup_suggestions_patch_1');
+      var isSuggestionsEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_status_popup_suggestions');
       var isUpdateStatusColorsEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_update_status_colors') || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_update_status_colors_jira');
-      var suggestedStatusList = suggestedStatuses !== null && suggestedStatuses !== void 0 && suggestedStatuses.length && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_status_popup_suggestions') ? (0, _react2.jsx)("div", {
-        css: [suggestedStatusesContainerStyles, suggestionsPatchEnabled ? suggestedStatusesContainerPatchStyles : undefined, suggestionsPatchEnabled && (isUpdateStatusColorsEnabled || (0, _fg.fg)('platform_editor_status_popup_suggestions_patch_3')) ? suggestedStatusesContainerAlignedBottomPaddingStyles : undefined],
+      var suggestedStatusList = suggestedStatuses !== null && suggestedStatuses !== void 0 && suggestedStatuses.length && isSuggestionsEnabled ? (0, _react2.jsx)("div", {
+        css: [suggestedStatusesContainerStyles, isUpdateStatusColorsEnabled || (0, _fg.fg)('platform_editor_status_popup_suggestions_patch_3') ? suggestedStatusesContainerAlignedBottomPaddingStyles : undefined],
         "data-suggested-status-list": true
       }, suggestedStatuses.map(function (suggestedStatus, index) {
         return (0, _react2.jsx)("div", {
-          css: suggestionsPatchEnabled ? suggestedStatusButtonWrapperStyles : undefined,
+          css: suggestedStatusButtonWrapperStyles,
           key: "".concat(suggestedStatus.color, ":").concat(suggestedStatus.text)
         }, (0, _react2.jsx)("button", {
           type: "button",
-          css: [suggestedStatusButtonStyles, suggestionsPatchEnabled ? suggestedStatusButtonPatchStyles : suggestedStatusButtonOldStyles],
+          css: suggestedStatusButtonStyles,
           onClick: function onClick() {
             return _this3.onSuggestedStatusClick(suggestedStatus, index + 1);
           },
@@ -497,7 +480,7 @@ var StatusPickerWithIntl = /*#__PURE__*/function (_React$Component) {
           text: suggestedStatus.displayText
         })));
       })) : null;
-      var pickerContent = (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_picker.StatusPicker, {
+      var pickerContent = (0, _react2.jsx)(_picker.StatusPicker, {
         autoFocus: isNew || focusStatusInput,
         selectedColor: color,
         text: text,
@@ -506,13 +489,13 @@ var StatusPickerWithIntl = /*#__PURE__*/function (_React$Component) {
         onTextChanged: this.onTextChanged,
         onEnter: this.onEnter,
         palette: isUpdateStatusColorsEnabled ? 'extended' : 'default',
-        scrollableContent: suggestionsPatchEnabled ? suggestedStatusList : undefined
-      }), suggestionsPatchEnabled ? null : suggestedStatusList);
+        scrollableContent: suggestedStatusList
+      });
       return (0, _react2.jsx)(_userIntent.UserIntentPopupWrapper, {
         api: api,
         userIntent: "statusPickerOpen"
       }, (0, _react2.jsx)("div", {
-        css: [(0, _fg.fg)('platform-dst-lozenge-tag-badge-visual-uplifts') ? pickerContainerStylesTeam26 : pickerContainerStyles, suggestionsPatchEnabled && isUpdateStatusColorsEnabled ? statusPickerWidthStyles : undefined, suggestionsPatchEnabled && !isUpdateStatusColorsEnabled ? statusPickerWidthStylesOld : undefined, suggestionsPatchEnabled && !!suggestedStatusList && (isUpdateStatusColorsEnabled || (0, _fg.fg)('platform_editor_status_popup_suggestions_patch_3')) ? pickerContainerNoBottomPaddingStyles : undefined],
+        css: [(0, _fg.fg)('platform-dst-lozenge-tag-badge-visual-uplifts') ? pickerContainerStylesTeam26 : pickerContainerStyles, isSuggestionsEnabled && isUpdateStatusColorsEnabled ? statusPickerWidthStyles : undefined, isSuggestionsEnabled && !isUpdateStatusColorsEnabled ? statusPickerWidthStylesOld : undefined, isSuggestionsEnabled && !!suggestedStatusList && (isUpdateStatusColorsEnabled || (0, _fg.fg)('platform_editor_status_popup_suggestions_patch_3')) ? pickerContainerNoBottomPaddingStyles : undefined],
         role: "none",
         ref: this.setRef(setOutsideClickTargetRef),
         onClick: this.handlePopupClick,
@@ -542,7 +525,7 @@ var StatusPickerWithIntl = /*#__PURE__*/function (_React$Component) {
         handleClickOutside: this.handleClickOutside,
         handleEscapeKeydown: this.handleEscapeKeydown,
         zIndex: _editorSharedStyles.akEditorFloatingDialogZIndex,
-        fitHeight: (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_status_popup_suggestions') && (0, _fg.fg)('platform_editor_status_popup_suggestions_patch_1') ? fitHeight : 40,
+        fitHeight: (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_status_popup_suggestions') ? fitHeight : 40,
         mountTo: mountTo,
         boundariesElement: boundariesElement,
         scrollableElement: scrollableElement,

package/dist/es2019/ui/ContentComponent.js

@@ -4,7 +4,7 @@ import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { commitStatusPicker, updateStatus } from '../pm-plugins/actions';
-import { getSuggestedStatuses, MAX_SUGGESTED_STATUSES, MAX_SUGGESTED_STATUSES_OLD } from './getSuggestedStatuses';
+import { getSuggestedStatuses } from './getSuggestedStatuses';
 import StatusPicker from './statusPicker';
 /** Renders the status picker popup for the currently selected status node. */
 export function ContentComponent({
@@ -83,7 +83,6 @@ export function ContentComponent({
         text
       },
       doc: editorView.state.doc,
-      limit: fg('platform_editor_status_popup_suggestions_patch_1') ? MAX_SUGGESTED_STATUSES : MAX_SUGGESTED_STATUSES_OLD,
       shouldUppercaseText: fg('platform-dst-lozenge-tag-badge-visual-uplifts')
     });
   }, [showStatusPickerAt, editorView.state.doc]);

package/dist/es2019/ui/getSuggestedStatuses.js

@@ -1,7 +1,5 @@
 import { getLozengeAppearance } from '@atlaskit/status/status-colors';
 export const MAX_SUGGESTED_STATUSES = 20;
-// Remove when cleaning up `platform_editor_status_popup_suggestions_patch_1`.
-export const MAX_SUGGESTED_STATUSES_OLD = 7;
 
 // `color` may be a legacy name or a hex value that render the same hue (e.g. `green` and
 // `#D3F1A7` both resolve to `accent-lime`), so the key is built from the resolved appearance

package/dist/es2019/ui/statusPicker.js

@@ -82,9 +82,10 @@ const suggestedStatusesContainerAlignedBottomPaddingStyles = css({
 const suggestedStatusesContainerStyles = css({
   display: 'flex',
   flexDirection: 'column',
-  gap: "var(--ds-space-100, 8px)",
+  gap: "var(--ds-space-050, 4px)",
   margin: 0,
-  padding: `${"var(--ds-space-100, 8px)"} ${"var(--ds-space-150, 12px)"} ${"var(--ds-space-050, 4px)"}`
+  padding: `${"var(--ds-space-100, 8px)"} ${"var(--ds-space-150, 12px)"} ${"var(--ds-space-050, 4px)"}`,
+  paddingLeft: "var(--ds-space-100, 8px)"
 });
 
 // Fixed input plus capped scrolling color controls and suggestions. The ten-color picker is
@@ -103,31 +104,20 @@ const statusPickerWidthStylesOld = css({
 const statusPickerWidthStyles = css({
   width: `${STATUS_PICKER_TEN_COLOR_CONTENT_WIDTH}px`
 });
-
-// When cleaning up `platform_editor_status_popup_suggestions_patch_1`, merge this into
-// `suggestedStatusesContainerStyles` and remove its conditional style array.
-const suggestedStatusesContainerPatchStyles = css({
-  gap: "var(--ds-space-050, 4px)",
-  paddingLeft: "var(--ds-space-100, 8px)"
-});
 const suggestedStatusButtonStyles = css({
   background: 'transparent',
   border: 0,
   borderRadius: "var(--ds-radius-small, 3px)",
   cursor: 'pointer',
   justifyContent: 'flex-start',
+  // Allow this flex item to shrink so long statuses can truncate.
+  minWidth: 0,
   padding: 0,
   '&:focus-visible': {
     outline: `2px solid ${"var(--ds-border-focused, #0C66E4)"}`,
     outlineOffset: "var(--ds-space-025, 2px)"
   }
 });
-
-// Remove when cleaning up `platform_editor_status_popup_suggestions_patch_1`.
-const suggestedStatusButtonOldStyles = css({
-  display: 'flex',
-  width: '100%'
-});
 const suggestedStatusButtonWrapperStyles = css({
   alignSelf: 'flex-start',
   borderWidth: "var(--ds-border-width, 1px)",
@@ -147,13 +137,6 @@ const suggestedStatusButtonWrapperStyles = css({
   }
 });
 
-// When cleaning up `platform_editor_status_popup_suggestions_patch_1`, merge this into
-// `suggestedStatusButtonStyles` and remove its conditional style array.
-const suggestedStatusButtonPatchStyles = css({
-  // Allow this flex item to shrink so long statuses can truncate.
-  minWidth: 0
-});
-
 // eslint-disable-next-line @repo/internal/react/no-class-components
 class StatusPickerWithIntl extends React.Component {
   constructor(props) {
@@ -447,17 +430,17 @@ class StatusPickerWithIntl extends React.Component {
       color,
       text
     } = this.state;
-    const suggestionsPatchEnabled = isExperimentEnabled('platform_editor_status_popup_suggestions') && fg('platform_editor_status_popup_suggestions_patch_1');
+    const isSuggestionsEnabled = isExperimentEnabled('platform_editor_status_popup_suggestions');
     const isUpdateStatusColorsEnabled = isExperimentEnabled('platform_editor_update_status_colors') || isExperimentEnabled('platform_editor_update_status_colors_jira');
-    const suggestedStatusList = suggestedStatuses !== null && suggestedStatuses !== void 0 && suggestedStatuses.length && isExperimentEnabled('platform_editor_status_popup_suggestions') ? jsx("div", {
-      css: [suggestedStatusesContainerStyles, suggestionsPatchEnabled ? suggestedStatusesContainerPatchStyles : undefined, suggestionsPatchEnabled && (isUpdateStatusColorsEnabled || fg('platform_editor_status_popup_suggestions_patch_3')) ? suggestedStatusesContainerAlignedBottomPaddingStyles : undefined],
+    const suggestedStatusList = suggestedStatuses !== null && suggestedStatuses !== void 0 && suggestedStatuses.length && isSuggestionsEnabled ? jsx("div", {
+      css: [suggestedStatusesContainerStyles, isUpdateStatusColorsEnabled || fg('platform_editor_status_popup_suggestions_patch_3') ? suggestedStatusesContainerAlignedBottomPaddingStyles : undefined],
       "data-suggested-status-list": true
     }, suggestedStatuses.map((suggestedStatus, index) => jsx("div", {
-      css: suggestionsPatchEnabled ? suggestedStatusButtonWrapperStyles : undefined,
+      css: suggestedStatusButtonWrapperStyles,
       key: `${suggestedStatus.color}:${suggestedStatus.text}`
     }, jsx("button", {
       type: "button",
-      css: [suggestedStatusButtonStyles, suggestionsPatchEnabled ? suggestedStatusButtonPatchStyles : suggestedStatusButtonOldStyles],
+      css: suggestedStatusButtonStyles,
       onClick: () => this.onSuggestedStatusClick(suggestedStatus, index + 1),
       onKeyDown: this.handleSuggestedStatusKeyDown,
       "aria-label": suggestedStatus.displayText,
@@ -467,7 +450,7 @@ class StatusPickerWithIntl extends React.Component {
       isConstrainedToParent: true,
       text: suggestedStatus.displayText
     }))))) : null;
-    const pickerContent = jsx(React.Fragment, null, jsx(AkStatusPicker, {
+    const pickerContent = jsx(AkStatusPicker, {
       autoFocus: isNew || focusStatusInput,
       selectedColor: color,
       text: text,
@@ -476,13 +459,13 @@ class StatusPickerWithIntl extends React.Component {
       onTextChanged: this.onTextChanged,
       onEnter: this.onEnter,
       palette: isUpdateStatusColorsEnabled ? 'extended' : 'default',
-      scrollableContent: suggestionsPatchEnabled ? suggestedStatusList : undefined
-    }), suggestionsPatchEnabled ? null : suggestedStatusList);
+      scrollableContent: suggestedStatusList
+    });
     return jsx(UserIntentPopupWrapper, {
       api: api,
       userIntent: "statusPickerOpen"
     }, jsx("div", {
-      css: [fg('platform-dst-lozenge-tag-badge-visual-uplifts') ? pickerContainerStylesTeam26 : pickerContainerStyles, suggestionsPatchEnabled && isUpdateStatusColorsEnabled ? statusPickerWidthStyles : undefined, suggestionsPatchEnabled && !isUpdateStatusColorsEnabled ? statusPickerWidthStylesOld : undefined, suggestionsPatchEnabled && !!suggestedStatusList && (isUpdateStatusColorsEnabled || fg('platform_editor_status_popup_suggestions_patch_3')) ? pickerContainerNoBottomPaddingStyles : undefined],
+      css: [fg('platform-dst-lozenge-tag-badge-visual-uplifts') ? pickerContainerStylesTeam26 : pickerContainerStyles, isSuggestionsEnabled && isUpdateStatusColorsEnabled ? statusPickerWidthStyles : undefined, isSuggestionsEnabled && !isUpdateStatusColorsEnabled ? statusPickerWidthStylesOld : undefined, isSuggestionsEnabled && !!suggestedStatusList && (isUpdateStatusColorsEnabled || fg('platform_editor_status_popup_suggestions_patch_3')) ? pickerContainerNoBottomPaddingStyles : undefined],
       role: "none",
       ref: this.setRef(setOutsideClickTargetRef),
       onClick: this.handlePopupClick,
@@ -511,7 +494,7 @@ class StatusPickerWithIntl extends React.Component {
       handleClickOutside: this.handleClickOutside,
       handleEscapeKeydown: this.handleEscapeKeydown,
       zIndex: akEditorFloatingDialogZIndex,
-      fitHeight: isExperimentEnabled('platform_editor_status_popup_suggestions') && fg('platform_editor_status_popup_suggestions_patch_1') ? fitHeight : 40,
+      fitHeight: isExperimentEnabled('platform_editor_status_popup_suggestions') ? fitHeight : 40,
       mountTo: mountTo,
       boundariesElement: boundariesElement,
       scrollableElement: scrollableElement,

package/dist/esm/ui/ContentComponent.js

@@ -7,7 +7,7 @@ import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { commitStatusPicker, updateStatus } from '../pm-plugins/actions';
-import { getSuggestedStatuses, MAX_SUGGESTED_STATUSES, MAX_SUGGESTED_STATUSES_OLD } from './getSuggestedStatuses';
+import { getSuggestedStatuses } from './getSuggestedStatuses';
 import StatusPicker from './statusPicker';
 /** Renders the status picker popup for the currently selected status node. */
 export function ContentComponent(_ref) {
@@ -86,7 +86,6 @@ export function ContentComponent(_ref) {
         text: text
       },
       doc: editorView.state.doc,
-      limit: fg('platform_editor_status_popup_suggestions_patch_1') ? MAX_SUGGESTED_STATUSES : MAX_SUGGESTED_STATUSES_OLD,
       shouldUppercaseText: fg('platform-dst-lozenge-tag-badge-visual-uplifts')
     });
   }, [showStatusPickerAt, editorView.state.doc]);

package/dist/esm/ui/getSuggestedStatuses.js

@@ -5,8 +5,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { getLozengeAppearance } from '@atlaskit/status/status-colors';
 export var MAX_SUGGESTED_STATUSES = 20;
-// Remove when cleaning up `platform_editor_status_popup_suggestions_patch_1`.
-export var MAX_SUGGESTED_STATUSES_OLD = 7;
 
 // `color` may be a legacy name or a hex value that render the same hue (e.g. `green` and
 // `#D3F1A7` both resolve to `accent-lime`), so the key is built from the resolved appearance

package/dist/esm/ui/statusPicker.js

@@ -89,9 +89,10 @@ var suggestedStatusesContainerAlignedBottomPaddingStyles = css({
 var suggestedStatusesContainerStyles = css({
   display: 'flex',
   flexDirection: 'column',
-  gap: "var(--ds-space-100, 8px)",
+  gap: "var(--ds-space-050, 4px)",
   margin: 0,
-  padding: "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-150, 12px)", " ", "var(--ds-space-050, 4px)")
+  padding: "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-150, 12px)", " ", "var(--ds-space-050, 4px)"),
+  paddingLeft: "var(--ds-space-100, 8px)"
 });
 
 // Fixed input plus capped scrolling color controls and suggestions. The ten-color picker is
@@ -110,31 +111,20 @@ var statusPickerWidthStylesOld = css({
 var statusPickerWidthStyles = css({
   width: "".concat(STATUS_PICKER_TEN_COLOR_CONTENT_WIDTH, "px")
 });
-
-// When cleaning up `platform_editor_status_popup_suggestions_patch_1`, merge this into
-// `suggestedStatusesContainerStyles` and remove its conditional style array.
-var suggestedStatusesContainerPatchStyles = css({
-  gap: "var(--ds-space-050, 4px)",
-  paddingLeft: "var(--ds-space-100, 8px)"
-});
 var suggestedStatusButtonStyles = css({
   background: 'transparent',
   border: 0,
   borderRadius: "var(--ds-radius-small, 3px)",
   cursor: 'pointer',
   justifyContent: 'flex-start',
+  // Allow this flex item to shrink so long statuses can truncate.
+  minWidth: 0,
   padding: 0,
   '&:focus-visible': {
     outline: "2px solid ".concat("var(--ds-border-focused, #0C66E4)"),
     outlineOffset: "var(--ds-space-025, 2px)"
   }
 });
-
-// Remove when cleaning up `platform_editor_status_popup_suggestions_patch_1`.
-var suggestedStatusButtonOldStyles = css({
-  display: 'flex',
-  width: '100%'
-});
 var suggestedStatusButtonWrapperStyles = css({
   alignSelf: 'flex-start',
   borderWidth: "var(--ds-border-width, 1px)",
@@ -154,13 +144,6 @@ var suggestedStatusButtonWrapperStyles = css({
   }
 });
 
-// When cleaning up `platform_editor_status_popup_suggestions_patch_1`, merge this into
-// `suggestedStatusButtonStyles` and remove its conditional style array.
-var suggestedStatusButtonPatchStyles = css({
-  // Allow this flex item to shrink so long statuses can truncate.
-  minWidth: 0
-});
-
 // eslint-disable-next-line @repo/internal/react/no-class-components
 var StatusPickerWithIntl = /*#__PURE__*/function (_React$Component) {
   function StatusPickerWithIntl(props) {
@@ -470,18 +453,18 @@ var StatusPickerWithIntl = /*#__PURE__*/function (_React$Component) {
       var _this$state3 = this.state,
         color = _this$state3.color,
         text = _this$state3.text;
-      var suggestionsPatchEnabled = isExperimentEnabled('platform_editor_status_popup_suggestions') && fg('platform_editor_status_popup_suggestions_patch_1');
+      var isSuggestionsEnabled = isExperimentEnabled('platform_editor_status_popup_suggestions');
       var isUpdateStatusColorsEnabled = isExperimentEnabled('platform_editor_update_status_colors') || isExperimentEnabled('platform_editor_update_status_colors_jira');
-      var suggestedStatusList = suggestedStatuses !== null && suggestedStatuses !== void 0 && suggestedStatuses.length && isExperimentEnabled('platform_editor_status_popup_suggestions') ? jsx("div", {
-        css: [suggestedStatusesContainerStyles, suggestionsPatchEnabled ? suggestedStatusesContainerPatchStyles : undefined, suggestionsPatchEnabled && (isUpdateStatusColorsEnabled || fg('platform_editor_status_popup_suggestions_patch_3')) ? suggestedStatusesContainerAlignedBottomPaddingStyles : undefined],
+      var suggestedStatusList = suggestedStatuses !== null && suggestedStatuses !== void 0 && suggestedStatuses.length && isSuggestionsEnabled ? jsx("div", {
+        css: [suggestedStatusesContainerStyles, isUpdateStatusColorsEnabled || fg('platform_editor_status_popup_suggestions_patch_3') ? suggestedStatusesContainerAlignedBottomPaddingStyles : undefined],
         "data-suggested-status-list": true
       }, suggestedStatuses.map(function (suggestedStatus, index) {
         return jsx("div", {
-          css: suggestionsPatchEnabled ? suggestedStatusButtonWrapperStyles : undefined,
+          css: suggestedStatusButtonWrapperStyles,
           key: "".concat(suggestedStatus.color, ":").concat(suggestedStatus.text)
         }, jsx("button", {
           type: "button",
-          css: [suggestedStatusButtonStyles, suggestionsPatchEnabled ? suggestedStatusButtonPatchStyles : suggestedStatusButtonOldStyles],
+          css: suggestedStatusButtonStyles,
           onClick: function onClick() {
             return _this3.onSuggestedStatusClick(suggestedStatus, index + 1);
           },
@@ -494,7 +477,7 @@ var StatusPickerWithIntl = /*#__PURE__*/function (_React$Component) {
           text: suggestedStatus.displayText
         })));
       })) : null;
-      var pickerContent = jsx(React.Fragment, null, jsx(AkStatusPicker, {
+      var pickerContent = jsx(AkStatusPicker, {
         autoFocus: isNew || focusStatusInput,
         selectedColor: color,
         text: text,
@@ -503,13 +486,13 @@ var StatusPickerWithIntl = /*#__PURE__*/function (_React$Component) {
         onTextChanged: this.onTextChanged,
         onEnter: this.onEnter,
         palette: isUpdateStatusColorsEnabled ? 'extended' : 'default',
-        scrollableContent: suggestionsPatchEnabled ? suggestedStatusList : undefined
-      }), suggestionsPatchEnabled ? null : suggestedStatusList);
+        scrollableContent: suggestedStatusList
+      });
       return jsx(UserIntentPopupWrapper, {
         api: api,
         userIntent: "statusPickerOpen"
       }, jsx("div", {
-        css: [fg('platform-dst-lozenge-tag-badge-visual-uplifts') ? pickerContainerStylesTeam26 : pickerContainerStyles, suggestionsPatchEnabled && isUpdateStatusColorsEnabled ? statusPickerWidthStyles : undefined, suggestionsPatchEnabled && !isUpdateStatusColorsEnabled ? statusPickerWidthStylesOld : undefined, suggestionsPatchEnabled && !!suggestedStatusList && (isUpdateStatusColorsEnabled || fg('platform_editor_status_popup_suggestions_patch_3')) ? pickerContainerNoBottomPaddingStyles : undefined],
+        css: [fg('platform-dst-lozenge-tag-badge-visual-uplifts') ? pickerContainerStylesTeam26 : pickerContainerStyles, isSuggestionsEnabled && isUpdateStatusColorsEnabled ? statusPickerWidthStyles : undefined, isSuggestionsEnabled && !isUpdateStatusColorsEnabled ? statusPickerWidthStylesOld : undefined, isSuggestionsEnabled && !!suggestedStatusList && (isUpdateStatusColorsEnabled || fg('platform_editor_status_popup_suggestions_patch_3')) ? pickerContainerNoBottomPaddingStyles : undefined],
         role: "none",
         ref: this.setRef(setOutsideClickTargetRef),
         onClick: this.handlePopupClick,
@@ -539,7 +522,7 @@ var StatusPickerWithIntl = /*#__PURE__*/function (_React$Component) {
         handleClickOutside: this.handleClickOutside,
         handleEscapeKeydown: this.handleEscapeKeydown,
         zIndex: akEditorFloatingDialogZIndex,
-        fitHeight: isExperimentEnabled('platform_editor_status_popup_suggestions') && fg('platform_editor_status_popup_suggestions_patch_1') ? fitHeight : 40,
+        fitHeight: isExperimentEnabled('platform_editor_status_popup_suggestions') ? fitHeight : 40,
         mountTo: mountTo,
         boundariesElement: boundariesElement,
         scrollableElement: scrollableElement,

package/dist/types/ui/getSuggestedStatuses.d.ts

@@ -11,6 +11,5 @@ type GetSuggestedStatusesArgs = {
     shouldUppercaseText?: boolean;
 };
 export declare const MAX_SUGGESTED_STATUSES = 20;
-export declare const MAX_SUGGESTED_STATUSES_OLD = 7;
 export declare const getSuggestedStatuses: ({ currentPos, currentStatus, doc, limit, shouldUppercaseText, }: GetSuggestedStatusesArgs) => SuggestedStatus[];
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-status",
-	"version": "26.0.2",
+	"version": "27.0.0",
 	"description": "Status plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -24,11 +24,11 @@
 		"@atlaskit/adf-schema": "^57.7.0",
 		"@atlaskit/analytics-next": "^12.6.0",
 		"@atlaskit/browser-apis": "^1.2.0",
-		"@atlaskit/editor-plugin-analytics": "^25.0.0",
-		"@atlaskit/editor-plugin-block-controls": "^26.0.0",
-		"@atlaskit/editor-plugin-block-menu": "^24.0.0",
-		"@atlaskit/editor-plugin-selection": "^25.0.0",
-		"@atlaskit/editor-plugin-ui-control-registry": "^19.0.0",
+		"@atlaskit/editor-plugin-analytics": "^26.0.0",
+		"@atlaskit/editor-plugin-block-controls": "^27.0.0",
+		"@atlaskit/editor-plugin-block-menu": "^25.0.0",
+		"@atlaskit/editor-plugin-selection": "^26.0.0",
+		"@atlaskit/editor-plugin-ui-control-registry": "^20.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-shared-styles": "^4.3.0",
 		"@atlaskit/editor-toolbar": "^2.8.0",
@@ -38,14 +38,14 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/status": "^5.13.0",
-		"@atlaskit/tmp-editor-statsig": "^226.0.0",
-		"@atlaskit/tokens": "^20.3.0",
+		"@atlaskit/tmp-editor-statsig": "^227.0.0",
+		"@atlaskit/tokens": "^20.4.0",
 		"@atlaskit/visually-hidden": "^4.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^129.1.0",
+		"@atlaskit/editor-common": "^130.0.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -64,9 +64,6 @@
 		"platform-dst-lozenge-tag-badge-visual-uplifts": {
 			"type": "boolean"
 		},
-		"platform_editor_status_popup_suggestions_patch_1": {
-			"type": "boolean"
-		},
 		"platform_editor_status_popup_suggestions_patch_3": {
 			"type": "boolean"
 		}