@atlaskit/editor-plugin-block-menu 5.2.9 → 5.2.10

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.2.10
+
+### Patch Changes
+
+- [`eb116a739e7c2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/eb116a739e7c2) -
+  [ux] Fix bug / make unwrap of expand convert nestedExpand node to regular expand node
+
 ## 5.2.9
 
 ### Patch Changes

package/dist/cjs/editor-commands/transform-node-utils/steps/wrapMixedContentStep.js

@@ -48,21 +48,6 @@ var canWrapInTarget = function canWrapInTarget(node, targetNodeType, targetNodeT
   return targetNodeType.validContent(_model.Fragment.from(node));
 };
 
-/**
- * Converts a nestedExpand to a regular expand node.
- * NestedExpands can only exist inside expands, so when breaking out they must be converted.
- */
-var convertNestedExpandToExpand = function convertNestedExpandToExpand(node, schema) {
-  var _node$attrs;
-  var expandType = schema.nodes.expand;
-  if (!expandType) {
-    return null;
-  }
-  return expandType.createAndFill({
-    title: ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title) || ''
-  }, node.content);
-};
-
 /**
  * A wrap step that handles mixed content according to the Compatibility Matrix:
  * - Wraps consecutive compatible nodes into the target container
@@ -108,14 +93,6 @@ var wrapMixedContentStep = exports.wrapMixedContentStep = function wrapMixedCont
       // This handles: "If there's a panel in the expand, it breaks out into a separate panel"
       flushCurrentContainer();
       result.push(node);
-    } else if (node.type.name === 'nestedExpand') {
-      // NestedExpand can't be wrapped and can't exist outside an expand
-      // Convert to regular expand and break out
-      flushCurrentContainer();
-      var expandNode = convertNestedExpandToExpand(node, schema);
-      if (expandNode) {
-        result.push(expandNode);
-      }
     } else if (isTextNode(node)) {
       // Text node (heading, paragraph) that can't be wrapped - convert to paragraph
       // Example: heading can't go in blockquote, so convert to paragraph with same content

package/dist/cjs/editor-commands/transform-node-utils/unwrapExpandStep.js

@@ -1,17 +1,21 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.unwrapExpandStep = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _unwrapStep = require("./unwrapStep");
+var _utils = require("./utils");
 /**
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
  *
+ * Any nestedExpand children are converted to regular expands since nestedExpand
+ * can only exist inside an expand.
+ *
  * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ * Example: expand({ title: 'outer' })(nestedExpand({ title: 'inner' })(p('x')))
+ *        → [p('outer'), expand({ title: 'inner' })(p('x'))]
  */
 var unwrapExpandStep = exports.unwrapExpandStep = function unwrapExpandStep(nodes, context) {
   var schema = context.schema;
@@ -33,8 +37,20 @@ var unwrapExpandStep = exports.unwrapExpandStep = function unwrapExpandStep(node
         }
       }
 
-      // Add the children
-      outputNodes.push.apply(outputNodes, (0, _toConsumableArray2.default)(node.children));
+      // Add the children, converting any nestedExpands to regular expands
+      // since nestedExpand can only exist inside an expand
+      node.children.forEach(function (child) {
+        if (child.type.name === nestedExpand.name) {
+          var expandNode = (0, _utils.convertNestedExpandToExpand)(child, schema);
+          if (expandNode) {
+            outputNodes.push(expandNode);
+          } else {
+            outputNodes.push(child);
+          }
+        } else {
+          outputNodes.push(child);
+        }
+      });
     } else {
       (0, _unwrapStep.unwrapStep)([node], context);
     }

package/dist/cjs/editor-commands/transform-node-utils/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isListType = exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.getBlockNodesInRange = exports.expandSelectionToBlockRange = void 0;
+exports.isListType = exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.getBlockNodesInRange = exports.expandSelectionToBlockRange = exports.convertNestedExpandToExpand = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
@@ -112,6 +112,22 @@ var isListType = exports.isListType = function isListType(node, schema) {
     return list === node.type;
   });
 };
+
+/**
+ * Converts a nestedExpand to a regular expand node.
+ * NestedExpands can only exist inside expands, so when breaking out or placing
+ * in containers that don't support nesting, they must be converted.
+ */
+var convertNestedExpandToExpand = exports.convertNestedExpandToExpand = function convertNestedExpandToExpand(node, schema) {
+  var _node$attrs;
+  var expandType = schema.nodes.expand;
+  if (!expandType) {
+    return null;
+  }
+  return expandType.createAndFill({
+    title: ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title) || ''
+  }, node.content);
+};
 var getBlockNodesInRange = exports.getBlockNodesInRange = function getBlockNodesInRange(range) {
   if (range.endIndex - range.startIndex <= 1) {
     return [range.parent.child(range.startIndex)];

package/dist/es2019/editor-commands/transform-node-utils/steps/wrapMixedContentStep.js

@@ -43,21 +43,6 @@ const canWrapInTarget = (node, targetNodeType, targetNodeTypeName) => {
   return targetNodeType.validContent(Fragment.from(node));
 };
 
-/**
- * Converts a nestedExpand to a regular expand node.
- * NestedExpands can only exist inside expands, so when breaking out they must be converted.
- */
-const convertNestedExpandToExpand = (node, schema) => {
-  var _node$attrs;
-  const expandType = schema.nodes.expand;
-  if (!expandType) {
-    return null;
-  }
-  return expandType.createAndFill({
-    title: ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title) || ''
-  }, node.content);
-};
-
 /**
  * A wrap step that handles mixed content according to the Compatibility Matrix:
  * - Wraps consecutive compatible nodes into the target container
@@ -105,14 +90,6 @@ export const wrapMixedContentStep = (nodes, context) => {
       // This handles: "If there's a panel in the expand, it breaks out into a separate panel"
       flushCurrentContainer();
       result.push(node);
-    } else if (node.type.name === 'nestedExpand') {
-      // NestedExpand can't be wrapped and can't exist outside an expand
-      // Convert to regular expand and break out
-      flushCurrentContainer();
-      const expandNode = convertNestedExpandToExpand(node, schema);
-      if (expandNode) {
-        result.push(expandNode);
-      }
     } else if (isTextNode(node)) {
       // Text node (heading, paragraph) that can't be wrapped - convert to paragraph
       // Example: heading can't go in blockquote, so convert to paragraph with same content

package/dist/es2019/editor-commands/transform-node-utils/unwrapExpandStep.js

@@ -1,10 +1,16 @@
 import { unwrapStep } from './unwrapStep';
+import { convertNestedExpandToExpand } from './utils';
 
 /**
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
  *
+ * Any nestedExpand children are converted to regular expands since nestedExpand
+ * can only exist inside an expand.
+ *
  * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ * Example: expand({ title: 'outer' })(nestedExpand({ title: 'inner' })(p('x')))
+ *        → [p('outer'), expand({ title: 'inner' })(p('x'))]
  */
 export const unwrapExpandStep = (nodes, context) => {
   const {
@@ -29,8 +35,20 @@ export const unwrapExpandStep = (nodes, context) => {
         }
       }
 
-      // Add the children
-      outputNodes.push(...node.children);
+      // Add the children, converting any nestedExpands to regular expands
+      // since nestedExpand can only exist inside an expand
+      node.children.forEach(child => {
+        if (child.type.name === nestedExpand.name) {
+          const expandNode = convertNestedExpandToExpand(child, schema);
+          if (expandNode) {
+            outputNodes.push(expandNode);
+          } else {
+            outputNodes.push(child);
+          }
+        } else {
+          outputNodes.push(child);
+        }
+      });
     } else {
       unwrapStep([node], context);
     }

package/dist/es2019/editor-commands/transform-node-utils/utils.js

@@ -107,6 +107,22 @@ export const isListType = (node, schema) => {
   const lists = [schema.nodes.taskList, schema.nodes.bulletList, schema.nodes.orderedList];
   return lists.some(list => list === node.type);
 };
+
+/**
+ * Converts a nestedExpand to a regular expand node.
+ * NestedExpands can only exist inside expands, so when breaking out or placing
+ * in containers that don't support nesting, they must be converted.
+ */
+export const convertNestedExpandToExpand = (node, schema) => {
+  var _node$attrs;
+  const expandType = schema.nodes.expand;
+  if (!expandType) {
+    return null;
+  }
+  return expandType.createAndFill({
+    title: ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title) || ''
+  }, node.content);
+};
 export const getBlockNodesInRange = range => {
   if (range.endIndex - range.startIndex <= 1) {
     return [range.parent.child(range.startIndex)];

package/dist/esm/editor-commands/transform-node-utils/steps/wrapMixedContentStep.js

@@ -43,21 +43,6 @@ var canWrapInTarget = function canWrapInTarget(node, targetNodeType, targetNodeT
   return targetNodeType.validContent(Fragment.from(node));
 };
 
-/**
- * Converts a nestedExpand to a regular expand node.
- * NestedExpands can only exist inside expands, so when breaking out they must be converted.
- */
-var convertNestedExpandToExpand = function convertNestedExpandToExpand(node, schema) {
-  var _node$attrs;
-  var expandType = schema.nodes.expand;
-  if (!expandType) {
-    return null;
-  }
-  return expandType.createAndFill({
-    title: ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title) || ''
-  }, node.content);
-};
-
 /**
  * A wrap step that handles mixed content according to the Compatibility Matrix:
  * - Wraps consecutive compatible nodes into the target container
@@ -103,14 +88,6 @@ export var wrapMixedContentStep = function wrapMixedContentStep(nodes, context)
       // This handles: "If there's a panel in the expand, it breaks out into a separate panel"
       flushCurrentContainer();
       result.push(node);
-    } else if (node.type.name === 'nestedExpand') {
-      // NestedExpand can't be wrapped and can't exist outside an expand
-      // Convert to regular expand and break out
-      flushCurrentContainer();
-      var expandNode = convertNestedExpandToExpand(node, schema);
-      if (expandNode) {
-        result.push(expandNode);
-      }
     } else if (isTextNode(node)) {
       // Text node (heading, paragraph) that can't be wrapped - convert to paragraph
       // Example: heading can't go in blockquote, so convert to paragraph with same content

package/dist/esm/editor-commands/transform-node-utils/unwrapExpandStep.js

@@ -1,11 +1,16 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { unwrapStep } from './unwrapStep';
+import { convertNestedExpandToExpand } from './utils';
 
 /**
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
  *
+ * Any nestedExpand children are converted to regular expands since nestedExpand
+ * can only exist inside an expand.
+ *
  * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ * Example: expand({ title: 'outer' })(nestedExpand({ title: 'inner' })(p('x')))
+ *        → [p('outer'), expand({ title: 'inner' })(p('x'))]
  */
 export var unwrapExpandStep = function unwrapExpandStep(nodes, context) {
   var schema = context.schema;
@@ -27,8 +32,20 @@ export var unwrapExpandStep = function unwrapExpandStep(nodes, context) {
         }
       }
 
-      // Add the children
-      outputNodes.push.apply(outputNodes, _toConsumableArray(node.children));
+      // Add the children, converting any nestedExpands to regular expands
+      // since nestedExpand can only exist inside an expand
+      node.children.forEach(function (child) {
+        if (child.type.name === nestedExpand.name) {
+          var expandNode = convertNestedExpandToExpand(child, schema);
+          if (expandNode) {
+            outputNodes.push(expandNode);
+          } else {
+            outputNodes.push(child);
+          }
+        } else {
+          outputNodes.push(child);
+        }
+      });
     } else {
       unwrapStep([node], context);
     }

package/dist/esm/editor-commands/transform-node-utils/utils.js

@@ -106,6 +106,22 @@ export var isListType = function isListType(node, schema) {
     return list === node.type;
   });
 };
+
+/**
+ * Converts a nestedExpand to a regular expand node.
+ * NestedExpands can only exist inside expands, so when breaking out or placing
+ * in containers that don't support nesting, they must be converted.
+ */
+export var convertNestedExpandToExpand = function convertNestedExpandToExpand(node, schema) {
+  var _node$attrs;
+  var expandType = schema.nodes.expand;
+  if (!expandType) {
+    return null;
+  }
+  return expandType.createAndFill({
+    title: ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title) || ''
+  }, node.content);
+};
 export var getBlockNodesInRange = function getBlockNodesInRange(range) {
   if (range.endIndex - range.startIndex <= 1) {
     return [range.parent.child(range.startIndex)];

package/dist/types/editor-commands/transform-node-utils/unwrapExpandStep.d.ts

@@ -3,6 +3,11 @@ import type { TransformStep } from './types';
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
  *
+ * Any nestedExpand children are converted to regular expands since nestedExpand
+ * can only exist inside an expand.
+ *
  * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ * Example: expand({ title: 'outer' })(nestedExpand({ title: 'inner' })(p('x')))
+ *        → [p('outer'), expand({ title: 'inner' })(p('x'))]
  */
 export declare const unwrapExpandStep: TransformStep;

package/dist/types/editor-commands/transform-node-utils/utils.d.ts

@@ -16,4 +16,10 @@ export declare const expandSelectionToBlockRange: (selection: Selection, schema:
     $to: import("prosemirror-model").ResolvedPos;
 };
 export declare const isListType: (node: PMNode, schema: Schema) => boolean;
+/**
+ * Converts a nestedExpand to a regular expand node.
+ * NestedExpands can only exist inside expands, so when breaking out or placing
+ * in containers that don't support nesting, they must be converted.
+ */
+export declare const convertNestedExpandToExpand: (node: PMNode, schema: Schema) => PMNode | null;
 export declare const getBlockNodesInRange: (range: NodeRange) => PMNode[];

package/dist/types-ts4.5/editor-commands/transform-node-utils/unwrapExpandStep.d.ts

@@ -3,6 +3,11 @@ import type { TransformStep } from './types';
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
  *
+ * Any nestedExpand children are converted to regular expands since nestedExpand
+ * can only exist inside an expand.
+ *
  * Example: expand({ title: 'title' })(p('b')) → [p('title'), p('b')]
+ * Example: expand({ title: 'outer' })(nestedExpand({ title: 'inner' })(p('x')))
+ *        → [p('outer'), expand({ title: 'inner' })(p('x'))]
  */
 export declare const unwrapExpandStep: TransformStep;

package/dist/types-ts4.5/editor-commands/transform-node-utils/utils.d.ts

@@ -16,4 +16,10 @@ export declare const expandSelectionToBlockRange: (selection: Selection, schema:
     $to: import("prosemirror-model").ResolvedPos;
 };
 export declare const isListType: (node: PMNode, schema: Schema) => boolean;
+/**
+ * Converts a nestedExpand to a regular expand node.
+ * NestedExpands can only exist inside expands, so when breaking out or placing
+ * in containers that don't support nesting, they must be converted.
+ */
+export declare const convertNestedExpandToExpand: (node: PMNode, schema: Schema) => PMNode | null;
 export declare const getBlockNodesInRange: (range: NodeRange) => PMNode[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.2.9",
+	"version": "5.2.10",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -45,11 +45,11 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^16.4.0",
 		"@atlaskit/tmp-editor-statsig": "^15.10.0",
-		"@atlaskit/tokens": "^8.4.0",
+		"@atlaskit/tokens": "^8.5.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.42.0",
+		"@atlaskit/editor-common": "^110.43.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},