@atlaskit/editor-plugin-block-menu 5.2.27 → 5.2.28

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.2.28
+
+### Patch Changes
+
+- [`8c62a0141a5fa`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8c62a0141a5fa) -
+  [ux] Fixes contextual transform options for direct children of top level nodes.
+- Updated dependencies
+
 ## 5.2.27
 
 ### Patch Changes

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

@@ -9,13 +9,19 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 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, parentNode, nodeTypeName, nodeTypeAttrs) {
-  var adjustedNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(nodeTypeName, true);
+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);
   if (!adjustedNodeTypeName) {
     return false;
   }
   var nodeType = schema.nodes[adjustedNodeTypeName];
-  return parentNode.type.validContent(_model.Fragment.from(nodeType.createAndFill(nodeTypeAttrs)));
+  var content = null;
+  var nodesThatCantBeNestedInNestedExpand = ['blockCard', 'embedCard', 'table'];
+  if (nodesThatCantBeNestedInNestedExpand.includes(selectedNodeTypeName) && (adjustedNodeTypeName === 'expand' || adjustedNodeTypeName === 'nestedExpand')) {
+    var table = schema.nodes[selectedNodeTypeName];
+    content = table.createAndFill();
+  }
+  return parentNode.type.validContent(_model.Fragment.from(nodeType.createAndFill(nodeTypeAttrs, content)));
 };
 var isHeadingToHeadingTransformEnabled = function isHeadingToHeadingTransformEnabled(selectedNode, targetNodeTypeAttrs) {
   var _selectedNode$attrs;
@@ -38,7 +44,7 @@ var isTransformEnabledForNode = function isTransformEnabledForNode(node, targetN
   if (selectedNodeTypeName === 'heading' && targetNodeTypeName === 'heading') {
     return isHeadingToHeadingTransformEnabled(node, targetNodeTypeAttrs);
   }
-  if (isNested && !canParentContainNodeType(schema, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
+  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
     return false;
   }
   return true;

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

@@ -3,13 +3,19 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isTransformDisabledBasedOnStepsConfig } from '../editor-commands/transform-node-utils/transform';
 import { toNodeTypeValue } from '../editor-commands/transform-node-utils/types';
 import { getBlockNodesInRange, getTargetNodeTypeNameInContext } from '../editor-commands/transform-node-utils/utils';
-export const canParentContainNodeType = (schema, parentNode, nodeTypeName, nodeTypeAttrs) => {
-  const adjustedNodeTypeName = getTargetNodeTypeNameInContext(nodeTypeName, true);
+export const canParentContainNodeType = (schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) => {
+  const adjustedNodeTypeName = parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock' ? nodeTypeName : getTargetNodeTypeNameInContext(nodeTypeName, true);
   if (!adjustedNodeTypeName) {
     return false;
   }
   const nodeType = schema.nodes[adjustedNodeTypeName];
-  return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs)));
+  let content = null;
+  const nodesThatCantBeNestedInNestedExpand = ['blockCard', 'embedCard', 'table'];
+  if (nodesThatCantBeNestedInNestedExpand.includes(selectedNodeTypeName) && (adjustedNodeTypeName === 'expand' || adjustedNodeTypeName === 'nestedExpand')) {
+    const table = schema.nodes[selectedNodeTypeName];
+    content = table.createAndFill();
+  }
+  return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs, content)));
 };
 const isHeadingToHeadingTransformEnabled = (selectedNode, targetNodeTypeAttrs) => {
   var _selectedNode$attrs;
@@ -32,7 +38,7 @@ const isTransformEnabledForNode = (node, targetNodeTypeName, targetNodeTypeAttrs
   if (selectedNodeTypeName === 'heading' && targetNodeTypeName === 'heading') {
     return isHeadingToHeadingTransformEnabled(node, targetNodeTypeAttrs);
   }
-  if (isNested && !canParentContainNodeType(schema, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
+  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
     return false;
   }
   return true;

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

@@ -3,13 +3,19 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isTransformDisabledBasedOnStepsConfig } from '../editor-commands/transform-node-utils/transform';
 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, parentNode, nodeTypeName, nodeTypeAttrs) {
-  var adjustedNodeTypeName = getTargetNodeTypeNameInContext(nodeTypeName, true);
+export var canParentContainNodeType = function canParentContainNodeType(schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) {
+  var adjustedNodeTypeName = parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock' ? nodeTypeName : getTargetNodeTypeNameInContext(nodeTypeName, true);
   if (!adjustedNodeTypeName) {
     return false;
   }
   var nodeType = schema.nodes[adjustedNodeTypeName];
-  return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs)));
+  var content = null;
+  var nodesThatCantBeNestedInNestedExpand = ['blockCard', 'embedCard', 'table'];
+  if (nodesThatCantBeNestedInNestedExpand.includes(selectedNodeTypeName) && (adjustedNodeTypeName === 'expand' || adjustedNodeTypeName === 'nestedExpand')) {
+    var table = schema.nodes[selectedNodeTypeName];
+    content = table.createAndFill();
+  }
+  return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs, content)));
 };
 var isHeadingToHeadingTransformEnabled = function isHeadingToHeadingTransformEnabled(selectedNode, targetNodeTypeAttrs) {
   var _selectedNode$attrs;
@@ -32,7 +38,7 @@ var isTransformEnabledForNode = function isTransformEnabledForNode(node, targetN
   if (selectedNodeTypeName === 'heading' && targetNodeTypeName === 'heading') {
     return isHeadingToHeadingTransformEnabled(node, targetNodeTypeAttrs);
   }
-  if (isNested && !canParentContainNodeType(schema, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
+  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
     return false;
   }
   return true;

package/dist/types/editor-actions/isTransformToTargetDisabled.d.ts

@@ -6,6 +6,6 @@ type TransformDisabledArgs = {
     targetNodeTypeAttrs?: Record<string, unknown>;
     targetNodeTypeName: string;
 };
-export declare const canParentContainNodeType: (schema: Schema, parentNode: PMNode, nodeTypeName: NodeTypeName, nodeTypeAttrs?: Record<string, unknown>) => boolean;
+export declare const canParentContainNodeType: (schema: Schema, selectedNodeTypeName: NodeTypeName, parentNode: PMNode, nodeTypeName: NodeTypeName, nodeTypeAttrs?: Record<string, unknown>) => boolean;
 export declare const isTransformToTargetDisabled: ({ selection, targetNodeTypeName, targetNodeTypeAttrs, }: TransformDisabledArgs) => boolean;
 export {};

package/dist/types-ts4.5/editor-actions/isTransformToTargetDisabled.d.ts

@@ -6,6 +6,6 @@ type TransformDisabledArgs = {
     targetNodeTypeAttrs?: Record<string, unknown>;
     targetNodeTypeName: string;
 };
-export declare const canParentContainNodeType: (schema: Schema, parentNode: PMNode, nodeTypeName: NodeTypeName, nodeTypeAttrs?: Record<string, unknown>) => boolean;
+export declare const canParentContainNodeType: (schema: Schema, selectedNodeTypeName: NodeTypeName, parentNode: PMNode, nodeTypeName: NodeTypeName, nodeTypeAttrs?: Record<string, unknown>) => boolean;
 export declare const isTransformToTargetDisabled: ({ selection, targetNodeTypeName, targetNodeTypeAttrs, }: TransformDisabledArgs) => boolean;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.2.27",
+	"version": "5.2.28",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-controls": "^7.18.0",
+		"@atlaskit/editor-plugin-block-controls": "^7.19.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",