@atlaskit/editor-common 78.36.3 → 78.36.5

package/dist/cjs/media-single/CommentBadge.js

@@ -25,10 +25,12 @@ var commentBadgeWrapper = (0, _react2.css)({
   borderRadius: '3px',
   zIndex: _editorSharedStyles.akEditorUnitZIndex * 10
 });
-var commentBadgeEditorOverrides = (0, _react2.css)({
-  right: '14px',
-  zIndex: _constants.layers.card()
-});
+var commentBadgeEditorOverrides = function commentBadgeEditorOverrides(commentsOnMediaBugFixEnabled, badgeOffsetRight) {
+  return (0, _react2.css)({
+    right: commentsOnMediaBugFixEnabled ? badgeOffsetRight : '14px',
+    zIndex: _constants.layers.card()
+  });
+};
 var getBadgeSize = function getBadgeSize(width, height) {
   // width is the original width of image, not resized or currently rendered to user. Defaulting to medium for now
   return width && width < 70 || height && height < 70 ? 'small' : 'medium';
@@ -43,8 +45,8 @@ var CommentBadge = exports.CommentBadge = function CommentBadge(_ref) {
     onClick = _ref.onClick,
     onMouseEnter = _ref.onMouseEnter,
     onMouseLeave = _ref.onMouseLeave,
-    _ref$isEditor = _ref.isEditor,
-    isEditor = _ref$isEditor === void 0 ? false : _ref$isEditor;
+    badgeOffsetRight = _ref.badgeOffsetRight,
+    commentsOnMediaBugFixEnabled = _ref.commentsOnMediaBugFixEnabled;
   var _useState = (0, _react.useState)(getBadgeSize(width, height)),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     badgeSize = _useState2[0],
@@ -78,7 +80,7 @@ var CommentBadge = exports.CommentBadge = function CommentBadge(_ref) {
     }
   }, [status]);
   return (0, _react2.jsx)("div", {
-    css: isEditor ? [commentBadgeWrapper, commentBadgeEditorOverrides] : commentBadgeWrapper
+    css: badgeOffsetRight ? [commentBadgeWrapper, commentBadgeEditorOverrides(commentsOnMediaBugFixEnabled, badgeOffsetRight)] : commentBadgeWrapper
     // This is needed so that mediaWrapperStyle in editor/editor-common/src/ui/MediaSingle/styled.tsx
     // can target the correct div
     ,

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.3";
+var packageVersion = "78.36.5";
 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.3";
+var packageVersion = "78.36.5";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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/media-single/CommentBadge.js

@@ -16,8 +16,8 @@ const commentBadgeWrapper = css({
   borderRadius: '3px',
   zIndex: akEditorUnitZIndex * 10
 });
-const commentBadgeEditorOverrides = css({
-  right: '14px',
+const commentBadgeEditorOverrides = (commentsOnMediaBugFixEnabled, badgeOffsetRight) => css({
+  right: commentsOnMediaBugFixEnabled ? badgeOffsetRight : '14px',
   zIndex: layers.card()
 });
 const getBadgeSize = (width, height) => {
@@ -33,7 +33,8 @@ export const CommentBadge = ({
   onClick,
   onMouseEnter,
   onMouseLeave,
-  isEditor = false
+  badgeOffsetRight,
+  commentsOnMediaBugFixEnabled
 }) => {
   const [badgeSize, setBadgeSize] = useState(getBadgeSize(width, height));
   const title = intl.formatMessage(messages.viewCommentsOnMedia);
@@ -65,7 +66,7 @@ export const CommentBadge = ({
     }
   }, [status]);
   return jsx("div", {
-    css: isEditor ? [commentBadgeWrapper, commentBadgeEditorOverrides] : commentBadgeWrapper
+    css: badgeOffsetRight ? [commentBadgeWrapper, commentBadgeEditorOverrides(commentsOnMediaBugFixEnabled, badgeOffsetRight)] : commentBadgeWrapper
     // This is needed so that mediaWrapperStyle in editor/editor-common/src/ui/MediaSingle/styled.tsx
     // can target the correct div
     ,

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.3";
+const packageVersion = "78.36.5";
 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.3";
+const packageVersion = "78.36.5";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

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/media-single/CommentBadge.js

@@ -17,10 +17,12 @@ var commentBadgeWrapper = css({
   borderRadius: '3px',
   zIndex: akEditorUnitZIndex * 10
 });
-var commentBadgeEditorOverrides = css({
-  right: '14px',
-  zIndex: layers.card()
-});
+var commentBadgeEditorOverrides = function commentBadgeEditorOverrides(commentsOnMediaBugFixEnabled, badgeOffsetRight) {
+  return css({
+    right: commentsOnMediaBugFixEnabled ? badgeOffsetRight : '14px',
+    zIndex: layers.card()
+  });
+};
 var getBadgeSize = function getBadgeSize(width, height) {
   // width is the original width of image, not resized or currently rendered to user. Defaulting to medium for now
   return width && width < 70 || height && height < 70 ? 'small' : 'medium';
@@ -35,8 +37,8 @@ export var CommentBadge = function CommentBadge(_ref) {
     onClick = _ref.onClick,
     onMouseEnter = _ref.onMouseEnter,
     onMouseLeave = _ref.onMouseLeave,
-    _ref$isEditor = _ref.isEditor,
-    isEditor = _ref$isEditor === void 0 ? false : _ref$isEditor;
+    badgeOffsetRight = _ref.badgeOffsetRight,
+    commentsOnMediaBugFixEnabled = _ref.commentsOnMediaBugFixEnabled;
   var _useState = useState(getBadgeSize(width, height)),
     _useState2 = _slicedToArray(_useState, 2),
     badgeSize = _useState2[0],
@@ -70,7 +72,7 @@ export var CommentBadge = function CommentBadge(_ref) {
     }
   }, [status]);
   return jsx("div", {
-    css: isEditor ? [commentBadgeWrapper, commentBadgeEditorOverrides] : commentBadgeWrapper
+    css: badgeOffsetRight ? [commentBadgeWrapper, commentBadgeEditorOverrides(commentsOnMediaBugFixEnabled, badgeOffsetRight)] : commentBadgeWrapper
     // This is needed so that mediaWrapperStyle in editor/editor-common/src/ui/MediaSingle/styled.tsx
     // can target the correct div
     ,

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.3";
+var packageVersion = "78.36.5";
 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.3";
+var packageVersion = "78.36.5";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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/dist/types/media-single/CommentBadge.d.ts

@@ -12,5 +12,7 @@ export type CommentBadgeProps = {
     onMouseLeave?: (e: React.MouseEvent) => void;
     isEditor?: boolean;
     isDrafting?: boolean;
+    badgeOffsetRight?: string;
+    commentsOnMediaBugFixEnabled?: boolean;
 };
-export declare const CommentBadge: ({ intl, width, height, status, mediaElement, onClick, onMouseEnter, onMouseLeave, isEditor, }: CommentBadgeProps) => jsx.JSX.Element;
+export declare const CommentBadge: ({ intl, width, height, status, mediaElement, onClick, onMouseEnter, onMouseLeave, badgeOffsetRight, commentsOnMediaBugFixEnabled, }: CommentBadgeProps) => jsx.JSX.Element;

package/dist/types/types/feature-flags.d.ts

@@ -237,6 +237,14 @@ export type FeatureFlags = {
      * @default false
      */
     macroInteractionUpdates?: boolean;
+    /**
+    * @description
+    * Enables bug fix on media comments
+    *
+   //  * @see https://product-fabric.atlassian.net/browse/ED-23093
+    * @default false
+    */
+    commentsOnMediaBugFix?: boolean;
 };
 export type FeatureFlagKey = keyof FeatureFlags;
 export type GetEditorFeatureFlags = () => FeatureFlags;

package/dist/types-ts4.5/media-single/CommentBadge.d.ts

@@ -12,5 +12,7 @@ export type CommentBadgeProps = {
     onMouseLeave?: (e: React.MouseEvent) => void;
     isEditor?: boolean;
     isDrafting?: boolean;
+    badgeOffsetRight?: string;
+    commentsOnMediaBugFixEnabled?: boolean;
 };
-export declare const CommentBadge: ({ intl, width, height, status, mediaElement, onClick, onMouseEnter, onMouseLeave, isEditor, }: CommentBadgeProps) => jsx.JSX.Element;
+export declare const CommentBadge: ({ intl, width, height, status, mediaElement, onClick, onMouseEnter, onMouseLeave, badgeOffsetRight, commentsOnMediaBugFixEnabled, }: CommentBadgeProps) => jsx.JSX.Element;

package/dist/types-ts4.5/types/feature-flags.d.ts

@@ -237,6 +237,14 @@ export type FeatureFlags = {
      * @default false
      */
     macroInteractionUpdates?: boolean;
+    /**
+    * @description
+    * Enables bug fix on media comments
+    *
+   //  * @see https://product-fabric.atlassian.net/browse/ED-23093
+    * @default false
+    */
+    commentsOnMediaBugFix?: boolean;
 };
 export type FeatureFlagKey = keyof FeatureFlags;
 export type GetEditorFeatureFlags = () => FeatureFlags;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "78.36.3",
+  "version": "78.36.5",
   "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",
@@ -131,7 +131,7 @@
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/primitives": "^5.7.0",
     "@atlaskit/profilecard": "^19.11.0",
-    "@atlaskit/section-message": "^6.4.0",
+    "@atlaskit/section-message": "^6.5.0",
     "@atlaskit/smart-card": "^26.58.0",
     "@atlaskit/smart-user-picker": "^6.9.0",
     "@atlaskit/spinner": "^16.0.0",
@@ -139,7 +139,7 @@
     "@atlaskit/textfield": "^6.1.0",
     "@atlaskit/theme": "^12.7.0",
     "@atlaskit/tokens": "^1.44.0",
-    "@atlaskit/tooltip": "^18.2.0",
+    "@atlaskit/tooltip": "^18.3.0",
     "@atlaskit/ufo": "^0.2.0",
     "@atlaskit/width-detector": "^4.1.0",
     "@babel/runtime": "^7.0.0",