@atlaskit/editor-plugin-paste-options-toolbar 9.1.4 → 9.1.5

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 9.1.5
+
+### Patch Changes
+
+- [`2e030e319c013`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2e030e319c013) -
+  [EDITOR-5982] Fix AI paste menu not appearing when pasting heading + text
+- [`e7032ec0e9287`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e7032ec0e9287) -
+  [ux] EDITOR-5983 Ensure paste menu is in correct position when first pasted node is empty
+
 ## 9.1.4
 
 ### Patch Changes

package/dist/cjs/ui/on-paste-actions-menu/PasteActionsMenu.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PasteActionsMenu = void 0;
+exports.getTargetElement = getTargetElement;
 exports.getVisualEndBottom = getVisualEndBottom;
 exports.onPositionCalculated = onPositionCalculated;
 exports.resolveTableAfterPos = resolveTableAfterPos;
@@ -29,10 +30,21 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var PopupWithListeners = (0, _uiReact.withReactEditorViewOuterListeners)(_ui.Popup);
+/**
+ * Returns the DOM element at the given document position for use as a Popup anchor.
+ * For empty blocks (BR elements), returns the parent element to ensure correct positioning.
+ */
 function getTargetElement(editorView, pos) {
   try {
     var domRef = (0, _utils.findDomRefAtPos)(pos, editorView.domAtPos.bind(editorView));
     if (domRef instanceof HTMLElement) {
+      // Empty blocks render a <br> placeholder whose bounding rect has no
+      // meaningful dimensions (height ≈ 0). Using it as the Popup anchor
+      // causes the menu to appear at an unexpected position. Walk up to the
+      // parent block element so the Popup anchors correctly.
+      if (domRef.nodeName === 'BR' && domRef.parentElement) {
+        return domRef.parentElement;
+      }
       return domRef;
     }
     return null;
@@ -147,7 +159,12 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
     var $pos = editorView.state.doc.resolve(lastContentPasted.pasteStartPos);
     var pasteAncestorNodeNames = [];
     for (var depth = $pos.depth; depth > 0; depth--) {
-      pasteAncestorNodeNames.push($pos.node(depth).type.name);
+      // Only include an ancestor if the entire pasted range is contained within it.
+      // This prevents nodes like 'heading' from being flagged as ancestors when the
+      // pasted content starts in a heading but extends beyond it (e.g. heading + paragraph).
+      if (lastContentPasted.pasteEndPos <= $pos.end(depth)) {
+        pasteAncestorNodeNames.push($pos.node(depth).type.name);
+      }
     }
     var legacyVisible = (0, _toolbar2.isToolbarVisible)(editorView.state, lastContentPasted) && ((_lastContentPasted$te = (_lastContentPasted$te2 = lastContentPasted.text) === null || _lastContentPasted$te2 === void 0 ? void 0 : _lastContentPasted$te2.length) !== null && _lastContentPasted$te !== void 0 ? _lastContentPasted$te : 0) >= 100;
     (0, _commands.showToolbar)(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);

package/dist/es2019/ui/on-paste-actions-menu/PasteActionsMenu.js

@@ -14,10 +14,21 @@ import { isToolbarVisible } from '../toolbar';
 import { getVisibleKeys, hasVisibleButton } from './hasVisibleButton';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
-function getTargetElement(editorView, pos) {
+/**
+ * Returns the DOM element at the given document position for use as a Popup anchor.
+ * For empty blocks (BR elements), returns the parent element to ensure correct positioning.
+ */
+export function getTargetElement(editorView, pos) {
   try {
     const domRef = findDomRefAtPos(pos, editorView.domAtPos.bind(editorView));
     if (domRef instanceof HTMLElement) {
+      // Empty blocks render a <br> placeholder whose bounding rect has no
+      // meaningful dimensions (height ≈ 0). Using it as the Popup anchor
+      // causes the menu to appear at an unexpected position. Walk up to the
+      // parent block element so the Popup anchors correctly.
+      if (domRef.nodeName === 'BR' && domRef.parentElement) {
+        return domRef.parentElement;
+      }
       return domRef;
     }
     return null;
@@ -135,7 +146,12 @@ export const PasteActionsMenu = ({
     const $pos = editorView.state.doc.resolve(lastContentPasted.pasteStartPos);
     const pasteAncestorNodeNames = [];
     for (let depth = $pos.depth; depth > 0; depth--) {
-      pasteAncestorNodeNames.push($pos.node(depth).type.name);
+      // Only include an ancestor if the entire pasted range is contained within it.
+      // This prevents nodes like 'heading' from being flagged as ancestors when the
+      // pasted content starts in a heading but extends beyond it (e.g. heading + paragraph).
+      if (lastContentPasted.pasteEndPos <= $pos.end(depth)) {
+        pasteAncestorNodeNames.push($pos.node(depth).type.name);
+      }
     }
     const legacyVisible = isToolbarVisible(editorView.state, lastContentPasted) && ((_lastContentPasted$te = (_lastContentPasted$te2 = lastContentPasted.text) === null || _lastContentPasted$te2 === void 0 ? void 0 : _lastContentPasted$te2.length) !== null && _lastContentPasted$te !== void 0 ? _lastContentPasted$te : 0) >= 100;
     showToolbar(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);

package/dist/esm/ui/on-paste-actions-menu/PasteActionsMenu.js

@@ -17,10 +17,21 @@ import { isToolbarVisible } from '../toolbar';
 import { getVisibleKeys, hasVisibleButton } from './hasVisibleButton';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 var PopupWithListeners = withReactEditorViewOuterListeners(Popup);
-function getTargetElement(editorView, pos) {
+/**
+ * Returns the DOM element at the given document position for use as a Popup anchor.
+ * For empty blocks (BR elements), returns the parent element to ensure correct positioning.
+ */
+export function getTargetElement(editorView, pos) {
   try {
     var domRef = findDomRefAtPos(pos, editorView.domAtPos.bind(editorView));
     if (domRef instanceof HTMLElement) {
+      // Empty blocks render a <br> placeholder whose bounding rect has no
+      // meaningful dimensions (height ≈ 0). Using it as the Popup anchor
+      // causes the menu to appear at an unexpected position. Walk up to the
+      // parent block element so the Popup anchors correctly.
+      if (domRef.nodeName === 'BR' && domRef.parentElement) {
+        return domRef.parentElement;
+      }
       return domRef;
     }
     return null;
@@ -135,7 +146,12 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
     var $pos = editorView.state.doc.resolve(lastContentPasted.pasteStartPos);
     var pasteAncestorNodeNames = [];
     for (var depth = $pos.depth; depth > 0; depth--) {
-      pasteAncestorNodeNames.push($pos.node(depth).type.name);
+      // Only include an ancestor if the entire pasted range is contained within it.
+      // This prevents nodes like 'heading' from being flagged as ancestors when the
+      // pasted content starts in a heading but extends beyond it (e.g. heading + paragraph).
+      if (lastContentPasted.pasteEndPos <= $pos.end(depth)) {
+        pasteAncestorNodeNames.push($pos.node(depth).type.name);
+      }
     }
     var legacyVisible = isToolbarVisible(editorView.state, lastContentPasted) && ((_lastContentPasted$te = (_lastContentPasted$te2 = lastContentPasted.text) === null || _lastContentPasted$te2 === void 0 ? void 0 : _lastContentPasted$te2.length) !== null && _lastContentPasted$te !== void 0 ? _lastContentPasted$te : 0) >= 100;
     showToolbar(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);

package/dist/types/ui/on-paste-actions-menu/PasteActionsMenu.d.ts

@@ -9,6 +9,11 @@ interface PasteActionsMenuProps {
     mountTo?: HTMLElement;
     scrollableElement?: HTMLElement;
 }
+/**
+ * Returns the DOM element at the given document position for use as a Popup anchor.
+ * For empty blocks (BR elements), returns the parent element to ensure correct positioning.
+ */
+export declare function getTargetElement(editorView: EditorView, pos: number): HTMLElement | null;
 /**
  * Returns the position immediately after a table ancestor of `pos`, or
  * `undefined` if not inside a table. Safe to cache per document version.

package/dist/types-ts4.5/ui/on-paste-actions-menu/PasteActionsMenu.d.ts

@@ -9,6 +9,11 @@ interface PasteActionsMenuProps {
     mountTo?: HTMLElement;
     scrollableElement?: HTMLElement;
 }
+/**
+ * Returns the DOM element at the given document position for use as a Popup anchor.
+ * For empty blocks (BR elements), returns the parent element to ensure correct positioning.
+ */
+export declare function getTargetElement(editorView: EditorView, pos: number): HTMLElement | null;
 /**
  * Returns the position immediately after a table ancestor of `pos`, or
  * `undefined` if not inside a table. Safe to cache per document version.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste-options-toolbar",
-	"version": "9.1.4",
+	"version": "9.1.5",
 	"description": "Paste options toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.5.0",
+		"@atlaskit/editor-common": "^112.6.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},