@atlaskit/editor-common 88.11.0 → 88.12.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/editor-common
 
+## 88.12.1
+
+### Patch Changes
+
+- [`1269ffa635367`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1269ffa635367) -
+  Cleanup FF platform_editor_get_card_provider_from_config
+
+## 88.12.0
+
+### Minor Changes
+
+- [#137821](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137821)
+  [`e26174c7d02a6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e26174c7d02a6) -
+  ED-24631 Refactor how ExternalImageBadge and CommentBadge are rendered
+
+### Patch Changes
+
+- [#138136](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138136)
+  [`35938ecf46ba7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/35938ecf46ba7) -
+  [ED-24755] Implement insert functionality of element templates and fire document inserted event
+  with template IDs
+- [#138270](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138270)
+  [`0acb3673d32d9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0acb3673d32d9) -
+  Add insert menu to right rail for experiment
+- Updated dependencies
+
 ## 88.11.0
 
 ### Minor Changes

package/afm-post-office/tsconfig.json

@@ -41,6 +41,9 @@
     {
       "path": "../../../design-system/code/afm-post-office/tsconfig.json"
     },
+    {
+      "path": "../../../monorepo-tooling/codemod-utils/afm-post-office/tsconfig.json"
+    },
     {
       "path": "../../custom-steps/afm-post-office/tsconfig.json"
     },

package/dist/cjs/analytics/types/enums.js

@@ -169,6 +169,7 @@ var INPUT_METHOD = exports.INPUT_METHOD = /*#__PURE__*/function (INPUT_METHOD) {
   INPUT_METHOD["FLOATING_TB"] = "floatingToolbar";
   INPUT_METHOD["FORMATTING"] = "autoformatting";
   INPUT_METHOD["INSERT_MENU"] = "insertMenu";
+  INPUT_METHOD["INSERT_MENU_RIGHT_RAIL"] = "insertMenuRightRail";
   INPUT_METHOD["KEYBOARD"] = "keyboard";
   INPUT_METHOD["MEDIA_PICKER"] = "mediaPicker";
   INPUT_METHOD["MACRO_BROWSER"] = "macroBrowser";

package/dist/cjs/insert/index.js

@@ -246,6 +246,20 @@ var insertSelectedItem = exports.insertSelectedItem = function insertSelectedIte
        */
     } else if (node instanceof _model.Node && node.isInline || isInputFragment) {
       var fragment = isInputFragment ? node : _model.Fragment.fromArray([node, state.schema.text(' ')]);
+
+      // For platform_editor_element_level_templates experiment only
+      // clean up ticket ED-24873
+      // @ts-ignore
+      if (opts.isTemplate) {
+        return insertTemplateFragment({
+          fragment: fragment,
+          tr: tr,
+          position: {
+            start: start,
+            end: start
+          }
+        });
+      }
       tr = tr.replaceWith(start, start, fragment);
       if (opts.selectInlineNode) {
         // Select inserted node
@@ -291,4 +305,16 @@ function contentAllowedInCodeBlock(state) {
     return isAllowedChild = node.type === state.schema.nodes.listItem || node.type === state.schema.nodes.bulletList || node.type === state.schema.nodes.orderedList || node.type === state.schema.nodes.paragraph || node.isInline || node.type === state.schema.nodes.panel || node.isText;
   });
   return isAllowedChild;
-}
+}
+
+// For platform_editor_element_level_templates experiment only
+// clean up ticket ED-24873
+var insertTemplateFragment = function insertTemplateFragment(_ref3) {
+  var fragment = _ref3.fragment,
+    tr = _ref3.tr,
+    position = _ref3.position;
+  var start = position.start;
+  var trWithInsert = (0, _utils.safeInsert)(fragment, start)(tr);
+  tr.setSelection(trWithInsert.selection);
+  return tr;
+};

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

@@ -0,0 +1,61 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CommentBadgeNext = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _comment = _interopRequireDefault(require("@atlaskit/icon/glyph/comment"));
+var _primitives = require("@atlaskit/primitives");
+var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
+var _media = require("../media");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+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 baseStyles = (0, _primitives.xcss)({
+  borderRadius: 'border.radius'
+});
+var smallBadgeStyles = (0, _primitives.xcss)({
+  height: 'space.200',
+  width: 'space.200'
+});
+var mediumBadgeStyles = (0, _primitives.xcss)({
+  height: 'space.300',
+  width: 'space.300'
+});
+var CommentBadgeNext = exports.CommentBadgeNext = function CommentBadgeNext(_ref) {
+  var _ref$status = _ref.status,
+    status = _ref$status === void 0 ? 'default' : _ref$status,
+    onClick = _ref.onClick,
+    onMouseEnter = _ref.onMouseEnter,
+    onMouseLeave = _ref.onMouseLeave,
+    badgeSize = _ref.badgeSize;
+  var intl = (0, _reactIntlNext.useIntl)();
+  var title = intl.formatMessage(_media.commentMessages.viewCommentsOnMedia);
+  var colourToken = (0, _react.useMemo)(function () {
+    switch (status) {
+      case 'active':
+        return 'color.background.accent.yellow.subtlest.pressed';
+      case 'entered':
+        return 'color.background.accent.yellow.subtlest.hovered';
+      default:
+        return 'color.background.accent.yellow.subtlest';
+    }
+  }, [status]);
+  return /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+    position: "top",
+    content: title
+  }, /*#__PURE__*/_react.default.createElement(_primitives.Pressable, {
+    xcss: [baseStyles, badgeSize === 'medium' ? mediumBadgeStyles : smallBadgeStyles],
+    padding: "space.0",
+    onClick: onClick,
+    onMouseEnter: onMouseEnter,
+    onMouseLeave: onMouseLeave,
+    backgroundColor: colourToken
+  }, /*#__PURE__*/_react.default.createElement(_comment.default, {
+    label: title,
+    size: badgeSize
+  })));
+};

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

@@ -1,76 +1,33 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ExternalImageBadge = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireWildcard(require("react"));
-var _debounce = _interopRequireDefault(require("lodash/debounce"));
+var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _info = _interopRequireDefault(require("@atlaskit/icon/glyph/info"));
 var _primitives = require("@atlaskit/primitives");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _media = require("../media");
-var _CommentBadge = require("./CommentBadge");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-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 baseStyles = (0, _primitives.xcss)({
-  position: 'absolute',
-  top: 'space.025',
   borderRadius: 'border.radius',
   backgroundColor: 'elevation.surface',
-  zIndex: 'tooltip',
   lineHeight: "var(--ds-space-200, 16px)",
-  right: 'var(--right-offset)',
   cursor: 'pointer'
 });
 var ExternalImageBadge = exports.ExternalImageBadge = function ExternalImageBadge(_ref) {
-  var mediaWidth = _ref.mediaWidth,
-    mediaHeight = _ref.mediaHeight,
-    _ref$commentBadgeRigh = _ref.commentBadgeRightOffset,
-    commentBadgeRightOffset = _ref$commentBadgeRigh === void 0 ? 0 : _ref$commentBadgeRigh,
-    mediaElement = _ref.mediaElement;
+  var badgeSize = _ref.badgeSize;
   var intl = (0, _reactIntlNext.useIntl)();
   var message = intl.formatMessage(_media.externalMediaMessages.externalMediaFile);
-  var _useState = (0, _react.useState)((0, _CommentBadge.getBadgeSize)(mediaWidth, mediaHeight)),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    badgeSize = _useState2[0],
-    setBadgeSize = _useState2[1];
-  // detect resize of media element to adjust badge size
-  // will combine with the comment badge resize observer when refactoring in the future to avoid multiple resize observers
-  (0, _react.useEffect)(function () {
-    var observer = new ResizeObserver((0, _debounce.default)(function (entries) {
-      var _entries = (0, _slicedToArray2.default)(entries, 1),
-        entry = _entries[0];
-      var _entry$contentRect = entry.contentRect,
-        width = _entry$contentRect.width,
-        height = _entry$contentRect.height;
-      setBadgeSize((0, _CommentBadge.getBadgeSize)(width, height));
-    }));
-    if (mediaElement) {
-      observer.observe(mediaElement);
-    }
-    return function () {
-      observer.disconnect();
-    };
-  }, [mediaElement]);
-  var baseRightOffset = badgeSize === 'medium' ? 4 : 2;
-  var rightOffset = baseRightOffset + commentBadgeRightOffset;
-  return /*#__PURE__*/_react.default.createElement(_primitives.Box
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-  , {
-    style: {
-      '--right-offset': "".concat(rightOffset, "px")
-    },
+  return /*#__PURE__*/_react.default.createElement(_primitives.Box, {
     padding: badgeSize === 'medium' ? 'space.050' : 'space.0',
-    "data-external-image-badge": "true",
     xcss: baseStyles,
     tabIndex: 0
   }, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
-    content: message
+    content: message,
+    position: "top"
   }, /*#__PURE__*/_react.default.createElement(_info.default, {
     size: "small",
     label: message

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

@@ -0,0 +1,76 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MediaBadges = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _debounce = _interopRequireDefault(require("lodash/debounce"));
+var _primitives = require("@atlaskit/primitives");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+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 containerStyles = (0, _primitives.xcss)({
+  display: 'flex',
+  position: 'absolute',
+  top: 'space.0',
+  right: 'space.0',
+  lineHeight: "var(--ds-space-200, 16px)",
+  gap: 'space.025',
+  zIndex: 'card',
+  height: 'fit-content',
+  width: 'fit-content',
+  margin: 'space.075'
+});
+var resizeOffsetStyles = (0, _primitives.xcss)({
+  right: 'space.150'
+});
+var smallBadgeStyles = (0, _primitives.xcss)({
+  margin: 'space.025'
+});
+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';
+};
+var MediaBadges = exports.MediaBadges = function MediaBadges(_ref) {
+  var children = _ref.children,
+    mediaElement = _ref.mediaElement,
+    mediaWidth = _ref.mediaWidth,
+    mediaHeight = _ref.mediaHeight,
+    extendedResizeOffset = _ref.extendedResizeOffset;
+  var _useState = (0, _react.useState)(getBadgeSize(mediaWidth, mediaHeight)),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    badgeSize = _useState2[0],
+    setBadgeSize = _useState2[1];
+  (0, _react.useEffect)(function () {
+    var observer = new ResizeObserver((0, _debounce.default)(function (entries) {
+      var _entries = (0, _slicedToArray2.default)(entries, 1),
+        entry = _entries[0];
+      var _entry$contentRect = entry.contentRect,
+        width = _entry$contentRect.width,
+        height = _entry$contentRect.height;
+      setBadgeSize(getBadgeSize(width, height));
+    }));
+    if (mediaElement) {
+      observer.observe(mediaElement);
+    }
+    return function () {
+      observer.disconnect();
+    };
+  }, [mediaElement]);
+  if (typeof children === 'function') {
+    children = children({
+      badgeSize: badgeSize
+    });
+  }
+  if (!mediaElement || _react.default.Children.count(children) === 0) {
+    return null;
+  }
+  return /*#__PURE__*/_react.default.createElement(_primitives.Box, {
+    testId: "media-badges",
+    "data-media-badges": "true",
+    xcss: [containerStyles, extendedResizeOffset && resizeOffsetStyles, badgeSize === 'small' && smallBadgeStyles]
+  }, children);
+};

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

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "CommentBadge", {
     return _CommentBadge.CommentBadge;
   }
 });
+Object.defineProperty(exports, "CommentBadgeNext", {
+  enumerable: true,
+  get: function get() {
+    return _CommentBadgeNext.CommentBadgeNext;
+  }
+});
 Object.defineProperty(exports, "DEFAULT_IMAGE_HEIGHT", {
   enumerable: true,
   get: function get() {
@@ -69,6 +75,12 @@ Object.defineProperty(exports, "MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH", {
     return _constants.MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH;
   }
 });
+Object.defineProperty(exports, "MediaBadges", {
+  enumerable: true,
+  get: function get() {
+    return _MediaBadges.MediaBadges;
+  }
+});
 Object.defineProperty(exports, "MediaSingleLayout", {
   enumerable: true,
   get: function get() {
@@ -144,4 +156,6 @@ Object.defineProperty(exports, "wrappedLayouts", {
 var _constants = require("./constants");
 var _utils = require("./utils");
 var _CommentBadge = require("./CommentBadge");
-var _ExternalImageBadge = require("./ExternalImageBadge");
+var _CommentBadgeNext = require("./CommentBadgeNext");
+var _ExternalImageBadge = require("./ExternalImageBadge");
+var _MediaBadges = require("./MediaBadges");

package/dist/cjs/messages/insert-block.js

@@ -16,6 +16,11 @@ var toolbarInsertBlockMessages = exports.toolbarInsertBlockMessages = (0, _react
     defaultMessage: 'Create and assign action items',
     description: ''
   },
+  closeInsertRightRail: {
+    id: 'fabric.editor.insertRightRail.close',
+    defaultMessage: 'Close',
+    description: 'Close button label'
+  },
   link: {
     id: 'fabric.editor.link',
     defaultMessage: 'Link',
@@ -36,6 +41,11 @@ var toolbarInsertBlockMessages = exports.toolbarInsertBlockMessages = (0, _react
     defaultMessage: 'Add image, video, or file',
     description: 'Insert one or more files, videos or images'
   },
+  insertRightRailTitle: {
+    id: 'fabric.editor.insertRightRail.title',
+    defaultMessage: 'Insert',
+    description: 'Insert a node into the document'
+  },
   insertMediaFromUrl: {
     id: 'fabric.editor.insertMediaFromUrl',
     defaultMessage: 'Image from link',

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,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 = "88.11.0";
+var packageVersion = "88.12.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

@@ -25,7 +25,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "88.11.0";
+var packageVersion = "88.12.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -211,7 +211,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\tposition: relative;\n\n\t", "\n\n\t/* Editor */\n  & > figure {\n\t\tposition: ", ";\n\t\theight: 100%;\n\t\twidth: 100%;\n\t}\n\n\t// Comments on media project adds comment badge as child of the media wrapper,\n\t// thus we need to exclude it so that style is applied to intended div\n\t& > div:not([data-comment-badge='true'], [data-external-image-badge='true']) {\n\t\tposition: ", ";\n\t\theight: 100%;\n\t\twidth: 100%;\n\t}\n\n\t& * [data-mark-annotation-type='inlineComment'] {\n\t\twidth: 100%;\n\t\theight: 100%;\n\t}\n\n\t&[data-node-type='embedCard'] > div {\n\t\twidth: 100%;\n\t}\n\n\t/* Renderer */\n\t[data-node-type='media'] {\n\t\tposition: static !important;\n\n\t\t> div {\n\t\t\tposition: absolute;\n\t\t\theight: 100%;\n\t\t}\n\t}\n"])), RenderFallbackContainer(props), props.hasFallbackContainer ? 'absolute' : 'relative', props.hasFallbackContainer ? 'absolute' : 'relative');
+  return (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n\tposition: relative;\n\n\t", "\n\n\t/* Editor */\n  & > figure {\n\t\tposition: ", ";\n\t\theight: 100%;\n\t\twidth: 100%;\n\t}\n\n\t// Comments on media project adds comment badge as child of the media wrapper,\n\t// thus we need to exclude it so that style is applied to intended div\n\t// remove [data-comment-badge='true'] when ff platform_editor_insert_media_plugin_phase_one is cleaned up\n\t& > div:not([data-comment-badge='true'], [data-media-badges='true']) {\n\t\tposition: ", ";\n\t\theight: 100%;\n\t\twidth: 100%;\n\t}\n\n\t& * [data-mark-annotation-type='inlineComment'] {\n\t\twidth: 100%;\n\t\theight: 100%;\n\t}\n\n\t&[data-node-type='embedCard'] > div {\n\t\twidth: 100%;\n\t}\n\n\t/* Renderer */\n\t[data-node-type='media'] {\n\t\tposition: static !important;\n\n\t\t> div {\n\t\t\tposition: absolute;\n\t\t\theight: 100%;\n\t\t}\n\t}\n"])), RenderFallbackContainer(props), props.hasFallbackContainer ? 'absolute' : 'relative', props.hasFallbackContainer ? 'absolute' : 'relative');
 };
 var MediaWrapper = exports.MediaWrapper = function MediaWrapper(_ref3) {
   var children = _ref3.children,

package/dist/es2019/analytics/types/enums.js

@@ -163,6 +163,7 @@ export let INPUT_METHOD = /*#__PURE__*/function (INPUT_METHOD) {
   INPUT_METHOD["FLOATING_TB"] = "floatingToolbar";
   INPUT_METHOD["FORMATTING"] = "autoformatting";
   INPUT_METHOD["INSERT_MENU"] = "insertMenu";
+  INPUT_METHOD["INSERT_MENU_RIGHT_RAIL"] = "insertMenuRightRail";
   INPUT_METHOD["KEYBOARD"] = "keyboard";
   INPUT_METHOD["MEDIA_PICKER"] = "mediaPicker";
   INPUT_METHOD["MACRO_BROWSER"] = "macroBrowser";

package/dist/es2019/insert/index.js

@@ -239,6 +239,20 @@ export const insertSelectedItem = (maybeNode, opts = {}) => (state, tr, start) =
      */
   } else if (node instanceof Node && node.isInline || isInputFragment) {
     const fragment = isInputFragment ? node : Fragment.fromArray([node, state.schema.text(' ')]);
+
+    // For platform_editor_element_level_templates experiment only
+    // clean up ticket ED-24873
+    // @ts-ignore
+    if (opts.isTemplate) {
+      return insertTemplateFragment({
+        fragment,
+        tr,
+        position: {
+          start,
+          end: start
+        }
+      });
+    }
     tr = tr.replaceWith(start, start, fragment);
     if (opts.selectInlineNode) {
       // Select inserted node
@@ -285,4 +299,19 @@ export function contentAllowedInCodeBlock(state) {
     return isAllowedChild = node.type === state.schema.nodes.listItem || node.type === state.schema.nodes.bulletList || node.type === state.schema.nodes.orderedList || node.type === state.schema.nodes.paragraph || node.isInline || node.type === state.schema.nodes.panel || node.isText;
   });
   return isAllowedChild;
-}
+}
+
+// For platform_editor_element_level_templates experiment only
+// clean up ticket ED-24873
+const insertTemplateFragment = ({
+  fragment,
+  tr,
+  position
+}) => {
+  const {
+    start
+  } = position;
+  const trWithInsert = pmSafeInsert(fragment, start)(tr);
+  tr.setSelection(trWithInsert.selection);
+  return tr;
+};

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

@@ -0,0 +1,51 @@
+import React, { useMemo } from 'react';
+import { useIntl } from 'react-intl-next';
+import CommentIcon from '@atlaskit/icon/glyph/comment';
+import { Pressable, xcss } from '@atlaskit/primitives';
+import Tooltip from '@atlaskit/tooltip';
+import { commentMessages as messages } from '../media';
+const baseStyles = xcss({
+  borderRadius: 'border.radius'
+});
+const smallBadgeStyles = xcss({
+  height: 'space.200',
+  width: 'space.200'
+});
+const mediumBadgeStyles = xcss({
+  height: 'space.300',
+  width: 'space.300'
+});
+export const CommentBadgeNext = ({
+  status = 'default',
+  onClick,
+  onMouseEnter,
+  onMouseLeave,
+  badgeSize
+}) => {
+  const intl = useIntl();
+  const title = intl.formatMessage(messages.viewCommentsOnMedia);
+  const colourToken = useMemo(() => {
+    switch (status) {
+      case 'active':
+        return 'color.background.accent.yellow.subtlest.pressed';
+      case 'entered':
+        return 'color.background.accent.yellow.subtlest.hovered';
+      default:
+        return 'color.background.accent.yellow.subtlest';
+    }
+  }, [status]);
+  return /*#__PURE__*/React.createElement(Tooltip, {
+    position: "top",
+    content: title
+  }, /*#__PURE__*/React.createElement(Pressable, {
+    xcss: [baseStyles, badgeSize === 'medium' ? mediumBadgeStyles : smallBadgeStyles],
+    padding: "space.0",
+    onClick: onClick,
+    onMouseEnter: onMouseEnter,
+    onMouseLeave: onMouseLeave,
+    backgroundColor: colourToken
+  }, /*#__PURE__*/React.createElement(CommentIcon, {
+    label: title,
+    size: badgeSize
+  })));
+};

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

@@ -1,62 +1,27 @@
-import React, { useEffect, useState } from 'react';
-import debounce from 'lodash/debounce';
+import React from 'react';
 import { useIntl } from 'react-intl-next';
 import InfoIcon from '@atlaskit/icon/glyph/info';
 import { Box, xcss } from '@atlaskit/primitives';
 import Tooltip from '@atlaskit/tooltip';
 import { externalMediaMessages } from '../media';
-import { getBadgeSize } from './CommentBadge';
 const baseStyles = xcss({
-  position: 'absolute',
-  top: 'space.025',
   borderRadius: 'border.radius',
   backgroundColor: 'elevation.surface',
-  zIndex: 'tooltip',
   lineHeight: "var(--ds-space-200, 16px)",
-  right: 'var(--right-offset)',
   cursor: 'pointer'
 });
 export const ExternalImageBadge = ({
-  mediaWidth,
-  mediaHeight,
-  commentBadgeRightOffset = 0,
-  mediaElement
+  badgeSize
 }) => {
   const intl = useIntl();
   const message = intl.formatMessage(externalMediaMessages.externalMediaFile);
-  const [badgeSize, setBadgeSize] = useState(getBadgeSize(mediaWidth, mediaHeight));
-  // detect resize of media element to adjust badge size
-  // will combine with the comment badge resize observer when refactoring in the future to avoid multiple resize observers
-  useEffect(() => {
-    const observer = new ResizeObserver(debounce(entries => {
-      const [entry] = entries;
-      const {
-        width,
-        height
-      } = entry.contentRect;
-      setBadgeSize(getBadgeSize(width, height));
-    }));
-    if (mediaElement) {
-      observer.observe(mediaElement);
-    }
-    return () => {
-      observer.disconnect();
-    };
-  }, [mediaElement]);
-  const baseRightOffset = badgeSize === 'medium' ? 4 : 2;
-  const rightOffset = baseRightOffset + commentBadgeRightOffset;
-  return /*#__PURE__*/React.createElement(Box
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-  , {
-    style: {
-      '--right-offset': `${rightOffset}px`
-    },
+  return /*#__PURE__*/React.createElement(Box, {
     padding: badgeSize === 'medium' ? 'space.050' : 'space.0',
-    "data-external-image-badge": "true",
     xcss: baseStyles,
     tabIndex: 0
   }, /*#__PURE__*/React.createElement(Tooltip, {
-    content: message
+    content: message,
+    position: "top"
   }, /*#__PURE__*/React.createElement(InfoIcon, {
     size: "small",
     label: message

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

@@ -0,0 +1,63 @@
+import React, { useEffect, useState } from 'react';
+import debounce from 'lodash/debounce';
+import { Box, xcss } from '@atlaskit/primitives';
+const containerStyles = xcss({
+  display: 'flex',
+  position: 'absolute',
+  top: 'space.0',
+  right: 'space.0',
+  lineHeight: "var(--ds-space-200, 16px)",
+  gap: 'space.025',
+  zIndex: 'card',
+  height: 'fit-content',
+  width: 'fit-content',
+  margin: 'space.075'
+});
+const resizeOffsetStyles = xcss({
+  right: 'space.150'
+});
+const smallBadgeStyles = xcss({
+  margin: 'space.025'
+});
+const 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';
+};
+export const MediaBadges = ({
+  children,
+  mediaElement,
+  mediaWidth,
+  mediaHeight,
+  extendedResizeOffset
+}) => {
+  const [badgeSize, setBadgeSize] = useState(getBadgeSize(mediaWidth, mediaHeight));
+  useEffect(() => {
+    const observer = new ResizeObserver(debounce(entries => {
+      const [entry] = entries;
+      const {
+        width,
+        height
+      } = entry.contentRect;
+      setBadgeSize(getBadgeSize(width, height));
+    }));
+    if (mediaElement) {
+      observer.observe(mediaElement);
+    }
+    return () => {
+      observer.disconnect();
+    };
+  }, [mediaElement]);
+  if (typeof children === 'function') {
+    children = children({
+      badgeSize
+    });
+  }
+  if (!mediaElement || React.Children.count(children) === 0) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(Box, {
+    testId: "media-badges",
+    "data-media-badges": "true",
+    xcss: [containerStyles, extendedResizeOffset && resizeOffsetStyles, badgeSize === 'small' && smallBadgeStyles]
+  }, children);
+};

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

@@ -1,4 +1,6 @@
 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 { ExternalImageBadge } from './ExternalImageBadge';
+export { CommentBadgeNext } from './CommentBadgeNext';
+export { ExternalImageBadge } from './ExternalImageBadge';
+export { MediaBadges } from './MediaBadges';