@atlaskit/editor-common 78.11.3 → 78.11.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-common
 
+## 78.11.4
+
+### Patch Changes
+
+- [#78796](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/78796) [`76cf1e2f8fd4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/76cf1e2f8fd4) - [ux] Fixes macro backgrounds for macro interaction project
+- [#79721](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/79721) [`8cff83fbb472`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8cff83fbb472) - [ux] Removes changes for inline macros for macro interaction updates
+
 ## 78.11.3
 
 ### Patch Changes

package/dist/cjs/extensibility/Extension/Extension/index.js

@@ -65,6 +65,9 @@ function ExtensionWithPluginState(props) {
     'with-children': hasChildren,
     'without-frame': removeBorder
   });
+  var contentClassNames = (0, _classnames2.default)({
+    'remove-padding': showMacroInteractionDesignUpdates
+  });
   var customContainerStyles = {
     width: '100%'
   };
@@ -106,7 +109,8 @@ function ExtensionWithPluginState(props) {
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
   }), children), hasBody && (0, _react2.jsx)("div", {
-    css: newContentStyles
+    css: newContentStyles,
+    className: contentClassNames
   }, (0, _react2.jsx)("div", {
     css: _styles2.content,
     ref: handleContentDOMRef,

package/dist/cjs/extensibility/Extension/Extension/styles.js

@@ -1,17 +1,46 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.wrapperStyle = exports.widerLayoutClassName = exports.header = exports.contentWrapper = exports.content = void 0;
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
 var _colors = require("@atlaskit/theme/colors");
 var _styles = require("../styles");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 var widerLayoutClassName = exports.widerLayoutClassName = 'wider-layout';
-var wrapperStyle = exports.wrapperStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n\n  &.without-frame {\n    background: transparent;\n  }\n  cursor: pointer;\n  width: 100%;\n\n  .extension-overflow-wrapper:not(.with-body) {\n    overflow-x: auto;\n  }\n"])), _styles.wrapperDefault);
-var header = exports.header = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  padding: ", "px ", "px 0px;\n  vertical-align: middle;\n\n  &.with-children:not(.without-frame) {\n    padding: ", " ", "\n      ", ";\n  }\n  &.without-frame {\n    padding: 0;\n  }\n"])), _styles.padding / 2, _styles.padding / 2, "var(--ds-space-050, 4px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)");
-var content = exports.content = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  padding: ", "px;\n  background: ", ";\n  border: 1px solid ", ";\n  border-radius: ", ";\n  cursor: initial;\n  width: 100%;\n"])), _styles.padding, "var(--ds-surface, white)", "var(--ds-border, ".concat(_colors.N30, ")"), "var(--ds-border-radius, 3px)");
-var contentWrapper = exports.contentWrapper = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  padding: 0 ", "px ", "px;\n  display: flex;\n  justify-content: center;\n"])), _styles.padding, _styles.padding);
+var wrapperStyle = exports.wrapperStyle = (0, _react.css)(_styles.wrapperDefault, {
+  '&.without-frame': {
+    background: 'transparent'
+  },
+  cursor: 'pointer',
+  width: '100%',
+  '.extension-overflow-wrapper:not(.with-body)': {
+    overflowX: 'auto'
+  }
+});
+var header = exports.header = (0, _react.css)({
+  padding: "".concat(_styles.padding / 2, "px ").concat(_styles.padding / 2, "px 0px"),
+  verticalAlign: 'middle',
+  '&.with-children:not(.without-frame)': {
+    padding: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-100, 8px)", " ", "var(--ds-space-100, 8px)")
+  },
+  '&.without-frame': {
+    padding: 0
+  }
+});
+var content = exports.content = (0, _react.css)({
+  padding: "".concat(_styles.padding, "px"),
+  background: "var(--ds-surface, white)",
+  border: "1px solid ".concat("var(--ds-border, ".concat(_colors.N30, ")")),
+  borderRadius: "var(--ds-border-radius, 3px)",
+  cursor: 'initial',
+  width: '100%'
+});
+var contentWrapper = exports.contentWrapper = (0, _react.css)({
+  padding: "0 ".concat(_styles.padding, "px ").concat(_styles.padding, "px"),
+  display: 'flex',
+  justifyContent: 'center',
+  '&.remove-padding': {
+    padding: 0
+  }
+});

package/dist/cjs/extensibility/Extension/InlineExtension/index.js

@@ -1,12 +1,11 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -15,8 +14,6 @@ var _ui = require("../../../ui");
 var _Lozenge = _interopRequireDefault(require("../Lozenge"));
 var _styles = require("../styles");
 var _styles2 = require("./styles");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /** @jsx jsx */
 
 var InlineExtension = function InlineExtension(props) {
@@ -31,11 +28,7 @@ var InlineExtension = function InlineExtension(props) {
   var className = hasChildren ? 'with-overlay with-children' : 'with-overlay';
   var rendererContainerWidth = widthState ? widthState.width - _editorSharedStyles.akEditorGutterPadding * 2 : 0;
   var extendedInlineExtension = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.inline_extension.extended_lcqdn') || false;
-  var inlineExtensionInternal = (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && (0, _react2.jsx)(_Lozenge.default, {
-    node: node,
-    isNodeSelected: isNodeSelected,
-    showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
-  }), (0, _react2.jsx)("div", {
+  var inlineExtensionInternal = (0, _react2.jsx)("div", {
     css: [_styles2.wrapperStyle, extendedInlineExtension && _styles2.inlineWrapperStyels],
     className: "extension-container inline ".concat(className)
   }, (0, _react2.jsx)("div", {
@@ -45,7 +38,7 @@ var InlineExtension = function InlineExtension(props) {
     node: node,
     isNodeSelected: isNodeSelected,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
-  })));
+  }));
   if (extendedInlineExtension) {
     return (0, _react2.jsx)(_ui.WidthContext.Provider, {
       value: (0, _ui.createWidthContext)(rendererContainerWidth)

package/dist/cjs/extensibility/ExtensionNodeWrapper.js

@@ -6,19 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ExtensionNodeWrapper = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _react2 = require("@emotion/react");
-var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("../utils");
-/** @jsx jsx */
-
-var styles = (0, _react2.css)({
-  '&.inline-extension': {
-    display: 'inline-block'
-  }
-});
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
- * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
  * else wrap with a div (for multi bodied extensions)
  *
  * @param param0
@@ -26,13 +16,6 @@ var styles = (0, _react2.css)({
  */
 var ExtensionNodeWrapper = exports.ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
   var children = _ref.children,
-    nodeType = _ref.nodeType,
-    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
-  var wrapperClassNames = (0, _classnames.default)({
-    'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates
-  });
-  return (0, _react2.jsx)("span", {
-    className: wrapperClassNames,
-    css: styles
-  }, children, nodeType === 'inlineExtension' && _utils.ZERO_WIDTH_SPACE);
+    nodeType = _ref.nodeType;
+  return /*#__PURE__*/_react.default.createElement("span", null, children, nodeType === 'inlineExtension' && _utils.ZERO_WIDTH_SPACE);
 };

package/dist/cjs/extensibility/MultiBodiedExtension/index.js

@@ -99,7 +99,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
   var articleRef = _react.default.useCallback(function (node) {
     return handleContentDOMRef(node);
   }, [handleContentDOMRef]);
-  var containerCssExtended = (0, _react2.css)(_MultiBodiedExtension.sharedMultiBodiedExtensionStyles.mbeExtensionContainer, (0, _defineProperty2.default)({}, ".multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true']:nth-of-type(".concat(activeChildIndex + 1, ")"), _MultiBodiedExtension.sharedMultiBodiedExtensionStyles.extensionFrameContent));
+  var containerCssExtended = (0, _react2.css)(_MultiBodiedExtension.sharedMultiBodiedExtensionStyles.mbeExtensionContainer, (0, _defineProperty2.default)({}, ".multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true']:nth-of-type(".concat(activeChildIndex + 1, ")"), (0, _react2.css)(_MultiBodiedExtension.sharedMultiBodiedExtensionStyles.extensionFrameContent, showMacroInteractionDesignUpdates && _MultiBodiedExtension.removeMargins)));
   var shouldBreakout =
   // Extension should breakout when the layout is set to 'full-width' or 'wide'.
   ['full-width', 'wide'].includes(node.attrs.layout) &&
@@ -118,6 +118,12 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
   var wrapperClassNames = (0, _classnames.default)('multiBodiedExtension--wrapper', 'extension-container', 'block', {
     'remove-margin-top': showMacroInteractionDesignUpdates
   });
+  var containerClassNames = (0, _classnames.default)('multiBodiedExtension--container', {
+    'remove-padding': showMacroInteractionDesignUpdates
+  });
+  var navigationClassNames = (0, _classnames.default)('multiBodiedExtension--navigation', {
+    'remove-margins': showMacroInteractionDesignUpdates
+  });
   return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && (0, _react2.jsx)(_Lozenge.default, {
     isNodeSelected: isNodeSelected,
     node: node,
@@ -129,12 +135,12 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
     "data-testid": "multiBodiedExtension--wrapper",
     style: mbeWrapperStyles
   }, getWrapperTitleContent(imageData, title, showMacroInteractionDesignUpdates), (0, _react2.jsx)("div", {
-    className: "multiBodiedExtension--container",
+    className: containerClassNames,
     css: containerCssExtended,
     "data-testid": "multiBodiedExtension--container",
     "data-active-child-index": activeChildIndex
   }, (0, _react2.jsx)("nav", {
-    className: "multiBodiedExtension-navigation",
+    className: navigationClassNames,
     css: _MultiBodiedExtension.sharedMultiBodiedExtensionStyles.mbeNavigation,
     "data-testid": "multiBodiedExtension-navigation"
   }, extensionHandlerResult), (0, _react2.jsx)("article", {

package/dist/cjs/extensibility/extensionNodeView.js

@@ -55,8 +55,7 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
     value: function render(props, forwardRef) {
       var _props$extensionNodeV;
       return /*#__PURE__*/_react.default.createElement(_ExtensionNodeWrapper.ExtensionNodeWrapper, {
-        nodeType: this.node.type.name,
-        showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
+        nodeType: this.node.type.name
       }, /*#__PURE__*/_react.default.createElement(_Extension.Extension, {
         editorView: this.view,
         node: this.node,

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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.11.3";
+var packageVersion = "78.11.4";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -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() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.11.3";
+var packageVersion = "78.11.4";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sharedMultiBodiedExtensionStyles = void 0;
+exports.sharedMultiBodiedExtensionStyles = exports.removeMargins = void 0;
 var _react = require("@emotion/react");
 var _colors = require("@atlaskit/theme/colors");
 var _styles = require("../../styles");
@@ -17,6 +17,9 @@ var mbeExtensionContainer = (0, _react.css)({
     right: "var(--ds-space-100, 8px)".concat(" !important")
   },
   paddingBottom: "var(--ds-space-100, 8px)",
+  '&.remove-padding': {
+    paddingBottom: 0
+  },
   position: 'relative',
   verticalAlign: 'middle',
   cursor: 'pointer',
@@ -42,7 +45,11 @@ var mbeNavigation = (0, _react.css)({
   borderBottom: 'none !important',
   background: "var(--ds-surface, white)",
   marginLeft: "var(--ds-space-100, 8px)",
-  marginRight: "var(--ds-space-100, 8px)"
+  marginRight: "var(--ds-space-100, 8px)",
+  '&.remove-margins': {
+    marginLeft: 0,
+    marginRight: 0
+  }
 });
 var extensionFrameContent = (0, _react.css)({
   padding: "var(--ds-space-100, 8px)".concat(" !important"),
@@ -66,6 +73,10 @@ var extensionFrameContent = (0, _react.css)({
     marginTop: "var(--ds-space-100, 8px)".concat(" !important")
   }
 });
+var removeMargins = exports.removeMargins = (0, _react.css)({
+  marginLeft: 0,
+  marginRight: 0
+});
 var sharedMultiBodiedExtensionStyles = exports.sharedMultiBodiedExtensionStyles = {
   mbeExtensionContainer: mbeExtensionContainer,
   mbeNavigation: mbeNavigation,

package/dist/es2019/extensibility/Extension/Extension/index.js

@@ -55,6 +55,9 @@ function ExtensionWithPluginState(props) {
     'with-children': hasChildren,
     'without-frame': removeBorder
   });
+  const contentClassNames = classnames({
+    'remove-padding': showMacroInteractionDesignUpdates
+  });
   let customContainerStyles = {
     width: '100%'
   };
@@ -102,7 +105,8 @@ function ExtensionWithPluginState(props) {
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
   }), children), hasBody && jsx("div", {
-    css: newContentStyles
+    css: newContentStyles,
+    className: contentClassNames
   }, jsx("div", {
     css: content,
     ref: handleContentDOMRef,

package/dist/es2019/extensibility/Extension/Extension/styles.js

@@ -2,41 +2,39 @@ import { css } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
 import { padding, wrapperDefault } from '../styles';
 export const widerLayoutClassName = 'wider-layout';
-export const wrapperStyle = css`
-  ${wrapperDefault}
-
-  &.without-frame {
-    background: transparent;
+export const wrapperStyle = css(wrapperDefault, {
+  '&.without-frame': {
+    background: 'transparent'
+  },
+  cursor: 'pointer',
+  width: '100%',
+  '.extension-overflow-wrapper:not(.with-body)': {
+    overflowX: 'auto'
   }
-  cursor: pointer;
-  width: 100%;
-
-  .extension-overflow-wrapper:not(.with-body) {
-    overflow-x: auto;
+});
+export const header = css({
+  padding: `${padding / 2}px ${padding / 2}px 0px`,
+  verticalAlign: 'middle',
+  '&.with-children:not(.without-frame)': {
+    padding: `${"var(--ds-space-050, 4px)"} ${"var(--ds-space-100, 8px)"} ${"var(--ds-space-100, 8px)"}`
+  },
+  '&.without-frame': {
+    padding: 0
   }
-`;
-export const header = css`
-  padding: ${padding / 2}px ${padding / 2}px 0px;
-  vertical-align: middle;
-
-  &.with-children:not(.without-frame) {
-    padding: ${"var(--ds-space-050, 4px)"} ${"var(--ds-space-100, 8px)"}
-      ${"var(--ds-space-100, 8px)"};
+});
+export const content = css({
+  padding: `${padding}px`,
+  background: "var(--ds-surface, white)",
+  border: `1px solid ${`var(--ds-border, ${N30})`}`,
+  borderRadius: "var(--ds-border-radius, 3px)",
+  cursor: 'initial',
+  width: '100%'
+});
+export const contentWrapper = css({
+  padding: `0 ${padding}px ${padding}px`,
+  display: 'flex',
+  justifyContent: 'center',
+  '&.remove-padding': {
+    padding: 0
   }
-  &.without-frame {
-    padding: 0;
-  }
-`;
-export const content = css`
-  padding: ${padding}px;
-  background: ${"var(--ds-surface, white)"};
-  border: 1px solid ${`var(--ds-border, ${N30})`};
-  border-radius: ${"var(--ds-border-radius, 3px)"};
-  cursor: initial;
-  width: 100%;
-`;
-export const contentWrapper = css`
-  padding: 0 ${padding}px ${padding}px;
-  display: flex;
-  justify-content: center;
-`;
+});

package/dist/es2019/extensibility/Extension/InlineExtension/index.js

@@ -1,5 +1,5 @@
 /** @jsx jsx */
-import React, { Fragment } from 'react';
+import React from 'react';
 import { jsx } from '@emotion/react';
 import { akEditorGutterPadding } from '@atlaskit/editor-shared-styles';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -23,11 +23,7 @@ const InlineExtension = props => {
   const className = hasChildren ? 'with-overlay with-children' : 'with-overlay';
   const rendererContainerWidth = widthState ? widthState.width - akEditorGutterPadding * 2 : 0;
   const extendedInlineExtension = getBooleanFF('platform.editor.inline_extension.extended_lcqdn') || false;
-  const inlineExtensionInternal = jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
-    node: node,
-    isNodeSelected: isNodeSelected,
-    showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
-  }), jsx("div", {
+  const inlineExtensionInternal = jsx("div", {
     css: [wrapperStyle, extendedInlineExtension && inlineWrapperStyels],
     className: `extension-container inline ${className}`
   }, jsx("div", {
@@ -37,7 +33,7 @@ const InlineExtension = props => {
     node: node,
     isNodeSelected: isNodeSelected,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
-  })));
+  }));
   if (extendedInlineExtension) {
     return jsx(WidthContext.Provider, {
       value: createWidthContext(rendererContainerWidth)

package/dist/es2019/extensibility/ExtensionNodeWrapper.js

@@ -1,16 +1,7 @@
-/** @jsx jsx */
 import React from 'react';
-import { css, jsx } from '@emotion/react';
-import classnames from 'classnames';
 import { ZERO_WIDTH_SPACE } from '../utils';
-const styles = css({
-  '&.inline-extension': {
-    display: 'inline-block'
-  }
-});
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
- * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
  * else wrap with a div (for multi bodied extensions)
  *
  * @param param0
@@ -18,14 +9,5 @@ const styles = css({
  */
 export const ExtensionNodeWrapper = ({
   children,
-  nodeType,
-  showMacroInteractionDesignUpdates
-}) => {
-  const wrapperClassNames = classnames({
-    'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates
-  });
-  return jsx("span", {
-    className: wrapperClassNames,
-    css: styles
-  }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
-};
+  nodeType
+}) => /*#__PURE__*/React.createElement("span", null, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);

package/dist/es2019/extensibility/MultiBodiedExtension/index.js

@@ -7,7 +7,7 @@ import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
 import EditorFileIcon from '@atlaskit/icon/glyph/editor/file';
 import { useSharedPluginState } from '../../hooks';
-import { sharedMultiBodiedExtensionStyles } from '../../ui/MultiBodiedExtension';
+import { removeMargins, sharedMultiBodiedExtensionStyles } from '../../ui/MultiBodiedExtension';
 import { calculateBreakoutStyles, getExtensionLozengeData } from '../../utils';
 import { WithPluginState } from '../../with-plugin-state';
 import ExtensionLozenge from '../Extension/Lozenge';
@@ -87,7 +87,7 @@ const MultiBodiedExtensionWithWidth = ({
     return handleContentDOMRef(node);
   }, [handleContentDOMRef]);
   const containerCssExtended = css(sharedMultiBodiedExtensionStyles.mbeExtensionContainer, {
-    [`.multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true']:nth-of-type(${activeChildIndex + 1})`]: sharedMultiBodiedExtensionStyles.extensionFrameContent
+    [`.multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true']:nth-of-type(${activeChildIndex + 1})`]: css(sharedMultiBodiedExtensionStyles.extensionFrameContent, showMacroInteractionDesignUpdates && removeMargins)
   });
   const shouldBreakout =
   // Extension should breakout when the layout is set to 'full-width' or 'wide'.
@@ -108,6 +108,12 @@ const MultiBodiedExtensionWithWidth = ({
   const wrapperClassNames = classnames('multiBodiedExtension--wrapper', 'extension-container', 'block', {
     'remove-margin-top': showMacroInteractionDesignUpdates
   });
+  const containerClassNames = classnames('multiBodiedExtension--container', {
+    'remove-padding': showMacroInteractionDesignUpdates
+  });
+  const navigationClassNames = classnames('multiBodiedExtension--navigation', {
+    'remove-margins': showMacroInteractionDesignUpdates
+  });
   return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
     isNodeSelected: isNodeSelected,
     node: node,
@@ -119,12 +125,12 @@ const MultiBodiedExtensionWithWidth = ({
     "data-testid": "multiBodiedExtension--wrapper",
     style: mbeWrapperStyles
   }, getWrapperTitleContent(imageData, title, showMacroInteractionDesignUpdates), jsx("div", {
-    className: "multiBodiedExtension--container",
+    className: containerClassNames,
     css: containerCssExtended,
     "data-testid": "multiBodiedExtension--container",
     "data-active-child-index": activeChildIndex
   }, jsx("nav", {
-    className: "multiBodiedExtension-navigation",
+    className: navigationClassNames,
     css: sharedMultiBodiedExtensionStyles.mbeNavigation,
     "data-testid": "multiBodiedExtension-navigation"
   }, extensionHandlerResult), jsx("article", {

package/dist/es2019/extensibility/extensionNodeView.js

@@ -28,8 +28,7 @@ export class ExtensionNode extends ReactNodeView {
   render(props, forwardRef) {
     var _props$extensionNodeV;
     return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {
-      nodeType: this.node.type.name,
-      showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
+      nodeType: this.node.type.name
     }, /*#__PURE__*/React.createElement(Extension, {
       editorView: this.view,
       node: this.node,

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

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

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

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

@@ -12,6 +12,9 @@ const mbeExtensionContainer = css({
     right: `${"var(--ds-space-100, 8px)"} !important`
   },
   paddingBottom: "var(--ds-space-100, 8px)",
+  '&.remove-padding': {
+    paddingBottom: 0
+  },
   position: 'relative',
   verticalAlign: 'middle',
   cursor: 'pointer',
@@ -37,7 +40,11 @@ const mbeNavigation = css({
   borderBottom: 'none !important',
   background: "var(--ds-surface, white)",
   marginLeft: "var(--ds-space-100, 8px)",
-  marginRight: "var(--ds-space-100, 8px)"
+  marginRight: "var(--ds-space-100, 8px)",
+  '&.remove-margins': {
+    marginLeft: 0,
+    marginRight: 0
+  }
 });
 const extensionFrameContent = css({
   padding: `${"var(--ds-space-100, 8px)"} !important`,
@@ -61,6 +68,10 @@ const extensionFrameContent = css({
     marginTop: `${"var(--ds-space-100, 8px)"} !important`
   }
 });
+export const removeMargins = css({
+  marginLeft: 0,
+  marginRight: 0
+});
 export const sharedMultiBodiedExtensionStyles = {
   mbeExtensionContainer,
   mbeNavigation,

package/dist/esm/extensibility/Extension/Extension/index.js

@@ -56,6 +56,9 @@ function ExtensionWithPluginState(props) {
     'with-children': hasChildren,
     'without-frame': removeBorder
   });
+  var contentClassNames = classnames({
+    'remove-padding': showMacroInteractionDesignUpdates
+  });
   var customContainerStyles = {
     width: '100%'
   };
@@ -97,7 +100,8 @@ function ExtensionWithPluginState(props) {
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
   }), children), hasBody && jsx("div", {
-    css: newContentStyles
+    css: newContentStyles,
+    className: contentClassNames
   }, jsx("div", {
     css: content,
     ref: handleContentDOMRef,

package/dist/esm/extensibility/Extension/Extension/styles.js

@@ -1,10 +1,40 @@
-import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 import { css } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
 import { padding, wrapperDefault } from '../styles';
 export var widerLayoutClassName = 'wider-layout';
-export var wrapperStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  ", "\n\n  &.without-frame {\n    background: transparent;\n  }\n  cursor: pointer;\n  width: 100%;\n\n  .extension-overflow-wrapper:not(.with-body) {\n    overflow-x: auto;\n  }\n"])), wrapperDefault);
-export var header = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: ", "px ", "px 0px;\n  vertical-align: middle;\n\n  &.with-children:not(.without-frame) {\n    padding: ", " ", "\n      ", ";\n  }\n  &.without-frame {\n    padding: 0;\n  }\n"])), padding / 2, padding / 2, "var(--ds-space-050, 4px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)");
-export var content = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  padding: ", "px;\n  background: ", ";\n  border: 1px solid ", ";\n  border-radius: ", ";\n  cursor: initial;\n  width: 100%;\n"])), padding, "var(--ds-surface, white)", "var(--ds-border, ".concat(N30, ")"), "var(--ds-border-radius, 3px)");
-export var contentWrapper = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  padding: 0 ", "px ", "px;\n  display: flex;\n  justify-content: center;\n"])), padding, padding);
+export var wrapperStyle = css(wrapperDefault, {
+  '&.without-frame': {
+    background: 'transparent'
+  },
+  cursor: 'pointer',
+  width: '100%',
+  '.extension-overflow-wrapper:not(.with-body)': {
+    overflowX: 'auto'
+  }
+});
+export var header = css({
+  padding: "".concat(padding / 2, "px ").concat(padding / 2, "px 0px"),
+  verticalAlign: 'middle',
+  '&.with-children:not(.without-frame)': {
+    padding: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-100, 8px)", " ", "var(--ds-space-100, 8px)")
+  },
+  '&.without-frame': {
+    padding: 0
+  }
+});
+export var content = css({
+  padding: "".concat(padding, "px"),
+  background: "var(--ds-surface, white)",
+  border: "1px solid ".concat("var(--ds-border, ".concat(N30, ")")),
+  borderRadius: "var(--ds-border-radius, 3px)",
+  cursor: 'initial',
+  width: '100%'
+});
+export var contentWrapper = css({
+  padding: "0 ".concat(padding, "px ").concat(padding, "px"),
+  display: 'flex',
+  justifyContent: 'center',
+  '&.remove-padding': {
+    padding: 0
+  }
+});

package/dist/esm/extensibility/Extension/InlineExtension/index.js

@@ -1,5 +1,5 @@
 /** @jsx jsx */
-import React, { Fragment } from 'react';
+import React from 'react';
 import { jsx } from '@emotion/react';
 import { akEditorGutterPadding } from '@atlaskit/editor-shared-styles';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -20,11 +20,7 @@ var InlineExtension = function InlineExtension(props) {
   var className = hasChildren ? 'with-overlay with-children' : 'with-overlay';
   var rendererContainerWidth = widthState ? widthState.width - akEditorGutterPadding * 2 : 0;
   var extendedInlineExtension = getBooleanFF('platform.editor.inline_extension.extended_lcqdn') || false;
-  var inlineExtensionInternal = jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
-    node: node,
-    isNodeSelected: isNodeSelected,
-    showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
-  }), jsx("div", {
+  var inlineExtensionInternal = jsx("div", {
     css: [wrapperStyle, extendedInlineExtension && inlineWrapperStyels],
     className: "extension-container inline ".concat(className)
   }, jsx("div", {
@@ -34,7 +30,7 @@ var InlineExtension = function InlineExtension(props) {
     node: node,
     isNodeSelected: isNodeSelected,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
-  })));
+  }));
   if (extendedInlineExtension) {
     return jsx(WidthContext.Provider, {
       value: createWidthContext(rendererContainerWidth)

package/dist/esm/extensibility/ExtensionNodeWrapper.js

@@ -1,16 +1,7 @@
-/** @jsx jsx */
 import React from 'react';
-import { css, jsx } from '@emotion/react';
-import classnames from 'classnames';
 import { ZERO_WIDTH_SPACE } from '../utils';
-var styles = css({
-  '&.inline-extension': {
-    display: 'inline-block'
-  }
-});
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
- * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
  * else wrap with a div (for multi bodied extensions)
  *
  * @param param0
@@ -18,13 +9,6 @@ var styles = css({
  */
 export var ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
   var children = _ref.children,
-    nodeType = _ref.nodeType,
-    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
-  var wrapperClassNames = classnames({
-    'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates
-  });
-  return jsx("span", {
-    className: wrapperClassNames,
-    css: styles
-  }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
+    nodeType = _ref.nodeType;
+  return /*#__PURE__*/React.createElement("span", null, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
 };

package/dist/esm/extensibility/MultiBodiedExtension/index.js

@@ -12,7 +12,7 @@ import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
 import EditorFileIcon from '@atlaskit/icon/glyph/editor/file';
 import { useSharedPluginState } from '../../hooks';
-import { sharedMultiBodiedExtensionStyles } from '../../ui/MultiBodiedExtension';
+import { removeMargins, sharedMultiBodiedExtensionStyles } from '../../ui/MultiBodiedExtension';
 import { calculateBreakoutStyles, getExtensionLozengeData } from '../../utils';
 import { WithPluginState } from '../../with-plugin-state';
 import ExtensionLozenge from '../Extension/Lozenge';
@@ -90,7 +90,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
   var articleRef = React.useCallback(function (node) {
     return handleContentDOMRef(node);
   }, [handleContentDOMRef]);
-  var containerCssExtended = css(sharedMultiBodiedExtensionStyles.mbeExtensionContainer, _defineProperty({}, ".multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true']:nth-of-type(".concat(activeChildIndex + 1, ")"), sharedMultiBodiedExtensionStyles.extensionFrameContent));
+  var containerCssExtended = css(sharedMultiBodiedExtensionStyles.mbeExtensionContainer, _defineProperty({}, ".multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true']:nth-of-type(".concat(activeChildIndex + 1, ")"), css(sharedMultiBodiedExtensionStyles.extensionFrameContent, showMacroInteractionDesignUpdates && removeMargins)));
   var shouldBreakout =
   // Extension should breakout when the layout is set to 'full-width' or 'wide'.
   ['full-width', 'wide'].includes(node.attrs.layout) &&
@@ -109,6 +109,12 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
   var wrapperClassNames = classnames('multiBodiedExtension--wrapper', 'extension-container', 'block', {
     'remove-margin-top': showMacroInteractionDesignUpdates
   });
+  var containerClassNames = classnames('multiBodiedExtension--container', {
+    'remove-padding': showMacroInteractionDesignUpdates
+  });
+  var navigationClassNames = classnames('multiBodiedExtension--navigation', {
+    'remove-margins': showMacroInteractionDesignUpdates
+  });
   return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
     isNodeSelected: isNodeSelected,
     node: node,
@@ -120,12 +126,12 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
     "data-testid": "multiBodiedExtension--wrapper",
     style: mbeWrapperStyles
   }, getWrapperTitleContent(imageData, title, showMacroInteractionDesignUpdates), jsx("div", {
-    className: "multiBodiedExtension--container",
+    className: containerClassNames,
     css: containerCssExtended,
     "data-testid": "multiBodiedExtension--container",
     "data-active-child-index": activeChildIndex
   }, jsx("nav", {
-    className: "multiBodiedExtension-navigation",
+    className: navigationClassNames,
     css: sharedMultiBodiedExtensionStyles.mbeNavigation,
     "data-testid": "multiBodiedExtension-navigation"
   }, extensionHandlerResult), jsx("article", {

package/dist/esm/extensibility/extensionNodeView.js

@@ -47,8 +47,7 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
     value: function render(props, forwardRef) {
       var _props$extensionNodeV;
       return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {
-        nodeType: this.node.type.name,
-        showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
+        nodeType: this.node.type.name
       }, /*#__PURE__*/React.createElement(Extension, {
         editorView: this.view,
         node: this.node,

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

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

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

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

@@ -12,6 +12,9 @@ var mbeExtensionContainer = css({
     right: "var(--ds-space-100, 8px)".concat(" !important")
   },
   paddingBottom: "var(--ds-space-100, 8px)",
+  '&.remove-padding': {
+    paddingBottom: 0
+  },
   position: 'relative',
   verticalAlign: 'middle',
   cursor: 'pointer',
@@ -37,7 +40,11 @@ var mbeNavigation = css({
   borderBottom: 'none !important',
   background: "var(--ds-surface, white)",
   marginLeft: "var(--ds-space-100, 8px)",
-  marginRight: "var(--ds-space-100, 8px)"
+  marginRight: "var(--ds-space-100, 8px)",
+  '&.remove-margins': {
+    marginLeft: 0,
+    marginRight: 0
+  }
 });
 var extensionFrameContent = css({
   padding: "var(--ds-space-100, 8px)".concat(" !important"),
@@ -61,6 +68,10 @@ var extensionFrameContent = css({
     marginTop: "var(--ds-space-100, 8px)".concat(" !important")
   }
 });
+export var removeMargins = css({
+  marginLeft: 0,
+  marginRight: 0
+});
 export var sharedMultiBodiedExtensionStyles = {
   mbeExtensionContainer: mbeExtensionContainer,
   mbeNavigation: mbeNavigation,

package/dist/types/extensibility/ExtensionNodeWrapper.d.ts

@@ -1,18 +1,14 @@
-/** @jsx jsx */
 import React from 'react';
-import { jsx } from '@emotion/react';
 type Props = {
     children: React.ReactNode;
     nodeType: string;
-    showMacroInteractionDesignUpdates?: boolean;
 };
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
- * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
  * else wrap with a div (for multi bodied extensions)
  *
  * @param param0
  * @returns
  */
-export declare const ExtensionNodeWrapper: ({ children, nodeType, showMacroInteractionDesignUpdates, }: Props) => jsx.JSX.Element;
+export declare const ExtensionNodeWrapper: ({ children, nodeType }: Props) => JSX.Element;
 export {};

package/dist/types/ui/MultiBodiedExtension/index.d.ts

@@ -1,4 +1,5 @@
 /** @jsx jsx */
+export declare const removeMargins: import("@emotion/react").SerializedStyles;
 export declare const sharedMultiBodiedExtensionStyles: {
     mbeExtensionContainer: import("@emotion/react").SerializedStyles;
     mbeNavigation: import("@emotion/react").SerializedStyles;

package/dist/types-ts4.5/extensibility/ExtensionNodeWrapper.d.ts

@@ -1,18 +1,14 @@
-/** @jsx jsx */
 import React from 'react';
-import { jsx } from '@emotion/react';
 type Props = {
     children: React.ReactNode;
     nodeType: string;
-    showMacroInteractionDesignUpdates?: boolean;
 };
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
- * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
  * else wrap with a div (for multi bodied extensions)
  *
  * @param param0
  * @returns
  */
-export declare const ExtensionNodeWrapper: ({ children, nodeType, showMacroInteractionDesignUpdates, }: Props) => jsx.JSX.Element;
+export declare const ExtensionNodeWrapper: ({ children, nodeType }: Props) => JSX.Element;
 export {};

package/dist/types-ts4.5/ui/MultiBodiedExtension/index.d.ts

@@ -1,4 +1,5 @@
 /** @jsx jsx */
+export declare const removeMargins: import("@emotion/react").SerializedStyles;
 export declare const sharedMultiBodiedExtensionStyles: {
     mbeExtensionContainer: import("@emotion/react").SerializedStyles;
     mbeNavigation: import("@emotion/react").SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "78.11.3",
+  "version": "78.11.4",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"