@atlaskit/editor-common 94.3.1 → 94.4.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-common
 
+## 94.4.0
+
+### Minor Changes
+
+- [#156360](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/156360)
+  [`482dbb03dbf68`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/482dbb03dbf68) -
+  [ux] Update mediaSingle and embedCard to set wrap layout z-index under FG
+
+### Patch Changes
+
+- [#156974](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/156974)
+  [`e23605a60e753`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e23605a60e753) -
+  Add four and five column support for layout sections
+- Updated dependencies
+
 ## 94.3.1
 
 ### Patch Changes

package/dist/cjs/analytics/types/node-events.js

@@ -11,6 +11,8 @@ var LAYOUT_TYPE = exports.LAYOUT_TYPE = /*#__PURE__*/function (LAYOUT_TYPE) {
   LAYOUT_TYPE["LEFT_SIDEBAR"] = "twoColumnsLeftSidebar";
   LAYOUT_TYPE["RIGHT_SIDEBAR"] = "twoColumnsRightSidebar";
   LAYOUT_TYPE["THREE_WITH_SIDEBARS"] = "threeColumnsWithSidebars ";
+  LAYOUT_TYPE["FOUR_COLS_EQUAL"] = "fourColumnsEqual";
+  LAYOUT_TYPE["FIVE_COLS_EQUAL"] = "fiveColumnsEqual";
   return LAYOUT_TYPE;
 }({});
 var SMART_LINK_TYPE = exports.SMART_LINK_TYPE = /*#__PURE__*/function (SMART_LINK_TYPE) {

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 && {}.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 = "94.3.1";
+var packageVersion = "94.4.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/styles/index.js

@@ -273,6 +273,12 @@ Object.defineProperty(exports, "mediaSingleSharedStyle", {
     return _mediaSingle.mediaSingleSharedStyle;
   }
 });
+Object.defineProperty(exports, "mediaSingleSharedStyleNew", {
+  enumerable: true,
+  get: function get() {
+    return _mediaSingle.mediaSingleSharedStyleNew;
+  }
+});
 Object.defineProperty(exports, "paragraphSharedStyles", {
   enumerable: true,
   get: function get() {

package/dist/cjs/styles/shared/embedCard.js

@@ -5,30 +5,57 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.embedSpacingStyles = exports.embedCardStyles = void 0;
 var _react = require("@emotion/react");
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-var embedCardStyles = exports.embedCardStyles = (0, _react.css)({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '.ProseMirror': {
+var embedCardStyles = exports.embedCardStyles = function embedCardStyles() {
+  return (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_3') ? (0, _react.css)({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    ".embedCardView-content-wrap[layout^='wrap-']": {
-      maxWidth: '100%'
-    },
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    ".embedCardView-content-wrap[layout='wrap-left']": {
-      float: 'left'
-    },
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    ".embedCardView-content-wrap[layout='wrap-right']": {
-      float: 'right'
-    },
+    '.ProseMirror': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout^='wrap-']": {
+        maxWidth: '100%',
+        position: 'relative',
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+        zIndex: _editorSharedStyles.akEditorWrappedNodeZIndex
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout='wrap-left']": {
+        float: 'left'
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout='wrap-right']": {
+        float: 'right'
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout='wrap-right'] + .embedCardView-content-wrap[layout='wrap-left']": {
+        clear: 'both'
+      }
+    }
+  }) : (0, _react.css)({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    ".embedCardView-content-wrap[layout='wrap-right'] + .embedCardView-content-wrap[layout='wrap-left']": {
-      clear: 'both'
+    '.ProseMirror': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout^='wrap-']": {
+        maxWidth: '100%'
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout='wrap-left']": {
+        float: 'left'
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout='wrap-right']": {
+        float: 'right'
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout='wrap-right'] + .embedCardView-content-wrap[layout='wrap-left']": {
+        clear: 'both'
+      }
     }
-  }
-});
+  });
+};
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var embedSpacingStyles = exports.embedSpacingStyles = (0, _react.css)({

package/dist/cjs/styles/shared/media-single.js

@@ -4,10 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.richMediaClassName = exports.mediaSingleSharedStyle = void 0;
+exports.richMediaClassName = exports.mediaSingleSharedStyleNew = exports.mediaSingleSharedStyle = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
-var _css; // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _css, _css2; // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var richMediaClassName = exports.richMediaClassName = 'rich-media-item';
 var wrappedMediaBreakoutPoint = 410;
 var mediaSingleSharedStyle = exports.mediaSingleSharedStyle = (0, _react.css)((_css = {}, (0, _defineProperty2.default)(_css, "li .".concat(richMediaClassName), {
@@ -52,5 +53,51 @@ var mediaSingleSharedStyle = exports.mediaSingleSharedStyle = (0, _react.css)((_
     margin: "var(--ds-space-150, 12px)".concat(" 0")
   }
 }), _css));
+var mediaSingleSharedStyleNew = exports.mediaSingleSharedStyleNew = (0, _react.css)((_css2 = {}, (0, _defineProperty2.default)(_css2, "li .".concat(richMediaClassName), {
+  margin: 0
+}), (0, _defineProperty2.default)(_css2, '&.ua-chrome li > .mediaSingleView-content-wrap::before', {
+  content: "''",
+  display: 'block',
+  height: 0
+}), (0, _defineProperty2.default)(_css2, '&.ua-firefox', {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '.mediaSingleView-content-wrap': {
+    userSelect: 'none'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '.captionView-content-wrap': {
+    userSelect: 'text'
+  }
+}), (0, _defineProperty2.default)(_css2, ".mediaSingleView-content-wrap[layout^='wrap-']", {
+  position: 'relative',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+  zIndex: _editorSharedStyles.akEditorWrappedNodeZIndex
+}), (0, _defineProperty2.default)(_css2, ".mediaSingleView-content-wrap[layout='center']", {
+  clear: 'both'
+}), (0, _defineProperty2.default)(_css2, "table .".concat(richMediaClassName), {
+  marginTop: "var(--ds-space-150, 12px)",
+  marginBottom: "var(--ds-space-150, 12px)",
+  clear: 'both',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.image-wrap-left[data-layout], &.image-wrap-right[data-layout]': {
+    clear: 'none',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+    '&:first-child': {
+      marginTop: "var(--ds-space-150, 12px)"
+    }
+  }
+}), (0, _defineProperty2.default)(_css2, ".".concat(richMediaClassName, ".image-wrap-right + .").concat(richMediaClassName, ".image-wrap-left"), {
+  clear: 'both'
+}), (0, _defineProperty2.default)(_css2, ".".concat(richMediaClassName, ".image-wrap-left + .").concat(richMediaClassName, ".image-wrap-right, .").concat(richMediaClassName, ".image-wrap-right + .").concat(richMediaClassName, ".image-wrap-left, .").concat(richMediaClassName, ".image-wrap-left + .").concat(richMediaClassName, ".image-wrap-left, .").concat(richMediaClassName, ".image-wrap-right + .").concat(richMediaClassName, ".image-wrap-right"), {
+  marginRight: 0,
+  marginLeft: 0
+}), (0, _defineProperty2.default)(_css2, "@media all and (max-width: ".concat(wrappedMediaBreakoutPoint, "px)"), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  "div.mediaSingleView-content-wrap[layout='wrap-left'], div.mediaSingleView-content-wrap[data-layout='wrap-left'], div.mediaSingleView-content-wrap[layout='wrap-right'], div.mediaSingleView-content-wrap[data-layout='wrap-right']": {
+    float: 'none',
+    overflow: 'auto',
+    margin: "var(--ds-space-150, 12px)".concat(" 0")
+  }
+}), _css2));
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766

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

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

package/dist/es2019/analytics/types/node-events.js

@@ -5,6 +5,8 @@ export let LAYOUT_TYPE = /*#__PURE__*/function (LAYOUT_TYPE) {
   LAYOUT_TYPE["LEFT_SIDEBAR"] = "twoColumnsLeftSidebar";
   LAYOUT_TYPE["RIGHT_SIDEBAR"] = "twoColumnsRightSidebar";
   LAYOUT_TYPE["THREE_WITH_SIDEBARS"] = "threeColumnsWithSidebars ";
+  LAYOUT_TYPE["FOUR_COLS_EQUAL"] = "fourColumnsEqual";
+  LAYOUT_TYPE["FIVE_COLS_EQUAL"] = "fiveColumnsEqual";
   return LAYOUT_TYPE;
 }({});
 export let SMART_LINK_TYPE = /*#__PURE__*/function (SMART_LINK_TYPE) {

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 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 = "94.3.1";
+const packageVersion = "94.4.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/styles/index.js

@@ -3,7 +3,7 @@ export { backgroundColorStyles } from './shared/background-color';
 export { tableSharedStyle, tableMarginTop, tableMarginBottom, tableMarginSides, tableCellMinWidth, tableNewColumnMinWidth, tableCellBorderWidth, calcTableWidth, TableSharedCssClassName, tableResizeHandleWidth, tableCellPadding, tableMarginTopWithControl } from './shared/table';
 export { AnnotationSharedClassNames, BlockAnnotationSharedClassNames, AnnotationSharedCSSByState, annotationSharedStyles } from './shared/annotation';
 export { columnLayoutSharedStyle } from './shared/column-layout';
-export { mediaSingleSharedStyle, richMediaClassName } from './shared/media-single';
+export { mediaSingleSharedStyle, mediaSingleSharedStyleNew, richMediaClassName } from './shared/media-single';
 export { blockquoteSharedStyles } from './shared/blockquote';
 export { headingsSharedStyles } from './shared/headings';
 export { ruleSharedStyles } from './shared/rule';

package/dist/es2019/styles/shared/embedCard.js

@@ -1,7 +1,32 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
+import { akEditorWrappedNodeZIndex } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export const embedCardStyles = css({
+export const embedCardStyles = () => fg('platform_editor_element_dnd_nested_fix_patch_3') ? css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '.ProseMirror': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    ".embedCardView-content-wrap[layout^='wrap-']": {
+      maxWidth: '100%',
+      position: 'relative',
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+      zIndex: akEditorWrappedNodeZIndex
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    ".embedCardView-content-wrap[layout='wrap-left']": {
+      float: 'left'
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    ".embedCardView-content-wrap[layout='wrap-right']": {
+      float: 'right'
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    ".embedCardView-content-wrap[layout='wrap-right'] + .embedCardView-content-wrap[layout='wrap-left']": {
+      clear: 'both'
+    }
+  }
+}) : css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '.ProseMirror': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766

package/dist/es2019/styles/shared/media-single.js

@@ -1,5 +1,6 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
+import { akEditorWrappedNodeZIndex } from '@atlaskit/editor-shared-styles';
 const richMediaClassName = 'rich-media-item';
 const wrappedMediaBreakoutPoint = 410;
 const mediaSingleSharedStyle = css({
@@ -62,6 +63,72 @@ const mediaSingleSharedStyle = css({
     }
   }
 });
+const mediaSingleSharedStyleNew = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  [`li .${richMediaClassName}`]: {
+    margin: 0
+  },
+  // Hack for chrome to fix media single position inside a list when media is the first child
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.ua-chrome li > .mediaSingleView-content-wrap::before': {
+    content: "''",
+    display: 'block',
+    height: 0
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.ua-firefox': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.mediaSingleView-content-wrap': {
+      userSelect: 'none'
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.captionView-content-wrap': {
+      userSelect: 'text'
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  ".mediaSingleView-content-wrap[layout^='wrap-']": {
+    position: 'relative',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+    zIndex: akEditorWrappedNodeZIndex
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  ".mediaSingleView-content-wrap[layout='center']": {
+    clear: 'both'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  [`table .${richMediaClassName}`]: {
+    marginTop: "var(--ds-space-150, 12px)",
+    marginBottom: "var(--ds-space-150, 12px)",
+    clear: 'both',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '&.image-wrap-left[data-layout], &.image-wrap-right[data-layout]': {
+      clear: 'none',
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+      '&:first-child': {
+        marginTop: "var(--ds-space-150, 12px)"
+      }
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  [`.${richMediaClassName}.image-wrap-right + .${richMediaClassName}.image-wrap-left`]: {
+    clear: 'both'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  [`.${richMediaClassName}.image-wrap-left + .${richMediaClassName}.image-wrap-right, .${richMediaClassName}.image-wrap-right + .${richMediaClassName}.image-wrap-left, .${richMediaClassName}.image-wrap-left + .${richMediaClassName}.image-wrap-left, .${richMediaClassName}.image-wrap-right + .${richMediaClassName}.image-wrap-right`]: {
+    marginRight: 0,
+    marginLeft: 0
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  [`@media all and (max-width: ${wrappedMediaBreakoutPoint}px)`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    "div.mediaSingleView-content-wrap[layout='wrap-left'], div.mediaSingleView-content-wrap[data-layout='wrap-left'], div.mediaSingleView-content-wrap[layout='wrap-right'], div.mediaSingleView-content-wrap[data-layout='wrap-right']": {
+      float: 'none',
+      overflow: 'auto',
+      margin: `${"var(--ds-space-150, 12px)"} 0`
+    }
+  }
+});
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export { mediaSingleSharedStyle, richMediaClassName };
+export { mediaSingleSharedStyle, mediaSingleSharedStyleNew, richMediaClassName };

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

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "94.3.1";
+const packageVersion = "94.4.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/esm/analytics/types/node-events.js

@@ -5,6 +5,8 @@ export var LAYOUT_TYPE = /*#__PURE__*/function (LAYOUT_TYPE) {
   LAYOUT_TYPE["LEFT_SIDEBAR"] = "twoColumnsLeftSidebar";
   LAYOUT_TYPE["RIGHT_SIDEBAR"] = "twoColumnsRightSidebar";
   LAYOUT_TYPE["THREE_WITH_SIDEBARS"] = "threeColumnsWithSidebars ";
+  LAYOUT_TYPE["FOUR_COLS_EQUAL"] = "fourColumnsEqual";
+  LAYOUT_TYPE["FIVE_COLS_EQUAL"] = "fiveColumnsEqual";
   return LAYOUT_TYPE;
 }({});
 export var SMART_LINK_TYPE = /*#__PURE__*/function (SMART_LINK_TYPE) {

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 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 = "94.3.1";
+var packageVersion = "94.4.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/styles/index.js

@@ -3,7 +3,7 @@ export { backgroundColorStyles } from './shared/background-color';
 export { tableSharedStyle, tableMarginTop, tableMarginBottom, tableMarginSides, tableCellMinWidth, tableNewColumnMinWidth, tableCellBorderWidth, calcTableWidth, TableSharedCssClassName, tableResizeHandleWidth, tableCellPadding, tableMarginTopWithControl } from './shared/table';
 export { AnnotationSharedClassNames, BlockAnnotationSharedClassNames, AnnotationSharedCSSByState, annotationSharedStyles } from './shared/annotation';
 export { columnLayoutSharedStyle } from './shared/column-layout';
-export { mediaSingleSharedStyle, richMediaClassName } from './shared/media-single';
+export { mediaSingleSharedStyle, mediaSingleSharedStyleNew, richMediaClassName } from './shared/media-single';
 export { blockquoteSharedStyles } from './shared/blockquote';
 export { headingsSharedStyles } from './shared/headings';
 export { ruleSharedStyles } from './shared/rule';

package/dist/esm/styles/shared/embedCard.js

@@ -1,27 +1,54 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
+import { akEditorWrappedNodeZIndex } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export var embedCardStyles = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '.ProseMirror': {
+export var embedCardStyles = function embedCardStyles() {
+  return fg('platform_editor_element_dnd_nested_fix_patch_3') ? css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    ".embedCardView-content-wrap[layout^='wrap-']": {
-      maxWidth: '100%'
-    },
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    ".embedCardView-content-wrap[layout='wrap-left']": {
-      float: 'left'
-    },
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    ".embedCardView-content-wrap[layout='wrap-right']": {
-      float: 'right'
-    },
+    '.ProseMirror': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout^='wrap-']": {
+        maxWidth: '100%',
+        position: 'relative',
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+        zIndex: akEditorWrappedNodeZIndex
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout='wrap-left']": {
+        float: 'left'
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout='wrap-right']": {
+        float: 'right'
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout='wrap-right'] + .embedCardView-content-wrap[layout='wrap-left']": {
+        clear: 'both'
+      }
+    }
+  }) : css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-    ".embedCardView-content-wrap[layout='wrap-right'] + .embedCardView-content-wrap[layout='wrap-left']": {
-      clear: 'both'
+    '.ProseMirror': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout^='wrap-']": {
+        maxWidth: '100%'
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout='wrap-left']": {
+        float: 'left'
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout='wrap-right']": {
+        float: 'right'
+      },
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+      ".embedCardView-content-wrap[layout='wrap-right'] + .embedCardView-content-wrap[layout='wrap-left']": {
+        clear: 'both'
+      }
     }
-  }
-});
+  });
+};
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var embedSpacingStyles = css({

package/dist/esm/styles/shared/media-single.js

@@ -1,7 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _css;
+var _css, _css2;
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
+import { akEditorWrappedNodeZIndex } from '@atlaskit/editor-shared-styles';
 var richMediaClassName = 'rich-media-item';
 var wrappedMediaBreakoutPoint = 410;
 var mediaSingleSharedStyle = css((_css = {}, _defineProperty(_css, "li .".concat(richMediaClassName), {
@@ -46,6 +47,52 @@ var mediaSingleSharedStyle = css((_css = {}, _defineProperty(_css, "li .".concat
     margin: "var(--ds-space-150, 12px)".concat(" 0")
   }
 }), _css));
+var mediaSingleSharedStyleNew = css((_css2 = {}, _defineProperty(_css2, "li .".concat(richMediaClassName), {
+  margin: 0
+}), _defineProperty(_css2, '&.ua-chrome li > .mediaSingleView-content-wrap::before', {
+  content: "''",
+  display: 'block',
+  height: 0
+}), _defineProperty(_css2, '&.ua-firefox', {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '.mediaSingleView-content-wrap': {
+    userSelect: 'none'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '.captionView-content-wrap': {
+    userSelect: 'text'
+  }
+}), _defineProperty(_css2, ".mediaSingleView-content-wrap[layout^='wrap-']", {
+  position: 'relative',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+  zIndex: akEditorWrappedNodeZIndex
+}), _defineProperty(_css2, ".mediaSingleView-content-wrap[layout='center']", {
+  clear: 'both'
+}), _defineProperty(_css2, "table .".concat(richMediaClassName), {
+  marginTop: "var(--ds-space-150, 12px)",
+  marginBottom: "var(--ds-space-150, 12px)",
+  clear: 'both',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.image-wrap-left[data-layout], &.image-wrap-right[data-layout]': {
+    clear: 'none',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+    '&:first-child': {
+      marginTop: "var(--ds-space-150, 12px)"
+    }
+  }
+}), _defineProperty(_css2, ".".concat(richMediaClassName, ".image-wrap-right + .").concat(richMediaClassName, ".image-wrap-left"), {
+  clear: 'both'
+}), _defineProperty(_css2, ".".concat(richMediaClassName, ".image-wrap-left + .").concat(richMediaClassName, ".image-wrap-right, .").concat(richMediaClassName, ".image-wrap-right + .").concat(richMediaClassName, ".image-wrap-left, .").concat(richMediaClassName, ".image-wrap-left + .").concat(richMediaClassName, ".image-wrap-left, .").concat(richMediaClassName, ".image-wrap-right + .").concat(richMediaClassName, ".image-wrap-right"), {
+  marginRight: 0,
+  marginLeft: 0
+}), _defineProperty(_css2, "@media all and (max-width: ".concat(wrappedMediaBreakoutPoint, "px)"), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  "div.mediaSingleView-content-wrap[layout='wrap-left'], div.mediaSingleView-content-wrap[data-layout='wrap-left'], div.mediaSingleView-content-wrap[layout='wrap-right'], div.mediaSingleView-content-wrap[data-layout='wrap-right']": {
+    float: 'none',
+    overflow: 'auto',
+    margin: "var(--ds-space-150, 12px)".concat(" 0")
+  }
+}), _css2));
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export { mediaSingleSharedStyle, richMediaClassName };
+export { mediaSingleSharedStyle, mediaSingleSharedStyleNew, richMediaClassName };

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

@@ -21,7 +21,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "94.3.1";
+var packageVersion = "94.4.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/types/analytics/types/node-events.d.ts

@@ -7,7 +7,9 @@ export declare enum LAYOUT_TYPE {
     THREE_COLS_EQUAL = "threeColumnsEqual",
     LEFT_SIDEBAR = "twoColumnsLeftSidebar",
     RIGHT_SIDEBAR = "twoColumnsRightSidebar",
-    THREE_WITH_SIDEBARS = "threeColumnsWithSidebars "
+    THREE_WITH_SIDEBARS = "threeColumnsWithSidebars ",
+    FOUR_COLS_EQUAL = "fourColumnsEqual",
+    FIVE_COLS_EQUAL = "fiveColumnsEqual"
 }
 export declare enum SMART_LINK_TYPE {
     INLINE_CARD = "inline",
@@ -36,11 +38,11 @@ type DeletedSmartLink = TrackAEP<ACTION.DELETED, ACTION_SUBJECT.SMART_LINK, ACTI
     displayMode: ACTION_SUBJECT_ID.CARD_BLOCK | ACTION_SUBJECT_ID.CARD_INLINE;
 }, undefined>;
 type ChangedLayoutAEP = TrackAEP<ACTION.CHANGED_LAYOUT, ACTION_SUBJECT.LAYOUT, undefined, {
-    previousLayout: LAYOUT_TYPE;
-    newLayout: LAYOUT_TYPE;
+    previousLayout?: LAYOUT_TYPE;
+    newLayout?: LAYOUT_TYPE;
 }, undefined>;
 type DeletedLayoutAEP = TrackAEP<ACTION.DELETED, ACTION_SUBJECT.LAYOUT, undefined, {
-    layout: LAYOUT_TYPE;
+    layout?: LAYOUT_TYPE;
 }, undefined>;
 type DeletedExpandAEP = TrackAEP<ACTION.DELETED, ACTION_SUBJECT.EXPAND | ACTION_SUBJECT.NESTED_EXPAND, undefined, {
     inputMethod: INPUT_METHOD.TOOLBAR;

package/dist/types/styles/index.d.ts

@@ -3,7 +3,7 @@ export { backgroundColorStyles } from './shared/background-color';
 export { tableSharedStyle, tableMarginTop, tableMarginBottom, tableMarginSides, tableCellMinWidth, tableNewColumnMinWidth, tableCellBorderWidth, calcTableWidth, TableSharedCssClassName, tableResizeHandleWidth, tableCellPadding, tableMarginTopWithControl, } from './shared/table';
 export { AnnotationSharedClassNames, BlockAnnotationSharedClassNames, AnnotationSharedCSSByState, annotationSharedStyles, } from './shared/annotation';
 export { columnLayoutSharedStyle } from './shared/column-layout';
-export { mediaSingleSharedStyle, richMediaClassName } from './shared/media-single';
+export { mediaSingleSharedStyle, mediaSingleSharedStyleNew, richMediaClassName, } from './shared/media-single';
 export { blockquoteSharedStyles } from './shared/blockquote';
 export { headingsSharedStyles } from './shared/headings';
 export { ruleSharedStyles } from './shared/rule';

package/dist/types/styles/shared/embedCard.d.ts

@@ -1,2 +1,2 @@
-export declare const embedCardStyles: import("@emotion/react").SerializedStyles;
+export declare const embedCardStyles: () => import("@emotion/react").SerializedStyles;
 export declare const embedSpacingStyles: import("@emotion/react").SerializedStyles;

package/dist/types/styles/shared/media-single.d.ts

@@ -1,3 +1,4 @@
 declare const richMediaClassName = "rich-media-item";
 declare const mediaSingleSharedStyle: import("@emotion/react").SerializedStyles;
-export { mediaSingleSharedStyle, richMediaClassName };
+declare const mediaSingleSharedStyleNew: import("@emotion/react").SerializedStyles;
+export { mediaSingleSharedStyle, mediaSingleSharedStyleNew, richMediaClassName };

package/dist/types-ts4.5/analytics/types/node-events.d.ts

@@ -7,7 +7,9 @@ export declare enum LAYOUT_TYPE {
     THREE_COLS_EQUAL = "threeColumnsEqual",
     LEFT_SIDEBAR = "twoColumnsLeftSidebar",
     RIGHT_SIDEBAR = "twoColumnsRightSidebar",
-    THREE_WITH_SIDEBARS = "threeColumnsWithSidebars "
+    THREE_WITH_SIDEBARS = "threeColumnsWithSidebars ",
+    FOUR_COLS_EQUAL = "fourColumnsEqual",
+    FIVE_COLS_EQUAL = "fiveColumnsEqual"
 }
 export declare enum SMART_LINK_TYPE {
     INLINE_CARD = "inline",
@@ -36,11 +38,11 @@ type DeletedSmartLink = TrackAEP<ACTION.DELETED, ACTION_SUBJECT.SMART_LINK, ACTI
     displayMode: ACTION_SUBJECT_ID.CARD_BLOCK | ACTION_SUBJECT_ID.CARD_INLINE;
 }, undefined>;
 type ChangedLayoutAEP = TrackAEP<ACTION.CHANGED_LAYOUT, ACTION_SUBJECT.LAYOUT, undefined, {
-    previousLayout: LAYOUT_TYPE;
-    newLayout: LAYOUT_TYPE;
+    previousLayout?: LAYOUT_TYPE;
+    newLayout?: LAYOUT_TYPE;
 }, undefined>;
 type DeletedLayoutAEP = TrackAEP<ACTION.DELETED, ACTION_SUBJECT.LAYOUT, undefined, {
-    layout: LAYOUT_TYPE;
+    layout?: LAYOUT_TYPE;
 }, undefined>;
 type DeletedExpandAEP = TrackAEP<ACTION.DELETED, ACTION_SUBJECT.EXPAND | ACTION_SUBJECT.NESTED_EXPAND, undefined, {
     inputMethod: INPUT_METHOD.TOOLBAR;

package/dist/types-ts4.5/styles/index.d.ts

@@ -3,7 +3,7 @@ export { backgroundColorStyles } from './shared/background-color';
 export { tableSharedStyle, tableMarginTop, tableMarginBottom, tableMarginSides, tableCellMinWidth, tableNewColumnMinWidth, tableCellBorderWidth, calcTableWidth, TableSharedCssClassName, tableResizeHandleWidth, tableCellPadding, tableMarginTopWithControl, } from './shared/table';
 export { AnnotationSharedClassNames, BlockAnnotationSharedClassNames, AnnotationSharedCSSByState, annotationSharedStyles, } from './shared/annotation';
 export { columnLayoutSharedStyle } from './shared/column-layout';
-export { mediaSingleSharedStyle, richMediaClassName } from './shared/media-single';
+export { mediaSingleSharedStyle, mediaSingleSharedStyleNew, richMediaClassName, } from './shared/media-single';
 export { blockquoteSharedStyles } from './shared/blockquote';
 export { headingsSharedStyles } from './shared/headings';
 export { ruleSharedStyles } from './shared/rule';

package/dist/types-ts4.5/styles/shared/embedCard.d.ts

@@ -1,2 +1,2 @@
-export declare const embedCardStyles: import("@emotion/react").SerializedStyles;
+export declare const embedCardStyles: () => import("@emotion/react").SerializedStyles;
 export declare const embedSpacingStyles: import("@emotion/react").SerializedStyles;

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

@@ -1,3 +1,4 @@
 declare const richMediaClassName = "rich-media-item";
 declare const mediaSingleSharedStyle: import("@emotion/react").SerializedStyles;
-export { mediaSingleSharedStyle, richMediaClassName };
+declare const mediaSingleSharedStyleNew: import("@emotion/react").SerializedStyles;
+export { mediaSingleSharedStyle, mediaSingleSharedStyleNew, richMediaClassName };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "94.3.1",
+	"version": "94.4.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -130,14 +130,14 @@
 		"@atlaskit/icon-object": "^6.7.0",
 		"@atlaskit/link-datasource": "^3.6.0",
 		"@atlaskit/link-picker": "^1.47.0",
-		"@atlaskit/media-card": "^78.8.0",
+		"@atlaskit/media-card": "^78.9.0",
 		"@atlaskit/media-client": "^28.0.0",
 		"@atlaskit/media-client-react": "^2.2.0",
 		"@atlaskit/media-common": "^11.7.0",
 		"@atlaskit/media-file-preview": "^0.9.0",
 		"@atlaskit/media-picker": "^66.7.0",
-		"@atlaskit/media-ui": "^25.16.0",
-		"@atlaskit/media-viewer": "49.2.2",
+		"@atlaskit/media-ui": "^26.0.0",
+		"@atlaskit/media-viewer": "49.2.3",
 		"@atlaskit/mention": "^23.3.0",
 		"@atlaskit/menu": "^2.13.0",
 		"@atlaskit/onboarding": "^11.16.0",
@@ -278,6 +278,9 @@
 		},
 		"platform_editor_heading_margin_fix": {
 			"type": "boolean"
+		},
+		"platform_editor_element_dnd_nested_fix_patch_3": {
+			"type": "boolean"
 		}
 	}
 }