@atlaskit/editor-common 78.23.2 → 78.23.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-common
 
+## 78.23.3
+
+### Patch Changes
+
+- [#87738](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/87738) [`40f32c84fb24`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/40f32c84fb24) - [ux] Fix nesting styles of block macros
+
 ## 78.23.2
 
 ### Patch Changes

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

@@ -40,6 +40,7 @@ function ExtensionWithPluginState(props) {
     showMacroInteractionDesignUpdates = props.showMacroInteractionDesignUpdates,
     isNodeSelected = props.isNodeSelected,
     isNodeHovered = props.isNodeHovered,
+    isNodeNested = props.isNodeNested,
     setIsNodeHovered = props.setIsNodeHovered;
   var hasBody = ['bodiedExtension', 'multiBodiedExtension'].includes(node.type.name);
   var isMobile = editorAppearance === 'mobile';
@@ -62,14 +63,14 @@ function ExtensionWithPluginState(props) {
   var classNames = (0, _classnames2.default)('extension-container', 'block', shadowClassNames, (0, _defineProperty2.default)({
     'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
     'with-border': showMacroInteractionDesignUpdates,
-    'with-margin-styles': showMacroInteractionDesignUpdates,
+    'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested,
     'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
     'with-danger-overlay': showMacroInteractionDesignUpdates,
     'without-frame': removeBorder
   }, _styles2.widerLayoutClassName, shouldBreakout));
   var overflowClassNames = (0, _classnames2.default)('extension-overflow-wrapper', {
     'with-body': hasBody,
-    'with-margin-styles': showMacroInteractionDesignUpdates
+    'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested
   });
   var headerClassNames = (0, _classnames2.default)({
     'with-children': hasChildren,

package/dist/cjs/extensibility/ExtensionComponent.js

@@ -203,6 +203,9 @@ var ExtensionComponent = exports.ExtensionComponent = /*#__PURE__*/function (_Co
         showMacroInteractionDesignUpdates = _this$props2.showMacroInteractionDesignUpdates;
       var selection = editorView.state.selection;
       var selectedNode = selection instanceof _state.NodeSelection && selection.node;
+      var position = typeof getPos === 'function' && getPos();
+      var resolvedPosition = position && editorView.state.doc.resolve(position);
+      var isNodeNested = !!(resolvedPosition && resolvedPosition.depth > 0);
       if (node.type.name === 'multiBodiedExtension') {
         return /*#__PURE__*/_react.default.createElement(_MultiBodiedExtension.default, {
           node: node,
@@ -215,6 +218,7 @@ var ExtensionComponent = exports.ExtensionComponent = /*#__PURE__*/function (_Co
           editorAppearance: editorAppearance,
           showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
           isNodeSelected: selectedNode === node,
+          isNodeNested: isNodeNested,
           isNodeHovered: this.state.isNodeHovered,
           setIsNodeHovered: this.setIsNodeHovered
         });
@@ -236,6 +240,7 @@ var ExtensionComponent = exports.ExtensionComponent = /*#__PURE__*/function (_Co
             showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
             isNodeSelected: selectedNode === node,
             isNodeHovered: this.state.isNodeHovered,
+            isNodeNested: isNodeNested,
             setIsNodeHovered: this.setIsNodeHovered
           }, extensionHandlerResult);
         case 'inlineExtension':

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

@@ -70,6 +70,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
     showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
     isNodeSelected = _ref.isNodeSelected,
     isNodeHovered = _ref.isNodeHovered,
+    isNodeNested = _ref.isNodeNested,
     setIsNodeHovered = _ref.setIsNodeHovered;
   var _node$attrs = node.attrs,
     parameters = _node$attrs.parameters,
@@ -121,7 +122,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
     mbeWrapperStyles = breakoutStyles;
   }
   var wrapperClassNames = (0, _classnames.default)('multiBodiedExtension--wrapper', 'extension-container', 'block', {
-    'with-margin-styles': showMacroInteractionDesignUpdates,
+    'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested,
     'with-border': showMacroInteractionDesignUpdates,
     'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
     'with-danger-overlay': showMacroInteractionDesignUpdates

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "78.23.2";
+var packageVersion = "78.23.3";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -22,7 +22,7 @@ var _templateObject, _templateObject2, _templateObject3;
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.23.2";
+var packageVersion = "78.23.3";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -26,6 +26,7 @@ function ExtensionWithPluginState(props) {
     showMacroInteractionDesignUpdates,
     isNodeSelected,
     isNodeHovered,
+    isNodeNested,
     setIsNodeHovered
   } = props;
   const hasBody = ['bodiedExtension', 'multiBodiedExtension'].includes(node.type.name);
@@ -51,7 +52,7 @@ function ExtensionWithPluginState(props) {
   const classNames = classnames('extension-container', 'block', shadowClassNames, {
     'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
     'with-border': showMacroInteractionDesignUpdates,
-    'with-margin-styles': showMacroInteractionDesignUpdates,
+    'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested,
     'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
     'with-danger-overlay': showMacroInteractionDesignUpdates,
     'without-frame': removeBorder,
@@ -59,7 +60,7 @@ function ExtensionWithPluginState(props) {
   });
   const overflowClassNames = classnames('extension-overflow-wrapper', {
     'with-body': hasBody,
-    'with-margin-styles': showMacroInteractionDesignUpdates
+    'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested
   });
   const headerClassNames = classnames({
     'with-children': hasChildren,

package/dist/es2019/extensibility/ExtensionComponent.js

@@ -158,6 +158,9 @@ export class ExtensionComponent extends Component {
       selection
     } = editorView.state;
     const selectedNode = selection instanceof NodeSelection && selection.node;
+    const position = typeof getPos === 'function' && getPos();
+    const resolvedPosition = position && editorView.state.doc.resolve(position);
+    const isNodeNested = !!(resolvedPosition && resolvedPosition.depth > 0);
     if (node.type.name === 'multiBodiedExtension') {
       return /*#__PURE__*/React.createElement(MultiBodiedExtension, {
         node: node,
@@ -170,6 +173,7 @@ export class ExtensionComponent extends Component {
         editorAppearance: editorAppearance,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
         isNodeSelected: selectedNode === node,
+        isNodeNested: isNodeNested,
         isNodeHovered: this.state.isNodeHovered,
         setIsNodeHovered: this.setIsNodeHovered
       });
@@ -191,6 +195,7 @@ export class ExtensionComponent extends Component {
           showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
           isNodeSelected: selectedNode === node,
           isNodeHovered: this.state.isNodeHovered,
+          isNodeNested: isNodeNested,
           setIsNodeHovered: this.setIsNodeHovered
         }, extensionHandlerResult);
       case 'inlineExtension':

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

@@ -58,6 +58,7 @@ const MultiBodiedExtensionWithWidth = ({
   showMacroInteractionDesignUpdates,
   isNodeSelected,
   isNodeHovered,
+  isNodeNested,
   setIsNodeHovered
 }) => {
   const {
@@ -109,7 +110,7 @@ const MultiBodiedExtensionWithWidth = ({
     mbeWrapperStyles = breakoutStyles;
   }
   const wrapperClassNames = classnames('multiBodiedExtension--wrapper', 'extension-container', 'block', {
-    'with-margin-styles': showMacroInteractionDesignUpdates,
+    'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested,
     'with-border': showMacroInteractionDesignUpdates,
     'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
     'with-danger-overlay': showMacroInteractionDesignUpdates

package/dist/es2019/monitoring/error.js

@@ -1,6 +1,6 @@
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "78.23.2";
+const packageVersion = "78.23.3";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

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

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

@@ -31,6 +31,7 @@ function ExtensionWithPluginState(props) {
     showMacroInteractionDesignUpdates = props.showMacroInteractionDesignUpdates,
     isNodeSelected = props.isNodeSelected,
     isNodeHovered = props.isNodeHovered,
+    isNodeNested = props.isNodeNested,
     setIsNodeHovered = props.setIsNodeHovered;
   var hasBody = ['bodiedExtension', 'multiBodiedExtension'].includes(node.type.name);
   var isMobile = editorAppearance === 'mobile';
@@ -53,14 +54,14 @@ function ExtensionWithPluginState(props) {
   var classNames = classnames('extension-container', 'block', shadowClassNames, _defineProperty({
     'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
     'with-border': showMacroInteractionDesignUpdates,
-    'with-margin-styles': showMacroInteractionDesignUpdates,
+    'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested,
     'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
     'with-danger-overlay': showMacroInteractionDesignUpdates,
     'without-frame': removeBorder
   }, widerLayoutClassName, shouldBreakout));
   var overflowClassNames = classnames('extension-overflow-wrapper', {
     'with-body': hasBody,
-    'with-margin-styles': showMacroInteractionDesignUpdates
+    'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested
   });
   var headerClassNames = classnames({
     'with-children': hasChildren,

package/dist/esm/extensibility/ExtensionComponent.js

@@ -193,6 +193,9 @@ export var ExtensionComponent = /*#__PURE__*/function (_Component) {
         showMacroInteractionDesignUpdates = _this$props2.showMacroInteractionDesignUpdates;
       var selection = editorView.state.selection;
       var selectedNode = selection instanceof NodeSelection && selection.node;
+      var position = typeof getPos === 'function' && getPos();
+      var resolvedPosition = position && editorView.state.doc.resolve(position);
+      var isNodeNested = !!(resolvedPosition && resolvedPosition.depth > 0);
       if (node.type.name === 'multiBodiedExtension') {
         return /*#__PURE__*/React.createElement(MultiBodiedExtension, {
           node: node,
@@ -205,6 +208,7 @@ export var ExtensionComponent = /*#__PURE__*/function (_Component) {
           editorAppearance: editorAppearance,
           showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
           isNodeSelected: selectedNode === node,
+          isNodeNested: isNodeNested,
           isNodeHovered: this.state.isNodeHovered,
           setIsNodeHovered: this.setIsNodeHovered
         });
@@ -226,6 +230,7 @@ export var ExtensionComponent = /*#__PURE__*/function (_Component) {
             showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
             isNodeSelected: selectedNode === node,
             isNodeHovered: this.state.isNodeHovered,
+            isNodeNested: isNodeNested,
             setIsNodeHovered: this.setIsNodeHovered
           }, extensionHandlerResult);
         case 'inlineExtension':

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

@@ -61,6 +61,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
     showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
     isNodeSelected = _ref.isNodeSelected,
     isNodeHovered = _ref.isNodeHovered,
+    isNodeNested = _ref.isNodeNested,
     setIsNodeHovered = _ref.setIsNodeHovered;
   var _node$attrs = node.attrs,
     parameters = _node$attrs.parameters,
@@ -112,7 +113,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
     mbeWrapperStyles = breakoutStyles;
   }
   var wrapperClassNames = classnames('multiBodiedExtension--wrapper', 'extension-container', 'block', {
-    'with-margin-styles': showMacroInteractionDesignUpdates,
+    'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested,
     'with-border': showMacroInteractionDesignUpdates,
     'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
     'with-danger-overlay': showMacroInteractionDesignUpdates

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "78.23.2";
+var packageVersion = "78.23.3";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -17,7 +17,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.23.2";
+var packageVersion = "78.23.3";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/types/extensibility/Extension/Extension/index.d.ts

@@ -19,6 +19,7 @@ export interface Props {
     showMacroInteractionDesignUpdates?: boolean;
     isNodeSelected?: boolean;
     isNodeHovered?: boolean;
+    isNodeNested?: boolean;
     setIsNodeHovered?: (isHovered: boolean) => void;
 }
 /**

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

@@ -21,6 +21,7 @@ type Props = {
     showMacroInteractionDesignUpdates?: boolean;
     isNodeSelected?: boolean;
     isNodeHovered?: boolean;
+    isNodeNested?: boolean;
     setIsNodeHovered?: (isHovered: boolean) => void;
 };
 declare const MultiBodiedExtension: (props: Props & OverflowShadowProps) => jsx.JSX.Element;

package/dist/types-ts4.5/extensibility/Extension/Extension/index.d.ts

@@ -19,6 +19,7 @@ export interface Props {
     showMacroInteractionDesignUpdates?: boolean;
     isNodeSelected?: boolean;
     isNodeHovered?: boolean;
+    isNodeNested?: boolean;
     setIsNodeHovered?: (isHovered: boolean) => void;
 }
 /**

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

@@ -21,6 +21,7 @@ type Props = {
     showMacroInteractionDesignUpdates?: boolean;
     isNodeSelected?: boolean;
     isNodeHovered?: boolean;
+    isNodeNested?: boolean;
     setIsNodeHovered?: (isHovered: boolean) => void;
 };
 declare const MultiBodiedExtension: (props: Props & OverflowShadowProps) => jsx.JSX.Element;

package/package.json

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