@atlaskit/editor-plugin-block-menu 6.0.3 → 6.0.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 6.0.4
+
+### Patch Changes
+
+- [`9d63742a083b1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9d63742a083b1) -
+  Fixes analytics and updates getTargeNodeTypeNameInContext to be used for transforms and contextual
+  options.
+- Updated dependencies
+
 ## 6.0.3
 
 ### Patch Changes

package/dist/cjs/editor-actions/isTransformToTargetDisabled.js

@@ -10,7 +10,7 @@ var _transform = require("../editor-commands/transform-node-utils/transform");
 var _types = require("../editor-commands/transform-node-utils/types");
 var _utils = require("../editor-commands/transform-node-utils/utils");
 var canParentContainNodeType = exports.canParentContainNodeType = function canParentContainNodeType(schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) {
-  var adjustedNodeTypeName = parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock' ? nodeTypeName : (0, _utils.getTargetNodeTypeNameInContext)(nodeTypeName, true);
+  var adjustedNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(nodeTypeName, true, parentNode);
   if (!adjustedNodeTypeName) {
     return false;
   }

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

@@ -6,13 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.tranformContent = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("./transform");
-var tranformContent = exports.tranformContent = function tranformContent(content, targetNodeType, schema, isNested, targetAttrs) {
+var tranformContent = exports.tranformContent = function tranformContent(content, targetNodeType, schema, isNested, targetAttrs, parent) {
   var outputNodes = (0, _transform.getOutputNodes)({
     sourceNodes: Array.from(content.content),
     targetNodeType: targetNodeType,
     schema: schema,
     isNested: isNested,
-    targetAttrs: targetAttrs
+    targetAttrs: targetAttrs,
+    parentNode: parent
   });
   return outputNodes ? _model.Fragment.fromArray(outputNodes) : content;
 };

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

@@ -242,14 +242,15 @@ var getOutputNodes = exports.getOutputNodes = function getOutputNodes(_ref) {
     targetNodeType = _ref.targetNodeType,
     schema = _ref.schema,
     isNested = _ref.isNested,
-    targetAttrs = _ref.targetAttrs;
+    targetAttrs = _ref.targetAttrs,
+    parentNode = _ref.parentNode;
   var sourceNode = sourceNodes.at(0);
   if (!sourceNode) {
     return;
   }
   var selectedNodeTypeName = (0, _types.toNodeTypeValue)((0, _types.getNodeName)(sourceNodes));
   var initialTargetNodeTypeName = (0, _types.toNodeTypeValue)(targetNodeType.name);
-  var targetNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(initialTargetNodeTypeName, isNested);
+  var targetNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(initialTargetNodeTypeName, isNested, parentNode);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
     // We may decide to return an empty array or undefined here
     return;

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

@@ -49,7 +49,10 @@ var getSelectedNode = exports.getSelectedNode = function getSelectedNode(selecti
   }
   return undefined;
 };
-var getTargetNodeTypeNameInContext = exports.getTargetNodeTypeNameInContext = function getTargetNodeTypeNameInContext(nodeTypeName, isNested) {
+var getTargetNodeTypeNameInContext = exports.getTargetNodeTypeNameInContext = function getTargetNodeTypeNameInContext(nodeTypeName, isNested, parentNode) {
+  if (parentNode && isNested && (parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock')) {
+    return nodeTypeName;
+  }
   if (nodeTypeName === 'expand' && isNested) {
     return 'nestedExpand';
   }

package/dist/cjs/editor-commands/transformNode.js

@@ -32,8 +32,7 @@ var transformNode = exports.transformNode = function transformNode(api) {
           $from = _expandSelectionToBlo.$from,
           $to = _expandSelectionToBlo.$to;
         var selectedParent = $from.parent;
-        var isParentLayout = selectedParent.type === nodes.layoutColumn;
-        var isNestedExceptLayout = (0, _isNestedNode.isNestedNode)(preservedSelection, '') && !isParentLayout;
+        var isNested = (0, _isNestedNode.isNestedNode)(preservedSelection, '');
         var isList = (0, _utils.isListNode)(selectedParent);
         var slice = tr.doc.slice(isList ? $from.pos - 1 : $from.pos, isList ? $to.pos + 1 : $to.pos);
 
@@ -45,7 +44,7 @@ var transformNode = exports.transformNode = function transformNode(api) {
           var nodeTypeName = node.type.name;
           sourceNodeTypes[nodeTypeName] = (sourceNodeTypes[nodeTypeName] || 0) + 1;
         });
-        var transformedNodes = (0, _tranformContent.tranformContent)(slice.content, targetType, schema, isNestedExceptLayout, metadata === null || metadata === void 0 ? void 0 : metadata.targetAttrs);
+        var transformedNodes = (0, _tranformContent.tranformContent)(slice.content, targetType, schema, isNested, metadata === null || metadata === void 0 ? void 0 : metadata.targetAttrs, selectedParent);
         var nodesToDeleteAndInsert = [nodes.mediaSingle];
         if (preservedSelection instanceof _state.NodeSelection && nodesToDeleteAndInsert.includes(preservedSelection.node.type)) {
           // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
@@ -65,7 +64,7 @@ var transformNode = exports.transformNode = function transformNode(api) {
             attributes: {
               duration: duration,
               isList: isList,
-              isNested: isNestedExceptLayout,
+              isNested: isNested,
               nodeCount: nodeCount,
               sourceNodeTypes: sourceNodeTypes,
               startTime: startTime,

package/dist/es2019/editor-actions/isTransformToTargetDisabled.js

@@ -4,7 +4,7 @@ import { isTransformDisabledBasedOnStepsConfig } from '../editor-commands/transf
 import { toNodeTypeValue } from '../editor-commands/transform-node-utils/types';
 import { getBlockNodesInRange, getTargetNodeTypeNameInContext } from '../editor-commands/transform-node-utils/utils';
 export const canParentContainNodeType = (schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) => {
-  const adjustedNodeTypeName = parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock' ? nodeTypeName : getTargetNodeTypeNameInContext(nodeTypeName, true);
+  const adjustedNodeTypeName = getTargetNodeTypeNameInContext(nodeTypeName, true, parentNode);
   if (!adjustedNodeTypeName) {
     return false;
   }

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

@@ -1,12 +1,13 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { getOutputNodes } from './transform';
-export const tranformContent = (content, targetNodeType, schema, isNested, targetAttrs) => {
+export const tranformContent = (content, targetNodeType, schema, isNested, targetAttrs, parent) => {
   const outputNodes = getOutputNodes({
     sourceNodes: Array.from(content.content),
     targetNodeType,
     schema,
     isNested,
-    targetAttrs
+    targetAttrs,
+    parentNode: parent
   });
   return outputNodes ? Fragment.fromArray(outputNodes) : content;
 };

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

@@ -237,7 +237,8 @@ export const getOutputNodes = ({
   targetNodeType,
   schema,
   isNested,
-  targetAttrs
+  targetAttrs,
+  parentNode
 }) => {
   const sourceNode = sourceNodes.at(0);
   if (!sourceNode) {
@@ -245,7 +246,7 @@ export const getOutputNodes = ({
   }
   const selectedNodeTypeName = toNodeTypeValue(getNodeName(sourceNodes));
   const initialTargetNodeTypeName = toNodeTypeValue(targetNodeType.name);
-  const targetNodeTypeName = getTargetNodeTypeNameInContext(initialTargetNodeTypeName, isNested);
+  const targetNodeTypeName = getTargetNodeTypeNameInContext(initialTargetNodeTypeName, isNested, parentNode);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
     // We may decide to return an empty array or undefined here
     return;

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

@@ -44,7 +44,10 @@ export const getSelectedNode = selection => {
   }
   return undefined;
 };
-export const getTargetNodeTypeNameInContext = (nodeTypeName, isNested) => {
+export const getTargetNodeTypeNameInContext = (nodeTypeName, isNested, parentNode) => {
+  if (parentNode && isNested && (parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock')) {
+    return nodeTypeName;
+  }
   if (nodeTypeName === 'expand' && isNested) {
     return 'nestedExpand';
   }

package/dist/es2019/editor-commands/transformNode.js

@@ -29,8 +29,7 @@ export const transformNode = api =>
       $to
     } = expandSelectionToBlockRange(preservedSelection);
     const selectedParent = $from.parent;
-    const isParentLayout = selectedParent.type === nodes.layoutColumn;
-    const isNestedExceptLayout = isNestedNode(preservedSelection, '') && !isParentLayout;
+    const isNested = isNestedNode(preservedSelection, '');
     const isList = isListNode(selectedParent);
     const slice = tr.doc.slice(isList ? $from.pos - 1 : $from.pos, isList ? $to.pos + 1 : $to.pos);
 
@@ -42,7 +41,7 @@ export const transformNode = api =>
       const nodeTypeName = node.type.name;
       sourceNodeTypes[nodeTypeName] = (sourceNodeTypes[nodeTypeName] || 0) + 1;
     });
-    const transformedNodes = tranformContent(slice.content, targetType, schema, isNestedExceptLayout, metadata === null || metadata === void 0 ? void 0 : metadata.targetAttrs);
+    const transformedNodes = tranformContent(slice.content, targetType, schema, isNested, metadata === null || metadata === void 0 ? void 0 : metadata.targetAttrs, selectedParent);
     const nodesToDeleteAndInsert = [nodes.mediaSingle];
     if (preservedSelection instanceof NodeSelection && nodesToDeleteAndInsert.includes(preservedSelection.node.type)) {
       // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
@@ -62,7 +61,7 @@ export const transformNode = api =>
         attributes: {
           duration,
           isList,
-          isNested: isNestedExceptLayout,
+          isNested,
           nodeCount,
           sourceNodeTypes,
           startTime,

package/dist/esm/editor-actions/isTransformToTargetDisabled.js

@@ -4,7 +4,7 @@ import { isTransformDisabledBasedOnStepsConfig } from '../editor-commands/transf
 import { toNodeTypeValue } from '../editor-commands/transform-node-utils/types';
 import { getBlockNodesInRange, getTargetNodeTypeNameInContext } from '../editor-commands/transform-node-utils/utils';
 export var canParentContainNodeType = function canParentContainNodeType(schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) {
-  var adjustedNodeTypeName = parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock' ? nodeTypeName : getTargetNodeTypeNameInContext(nodeTypeName, true);
+  var adjustedNodeTypeName = getTargetNodeTypeNameInContext(nodeTypeName, true, parentNode);
   if (!adjustedNodeTypeName) {
     return false;
   }

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

@@ -1,12 +1,13 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { getOutputNodes } from './transform';
-export var tranformContent = function tranformContent(content, targetNodeType, schema, isNested, targetAttrs) {
+export var tranformContent = function tranformContent(content, targetNodeType, schema, isNested, targetAttrs, parent) {
   var outputNodes = getOutputNodes({
     sourceNodes: Array.from(content.content),
     targetNodeType: targetNodeType,
     schema: schema,
     isNested: isNested,
-    targetAttrs: targetAttrs
+    targetAttrs: targetAttrs,
+    parentNode: parent
   });
   return outputNodes ? Fragment.fromArray(outputNodes) : content;
 };

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

@@ -237,14 +237,15 @@ export var getOutputNodes = function getOutputNodes(_ref) {
     targetNodeType = _ref.targetNodeType,
     schema = _ref.schema,
     isNested = _ref.isNested,
-    targetAttrs = _ref.targetAttrs;
+    targetAttrs = _ref.targetAttrs,
+    parentNode = _ref.parentNode;
   var sourceNode = sourceNodes.at(0);
   if (!sourceNode) {
     return;
   }
   var selectedNodeTypeName = toNodeTypeValue(getNodeName(sourceNodes));
   var initialTargetNodeTypeName = toNodeTypeValue(targetNodeType.name);
-  var targetNodeTypeName = getTargetNodeTypeNameInContext(initialTargetNodeTypeName, isNested);
+  var targetNodeTypeName = getTargetNodeTypeNameInContext(initialTargetNodeTypeName, isNested, parentNode);
   if (!selectedNodeTypeName || !targetNodeTypeName) {
     // We may decide to return an empty array or undefined here
     return;

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

@@ -43,7 +43,10 @@ export var getSelectedNode = function getSelectedNode(selection) {
   }
   return undefined;
 };
-export var getTargetNodeTypeNameInContext = function getTargetNodeTypeNameInContext(nodeTypeName, isNested) {
+export var getTargetNodeTypeNameInContext = function getTargetNodeTypeNameInContext(nodeTypeName, isNested, parentNode) {
+  if (parentNode && isNested && (parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock')) {
+    return nodeTypeName;
+  }
   if (nodeTypeName === 'expand' && isNested) {
     return 'nestedExpand';
   }

package/dist/esm/editor-commands/transformNode.js

@@ -26,8 +26,7 @@ export var transformNode = function transformNode(api) {
           $from = _expandSelectionToBlo.$from,
           $to = _expandSelectionToBlo.$to;
         var selectedParent = $from.parent;
-        var isParentLayout = selectedParent.type === nodes.layoutColumn;
-        var isNestedExceptLayout = isNestedNode(preservedSelection, '') && !isParentLayout;
+        var isNested = isNestedNode(preservedSelection, '');
         var isList = isListNode(selectedParent);
         var slice = tr.doc.slice(isList ? $from.pos - 1 : $from.pos, isList ? $to.pos + 1 : $to.pos);
 
@@ -39,7 +38,7 @@ export var transformNode = function transformNode(api) {
           var nodeTypeName = node.type.name;
           sourceNodeTypes[nodeTypeName] = (sourceNodeTypes[nodeTypeName] || 0) + 1;
         });
-        var transformedNodes = tranformContent(slice.content, targetType, schema, isNestedExceptLayout, metadata === null || metadata === void 0 ? void 0 : metadata.targetAttrs);
+        var transformedNodes = tranformContent(slice.content, targetType, schema, isNested, metadata === null || metadata === void 0 ? void 0 : metadata.targetAttrs, selectedParent);
         var nodesToDeleteAndInsert = [nodes.mediaSingle];
         if (preservedSelection instanceof NodeSelection && nodesToDeleteAndInsert.includes(preservedSelection.node.type)) {
           // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
@@ -59,7 +58,7 @@ export var transformNode = function transformNode(api) {
             attributes: {
               duration: duration,
               isList: isList,
-              isNested: isNestedExceptLayout,
+              isNested: isNested,
               nodeCount: nodeCount,
               sourceNodeTypes: sourceNodeTypes,
               startTime: startTime,

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

@@ -1,3 +1,3 @@
-import type { NodeType, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { NodeType, Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-export declare const tranformContent: (content: Fragment, targetNodeType: NodeType, schema: Schema, isNested: boolean, targetAttrs?: Record<string, unknown>) => Fragment;
+export declare const tranformContent: (content: Fragment, targetNodeType: NodeType, schema: Schema, isNested: boolean, targetAttrs?: Record<string, unknown>, parent?: PMNode) => Fragment;

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

@@ -2,11 +2,12 @@ import { type Node as PMNode, type NodeType, type Schema } from '@atlaskit/edito
 import type { NodeTypeName } from './types';
 interface GetOutputNodesArgs {
     isNested: boolean;
+    parentNode?: PMNode;
     schema: Schema;
     sourceNodes: PMNode[];
     targetAttrs?: Record<string, unknown>;
     targetNodeType: NodeType;
 }
-export declare const getOutputNodes: ({ sourceNodes, targetNodeType, schema, isNested, targetAttrs, }: GetOutputNodesArgs) => PMNode[] | undefined;
+export declare const getOutputNodes: ({ sourceNodes, targetNodeType, schema, isNested, targetAttrs, parentNode, }: GetOutputNodesArgs) => PMNode[] | undefined;
 export declare const isTransformDisabledBasedOnStepsConfig: (selectedNodeType: NodeTypeName, targetNodeType: NodeTypeName) => boolean;
 export {};

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

@@ -3,7 +3,7 @@ import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { type ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 import type { NodeTypeName } from './types';
 export declare const getSelectedNode: (selection: Selection) => ContentNodeWithPos | undefined;
-export declare const getTargetNodeTypeNameInContext: (nodeTypeName: NodeTypeName | null, isNested?: boolean) => NodeTypeName | null;
+export declare const getTargetNodeTypeNameInContext: (nodeTypeName: NodeTypeName | null, isNested?: boolean, parentNode?: PMNode) => NodeTypeName | null;
 /**
  * Converts a nestedExpand to a regular expand node.
  * NestedExpands can only exist inside expands, so when breaking out or placing

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

@@ -1,3 +1,3 @@
-import type { NodeType, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { NodeType, Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-export declare const tranformContent: (content: Fragment, targetNodeType: NodeType, schema: Schema, isNested: boolean, targetAttrs?: Record<string, unknown>) => Fragment;
+export declare const tranformContent: (content: Fragment, targetNodeType: NodeType, schema: Schema, isNested: boolean, targetAttrs?: Record<string, unknown>, parent?: PMNode) => Fragment;

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

@@ -2,11 +2,12 @@ import { type Node as PMNode, type NodeType, type Schema } from '@atlaskit/edito
 import type { NodeTypeName } from './types';
 interface GetOutputNodesArgs {
     isNested: boolean;
+    parentNode?: PMNode;
     schema: Schema;
     sourceNodes: PMNode[];
     targetAttrs?: Record<string, unknown>;
     targetNodeType: NodeType;
 }
-export declare const getOutputNodes: ({ sourceNodes, targetNodeType, schema, isNested, targetAttrs, }: GetOutputNodesArgs) => PMNode[] | undefined;
+export declare const getOutputNodes: ({ sourceNodes, targetNodeType, schema, isNested, targetAttrs, parentNode, }: GetOutputNodesArgs) => PMNode[] | undefined;
 export declare const isTransformDisabledBasedOnStepsConfig: (selectedNodeType: NodeTypeName, targetNodeType: NodeTypeName) => boolean;
 export {};

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

@@ -3,7 +3,7 @@ import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { type ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 import type { NodeTypeName } from './types';
 export declare const getSelectedNode: (selection: Selection) => ContentNodeWithPos | undefined;
-export declare const getTargetNodeTypeNameInContext: (nodeTypeName: NodeTypeName | null, isNested?: boolean) => NodeTypeName | null;
+export declare const getTargetNodeTypeNameInContext: (nodeTypeName: NodeTypeName | null, isNested?: boolean, parentNode?: PMNode) => NodeTypeName | null;
 /**
  * Converts a nestedExpand to a regular expand node.
  * NestedExpands can only exist inside expands, so when breaking out or placing

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "6.0.3",
+	"version": "6.0.4",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",