@atlaskit/editor-plugin-block-menu 5.1.5 → 5.1.6

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.1.6
+
+### Patch Changes
+
+- [`a202e97c73f3a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a202e97c73f3a) -
+  Adds base transform cases for codeBlock, layout, blockquote.
+
 ## 5.1.5
 
 ### Patch Changes

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

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.unwrapLayoutStep = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+/**
+ * Unwraps a layoutSection node, extracting content from all columns.
+ * Works with any number of columns (2, 3, etc.).
+ *
+ * Example:
+ * layoutSection(
+ *   layoutColumn(p('a'), p('b')),
+ *   layoutColumn(p('c')),
+ *   layoutColumn(p('d'))
+ * )
+ * → [p('a'), p('b'), p('c'), p('d')]
+ */
+var unwrapLayoutStep = exports.unwrapLayoutStep = function unwrapLayoutStep(nodes) {
+  var outputNodes = [];
+  nodes.forEach(function (node) {
+    var isLayoutSection = node.type.name === 'layoutSection';
+    if (isLayoutSection) {
+      node.children.forEach(function (column) {
+        var isLayoutColumn = column.type.name === 'layoutColumn';
+        if (isLayoutColumn) {
+          outputNodes.push.apply(outputNodes, (0, _toConsumableArray2.default)(column.children));
+        }
+      });
+    }
+  });
+  if (outputNodes.length === 0) {
+    return nodes;
+  }
+  return outputNodes;
+};

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

@@ -7,6 +7,7 @@ exports.getOutputNodes = void 0;
 var _utils = require("../transform-node-utils/utils");
 var _flattenListStep = require("./flattenListStep");
 var _flattenStep = require("./flattenStep");
+var _unwrapLayoutStep = require("./steps/unwrapLayoutStep");
 var _stubStep = require("./stubStep");
 var _types = require("./types");
 var _unwrapExpandStep = require("./unwrapExpandStep");
@@ -72,6 +73,26 @@ var TRANSFORM_STEPS_OVERRIDE = {
     blockquote: [_unwrapExpandStep.unwrapExpandStep, _wrapStep.wrapStep],
     paragraph: [_unwrapExpandStep.unwrapExpandStep],
     codeBlock: [_unwrapExpandStep.unwrapExpandStep, _flattenStep.flattenStep, _wrapStep.wrapStep]
+  },
+  blockquote: {
+    expand: [_wrapStep.wrapStep],
+    nestedExpand: [_wrapStep.wrapStep],
+    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    codeBlock: [_unwrapStep.unwrapStep, _flattenStep.flattenStep, _wrapStep.wrapStep]
+  },
+  layoutSection: {
+    blockquote: [_unwrapLayoutStep.unwrapLayoutStep, _wrapStep.wrapStep],
+    expand: [_unwrapLayoutStep.unwrapLayoutStep, _wrapStep.wrapStep],
+    panel: [_unwrapLayoutStep.unwrapLayoutStep, _wrapStep.wrapStep],
+    codeBlock: [_unwrapLayoutStep.unwrapLayoutStep, _flattenStep.flattenStep, _wrapStep.wrapStep],
+    paragraph: [_unwrapLayoutStep.unwrapLayoutStep]
+  },
+  codeBlock: {
+    blockquote: [_wrapStep.wrapStep],
+    expand: [_wrapStep.wrapStep],
+    nestedExpand: [_wrapStep.wrapStep],
+    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
+    panel: [_wrapStep.wrapStep]
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {
@@ -89,8 +110,8 @@ var getOutputNodes = exports.getOutputNodes = function getOutputNodes(_ref) {
     isNested = _ref.isNested;
   var nodesToReplace = [sourceNode];
   var selectedNodeTypeName = (0, _types.toNodeTypeValue)(sourceNode.type.name);
-  var targetNodeTypeName = (0, _types.toNodeTypeValue)(targetNodeType.name);
-  targetNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(targetNodeTypeName, isNested);
+  var initialTargetNodeTypeName = (0, _types.toNodeTypeValue)(targetNodeType.name);
+  var targetNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(initialTargetNodeTypeName, isNested);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
     // We may decide to return an empty array or undefined here
     return;
@@ -105,7 +126,6 @@ var getOutputNodes = exports.getOutputNodes = function getOutputNodes(_ref) {
     return;
   }
   return steps.reduce(function (nodes, step) {
-    var result = step(nodes, context);
-    return result;
+    return step(nodes, context);
   }, nodesToReplace);
 };

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.unwrapExpandStep = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _unwrapStep = require("./unwrapStep");
 /**
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
@@ -15,8 +16,11 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var unwrapExpandStep = exports.unwrapExpandStep = function unwrapExpandStep(nodes, context) {
   var schema = context.schema;
   var outputNodes = [];
+  var _schema$nodes = schema.nodes,
+    expand = _schema$nodes.expand,
+    nestedExpand = _schema$nodes.nestedExpand;
   nodes.forEach(function (node) {
-    var isExpand = node.type.name === 'expand' || node.type.name === 'nestedExpand';
+    var isExpand = node.type.name === expand.name || node.type.name === nestedExpand.name;
     if (isExpand) {
       var _node$attrs;
       var title = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title;
@@ -32,12 +36,7 @@ var unwrapExpandStep = exports.unwrapExpandStep = function unwrapExpandStep(node
       // Add the children
       outputNodes.push.apply(outputNodes, (0, _toConsumableArray2.default)(node.children));
     } else {
-      // Fallback: behave like unwrapStep for non-expand nodes
-      if (node.children.length === 0) {
-        outputNodes.push(node);
-      } else {
-        outputNodes.push.apply(outputNodes, (0, _toConsumableArray2.default)(node.children));
-      }
+      (0, _unwrapStep.unwrapStep)([node], context);
     }
   });
   return outputNodes;

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

@@ -7,7 +7,6 @@ exports.wrapStep = void 0;
 var wrapStep = exports.wrapStep = function wrapStep(nodes, context) {
   var schema = context.schema,
     targetNodeTypeName = context.targetNodeTypeName;
-  // edge case: nestedExpand
   var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, nodes);
   if (outputNode) {
     return [outputNode];

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

@@ -0,0 +1,30 @@
+/**
+ * Unwraps a layoutSection node, extracting content from all columns.
+ * Works with any number of columns (2, 3, etc.).
+ *
+ * Example:
+ * layoutSection(
+ *   layoutColumn(p('a'), p('b')),
+ *   layoutColumn(p('c')),
+ *   layoutColumn(p('d'))
+ * )
+ * → [p('a'), p('b'), p('c'), p('d')]
+ */
+export const unwrapLayoutStep = nodes => {
+  const outputNodes = [];
+  nodes.forEach(node => {
+    const isLayoutSection = node.type.name === 'layoutSection';
+    if (isLayoutSection) {
+      node.children.forEach(column => {
+        const isLayoutColumn = column.type.name === 'layoutColumn';
+        if (isLayoutColumn) {
+          outputNodes.push(...column.children);
+        }
+      });
+    }
+  });
+  if (outputNodes.length === 0) {
+    return nodes;
+  }
+  return outputNodes;
+};

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

@@ -1,6 +1,7 @@
 import { getTargetNodeTypeNameInContext } from '../transform-node-utils/utils';
 import { flattenListStep } from './flattenListStep';
 import { flattenStep } from './flattenStep';
+import { unwrapLayoutStep } from './steps/unwrapLayoutStep';
 import { stubStep } from './stubStep';
 import { NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
 import { unwrapExpandStep } from './unwrapExpandStep';
@@ -67,6 +68,26 @@ const TRANSFORM_STEPS_OVERRIDE = {
     blockquote: [unwrapExpandStep, wrapStep],
     paragraph: [unwrapExpandStep],
     codeBlock: [unwrapExpandStep, flattenStep, wrapStep]
+  },
+  blockquote: {
+    expand: [wrapStep],
+    nestedExpand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep],
+    codeBlock: [unwrapStep, flattenStep, wrapStep]
+  },
+  layoutSection: {
+    blockquote: [unwrapLayoutStep, wrapStep],
+    expand: [unwrapLayoutStep, wrapStep],
+    panel: [unwrapLayoutStep, wrapStep],
+    codeBlock: [unwrapLayoutStep, flattenStep, wrapStep],
+    paragraph: [unwrapLayoutStep]
+  },
+  codeBlock: {
+    blockquote: [wrapStep],
+    expand: [wrapStep],
+    nestedExpand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep],
+    panel: [wrapStep]
   }
 };
 const getTransformStepsForNodeTypes = (selectedNodeTypeName, targetNodeTypeName) => {
@@ -85,8 +106,8 @@ export const getOutputNodes = ({
 }) => {
   const nodesToReplace = [sourceNode];
   const selectedNodeTypeName = toNodeTypeValue(sourceNode.type.name);
-  let targetNodeTypeName = toNodeTypeValue(targetNodeType.name);
-  targetNodeTypeName = getTargetNodeTypeNameInContext(targetNodeTypeName, isNested);
+  const initialTargetNodeTypeName = toNodeTypeValue(targetNodeType.name);
+  const targetNodeTypeName = getTargetNodeTypeNameInContext(initialTargetNodeTypeName, isNested);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
     // We may decide to return an empty array or undefined here
     return;
@@ -101,7 +122,6 @@ export const getOutputNodes = ({
     return;
   }
   return steps.reduce((nodes, step) => {
-    const result = step(nodes, context);
-    return result;
+    return step(nodes, context);
   }, nodesToReplace);
 };

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

@@ -1,3 +1,5 @@
+import { unwrapStep } from './unwrapStep';
+
 /**
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
@@ -9,8 +11,12 @@ export const unwrapExpandStep = (nodes, context) => {
     schema
   } = context;
   const outputNodes = [];
+  const {
+    expand,
+    nestedExpand
+  } = schema.nodes;
   nodes.forEach(node => {
-    const isExpand = node.type.name === 'expand' || node.type.name === 'nestedExpand';
+    const isExpand = node.type.name === expand.name || node.type.name === nestedExpand.name;
     if (isExpand) {
       var _node$attrs;
       const title = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title;
@@ -26,12 +32,7 @@ export const unwrapExpandStep = (nodes, context) => {
       // Add the children
       outputNodes.push(...node.children);
     } else {
-      // Fallback: behave like unwrapStep for non-expand nodes
-      if (node.children.length === 0) {
-        outputNodes.push(node);
-      } else {
-        outputNodes.push(...node.children);
-      }
+      unwrapStep([node], context);
     }
   });
   return outputNodes;

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

@@ -3,7 +3,6 @@ export const wrapStep = (nodes, context) => {
     schema,
     targetNodeTypeName
   } = context;
-  // edge case: nestedExpand
   const outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, nodes);
   if (outputNode) {
     return [outputNode];

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

@@ -0,0 +1,31 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+/**
+ * Unwraps a layoutSection node, extracting content from all columns.
+ * Works with any number of columns (2, 3, etc.).
+ *
+ * Example:
+ * layoutSection(
+ *   layoutColumn(p('a'), p('b')),
+ *   layoutColumn(p('c')),
+ *   layoutColumn(p('d'))
+ * )
+ * → [p('a'), p('b'), p('c'), p('d')]
+ */
+export var unwrapLayoutStep = function unwrapLayoutStep(nodes) {
+  var outputNodes = [];
+  nodes.forEach(function (node) {
+    var isLayoutSection = node.type.name === 'layoutSection';
+    if (isLayoutSection) {
+      node.children.forEach(function (column) {
+        var isLayoutColumn = column.type.name === 'layoutColumn';
+        if (isLayoutColumn) {
+          outputNodes.push.apply(outputNodes, _toConsumableArray(column.children));
+        }
+      });
+    }
+  });
+  if (outputNodes.length === 0) {
+    return nodes;
+  }
+  return outputNodes;
+};

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

@@ -1,6 +1,7 @@
 import { getTargetNodeTypeNameInContext } from '../transform-node-utils/utils';
 import { flattenListStep } from './flattenListStep';
 import { flattenStep } from './flattenStep';
+import { unwrapLayoutStep } from './steps/unwrapLayoutStep';
 import { stubStep } from './stubStep';
 import { NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
 import { unwrapExpandStep } from './unwrapExpandStep';
@@ -67,6 +68,26 @@ var TRANSFORM_STEPS_OVERRIDE = {
     blockquote: [unwrapExpandStep, wrapStep],
     paragraph: [unwrapExpandStep],
     codeBlock: [unwrapExpandStep, flattenStep, wrapStep]
+  },
+  blockquote: {
+    expand: [wrapStep],
+    nestedExpand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep],
+    codeBlock: [unwrapStep, flattenStep, wrapStep]
+  },
+  layoutSection: {
+    blockquote: [unwrapLayoutStep, wrapStep],
+    expand: [unwrapLayoutStep, wrapStep],
+    panel: [unwrapLayoutStep, wrapStep],
+    codeBlock: [unwrapLayoutStep, flattenStep, wrapStep],
+    paragraph: [unwrapLayoutStep]
+  },
+  codeBlock: {
+    blockquote: [wrapStep],
+    expand: [wrapStep],
+    nestedExpand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep],
+    panel: [wrapStep]
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {
@@ -84,8 +105,8 @@ export var getOutputNodes = function getOutputNodes(_ref) {
     isNested = _ref.isNested;
   var nodesToReplace = [sourceNode];
   var selectedNodeTypeName = toNodeTypeValue(sourceNode.type.name);
-  var targetNodeTypeName = toNodeTypeValue(targetNodeType.name);
-  targetNodeTypeName = getTargetNodeTypeNameInContext(targetNodeTypeName, isNested);
+  var initialTargetNodeTypeName = toNodeTypeValue(targetNodeType.name);
+  var targetNodeTypeName = getTargetNodeTypeNameInContext(initialTargetNodeTypeName, isNested);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
     // We may decide to return an empty array or undefined here
     return;
@@ -100,7 +121,6 @@ export var getOutputNodes = function getOutputNodes(_ref) {
     return;
   }
   return steps.reduce(function (nodes, step) {
-    var result = step(nodes, context);
-    return result;
+    return step(nodes, context);
   }, nodesToReplace);
 };

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

@@ -1,4 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import { unwrapStep } from './unwrapStep';
+
 /**
  * Unwraps an expand/nestedExpand node, converting its title attribute to a paragraph
  * and prepending it to the children.
@@ -8,8 +10,11 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 export var unwrapExpandStep = function unwrapExpandStep(nodes, context) {
   var schema = context.schema;
   var outputNodes = [];
+  var _schema$nodes = schema.nodes,
+    expand = _schema$nodes.expand,
+    nestedExpand = _schema$nodes.nestedExpand;
   nodes.forEach(function (node) {
-    var isExpand = node.type.name === 'expand' || node.type.name === 'nestedExpand';
+    var isExpand = node.type.name === expand.name || node.type.name === nestedExpand.name;
     if (isExpand) {
       var _node$attrs;
       var title = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.title;
@@ -25,12 +30,7 @@ export var unwrapExpandStep = function unwrapExpandStep(nodes, context) {
       // Add the children
       outputNodes.push.apply(outputNodes, _toConsumableArray(node.children));
     } else {
-      // Fallback: behave like unwrapStep for non-expand nodes
-      if (node.children.length === 0) {
-        outputNodes.push(node);
-      } else {
-        outputNodes.push.apply(outputNodes, _toConsumableArray(node.children));
-      }
+      unwrapStep([node], context);
     }
   });
   return outputNodes;

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

@@ -1,7 +1,6 @@
 export var wrapStep = function wrapStep(nodes, context) {
   var schema = context.schema,
     targetNodeTypeName = context.targetNodeTypeName;
-  // edge case: nestedExpand
   var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, nodes);
   if (outputNode) {
     return [outputNode];

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

@@ -0,0 +1,14 @@
+import type { TransformStep } from '../types';
+/**
+ * Unwraps a layoutSection node, extracting content from all columns.
+ * Works with any number of columns (2, 3, etc.).
+ *
+ * Example:
+ * layoutSection(
+ *   layoutColumn(p('a'), p('b')),
+ *   layoutColumn(p('c')),
+ *   layoutColumn(p('d'))
+ * )
+ * → [p('a'), p('b'), p('c'), p('d')]
+ */
+export declare const unwrapLayoutStep: TransformStep;

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

@@ -0,0 +1,14 @@
+import type { TransformStep } from '../types';
+/**
+ * Unwraps a layoutSection node, extracting content from all columns.
+ * Works with any number of columns (2, 3, etc.).
+ *
+ * Example:
+ * layoutSection(
+ *   layoutColumn(p('a'), p('b')),
+ *   layoutColumn(p('c')),
+ *   layoutColumn(p('d'))
+ * )
+ * → [p('a'), p('b'), p('c'), p('d')]
+ */
+export declare const unwrapLayoutStep: TransformStep;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.1.5",
+	"version": "5.1.6",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/css": "^0.17.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-controls": "^7.11.0",
+		"@atlaskit/editor-plugin-block-controls": "^7.12.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^16.4.0",
-		"@atlaskit/tmp-editor-statsig": "^14.6.0",
+		"@atlaskit/tmp-editor-statsig": "^14.7.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@babel/runtime": "^7.0.0"
 	},