@atlaskit/editor-common 78.23.9 → 78.24.1

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-common
 
+## 78.24.1
+
+### Patch Changes
+
+- [#88742](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88742) [`6771cedeadd3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6771cedeadd3) - Add UI for comment badge in Renderer, clean up props
+
+## 78.24.0
+
+### Minor Changes
+
+- [#88295](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88295) [`6b703183b847`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6b703183b847) - [ux] Remove (Beta) from the /Assets and + Assets elements description for GA
+
+### Patch Changes
+
+- [#88323](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88323) [`98bac3c2f1ff`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/98bac3c2f1ff) - Update styles for annotation on media
+- [#88531](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88531) [`2362c633e4e9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2362c633e4e9) - Adds confluence-search modal integration
+- Updated dependencies
+
+## 78.23.10
+
+### Patch Changes
+
+- [#88137](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88137) [`0a744349d5e6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0a744349d5e6) - [ux] [ED-22833] Change icon used for comment button in media floating toolbar when there are active comments associated with the media. The icon will now be comment icon with a dot at top right corner.
+
 ## 78.23.9
 
 ### Patch Changes

package/dist/cjs/media/messages/comments.js

@@ -9,7 +9,12 @@ var commentMessages = exports.commentMessages = (0, _reactIntlNext.defineMessage
   addCommentOnMedia: {
     id: 'fabric.editor.addCommentOnMedia',
     defaultMessage: 'Add comment',
-    description: 'Add a comment for this image'
+    description: 'Add a comment for this media (image/video)'
+  },
+  viewCommentsOnMedia: {
+    id: 'fabric.editor.viewCommentOnMedia',
+    defaultMessage: 'View comment',
+    description: 'View a existing comment for this media (image/video)'
   },
   viewAndAddCommentsOnMedia: {
     id: 'fabric.editor.viewAndAddCommentsOnMedia',

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

@@ -10,6 +10,7 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
 var _button = require("@atlaskit/button");
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _comment = _interopRequireDefault(require("@atlaskit/icon/glyph/comment"));
 var _constants = require("@atlaskit/theme/constants");
 var _media = require("../media");
@@ -18,21 +19,28 @@ var _media = require("../media");
 var commentBadgeWrapper = (0, _react2.css)({
   position: 'absolute',
   // closest parent element with position relative is .resizer-hover-zone, which includes 10px padding
-  right: '14px',
+  right: '2px',
   top: '2px',
   borderRadius: '3px',
+  zIndex: _editorSharedStyles.akEditorUnitZIndex * 10
+});
+var commentBadgeEditorOverrides = (0, _react2.css)({
+  right: '14px',
   zIndex: _constants.layers.card()
 });
-var getDefaultSize = function getDefaultSize(node) {
+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 !node || node.attrs.width > 70 ? 'medium' : 'small';
+  return width && width < 70 || height && height < 70 ? 'small' : 'medium';
 };
 var CommentBadge = exports.CommentBadge = function CommentBadge(_ref) {
   var intl = _ref.intl,
-    mediaNode = _ref.mediaNode,
+    width = _ref.width,
+    height = _ref.height,
     mediaElement = _ref.mediaElement,
-    onClick = _ref.onClick;
-  var _useState = (0, _react.useState)(getDefaultSize(mediaNode)),
+    onClick = _ref.onClick,
+    _ref$isEditor = _ref.isEditor,
+    isEditor = _ref$isEditor === void 0 ? false : _ref$isEditor;
+  var _useState = (0, _react.useState)(getBadgeSize(width, height)),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     badgeSize = _useState2[0],
     setBadgeSize = _useState2[1];
@@ -44,7 +52,7 @@ var CommentBadge = exports.CommentBadge = function CommentBadge(_ref) {
       var _entry$contentRect = entry.contentRect,
         width = _entry$contentRect.width,
         height = _entry$contentRect.height;
-      setBadgeSize(width > 70 || height > 70 ? 'medium' : 'small');
+      setBadgeSize(getBadgeSize(width, height));
     }));
     if (mediaElement) {
       observer.observe(mediaElement);
@@ -55,7 +63,7 @@ var CommentBadge = exports.CommentBadge = function CommentBadge(_ref) {
   }, [mediaElement]);
   var badgeDimensions = badgeSize === 'medium' ? '24px' : '16px';
   return (0, _react2.jsx)("div", {
-    css: commentBadgeWrapper
+    css: isEditor ? [commentBadgeWrapper, commentBadgeEditorOverrides] : commentBadgeWrapper
   }, (0, _react2.jsx)(_button.CustomThemeButton, {
     style: {
       height: badgeDimensions,

package/dist/cjs/messages/card.js

@@ -106,6 +106,11 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'Insert Jira issues from Jira Cloud with enhanced search, filtering, and configuration.',
     description: 'Insert a jira datasource table'
   },
+  datasourceAssetsObjectsGeneralAvailability: {
+    id: 'fabric.editor.datasource.assetsObjectsGeneralAvailability',
+    defaultMessage: 'Assets',
+    description: 'Text displayed when selecting the type of data to include onto the page, in this case: JSM Assets objects.'
+  },
   datasourceAssetsObjects: {
     id: 'fabric.editor.datasource.assetsObjects',
     defaultMessage: 'Assets (Beta)',

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.23.9";
+var packageVersion = "78.24.1";
 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

@@ -22,7 +22,7 @@ var _templateObject, _templateObject2, _templateObject3;
 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.23.9";
+var packageVersion = "78.24.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/ui/MediaSingle/styled.js

@@ -180,7 +180,7 @@ var RenderFallbackContainer = function RenderFallbackContainer(_ref2) {
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Needs manual remediation
 var mediaWrapperStyle = exports.mediaWrapperStyle = function mediaWrapperStyle(props) {
-  return (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  position: relative;\n\n  ", "\n\n  /* Editor */\n  & > figure {\n    position: ", ";\n    height: 100%;\n    width: 100%;\n  }\n\n  & > div {\n    position: ", ";\n    height: 100%;\n    width: 100%;\n  }\n\n  &[data-node-type='embedCard'] > div {\n    width: 100%;\n  }\n\n  /* Renderer */\n  [data-node-type='media'] {\n    position: static !important;\n\n    > div {\n      position: absolute;\n      height: 100%;\n    }\n  }\n"])), RenderFallbackContainer(props), props.hasFallbackContainer ? 'absolute' : 'relative', props.hasFallbackContainer ? 'absolute' : 'relative');
+  return (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  position: relative;\n\n  ", "\n\n  /* Editor */\n  & > figure {\n    position: ", ";\n    height: 100%;\n    width: 100%;\n  }\n\n  & > div {\n    position: ", ";\n    height: 100%;\n    width: 100%;\n  }\n\n  & * [data-mark-annotation-type='inlineComment'] {\n    width: 100%;\n    height: 100%;\n  }\n\n  &[data-node-type='embedCard'] > div {\n    width: 100%;\n  }\n\n  /* Renderer */\n  [data-node-type='media'] {\n    position: static !important;\n\n    > div {\n      position: absolute;\n      height: 100%;\n    }\n  }\n"])), RenderFallbackContainer(props), props.hasFallbackContainer ? 'absolute' : 'relative', props.hasFallbackContainer ? 'absolute' : 'relative');
 };
 var MediaWrapper = exports.MediaWrapper = function MediaWrapper(_ref3) {
   var children = _ref3.children,

package/dist/cjs/utils/datasource.js

@@ -12,6 +12,8 @@ var getDatasourceType = exports.getDatasourceType = function getDatasourceType(d
       return 'jira';
     case _linkDatasource.ASSETS_LIST_OF_LINKS_DATASOURCE_ID:
       return 'assets';
+    case _linkDatasource.CONFLUENCE_SEARCH_DATASOURCE_ID:
+      return 'confluence-search';
     default:
       return undefined;
   }

package/dist/es2019/media/messages/comments.js

@@ -3,7 +3,12 @@ export const commentMessages = defineMessages({
   addCommentOnMedia: {
     id: 'fabric.editor.addCommentOnMedia',
     defaultMessage: 'Add comment',
-    description: 'Add a comment for this image'
+    description: 'Add a comment for this media (image/video)'
+  },
+  viewCommentsOnMedia: {
+    id: 'fabric.editor.viewCommentOnMedia',
+    defaultMessage: 'View comment',
+    description: 'View a existing comment for this media (image/video)'
   },
   viewAndAddCommentsOnMedia: {
     id: 'fabric.editor.viewAndAddCommentsOnMedia',

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

@@ -3,28 +3,35 @@ import { useEffect, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import debounce from 'lodash/debounce';
 import { CustomThemeButton } from '@atlaskit/button';
+import { akEditorUnitZIndex } from '@atlaskit/editor-shared-styles';
 import CommentIcon from '@atlaskit/icon/glyph/comment';
 import { layers } from '@atlaskit/theme/constants';
 import { commentMessages as messages } from '../media';
 const commentBadgeWrapper = css({
   position: 'absolute',
   // closest parent element with position relative is .resizer-hover-zone, which includes 10px padding
-  right: '14px',
+  right: '2px',
   top: '2px',
   borderRadius: '3px',
+  zIndex: akEditorUnitZIndex * 10
+});
+const commentBadgeEditorOverrides = css({
+  right: '14px',
   zIndex: layers.card()
 });
-const getDefaultSize = node => {
+const getBadgeSize = (width, height) => {
   // width is the original width of image, not resized or currently rendered to user. Defaulting to medium for now
-  return !node || node.attrs.width > 70 ? 'medium' : 'small';
+  return width && width < 70 || height && height < 70 ? 'small' : 'medium';
 };
 export const CommentBadge = ({
   intl,
-  mediaNode,
+  width,
+  height,
   mediaElement,
-  onClick
+  onClick,
+  isEditor = false
 }) => {
-  const [badgeSize, setBadgeSize] = useState(getDefaultSize(mediaNode));
+  const [badgeSize, setBadgeSize] = useState(getBadgeSize(width, height));
   const title = intl.formatMessage(messages.viewAndAddCommentsOnMedia);
   useEffect(() => {
     const observer = new ResizeObserver(debounce(entries => {
@@ -33,7 +40,7 @@ export const CommentBadge = ({
         width,
         height
       } = entry.contentRect;
-      setBadgeSize(width > 70 || height > 70 ? 'medium' : 'small');
+      setBadgeSize(getBadgeSize(width, height));
     }));
     if (mediaElement) {
       observer.observe(mediaElement);
@@ -44,7 +51,7 @@ export const CommentBadge = ({
   }, [mediaElement]);
   const badgeDimensions = badgeSize === 'medium' ? '24px' : '16px';
   return jsx("div", {
-    css: commentBadgeWrapper
+    css: isEditor ? [commentBadgeWrapper, commentBadgeEditorOverrides] : commentBadgeWrapper
   }, jsx(CustomThemeButton, {
     style: {
       height: badgeDimensions,

package/dist/es2019/messages/card.js

@@ -100,6 +100,11 @@ export const messages = defineMessages({
     defaultMessage: 'Insert Jira issues from Jira Cloud with enhanced search, filtering, and configuration.',
     description: 'Insert a jira datasource table'
   },
+  datasourceAssetsObjectsGeneralAvailability: {
+    id: 'fabric.editor.datasource.assetsObjectsGeneralAvailability',
+    defaultMessage: 'Assets',
+    description: 'Text displayed when selecting the type of data to include onto the page, in this case: JSM Assets objects.'
+  },
   datasourceAssetsObjects: {
     id: 'fabric.editor.datasource.assetsObjects',
     defaultMessage: 'Assets (Beta)',

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

package/dist/es2019/ui/MediaSingle/styled.js

@@ -220,6 +220,11 @@ export const mediaWrapperStyle = props => css`
     width: 100%;
   }
 
+  & * [data-mark-annotation-type='inlineComment'] {
+    width: 100%;
+    height: 100%;
+  }
+
   &[data-node-type='embedCard'] > div {
     width: 100%;
   }

package/dist/es2019/utils/datasource.js

@@ -1,4 +1,4 @@
-import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
+import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, CONFLUENCE_SEARCH_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export const getDatasourceType = datasourceId => {
   switch (datasourceId) {
@@ -6,6 +6,8 @@ export const getDatasourceType = datasourceId => {
       return 'jira';
     case ASSETS_LIST_OF_LINKS_DATASOURCE_ID:
       return 'assets';
+    case CONFLUENCE_SEARCH_DATASOURCE_ID:
+      return 'confluence-search';
     default:
       return undefined;
   }

package/dist/esm/media/messages/comments.js

@@ -3,7 +3,12 @@ export var commentMessages = defineMessages({
   addCommentOnMedia: {
     id: 'fabric.editor.addCommentOnMedia',
     defaultMessage: 'Add comment',
-    description: 'Add a comment for this image'
+    description: 'Add a comment for this media (image/video)'
+  },
+  viewCommentsOnMedia: {
+    id: 'fabric.editor.viewCommentOnMedia',
+    defaultMessage: 'View comment',
+    description: 'View a existing comment for this media (image/video)'
   },
   viewAndAddCommentsOnMedia: {
     id: 'fabric.editor.viewAndAddCommentsOnMedia',

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

@@ -4,27 +4,35 @@ import { useEffect, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import debounce from 'lodash/debounce';
 import { CustomThemeButton } from '@atlaskit/button';
+import { akEditorUnitZIndex } from '@atlaskit/editor-shared-styles';
 import CommentIcon from '@atlaskit/icon/glyph/comment';
 import { layers } from '@atlaskit/theme/constants';
 import { commentMessages as messages } from '../media';
 var commentBadgeWrapper = css({
   position: 'absolute',
   // closest parent element with position relative is .resizer-hover-zone, which includes 10px padding
-  right: '14px',
+  right: '2px',
   top: '2px',
   borderRadius: '3px',
+  zIndex: akEditorUnitZIndex * 10
+});
+var commentBadgeEditorOverrides = css({
+  right: '14px',
   zIndex: layers.card()
 });
-var getDefaultSize = function getDefaultSize(node) {
+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 !node || node.attrs.width > 70 ? 'medium' : 'small';
+  return width && width < 70 || height && height < 70 ? 'small' : 'medium';
 };
 export var CommentBadge = function CommentBadge(_ref) {
   var intl = _ref.intl,
-    mediaNode = _ref.mediaNode,
+    width = _ref.width,
+    height = _ref.height,
     mediaElement = _ref.mediaElement,
-    onClick = _ref.onClick;
-  var _useState = useState(getDefaultSize(mediaNode)),
+    onClick = _ref.onClick,
+    _ref$isEditor = _ref.isEditor,
+    isEditor = _ref$isEditor === void 0 ? false : _ref$isEditor;
+  var _useState = useState(getBadgeSize(width, height)),
     _useState2 = _slicedToArray(_useState, 2),
     badgeSize = _useState2[0],
     setBadgeSize = _useState2[1];
@@ -36,7 +44,7 @@ export var CommentBadge = function CommentBadge(_ref) {
       var _entry$contentRect = entry.contentRect,
         width = _entry$contentRect.width,
         height = _entry$contentRect.height;
-      setBadgeSize(width > 70 || height > 70 ? 'medium' : 'small');
+      setBadgeSize(getBadgeSize(width, height));
     }));
     if (mediaElement) {
       observer.observe(mediaElement);
@@ -47,7 +55,7 @@ export var CommentBadge = function CommentBadge(_ref) {
   }, [mediaElement]);
   var badgeDimensions = badgeSize === 'medium' ? '24px' : '16px';
   return jsx("div", {
-    css: commentBadgeWrapper
+    css: isEditor ? [commentBadgeWrapper, commentBadgeEditorOverrides] : commentBadgeWrapper
   }, jsx(CustomThemeButton, {
     style: {
       height: badgeDimensions,

package/dist/esm/messages/card.js

@@ -100,6 +100,11 @@ export var messages = defineMessages({
     defaultMessage: 'Insert Jira issues from Jira Cloud with enhanced search, filtering, and configuration.',
     description: 'Insert a jira datasource table'
   },
+  datasourceAssetsObjectsGeneralAvailability: {
+    id: 'fabric.editor.datasource.assetsObjectsGeneralAvailability',
+    defaultMessage: 'Assets',
+    description: 'Text displayed when selecting the type of data to include onto the page, in this case: JSM Assets objects.'
+  },
   datasourceAssetsObjects: {
     id: 'fabric.editor.datasource.assetsObjects',
     defaultMessage: 'Assets (Beta)',

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.23.9";
+var packageVersion = "78.24.1";
 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

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

package/dist/esm/ui/MediaSingle/styled.js

@@ -170,7 +170,7 @@ var RenderFallbackContainer = function RenderFallbackContainer(_ref2) {
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Needs manual remediation
 export var mediaWrapperStyle = function mediaWrapperStyle(props) {
-  return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  position: relative;\n\n  ", "\n\n  /* Editor */\n  & > figure {\n    position: ", ";\n    height: 100%;\n    width: 100%;\n  }\n\n  & > div {\n    position: ", ";\n    height: 100%;\n    width: 100%;\n  }\n\n  &[data-node-type='embedCard'] > div {\n    width: 100%;\n  }\n\n  /* Renderer */\n  [data-node-type='media'] {\n    position: static !important;\n\n    > div {\n      position: absolute;\n      height: 100%;\n    }\n  }\n"])), RenderFallbackContainer(props), props.hasFallbackContainer ? 'absolute' : 'relative', props.hasFallbackContainer ? 'absolute' : 'relative');
+  return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  position: relative;\n\n  ", "\n\n  /* Editor */\n  & > figure {\n    position: ", ";\n    height: 100%;\n    width: 100%;\n  }\n\n  & > div {\n    position: ", ";\n    height: 100%;\n    width: 100%;\n  }\n\n  & * [data-mark-annotation-type='inlineComment'] {\n    width: 100%;\n    height: 100%;\n  }\n\n  &[data-node-type='embedCard'] > div {\n    width: 100%;\n  }\n\n  /* Renderer */\n  [data-node-type='media'] {\n    position: static !important;\n\n    > div {\n      position: absolute;\n      height: 100%;\n    }\n  }\n"])), RenderFallbackContainer(props), props.hasFallbackContainer ? 'absolute' : 'relative', props.hasFallbackContainer ? 'absolute' : 'relative');
 };
 export var MediaWrapper = function MediaWrapper(_ref3) {
   var children = _ref3.children,

package/dist/esm/utils/datasource.js

@@ -1,4 +1,4 @@
-import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
+import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, CONFLUENCE_SEARCH_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export var getDatasourceType = function getDatasourceType(datasourceId) {
   switch (datasourceId) {
@@ -6,6 +6,8 @@ export var getDatasourceType = function getDatasourceType(datasourceId) {
       return 'jira';
     case ASSETS_LIST_OF_LINKS_DATASOURCE_ID:
       return 'assets';
+    case CONFLUENCE_SEARCH_DATASOURCE_ID:
+      return 'confluence-search';
     default:
       return undefined;
   }

package/dist/types/media/messages/comments.d.ts

@@ -4,6 +4,11 @@ export declare const commentMessages: {
         defaultMessage: string;
         description: string;
     };
+    viewCommentsOnMedia: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     viewAndAddCommentsOnMedia: {
         id: string;
         defaultMessage: string;

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

@@ -1,13 +1,12 @@
+/// <reference types="react" />
 import { jsx } from '@emotion/react';
 import type { IntlShape } from 'react-intl-next';
-import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-type CommentBadgeProps = {
+export type CommentBadgeProps = {
     intl: IntlShape;
-    mediaNode: PMNode | null;
-    view: EditorView;
-    mediaElement?: HTMLElement;
-    onClick: () => void;
+    width?: number;
+    height?: number;
+    mediaElement?: HTMLElement | null;
+    onClick: (e: React.MouseEvent) => void;
+    isEditor?: boolean;
 };
-export declare const CommentBadge: ({ intl, mediaNode, mediaElement, onClick, }: CommentBadgeProps) => jsx.JSX.Element;
-export {};
+export declare const CommentBadge: ({ intl, width, height, mediaElement, onClick, isEditor, }: CommentBadgeProps) => jsx.JSX.Element;

package/dist/types/media-single/index.d.ts

@@ -1,3 +1,4 @@
 export { MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH, MEDIA_SINGLE_SNAP_GAP, MEDIA_SINGLE_HIGHLIGHT_GAP, MEDIA_SINGLE_GUTTER_SIZE, MEDIA_SINGLE_RESIZE_THROTTLE_TIME, Layout as MediaSingleLayout, DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT, wrappedLayouts, CAPTION_PLACEHOLDER_ID, } from './constants';
 export { getMediaSinglePixelWidth, calcMediaSinglePixelWidth, calcMediaSingleMaxWidth, getMediaSingleInitialWidth, calculateOffsetLeft, roundToNearest, calcMinWidth, getMaxWidthForNestedNode, getMaxWidthForNestedNodeNext, currentMediaNodeWithPos, } from './utils';
 export { CommentBadge } from './CommentBadge';
+export type { CommentBadgeProps } from './CommentBadge';

package/dist/types/messages/card.d.ts

@@ -99,6 +99,11 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
+    datasourceAssetsObjectsGeneralAvailability: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     datasourceAssetsObjects: {
         id: string;
         defaultMessage: string;

package/dist/types/types/datasource.d.ts

@@ -1 +1 @@
-export type DatasourceModalType = 'jira' | 'assets';
+export type DatasourceModalType = 'jira' | 'assets' | 'confluence-search';

package/dist/types/types/floating-toolbar.d.ts

@@ -27,10 +27,18 @@ export interface DropdownOptionT<T extends {}> {
     selected?: boolean;
     disabled?: boolean;
     hidden?: boolean;
+    domItemOptions?: {
+        type: typeOption;
+    };
     testId?: string;
     tooltip?: string;
     elemAfter?: React.ReactNode;
 }
+export type typeOption = 
+/** Dropdown menu item type
+ * @default 'item'
+ */
+'item' | 'item-checkbox';
 export type DropdownOptions<T extends {}> = Array<DropdownOptionT<T>> | {
     render: (props: RenderOptionsPropsT<T>) => React.ReactElement<any> | null;
     height: number;

package/dist/types-ts4.5/media/messages/comments.d.ts

@@ -4,6 +4,11 @@ export declare const commentMessages: {
         defaultMessage: string;
         description: string;
     };
+    viewCommentsOnMedia: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     viewAndAddCommentsOnMedia: {
         id: string;
         defaultMessage: string;

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

@@ -1,13 +1,12 @@
+/// <reference types="react" />
 import { jsx } from '@emotion/react';
 import type { IntlShape } from 'react-intl-next';
-import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-type CommentBadgeProps = {
+export type CommentBadgeProps = {
     intl: IntlShape;
-    mediaNode: PMNode | null;
-    view: EditorView;
-    mediaElement?: HTMLElement;
-    onClick: () => void;
+    width?: number;
+    height?: number;
+    mediaElement?: HTMLElement | null;
+    onClick: (e: React.MouseEvent) => void;
+    isEditor?: boolean;
 };
-export declare const CommentBadge: ({ intl, mediaNode, mediaElement, onClick, }: CommentBadgeProps) => jsx.JSX.Element;
-export {};
+export declare const CommentBadge: ({ intl, width, height, mediaElement, onClick, isEditor, }: CommentBadgeProps) => jsx.JSX.Element;

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

@@ -1,3 +1,4 @@
 export { MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH, MEDIA_SINGLE_SNAP_GAP, MEDIA_SINGLE_HIGHLIGHT_GAP, MEDIA_SINGLE_GUTTER_SIZE, MEDIA_SINGLE_RESIZE_THROTTLE_TIME, Layout as MediaSingleLayout, DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT, wrappedLayouts, CAPTION_PLACEHOLDER_ID, } from './constants';
 export { getMediaSinglePixelWidth, calcMediaSinglePixelWidth, calcMediaSingleMaxWidth, getMediaSingleInitialWidth, calculateOffsetLeft, roundToNearest, calcMinWidth, getMaxWidthForNestedNode, getMaxWidthForNestedNodeNext, currentMediaNodeWithPos, } from './utils';
 export { CommentBadge } from './CommentBadge';
+export type { CommentBadgeProps } from './CommentBadge';

package/dist/types-ts4.5/messages/card.d.ts

@@ -99,6 +99,11 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
+    datasourceAssetsObjectsGeneralAvailability: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     datasourceAssetsObjects: {
         id: string;
         defaultMessage: string;

package/dist/types-ts4.5/types/datasource.d.ts

@@ -1 +1 @@
-export type DatasourceModalType = 'jira' | 'assets';
+export type DatasourceModalType = 'jira' | 'assets' | 'confluence-search';

package/dist/types-ts4.5/types/floating-toolbar.d.ts

@@ -27,10 +27,18 @@ export interface DropdownOptionT<T extends {}> {
     selected?: boolean;
     disabled?: boolean;
     hidden?: boolean;
+    domItemOptions?: {
+        type: typeOption;
+    };
     testId?: string;
     tooltip?: string;
     elemAfter?: React.ReactNode;
 }
+export type typeOption = 
+/** Dropdown menu item type
+ * @default 'item'
+ */
+'item' | 'item-checkbox';
 export type DropdownOptions<T extends {}> = Array<DropdownOptionT<T>> | {
     render: (props: RenderOptionsPropsT<T>) => React.ReactElement<any> | null;
     height: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "78.23.9",
+  "version": "78.24.1",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -113,7 +113,7 @@
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/icon-object": "^6.3.0",
     "@atlaskit/in-product-testing": "^0.2.0",
-    "@atlaskit/link-datasource": "^1.25.0",
+    "@atlaskit/link-datasource": "^1.26.0",
     "@atlaskit/link-picker": "^1.34.0",
     "@atlaskit/media-card": "^77.10.0",
     "@atlaskit/media-client": "^26.2.0",