@atlaskit/editor-plugin-status 19.0.11 → 20.0.1

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-plugin-status
 
+## 20.0.1
+
+### Patch Changes
+
+- [`8d37dc7e55d62`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8d37dc7e55d62) -
+  Clean up shipped experiment `platform_editor_block_menu`
+- Updated dependencies
+
+## 20.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 19.0.12
+
+### Patch Changes
+
+- [`01c0f8f495971`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/01c0f8f495971) -
+  Fix status suggestion popup showing duplicate entries when a legacy named color and its
+  equivalent-hue hex value (introduced by platform_editor_update_status_colors, e.g. green/#D3F1A7
+  or yellow/#FCE4A6) both appear in the document; suggestions now dedupe by resolved lozenge
+  appearance instead of the raw color attribute.
+- Updated dependencies
+
 ## 19.0.11
 
 ### Patch Changes

package/dist/cjs/statusPlugin.js

@@ -17,7 +17,6 @@ var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _utils = require("@atlaskit/editor-common/utils");
 var _comment = _interopRequireDefault(require("@atlaskit/icon/core/comment"));
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _actions = require("./pm-plugins/actions");
 var _turnInto = require("./utils/turnInto");
 var _keymap = require("./pm-plugins/keymap");
@@ -32,7 +31,7 @@ var statusPlugin = exports.statusPlugin = function statusPlugin(_ref) {
   var _api$analytics, _api$analytics2;
   var options = _ref.config,
     api = _ref.api;
-  if ((0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true) && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_turn_into_status')) {
+  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_turn_into_status')) {
     var _api$blockMenu;
     api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
       type: 'block-menu-item',

package/dist/cjs/ui/getSuggestedStatuses.js

@@ -7,16 +7,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.getSuggestedStatuses = exports.MAX_SUGGESTED_STATUSES_OLD = 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");
 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
+// rather than the raw attribute value — otherwise both variants would surface as suggestions.
 var getStatusKey = function getStatusKey(_ref) {
   var color = _ref.color,
     text = _ref.text;
-  return "".concat(color, ":").concat(text.trim().toLowerCase());
+  return "".concat((0, _statusColors.getLozengeAppearance)(color), ":").concat(text.trim().toLowerCase());
 };
 var getDisplayText = function getDisplayText(status, shouldUppercaseText) {
   return shouldUppercaseText && status.style !== 'mixedCase' ? status.text.toUpperCase() : status.text;

package/dist/es2019/statusPlugin.js

@@ -9,7 +9,6 @@ import { IconStatus } from '@atlaskit/editor-common/quick-insert';
 import { calculateToolbarPositionAboveSelection } from '@atlaskit/editor-common/utils';
 import CommentIcon from '@atlaskit/icon/core/comment';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { commitStatusPicker, insertStatus, removeStatus, updateStatusWithAnalytics } from './pm-plugins/actions';
 import { isStatusTurnIntoHidden } from './utils/turnInto';
 import { keymapPlugin } from './pm-plugins/keymap';
@@ -23,7 +22,7 @@ export const statusPlugin = ({
   api
 }) => {
   var _api$analytics, _api$analytics2;
-  if (expValEquals('platform_editor_block_menu', 'isEnabled', true) && isExperimentEnabled('platform_editor_turn_into_status')) {
+  if (isExperimentEnabled('platform_editor_turn_into_status')) {
     var _api$blockMenu;
     api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.registerBlockMenuComponents([{
       type: 'block-menu-item',

package/dist/es2019/ui/getSuggestedStatuses.js

@@ -1,10 +1,15 @@
+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
+// rather than the raw attribute value — otherwise both variants would surface as suggestions.
 const getStatusKey = ({
   color,
   text
-}) => `${color}:${text.trim().toLowerCase()}`;
+}) => `${getLozengeAppearance(color)}:${text.trim().toLowerCase()}`;
 const getDisplayText = (status, shouldUppercaseText) => shouldUppercaseText && status.style !== 'mixedCase' ? status.text.toUpperCase() : status.text;
 export const getSuggestedStatuses = ({
   currentPos,

package/dist/esm/statusPlugin.js

@@ -12,7 +12,6 @@ import { IconStatus } from '@atlaskit/editor-common/quick-insert';
 import { calculateToolbarPositionAboveSelection } from '@atlaskit/editor-common/utils';
 import CommentIcon from '@atlaskit/icon/core/comment';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { commitStatusPicker, insertStatus, removeStatus, updateStatusWithAnalytics } from './pm-plugins/actions';
 import { isStatusTurnIntoHidden } from './utils/turnInto';
 import { keymapPlugin } from './pm-plugins/keymap';
@@ -25,7 +24,7 @@ export var statusPlugin = function statusPlugin(_ref) {
   var _api$analytics, _api$analytics2;
   var options = _ref.config,
     api = _ref.api;
-  if (expValEquals('platform_editor_block_menu', 'isEnabled', true) && isExperimentEnabled('platform_editor_turn_into_status')) {
+  if (isExperimentEnabled('platform_editor_turn_into_status')) {
     var _api$blockMenu;
     api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
       type: 'block-menu-item',

package/dist/esm/ui/getSuggestedStatuses.js

@@ -3,13 +3,18 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _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
+// rather than the raw attribute value — otherwise both variants would surface as suggestions.
 var getStatusKey = function getStatusKey(_ref) {
   var color = _ref.color,
     text = _ref.text;
-  return "".concat(color, ":").concat(text.trim().toLowerCase());
+  return "".concat(getLozengeAppearance(color), ":").concat(text.trim().toLowerCase());
 };
 var getDisplayText = function getDisplayText(status, shouldUppercaseText) {
   return shouldUppercaseText && status.style !== 'mixedCase' ? status.text.toUpperCase() : status.text;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-status",
-	"version": "19.0.11",
+	"version": "20.0.1",
 	"description": "Status plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -24,12 +24,12 @@
 		"@atlaskit/adf-schema": "^57.5.0",
 		"@atlaskit/analytics-next": "^12.5.0",
 		"@atlaskit/browser-apis": "^1.2.0",
-		"@atlaskit/editor-plugin-analytics": "^18.0.0",
-		"@atlaskit/editor-plugin-block-controls": "^19.0.0",
-		"@atlaskit/editor-plugin-block-menu": "^17.0.0",
-		"@atlaskit/editor-plugin-selection": "^18.0.0",
-		"@atlaskit/editor-plugin-ui-control-registry": "^12.0.0",
-		"@atlaskit/editor-prosemirror": "^8.0.0",
+		"@atlaskit/editor-plugin-analytics": "^19.0.0",
+		"@atlaskit/editor-plugin-block-controls": "^20.0.0",
+		"@atlaskit/editor-plugin-block-menu": "^18.0.0",
+		"@atlaskit/editor-plugin-selection": "^19.0.0",
+		"@atlaskit/editor-plugin-ui-control-registry": "^13.0.0",
+		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-shared-styles": "^4.3.0",
 		"@atlaskit/editor-toolbar": "^2.6.0",
 		"@atlaskit/editor-ui-control-model": "^2.9.0",
@@ -37,15 +37,15 @@
 		"@atlaskit/icon-lab": "^7.9.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/status": "^5.11.0",
-		"@atlaskit/tmp-editor-statsig": "^199.0.0",
-		"@atlaskit/tokens": "^18.0.0",
+		"@atlaskit/status": "^5.12.0",
+		"@atlaskit/tmp-editor-statsig": "^200.0.0",
+		"@atlaskit/tokens": "^18.2.0",
 		"@atlaskit/visually-hidden": "^4.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^122.11.0",
+		"@atlaskit/editor-common": "^123.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"