@atlaskit/editor-common 78.36.2 → 78.36.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-common
 
+## 78.36.4
+
+### Patch Changes
+
+- [#95605](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/95605) [`ab6a0e7bac9c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ab6a0e7bac9c) - [ED-23098] Add support for background color mark to ADF utils and editor common validators
+- Updated dependencies
+
+## 78.36.3
+
+### Patch Changes
+
+- [#95258](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/95258) [`f40514ef08e3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f40514ef08e3) - Cleanup feature flag to allow grouping with editor dropdown menu.
+- Updated dependencies
+
 ## 78.36.2
 
 ### Patch Changes

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "78.36.2";
+var packageVersion = "78.36.4";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -20,7 +20,7 @@ var _Layer = _interopRequireDefault(require("../Layer"));
 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 */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.36.2";
+var packageVersion = "78.36.4";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/ui-menu/DropdownMenu/index.js

@@ -189,7 +189,7 @@ var DropdownMenuWrapper = exports.default = /*#__PURE__*/function (_PureComponen
         }
       }), (0, _react2.jsx)("div", {
         ref: this.popupRef
-      }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.menu.group-items') && (0, _react2.jsx)(_menu.MenuGroup, {
+      }, (0, _react2.jsx)(_menu.MenuGroup, {
         role: shouldUseDefaultRole ? 'group' : 'menu'
       }, items.map(function (group, index) {
         return (0, _react2.jsx)(_menu.Section, {
@@ -207,22 +207,7 @@ var DropdownMenuWrapper = exports.default = /*#__PURE__*/function (_PureComponen
             onMouseLeave: _this2.props.onMouseLeave
           });
         }));
-      })), !(0, _platformFeatureFlags.getBooleanFF)('platform.editor.menu.group-items') && items.map(function (group, index) {
-        return (0, _react2.jsx)(_menu.MenuGroup, {
-          key: index,
-          role: shouldUseDefaultRole ? 'group' : 'menu'
-        }, group.items.map(function (item) {
-          var _item$key2;
-          return (0, _react2.jsx)(DropdownMenuItem, {
-            key: (_item$key2 = item.key) !== null && _item$key2 !== void 0 ? _item$key2 : String(item.content),
-            item: item,
-            onItemActivated: _this2.props.onItemActivated,
-            shouldUseDefaultRole: _this2.props.shouldUseDefaultRole,
-            onMouseEnter: _this2.props.onMouseEnter,
-            onMouseLeave: _this2.props.onMouseLeave
-          });
-        }));
-      })))));
+      }))))));
     }
   }, {
     key: "render",
@@ -272,7 +257,7 @@ var DropdownMenuItemCustomComponent = /*#__PURE__*/_react.default.forwardRef(fun
   }), children);
 });
 function DropdownMenuItem(_ref) {
-  var _item$key3;
+  var _item$key2;
   var item = _ref.item,
     onItemActivated = _ref.onItemActivated,
     shouldUseDefaultRole = _ref.shouldUseDefaultRole,
@@ -306,7 +291,7 @@ function DropdownMenuItem(_ref) {
     onMouseDown: _handleSubmenuActive
   }, (0, _react2.jsx)(_menu.CustomItem, {
     item: item,
-    key: (_item$key3 = item.key) !== null && _item$key3 !== void 0 ? _item$key3 : String(item.content),
+    key: (_item$key2 = item.key) !== null && _item$key2 !== void 0 ? _item$key2 : String(item.content),
     testId: "dropdown-item__".concat(String(item.content)),
     role: shouldUseDefaultRole ? 'button' : 'menuitem',
     iconBefore: item.elemBefore,
@@ -336,9 +321,9 @@ function DropdownMenuItem(_ref) {
     }
   }, item.content));
   if (item.tooltipDescription) {
-    var _item$key4;
+    var _item$key3;
     return (0, _react2.jsx)(_tooltip.default, {
-      key: (_item$key4 = item.key) !== null && _item$key4 !== void 0 ? _item$key4 : String(item.content),
+      key: (_item$key3 = item.key) !== null && _item$key3 !== void 0 ? _item$key3 : String(item.content),
       content: item.tooltipDescription,
       position: item.tooltipPosition
     }, dropListItem);

package/dist/cjs/utils/validator.js

@@ -41,9 +41,9 @@ var ADFStages = exports.ADFStages = {
 
 /*
  * It's important that this order follows the marks rank defined here:
- * https://product-fabric.atlassian.net/wiki/spaces/E/pages/11174043/Document+structure#Documentstructure-Rank
+ * https://product-fabric.atlassian.net/wiki/spaces/ETEMP/pages/11174043/Atlassian+Document+Format+-+Internal+documentation#Rank
  */
-var markOrder = exports.markOrder = ['fragment', 'link', 'em', 'strong', 'textColor', 'strike', 'subsup', 'underline', 'code', 'confluenceInlineComment', 'annotation', 'dataConsumer'];
+var markOrder = exports.markOrder = ['fragment', 'link', 'em', 'strong', 'textColor', 'strike', 'subsup', 'underline', 'code', 'confluenceInlineComment', 'annotation', 'dataConsumer', 'backgroundColor'];
 var isSubSupType = exports.isSubSupType = function isSubSupType(type) {
   return type === 'sub' || type === 'sup';
 };
@@ -802,8 +802,7 @@ var getValidNode = exports.getValidNode = function getValidNode(originalNode) {
 
 /*
  * This method will validate a Mark according to the spec defined here
- * https://product-fabric.atlassian.net/wiki/spaces/E/pages/11174043/Document+structure#Documentstructure-Marks
- *
+ * https://developer.atlassian.com/platform/atlassian-document-format/concepts/document-structure/marks/overview/
  * This is also the place to handle backwards compatibility.
  *
  * If a node is not recognized or is missing required attributes, we should return null
@@ -909,6 +908,16 @@ var getValidMark = exports.getValidMark = function getValidMark(mark) {
             attrs: attrs
           };
         }
+      case 'backgroundColor':
+        {
+          if (attrs && TEXT_COLOR_PATTERN.test(attrs.color)) {
+            return {
+              type: type,
+              attrs: attrs
+            };
+          }
+          break;
+        }
     }
   }
   if (adfStage === 'stage0') {

package/dist/es2019/monitoring/error.js

@@ -1,6 +1,6 @@
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "78.36.2";
+const packageVersion = "78.36.4";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -7,7 +7,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "78.36.2";
+const packageVersion = "78.36.4";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/es2019/ui-menu/DropdownMenu/index.js

@@ -190,7 +190,7 @@ export default class DropdownMenuWrapper extends PureComponent {
       }
     }), jsx("div", {
       ref: this.popupRef
-    }, getBooleanFF('platform.editor.menu.group-items') && jsx(MenuGroup, {
+    }, jsx(MenuGroup, {
       role: shouldUseDefaultRole ? 'group' : 'menu'
     }, items.map((group, index) => jsx(Section, {
       hasSeparator: (section === null || section === void 0 ? void 0 : section.hasSeparator) && index > 0,
@@ -206,20 +206,7 @@ export default class DropdownMenuWrapper extends PureComponent {
         onMouseEnter: this.props.onMouseEnter,
         onMouseLeave: this.props.onMouseLeave
       });
-    })))), !getBooleanFF('platform.editor.menu.group-items') && items.map((group, index) => jsx(MenuGroup, {
-      key: index,
-      role: shouldUseDefaultRole ? 'group' : 'menu'
-    }, group.items.map(item => {
-      var _item$key2;
-      return jsx(DropdownMenuItem, {
-        key: (_item$key2 = item.key) !== null && _item$key2 !== void 0 ? _item$key2 : String(item.content),
-        item: item,
-        onItemActivated: this.props.onItemActivated,
-        shouldUseDefaultRole: this.props.shouldUseDefaultRole,
-        onMouseEnter: this.props.onMouseEnter,
-        onMouseLeave: this.props.onMouseLeave
-      });
-    })))))));
+    }))))))));
   }
   render() {
     const {
@@ -272,7 +259,7 @@ export function DropdownMenuItem({
   onMouseEnter,
   onMouseLeave
 }) {
-  var _item$key3;
+  var _item$key2;
   const [submenuActive, setSubmenuActive] = React.useState(false);
 
   // onClick and value.name are the action indicators in the handlers
@@ -296,7 +283,7 @@ export function DropdownMenuItem({
     onMouseDown: _handleSubmenuActive
   }, jsx(CustomItem, {
     item: item,
-    key: (_item$key3 = item.key) !== null && _item$key3 !== void 0 ? _item$key3 : String(item.content),
+    key: (_item$key2 = item.key) !== null && _item$key2 !== void 0 ? _item$key2 : String(item.content),
     testId: `dropdown-item__${String(item.content)}`,
     role: shouldUseDefaultRole ? 'button' : 'menuitem',
     iconBefore: item.elemBefore,
@@ -320,9 +307,9 @@ export function DropdownMenuItem({
     })
   }, item.content));
   if (item.tooltipDescription) {
-    var _item$key4;
+    var _item$key3;
     return jsx(Tooltip, {
-      key: (_item$key4 = item.key) !== null && _item$key4 !== void 0 ? _item$key4 : String(item.content),
+      key: (_item$key3 = item.key) !== null && _item$key3 !== void 0 ? _item$key3 : String(item.content),
       content: item.tooltipDescription,
       position: item.tooltipPosition
     }, dropListItem);

package/dist/es2019/utils/validator.js

@@ -30,9 +30,9 @@ export const ADFStages = {
 
 /*
  * It's important that this order follows the marks rank defined here:
- * https://product-fabric.atlassian.net/wiki/spaces/E/pages/11174043/Document+structure#Documentstructure-Rank
+ * https://product-fabric.atlassian.net/wiki/spaces/ETEMP/pages/11174043/Atlassian+Document+Format+-+Internal+documentation#Rank
  */
-export const markOrder = ['fragment', 'link', 'em', 'strong', 'textColor', 'strike', 'subsup', 'underline', 'code', 'confluenceInlineComment', 'annotation', 'dataConsumer'];
+export const markOrder = ['fragment', 'link', 'em', 'strong', 'textColor', 'strike', 'subsup', 'underline', 'code', 'confluenceInlineComment', 'annotation', 'dataConsumer', 'backgroundColor'];
 export const isSubSupType = type => {
   return type === 'sub' || type === 'sup';
 };
@@ -790,8 +790,7 @@ export const getValidNode = (originalNode, schema = defaultSchema, adfStage = 'f
 
 /*
  * This method will validate a Mark according to the spec defined here
- * https://product-fabric.atlassian.net/wiki/spaces/E/pages/11174043/Document+structure#Documentstructure-Marks
- *
+ * https://developer.atlassian.com/platform/atlassian-document-format/concepts/document-structure/marks/overview/
  * This is also the place to handle backwards compatibility.
  *
  * If a node is not recognized or is missing required attributes, we should return null
@@ -900,6 +899,16 @@ export const getValidMark = (mark, adfStage = 'final') => {
             attrs
           };
         }
+      case 'backgroundColor':
+        {
+          if (attrs && TEXT_COLOR_PATTERN.test(attrs.color)) {
+            return {
+              type,
+              attrs
+            };
+          }
+          break;
+        }
     }
   }
   if (adfStage === 'stage0') {

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ 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; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "78.36.2";
+var packageVersion = "78.36.4";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -15,7 +15,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.36.2";
+var packageVersion = "78.36.4";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/esm/ui-menu/DropdownMenu/index.js

@@ -179,7 +179,7 @@ var DropdownMenuWrapper = /*#__PURE__*/function (_PureComponent) {
         }
       }), jsx("div", {
         ref: this.popupRef
-      }, getBooleanFF('platform.editor.menu.group-items') && jsx(MenuGroup, {
+      }, jsx(MenuGroup, {
         role: shouldUseDefaultRole ? 'group' : 'menu'
       }, items.map(function (group, index) {
         return jsx(Section, {
@@ -197,22 +197,7 @@ var DropdownMenuWrapper = /*#__PURE__*/function (_PureComponent) {
             onMouseLeave: _this2.props.onMouseLeave
           });
         }));
-      })), !getBooleanFF('platform.editor.menu.group-items') && items.map(function (group, index) {
-        return jsx(MenuGroup, {
-          key: index,
-          role: shouldUseDefaultRole ? 'group' : 'menu'
-        }, group.items.map(function (item) {
-          var _item$key2;
-          return jsx(DropdownMenuItem, {
-            key: (_item$key2 = item.key) !== null && _item$key2 !== void 0 ? _item$key2 : String(item.content),
-            item: item,
-            onItemActivated: _this2.props.onItemActivated,
-            shouldUseDefaultRole: _this2.props.shouldUseDefaultRole,
-            onMouseEnter: _this2.props.onMouseEnter,
-            onMouseLeave: _this2.props.onMouseLeave
-          });
-        }));
-      })))));
+      }))))));
     }
   }, {
     key: "render",
@@ -263,7 +248,7 @@ var DropdownMenuItemCustomComponent = /*#__PURE__*/React.forwardRef(function (pr
   }), children);
 });
 export function DropdownMenuItem(_ref) {
-  var _item$key3;
+  var _item$key2;
   var item = _ref.item,
     onItemActivated = _ref.onItemActivated,
     shouldUseDefaultRole = _ref.shouldUseDefaultRole,
@@ -297,7 +282,7 @@ export function DropdownMenuItem(_ref) {
     onMouseDown: _handleSubmenuActive
   }, jsx(CustomItem, {
     item: item,
-    key: (_item$key3 = item.key) !== null && _item$key3 !== void 0 ? _item$key3 : String(item.content),
+    key: (_item$key2 = item.key) !== null && _item$key2 !== void 0 ? _item$key2 : String(item.content),
     testId: "dropdown-item__".concat(String(item.content)),
     role: shouldUseDefaultRole ? 'button' : 'menuitem',
     iconBefore: item.elemBefore,
@@ -327,9 +312,9 @@ export function DropdownMenuItem(_ref) {
     }
   }, item.content));
   if (item.tooltipDescription) {
-    var _item$key4;
+    var _item$key3;
     return jsx(Tooltip, {
-      key: (_item$key4 = item.key) !== null && _item$key4 !== void 0 ? _item$key4 : String(item.content),
+      key: (_item$key3 = item.key) !== null && _item$key3 !== void 0 ? _item$key3 : String(item.content),
       content: item.tooltipDescription,
       position: item.tooltipPosition
     }, dropListItem);

package/dist/esm/utils/validator.js

@@ -34,9 +34,9 @@ export var ADFStages = {
 
 /*
  * It's important that this order follows the marks rank defined here:
- * https://product-fabric.atlassian.net/wiki/spaces/E/pages/11174043/Document+structure#Documentstructure-Rank
+ * https://product-fabric.atlassian.net/wiki/spaces/ETEMP/pages/11174043/Atlassian+Document+Format+-+Internal+documentation#Rank
  */
-export var markOrder = ['fragment', 'link', 'em', 'strong', 'textColor', 'strike', 'subsup', 'underline', 'code', 'confluenceInlineComment', 'annotation', 'dataConsumer'];
+export var markOrder = ['fragment', 'link', 'em', 'strong', 'textColor', 'strike', 'subsup', 'underline', 'code', 'confluenceInlineComment', 'annotation', 'dataConsumer', 'backgroundColor'];
 export var isSubSupType = function isSubSupType(type) {
   return type === 'sub' || type === 'sup';
 };
@@ -795,8 +795,7 @@ export var getValidNode = function getValidNode(originalNode) {
 
 /*
  * This method will validate a Mark according to the spec defined here
- * https://product-fabric.atlassian.net/wiki/spaces/E/pages/11174043/Document+structure#Documentstructure-Marks
- *
+ * https://developer.atlassian.com/platform/atlassian-document-format/concepts/document-structure/marks/overview/
  * This is also the place to handle backwards compatibility.
  *
  * If a node is not recognized or is missing required attributes, we should return null
@@ -902,6 +901,16 @@ export var getValidMark = function getValidMark(mark) {
             attrs: attrs
           };
         }
+      case 'backgroundColor':
+        {
+          if (attrs && TEXT_COLOR_PATTERN.test(attrs.color)) {
+            return {
+              type: type,
+              attrs: attrs
+            };
+          }
+          break;
+        }
     }
   }
   if (adfStage === 'stage0') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "78.36.2",
+  "version": "78.36.4",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -108,7 +108,7 @@
     "@atlaskit/codemod-utils": "^4.2.0",
     "@atlaskit/custom-steps": "^0.1.0",
     "@atlaskit/editor-json-transformer": "^8.11.0",
-    "@atlaskit/editor-palette": "1.5.3",
+    "@atlaskit/editor-palette": "1.6.0",
     "@atlaskit/editor-prosemirror": "4.0.0",
     "@atlaskit/editor-shared-styles": "^2.10.0",
     "@atlaskit/editor-tables": "^2.7.0",
@@ -116,7 +116,7 @@
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/icon-object": "^6.3.0",
     "@atlaskit/in-product-testing": "^0.2.0",
-    "@atlaskit/link-datasource": "^1.29.0",
+    "@atlaskit/link-datasource": "^1.30.0",
     "@atlaskit/link-picker": "^1.36.0",
     "@atlaskit/media-card": "^77.11.0",
     "@atlaskit/media-client": "^26.3.0",
@@ -129,7 +129,7 @@
     "@atlaskit/mention": "^23.0.0",
     "@atlaskit/menu": "^2.2.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/primitives": "^5.6.0",
+    "@atlaskit/primitives": "^5.7.0",
     "@atlaskit/profilecard": "^19.11.0",
     "@atlaskit/section-message": "^6.4.0",
     "@atlaskit/smart-card": "^26.58.0",
@@ -231,9 +231,6 @@
     "platform.linking-platform.datasource-assets_objects": {
       "type": "boolean"
     },
-    "platform.editor.menu.group-items": {
-      "type": "boolean"
-    },
     "platform.editor.ordered-list-auto-join-improvements_mrlv5": {
       "type": "boolean"
     },