@atlaskit/editor-plugin-paste-options-toolbar 13.0.17 → 13.0.18

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 13.0.18
+
+### Patch Changes
+
+- [`e8a2ffea2c9eb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e8a2ffea2c9eb) -
+  [ux] Paste actions popup no longer appears for link-only pastes.
+- Updated dependencies
+
 ## 13.0.17
 
 ### Patch Changes

package/compass.yml

@@ -1,7 +1,7 @@
 configVersion: 1
 id: ari:cloud:compass:a436116f-02ce-4520-8fbb-7301462a1674:component/c5751cc6-3513-4070-9deb-af31e86aed34/e2696006-dd71-4fa9-8c65-6f36e32bac76
 name: '@atlaskit/editor-plugin-paste-options-toolbar'
-ownerId: ari:cloud:identity::team/e611522d-1773-43e4-85a5-e62f7cde47d6 # Editor - Core Experiences
+ownerId: ari:cloud:identity::team/0250ee69-f755-47fd-a468-bf8a9d10a3c5 # Editor AI
 labels:
   - platform-code
   - platform-afm
@@ -24,6 +24,9 @@ customFields:
   - name: Department
     type: text
     value: Eng - Editor
+  - name: Trusted Reviewer Teams
+    type: text
+    value: ari:cloud:identity::team/cf6a670b-5252-4c68-a769-9207de366beb
   - name: Technical Owner
     type: user
     value: ari:cloud:identity::user/612646c53fe26c00694fbe6a # Chris Kimber

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

@@ -12,7 +12,7 @@ exports.getVisualEndBottom = getVisualEndBottom;
 exports.onInlinePositionCalculated = onInlinePositionCalculated;
 exports.onPositionCalculated = onPositionCalculated;
 exports.resolveTableAfterPos = resolveTableAfterPos;
-exports.shouldSuppressPasteActionsForAgentMention = void 0;
+exports.shouldSuppressPasteActionsForSingleLink = exports.shouldSuppressPasteActionsForAgentMention = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -28,6 +28,7 @@ var _commands = require("../../editor-commands/commands");
 var _constants = require("../../pm-plugins/constants");
 var _types = require("../../types/types");
 var _toolbar2 = require("../toolbar");
+var _isNotSingleLink = require("../utils/paste-menu-rules/isNotSingleLink");
 var _hasVisibleButton = require("./hasVisibleButton");
 var _PasteActionsMenuContent = require("./PasteActionsMenuContent");
 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); }
@@ -56,6 +57,9 @@ var containsAgentMention = exports.containsAgentMention = function containsAgent
 var shouldSuppressPasteActionsForAgentMention = exports.shouldSuppressPasteActionsForAgentMention = function shouldSuppressPasteActionsForAgentMention(slice) {
   return (0, _expVal.expVal)('platform_editor_agent_mentions', 'isEnabled', false) && containsAgentMention(slice);
 };
+var shouldSuppressPasteActionsForSingleLink = exports.shouldSuppressPasteActionsForSingleLink = function shouldSuppressPasteActionsForSingleLink(slice) {
+  return (0, _expVal.expVal)('platform_editor_fix_link_paste_menu', 'isEnabled', false) && !(0, _isNotSingleLink.isNotSingleLink)(slice !== null && slice !== void 0 ? slice : undefined);
+};
 /**
  * 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.
@@ -265,7 +269,7 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
     lastContentPasted = _useSharedPluginState.lastContentPasted;
   var sliceForAgentMentionSuppression = lastContentPasted === null || lastContentPasted === void 0 ? void 0 : lastContentPasted.sourcePastedSlice;
   var shouldSuppressPasteActions = (0, _react.useMemo)(function () {
-    return shouldSuppressPasteActionsForAgentMention(sliceForAgentMentionSuppression);
+    return shouldSuppressPasteActionsForAgentMention(sliceForAgentMentionSuppression) || shouldSuppressPasteActionsForSingleLink(sliceForAgentMentionSuppression);
   }, [sliceForAgentMentionSuppression]);
   var prevShowToolbarRef = (0, _react.useRef)(false);
   var popupContentRef = (0, _react.useRef)(null);

package/dist/cjs/ui/utils/paste-menu-rules/isNotSingleLink.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isNotSingleLink = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 /**
  * Returns true if the given text node's sole mark is a `link` mark whose href
  * matches the node's text content exactly (i.e. the link label IS the URL).
@@ -42,36 +44,10 @@ var isParseableUrl = function isParseableUrl(text) {
     return false;
   }
 };
-
-/**
- * Returns true if the slice represents a single smart-link card node.
- * Handles two shapes:
- *  - paragraph > inlineCard|blockCard (smartlink from editor/renderer, wrapped in a paragraph)
- *  - inlineCard|blockCard             (top-level card with no paragraph wrapper)
- */
-var isSingleSmartLinkCard = function isSingleSmartLinkCard(slice) {
-  var isSupportedCard = function isSupportedCard(node) {
-    return node.type.name === 'inlineCard' || node.type.name === 'blockCard';
-  };
-  if (slice.content.childCount !== 1) {
-    return false;
-  }
-  var topNode = slice.content.child(0);
-
-  // Top-level inlineCard/blockCard (no paragraph wrapper)
-  if (isSupportedCard(topNode)) {
-    return true;
-  }
-
-  // paragraph > inlineCard/blockCard
-  if (topNode.type.name !== 'paragraph') {
-    return false;
-  }
-  if (topNode.childCount !== 1) {
-    return false;
-  }
-  return isSupportedCard(topNode.child(0));
+var isSupportedCard = function isSupportedCard(node) {
+  return node.type.name === 'inlineCard' || node.type.name === 'blockCard';
 };
+var transparentSingleChildContainerNodeTypes = new Set(['paragraph', 'listItem', 'bulletList', 'orderedList']);
 
 /**
  * Returns the children of a Fragment, filtering out whitespace-only text nodes.
@@ -91,32 +67,33 @@ var significantChildren = function significantChildren(fragment) {
 };
 
 /**
- * Returns true if the slice represents a single bare link with no label.
- * Handles two shapes:
- *  - paragraph > text(link mark)  (standard rich-text paste, wrapped in a paragraph)
- *  - text(link mark)              (top-level text node with no paragraph wrapper)
- * Whitespace-only sibling text nodes are ignored in both cases.
+ * Returns true when the fragment contains exactly one meaningful leaf that
+ * satisfies `isSupportedLeaf`.
+ *
+ * Transparent single-child containers (paragraph, listItem, bulletList, and
+ * orderedList) are traversed recursively. Whitespace-only sibling text nodes
+ * are ignored at each level.
  */
-var isSingleBareLink = function isSingleBareLink(slice) {
-  // Top-level text node with a link mark (no paragraph wrapper)
-  var significantTopChildren = significantChildren(slice.content);
-  if (significantTopChildren.length === 1 && isUrlOnlyLinkTextNode(significantTopChildren[0])) {
-    return true;
-  }
-
-  // paragraph > text(link mark)
-  if (slice.content.childCount !== 1) {
+var _containsExactlyOneMeaningfulLeaf = function containsExactlyOneMeaningfulLeaf(fragment, isSupportedLeaf) {
+  var children = significantChildren(fragment);
+  if (children.length !== 1) {
     return false;
   }
-  var topNode = slice.content.child(0);
-  if (topNode.type.name !== 'paragraph') {
-    return false;
+  var _children = (0, _slicedToArray2.default)(children, 1),
+    child = _children[0];
+  if (isSupportedLeaf(child)) {
+    return true;
   }
-  var children = significantChildren(topNode.content);
-  if (children.length !== 1) {
+  if (!transparentSingleChildContainerNodeTypes.has(child.type.name)) {
     return false;
   }
-  return isUrlOnlyLinkTextNode(children[0]);
+  return _containsExactlyOneMeaningfulLeaf(child.content, isSupportedLeaf);
+};
+var isSingleSmartLinkCard = function isSingleSmartLinkCard(slice) {
+  return _containsExactlyOneMeaningfulLeaf(slice.content, isSupportedCard);
+};
+var isSingleBareLink = function isSingleBareLink(slice) {
+  return _containsExactlyOneMeaningfulLeaf(slice.content, isUrlOnlyLinkTextNode);
 };
 
 /**

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

@@ -12,6 +12,7 @@ import { hideToolbar, highlightContent, showToolbar } from '../../editor-command
 import { PASTE_MENU_GAP_HORIZONTAL, PASTE_MENU_GAP_TOP } from '../../pm-plugins/constants';
 import { ToolbarDropdownOption } from '../../types/types';
 import { isToolbarVisible } from '../toolbar';
+import { isNotSingleLink } from '../utils/paste-menu-rules/isNotSingleLink';
 import { getVisibleKeys, hasVisibleButton } from './hasVisibleButton';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
@@ -33,6 +34,7 @@ export const containsAgentMention = slice => {
   return hasAgentMention;
 };
 export const shouldSuppressPasteActionsForAgentMention = slice => expVal('platform_editor_agent_mentions', 'isEnabled', false) && containsAgentMention(slice);
+export const shouldSuppressPasteActionsForSingleLink = slice => expVal('platform_editor_fix_link_paste_menu', 'isEnabled', false) && !isNotSingleLink(slice !== null && slice !== void 0 ? slice : undefined);
 /**
  * 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.
@@ -245,7 +247,7 @@ export const PasteActionsMenu = ({
     };
   });
   const sliceForAgentMentionSuppression = lastContentPasted === null || lastContentPasted === void 0 ? void 0 : lastContentPasted.sourcePastedSlice;
-  const shouldSuppressPasteActions = useMemo(() => shouldSuppressPasteActionsForAgentMention(sliceForAgentMentionSuppression), [sliceForAgentMentionSuppression]);
+  const shouldSuppressPasteActions = useMemo(() => shouldSuppressPasteActionsForAgentMention(sliceForAgentMentionSuppression) || shouldSuppressPasteActionsForSingleLink(sliceForAgentMentionSuppression), [sliceForAgentMentionSuppression]);
   const prevShowToolbarRef = useRef(false);
   const popupContentRef = useRef(null);
   useEffect(() => {

package/dist/es2019/ui/utils/paste-menu-rules/isNotSingleLink.js

@@ -36,34 +36,8 @@ const isParseableUrl = text => {
     return false;
   }
 };
-
-/**
- * Returns true if the slice represents a single smart-link card node.
- * Handles two shapes:
- *  - paragraph > inlineCard|blockCard (smartlink from editor/renderer, wrapped in a paragraph)
- *  - inlineCard|blockCard             (top-level card with no paragraph wrapper)
- */
-const isSingleSmartLinkCard = slice => {
-  const isSupportedCard = node => node.type.name === 'inlineCard' || node.type.name === 'blockCard';
-  if (slice.content.childCount !== 1) {
-    return false;
-  }
-  const topNode = slice.content.child(0);
-
-  // Top-level inlineCard/blockCard (no paragraph wrapper)
-  if (isSupportedCard(topNode)) {
-    return true;
-  }
-
-  // paragraph > inlineCard/blockCard
-  if (topNode.type.name !== 'paragraph') {
-    return false;
-  }
-  if (topNode.childCount !== 1) {
-    return false;
-  }
-  return isSupportedCard(topNode.child(0));
-};
+const isSupportedCard = node => node.type.name === 'inlineCard' || node.type.name === 'blockCard';
+const transparentSingleChildContainerNodeTypes = new Set(['paragraph', 'listItem', 'bulletList', 'orderedList']);
 
 /**
  * Returns the children of a Fragment, filtering out whitespace-only text nodes.
@@ -83,33 +57,29 @@ const significantChildren = fragment => {
 };
 
 /**
- * Returns true if the slice represents a single bare link with no label.
- * Handles two shapes:
- *  - paragraph > text(link mark)  (standard rich-text paste, wrapped in a paragraph)
- *  - text(link mark)              (top-level text node with no paragraph wrapper)
- * Whitespace-only sibling text nodes are ignored in both cases.
+ * Returns true when the fragment contains exactly one meaningful leaf that
+ * satisfies `isSupportedLeaf`.
+ *
+ * Transparent single-child containers (paragraph, listItem, bulletList, and
+ * orderedList) are traversed recursively. Whitespace-only sibling text nodes
+ * are ignored at each level.
  */
-const isSingleBareLink = slice => {
-  // Top-level text node with a link mark (no paragraph wrapper)
-  const significantTopChildren = significantChildren(slice.content);
-  if (significantTopChildren.length === 1 && isUrlOnlyLinkTextNode(significantTopChildren[0])) {
-    return true;
-  }
-
-  // paragraph > text(link mark)
-  if (slice.content.childCount !== 1) {
+const containsExactlyOneMeaningfulLeaf = (fragment, isSupportedLeaf) => {
+  const children = significantChildren(fragment);
+  if (children.length !== 1) {
     return false;
   }
-  const topNode = slice.content.child(0);
-  if (topNode.type.name !== 'paragraph') {
-    return false;
+  const [child] = children;
+  if (isSupportedLeaf(child)) {
+    return true;
   }
-  const children = significantChildren(topNode.content);
-  if (children.length !== 1) {
+  if (!transparentSingleChildContainerNodeTypes.has(child.type.name)) {
     return false;
   }
-  return isUrlOnlyLinkTextNode(children[0]);
+  return containsExactlyOneMeaningfulLeaf(child.content, isSupportedLeaf);
 };
+const isSingleSmartLinkCard = slice => containsExactlyOneMeaningfulLeaf(slice.content, isSupportedCard);
+const isSingleBareLink = slice => containsExactlyOneMeaningfulLeaf(slice.content, isUrlOnlyLinkTextNode);
 
 /**
  * Returns `true` when the pasted content is NOT a single standalone link.

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

@@ -15,6 +15,7 @@ import { hideToolbar, highlightContent, showToolbar } from '../../editor-command
 import { PASTE_MENU_GAP_HORIZONTAL, PASTE_MENU_GAP_TOP } from '../../pm-plugins/constants';
 import { ToolbarDropdownOption } from '../../types/types';
 import { isToolbarVisible } from '../toolbar';
+import { isNotSingleLink } from '../utils/paste-menu-rules/isNotSingleLink';
 import { getVisibleKeys, hasVisibleButton } from './hasVisibleButton';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 var PopupWithListeners = withReactEditorViewOuterListeners(Popup);
@@ -40,6 +41,9 @@ export var containsAgentMention = function containsAgentMention(slice) {
 export var shouldSuppressPasteActionsForAgentMention = function shouldSuppressPasteActionsForAgentMention(slice) {
   return expVal('platform_editor_agent_mentions', 'isEnabled', false) && containsAgentMention(slice);
 };
+export var shouldSuppressPasteActionsForSingleLink = function shouldSuppressPasteActionsForSingleLink(slice) {
+  return expVal('platform_editor_fix_link_paste_menu', 'isEnabled', false) && !isNotSingleLink(slice !== null && slice !== void 0 ? slice : undefined);
+};
 /**
  * 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.
@@ -249,7 +253,7 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
     lastContentPasted = _useSharedPluginState.lastContentPasted;
   var sliceForAgentMentionSuppression = lastContentPasted === null || lastContentPasted === void 0 ? void 0 : lastContentPasted.sourcePastedSlice;
   var shouldSuppressPasteActions = useMemo(function () {
-    return shouldSuppressPasteActionsForAgentMention(sliceForAgentMentionSuppression);
+    return shouldSuppressPasteActionsForAgentMention(sliceForAgentMentionSuppression) || shouldSuppressPasteActionsForSingleLink(sliceForAgentMentionSuppression);
   }, [sliceForAgentMentionSuppression]);
   var prevShowToolbarRef = useRef(false);
   var popupContentRef = useRef(null);

package/dist/esm/ui/utils/paste-menu-rules/isNotSingleLink.js

@@ -1,3 +1,4 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /**
  * Returns true if the given text node's sole mark is a `link` mark whose href
  * matches the node's text content exactly (i.e. the link label IS the URL).
@@ -36,36 +37,10 @@ var isParseableUrl = function isParseableUrl(text) {
     return false;
   }
 };
-
-/**
- * Returns true if the slice represents a single smart-link card node.
- * Handles two shapes:
- *  - paragraph > inlineCard|blockCard (smartlink from editor/renderer, wrapped in a paragraph)
- *  - inlineCard|blockCard             (top-level card with no paragraph wrapper)
- */
-var isSingleSmartLinkCard = function isSingleSmartLinkCard(slice) {
-  var isSupportedCard = function isSupportedCard(node) {
-    return node.type.name === 'inlineCard' || node.type.name === 'blockCard';
-  };
-  if (slice.content.childCount !== 1) {
-    return false;
-  }
-  var topNode = slice.content.child(0);
-
-  // Top-level inlineCard/blockCard (no paragraph wrapper)
-  if (isSupportedCard(topNode)) {
-    return true;
-  }
-
-  // paragraph > inlineCard/blockCard
-  if (topNode.type.name !== 'paragraph') {
-    return false;
-  }
-  if (topNode.childCount !== 1) {
-    return false;
-  }
-  return isSupportedCard(topNode.child(0));
+var isSupportedCard = function isSupportedCard(node) {
+  return node.type.name === 'inlineCard' || node.type.name === 'blockCard';
 };
+var transparentSingleChildContainerNodeTypes = new Set(['paragraph', 'listItem', 'bulletList', 'orderedList']);
 
 /**
  * Returns the children of a Fragment, filtering out whitespace-only text nodes.
@@ -85,32 +60,33 @@ var significantChildren = function significantChildren(fragment) {
 };
 
 /**
- * Returns true if the slice represents a single bare link with no label.
- * Handles two shapes:
- *  - paragraph > text(link mark)  (standard rich-text paste, wrapped in a paragraph)
- *  - text(link mark)              (top-level text node with no paragraph wrapper)
- * Whitespace-only sibling text nodes are ignored in both cases.
+ * Returns true when the fragment contains exactly one meaningful leaf that
+ * satisfies `isSupportedLeaf`.
+ *
+ * Transparent single-child containers (paragraph, listItem, bulletList, and
+ * orderedList) are traversed recursively. Whitespace-only sibling text nodes
+ * are ignored at each level.
  */
-var isSingleBareLink = function isSingleBareLink(slice) {
-  // Top-level text node with a link mark (no paragraph wrapper)
-  var significantTopChildren = significantChildren(slice.content);
-  if (significantTopChildren.length === 1 && isUrlOnlyLinkTextNode(significantTopChildren[0])) {
-    return true;
-  }
-
-  // paragraph > text(link mark)
-  if (slice.content.childCount !== 1) {
+var _containsExactlyOneMeaningfulLeaf = function containsExactlyOneMeaningfulLeaf(fragment, isSupportedLeaf) {
+  var children = significantChildren(fragment);
+  if (children.length !== 1) {
     return false;
   }
-  var topNode = slice.content.child(0);
-  if (topNode.type.name !== 'paragraph') {
-    return false;
+  var _children = _slicedToArray(children, 1),
+    child = _children[0];
+  if (isSupportedLeaf(child)) {
+    return true;
   }
-  var children = significantChildren(topNode.content);
-  if (children.length !== 1) {
+  if (!transparentSingleChildContainerNodeTypes.has(child.type.name)) {
     return false;
   }
-  return isUrlOnlyLinkTextNode(children[0]);
+  return _containsExactlyOneMeaningfulLeaf(child.content, isSupportedLeaf);
+};
+var isSingleSmartLinkCard = function isSingleSmartLinkCard(slice) {
+  return _containsExactlyOneMeaningfulLeaf(slice.content, isSupportedCard);
+};
+var isSingleBareLink = function isSingleBareLink(slice) {
+  return _containsExactlyOneMeaningfulLeaf(slice.content, isUrlOnlyLinkTextNode);
 };
 
 /**

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

@@ -8,6 +8,7 @@ import type { PasteOptionsToolbarPlugin } from '../../pasteOptionsToolbarPluginT
  */
 export declare const containsAgentMention: (slice?: Slice | null) => boolean;
 export declare const shouldSuppressPasteActionsForAgentMention: (slice?: Slice | null) => boolean;
+export declare const shouldSuppressPasteActionsForSingleLink: (slice?: Slice | null) => boolean;
 interface PasteActionsMenuProps {
     api: ExtractInjectionAPI<PasteOptionsToolbarPlugin> | undefined;
     boundariesElement?: HTMLElement;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste-options-toolbar",
-	"version": "13.0.17",
+	"version": "13.0.18",
 	"description": "Paste options toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 		"@atlaskit/icon": "^36.1.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
 		"@atlaskit/primitives": "^20.3.0",
-		"@atlaskit/tmp-editor-statsig": "^119.0.0",
+		"@atlaskit/tmp-editor-statsig": "^119.1.0",
 		"@atlaskit/tokens": "^15.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
@@ -57,6 +57,9 @@
 		"platform_editor_agent_mentions": {
 			"type": "experiment"
 		},
+		"platform_editor_fix_link_paste_menu": {
+			"type": "experiment"
+		},
 		"platform_editor_paste_actions_menu_exposure": {
 			"type": "boolean"
 		},