@atlaskit/editor-plugin-block-menu 1.0.9 → 1.0.10

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 1.0.10
+
+### Patch Changes
+
+- [`74c42a764926a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/74c42a764926a) -
+  Hide copy link option when platform_editor_adf_with_localid FG is off or when selection is a
+  nested node
+- [`614ef1a575e84`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/614ef1a575e84) -
+  [ux] ED-29183: Fixed p and headings with alignment not able to convert to panel, expand, block
+  quote
+
 ## 1.0.9
 
 ### Patch Changes

package/dist/cjs/editor-commands/transforms/container-transforms.js

@@ -20,6 +20,19 @@ var convertInvalidNodeToValidNodeType = function convertInvalidNodeToValidNodeTy
   });
   return _model.Fragment.from(validTransformedContent);
 };
+var filterMarksForTargetNodeType = function filterMarksForTargetNodeType(content, targetNodeType) {
+  var withValidMarks = [];
+  content.forEach(function (node) {
+    if (node.marks.length > 0) {
+      var allowedMarks = targetNodeType.allowedMarks(node.marks);
+      var updatedNode = node.mark(allowedMarks);
+      withValidMarks.push(updatedNode);
+    } else {
+      withValidMarks.push(node);
+    }
+  });
+  return _model.Fragment.from(withValidMarks);
+};
 
 /**
  * Transform selection to container type
@@ -39,6 +52,13 @@ var transformToContainer = exports.transformToContainer = function transformToCo
   if (targetNodeType === schema.nodes.blockquote) {
     transformedContent = convertInvalidNodeToValidNodeType(transformedContent, schema.nodes.heading, schema.nodes.paragraph, true);
   }
+
+  // Preserve marks that are allowed in the target node type
+  // e.g. blocks (heading/ paragraph) with alignment need to remove alignment
+  // as panel/ blockQuote/ expands does not support alignment
+  if (sourceNode.type === schema.nodes.paragraph || sourceNode.type === schema.nodes.heading) {
+    transformedContent = filterMarksForTargetNodeType(transformedContent, targetNodeType);
+  }
   var newNode = targetNodeType.createAndFill(targetAttrs, transformedContent);
   if (!newNode) {
     return null;

package/dist/cjs/ui/copy-link.js

@@ -11,7 +11,9 @@ var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _link = _interopRequireDefault(require("@atlaskit/icon/core/link"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _copyLink = require("./utils/copyLink");
+var _isNestedNode = require("./utils/isNestedNode");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   var api = _ref.api,
@@ -32,6 +34,16 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
     api === null || api === void 0 || api.core.actions.focus();
     return (0, _copyLink.copyLink)(config === null || config === void 0 ? void 0 : config.getLinkPath, config === null || config === void 0 ? void 0 : config.blockQueryParam, api);
   }, [config === null || config === void 0 ? void 0 : config.getLinkPath, config === null || config === void 0 ? void 0 : config.blockQueryParam, api]);
+  var checkIsNestedNode = (0, _react.useCallback)(function () {
+    var _api$selection;
+    var selection = api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.sharedState) === null || _api$selection === void 0 || (_api$selection = _api$selection.currentState()) === null || _api$selection === void 0 ? void 0 : _api$selection.selection;
+    return (0, _isNestedNode.isNestedNode)(selection);
+  }, [api]);
+
+  // Hide copy link when `platform_editor_adf_with_localid` feature flag is off or when the node is nested
+  if (!(0, _platformFeatureFlags.fg)('platform_editor_adf_with_localid') || checkIsNestedNode()) {
+    return null;
+  }
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/_react.default.createElement(_link.default, {

package/dist/cjs/ui/utils/isNestedNode.js

@@ -0,0 +1,54 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isNestedNode = void 0;
+var _state = require("@atlaskit/editor-prosemirror/state");
+/**
+ * Determines if a node is nested (not at top-level) based on its depth and context.
+ *
+ * Simple rules:
+ * - Depth 0-1: Always top-level (not nested)
+ * - Depth 2: Top-level for blockquotes and task lists
+ * - Depth 3: Top-level for list items only
+ * - Depth 4+: Always nested
+ *
+ * @param selection - The current ProseMirror selection
+ * @returns true if nested, false if top-level
+ */
+var isNestedNode = exports.isNestedNode = function isNestedNode(selection) {
+  if (!selection) {
+    return false;
+  }
+  var $from = selection.$from;
+  var depth = $from.depth;
+  if ($from.depth > 0 && selection instanceof _state.NodeSelection) {
+    return true;
+  }
+
+  // Depth 0-1: Always top-level
+  if (depth <= 1) {
+    return false;
+  }
+
+  // Depth 4+: Always nested
+  if (depth > 3) {
+    return true;
+  }
+
+  // Check parent node type for depth 2-3
+  var parentNode = $from.node(depth - 1);
+  if (!parentNode) {
+    return true;
+  }
+  var parentType = parentNode.type.name;
+
+  // Special cases where content is still top-level
+  if (parentType === 'listItem' && depth === 3 || parentType === 'blockquote' && depth === 2 || parentType === 'taskList' && depth === 2) {
+    return false;
+  }
+
+  // Everything else at depth 2-3 is nested
+  return true;
+};

package/dist/es2019/editor-commands/transforms/container-transforms.js

@@ -12,6 +12,19 @@ const convertInvalidNodeToValidNodeType = (sourceContent, sourceNodeType, validN
   });
   return Fragment.from(validTransformedContent);
 };
+const filterMarksForTargetNodeType = (content, targetNodeType) => {
+  const withValidMarks = [];
+  content.forEach(node => {
+    if (node.marks.length > 0) {
+      const allowedMarks = targetNodeType.allowedMarks(node.marks);
+      const updatedNode = node.mark(allowedMarks);
+      withValidMarks.push(updatedNode);
+    } else {
+      withValidMarks.push(node);
+    }
+  });
+  return Fragment.from(withValidMarks);
+};
 
 /**
  * Transform selection to container type
@@ -32,6 +45,13 @@ export const transformToContainer = ({
   if (targetNodeType === schema.nodes.blockquote) {
     transformedContent = convertInvalidNodeToValidNodeType(transformedContent, schema.nodes.heading, schema.nodes.paragraph, true);
   }
+
+  // Preserve marks that are allowed in the target node type
+  // e.g. blocks (heading/ paragraph) with alignment need to remove alignment
+  // as panel/ blockQuote/ expands does not support alignment
+  if (sourceNode.type === schema.nodes.paragraph || sourceNode.type === schema.nodes.heading) {
+    transformedContent = filterMarksForTargetNodeType(transformedContent, targetNodeType);
+  }
   const newNode = targetNodeType.createAndFill(targetAttrs, transformedContent);
   if (!newNode) {
     return null;

package/dist/es2019/ui/copy-link.js

@@ -3,7 +3,9 @@ import { useIntl, injectIntl } from 'react-intl-next';
 import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import LinkIcon from '@atlaskit/icon/core/link';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { copyLink } from './utils/copyLink';
+import { isNestedNode } from './utils/isNestedNode';
 const CopyLinkDropdownItemContent = ({
   api,
   config
@@ -26,6 +28,16 @@ const CopyLinkDropdownItemContent = ({
     api === null || api === void 0 ? void 0 : api.core.actions.focus();
     return copyLink(config === null || config === void 0 ? void 0 : config.getLinkPath, config === null || config === void 0 ? void 0 : config.blockQueryParam, api);
   }, [config === null || config === void 0 ? void 0 : config.getLinkPath, config === null || config === void 0 ? void 0 : config.blockQueryParam, api]);
+  const checkIsNestedNode = useCallback(() => {
+    var _api$selection, _api$selection$shared, _api$selection$shared2;
+    const selection = api === null || api === void 0 ? void 0 : (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : (_api$selection$shared = _api$selection.sharedState) === null || _api$selection$shared === void 0 ? void 0 : (_api$selection$shared2 = _api$selection$shared.currentState()) === null || _api$selection$shared2 === void 0 ? void 0 : _api$selection$shared2.selection;
+    return isNestedNode(selection);
+  }, [api]);
+
+  // Hide copy link when `platform_editor_adf_with_localid` feature flag is off or when the node is nested
+  if (!fg('platform_editor_adf_with_localid') || checkIsNestedNode()) {
+    return null;
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {

package/dist/es2019/ui/utils/isNestedNode.js

@@ -0,0 +1,51 @@
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+
+/**
+ * Determines if a node is nested (not at top-level) based on its depth and context.
+ *
+ * Simple rules:
+ * - Depth 0-1: Always top-level (not nested)
+ * - Depth 2: Top-level for blockquotes and task lists
+ * - Depth 3: Top-level for list items only
+ * - Depth 4+: Always nested
+ *
+ * @param selection - The current ProseMirror selection
+ * @returns true if nested, false if top-level
+ */
+export const isNestedNode = selection => {
+  if (!selection) {
+    return false;
+  }
+  const {
+    $from
+  } = selection;
+  const depth = $from.depth;
+  if ($from.depth > 0 && selection instanceof NodeSelection) {
+    return true;
+  }
+
+  // Depth 0-1: Always top-level
+  if (depth <= 1) {
+    return false;
+  }
+
+  // Depth 4+: Always nested
+  if (depth > 3) {
+    return true;
+  }
+
+  // Check parent node type for depth 2-3
+  const parentNode = $from.node(depth - 1);
+  if (!parentNode) {
+    return true;
+  }
+  const parentType = parentNode.type.name;
+
+  // Special cases where content is still top-level
+  if (parentType === 'listItem' && depth === 3 || parentType === 'blockquote' && depth === 2 || parentType === 'taskList' && depth === 2) {
+    return false;
+  }
+
+  // Everything else at depth 2-3 is nested
+  return true;
+};

package/dist/esm/editor-commands/transforms/container-transforms.js

@@ -13,6 +13,19 @@ var convertInvalidNodeToValidNodeType = function convertInvalidNodeToValidNodeTy
   });
   return Fragment.from(validTransformedContent);
 };
+var filterMarksForTargetNodeType = function filterMarksForTargetNodeType(content, targetNodeType) {
+  var withValidMarks = [];
+  content.forEach(function (node) {
+    if (node.marks.length > 0) {
+      var allowedMarks = targetNodeType.allowedMarks(node.marks);
+      var updatedNode = node.mark(allowedMarks);
+      withValidMarks.push(updatedNode);
+    } else {
+      withValidMarks.push(node);
+    }
+  });
+  return Fragment.from(withValidMarks);
+};
 
 /**
  * Transform selection to container type
@@ -32,6 +45,13 @@ export var transformToContainer = function transformToContainer(_ref) {
   if (targetNodeType === schema.nodes.blockquote) {
     transformedContent = convertInvalidNodeToValidNodeType(transformedContent, schema.nodes.heading, schema.nodes.paragraph, true);
   }
+
+  // Preserve marks that are allowed in the target node type
+  // e.g. blocks (heading/ paragraph) with alignment need to remove alignment
+  // as panel/ blockQuote/ expands does not support alignment
+  if (sourceNode.type === schema.nodes.paragraph || sourceNode.type === schema.nodes.heading) {
+    transformedContent = filterMarksForTargetNodeType(transformedContent, targetNodeType);
+  }
   var newNode = targetNodeType.createAndFill(targetAttrs, transformedContent);
   if (!newNode) {
     return null;

package/dist/esm/ui/copy-link.js

@@ -3,7 +3,9 @@ import { useIntl, injectIntl } from 'react-intl-next';
 import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import LinkIcon from '@atlaskit/icon/core/link';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { copyLink } from './utils/copyLink';
+import { isNestedNode } from './utils/isNestedNode';
 var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   var api = _ref.api,
     config = _ref.config;
@@ -23,6 +25,16 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
     api === null || api === void 0 || api.core.actions.focus();
     return copyLink(config === null || config === void 0 ? void 0 : config.getLinkPath, config === null || config === void 0 ? void 0 : config.blockQueryParam, api);
   }, [config === null || config === void 0 ? void 0 : config.getLinkPath, config === null || config === void 0 ? void 0 : config.blockQueryParam, api]);
+  var checkIsNestedNode = useCallback(function () {
+    var _api$selection;
+    var selection = api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.sharedState) === null || _api$selection === void 0 || (_api$selection = _api$selection.currentState()) === null || _api$selection === void 0 ? void 0 : _api$selection.selection;
+    return isNestedNode(selection);
+  }, [api]);
+
+  // Hide copy link when `platform_editor_adf_with_localid` feature flag is off or when the node is nested
+  if (!fg('platform_editor_adf_with_localid') || checkIsNestedNode()) {
+    return null;
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {

package/dist/esm/ui/utils/isNestedNode.js

@@ -0,0 +1,49 @@
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+
+/**
+ * Determines if a node is nested (not at top-level) based on its depth and context.
+ *
+ * Simple rules:
+ * - Depth 0-1: Always top-level (not nested)
+ * - Depth 2: Top-level for blockquotes and task lists
+ * - Depth 3: Top-level for list items only
+ * - Depth 4+: Always nested
+ *
+ * @param selection - The current ProseMirror selection
+ * @returns true if nested, false if top-level
+ */
+export var isNestedNode = function isNestedNode(selection) {
+  if (!selection) {
+    return false;
+  }
+  var $from = selection.$from;
+  var depth = $from.depth;
+  if ($from.depth > 0 && selection instanceof NodeSelection) {
+    return true;
+  }
+
+  // Depth 0-1: Always top-level
+  if (depth <= 1) {
+    return false;
+  }
+
+  // Depth 4+: Always nested
+  if (depth > 3) {
+    return true;
+  }
+
+  // Check parent node type for depth 2-3
+  var parentNode = $from.node(depth - 1);
+  if (!parentNode) {
+    return true;
+  }
+  var parentType = parentNode.type.name;
+
+  // Special cases where content is still top-level
+  if (parentType === 'listItem' && depth === 3 || parentType === 'blockquote' && depth === 2 || parentType === 'taskList' && depth === 2) {
+    return false;
+  }
+
+  // Everything else at depth 2-3 is nested
+  return true;
+};

package/dist/types/ui/utils/isNestedNode.d.ts

@@ -0,0 +1,14 @@
+import { type Selection } from '@atlaskit/editor-prosemirror/state';
+/**
+ * Determines if a node is nested (not at top-level) based on its depth and context.
+ *
+ * Simple rules:
+ * - Depth 0-1: Always top-level (not nested)
+ * - Depth 2: Top-level for blockquotes and task lists
+ * - Depth 3: Top-level for list items only
+ * - Depth 4+: Always nested
+ *
+ * @param selection - The current ProseMirror selection
+ * @returns true if nested, false if top-level
+ */
+export declare const isNestedNode: (selection: Selection | undefined) => boolean;

package/dist/types-ts4.5/ui/utils/isNestedNode.d.ts

@@ -0,0 +1,14 @@
+import { type Selection } from '@atlaskit/editor-prosemirror/state';
+/**
+ * Determines if a node is nested (not at top-level) based on its depth and context.
+ *
+ * Simple rules:
+ * - Depth 0-1: Always top-level (not nested)
+ * - Depth 2: Top-level for blockquotes and task lists
+ * - Depth 3: Top-level for list items only
+ * - Depth 4+: Always nested
+ *
+ * @param selection - The current ProseMirror selection
+ * @returns true if nested, false if top-level
+ */
+export declare const isNestedNode: (selection: Selection | undefined) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "1.0.9",
+	"version": "1.0.10",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,7 +46,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^108.5.0",
+		"@atlaskit/editor-common": "^108.6.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -85,5 +85,10 @@
 				"import-no-extraneous-disable-for-examples-and-docs"
 			]
 		}
+	},
+	"platform-feature-flags": {
+		"platform_editor_adf_with_localid": {
+			"type": "boolean"
+		}
 	}
 }