@atlaskit/editor-plugin-paste-options-toolbar 13.1.5 → 13.1.7

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 13.1.7
+
+### Patch Changes
+
+- Updated dependencies
+
+## 13.1.6
+
+### Patch Changes
+
+- [`0f828d3590ec8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0f828d3590ec8) -
+  Fix the paste actions menu to remain visible for single Smart Link pastes when an AI action is
+  available.
+
 ## 13.1.5
 
 ### Patch Changes

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

@@ -268,9 +268,22 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
     }),
     lastContentPasted = _useSharedPluginState.lastContentPasted;
   var sliceForAgentMentionSuppression = lastContentPasted === null || lastContentPasted === void 0 ? void 0 : lastContentPasted.sourcePastedSlice;
+  var pasteMenuComponents = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(_toolbar.PASTE_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
+
+  // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- pasteMenuComponents changes by reference each render; filter is small (< 10 items)
+  var aiMenuItems = pasteMenuComponents.filter(function (c) {
+    var _c$parents;
+    return c.type === 'menu-item' && ((_c$parents = c.parents) === null || _c$parents === void 0 ? void 0 : _c$parents.some(function (p) {
+      return p.key === _toolbar.AI_PASTE_MENU_SECTION.key;
+    }));
+  });
+  var visibleAiActionKeys = (0, _hasVisibleButton.getVisibleKeys)(aiMenuItems, ['menu-item']);
+  var hasVisibleAiActions = visibleAiActionKeys.length > 0;
   var shouldSuppressPasteActions = (0, _react.useMemo)(function () {
-    return shouldSuppressPasteActionsForAgentMention(sliceForAgentMentionSuppression) || shouldSuppressPasteActionsForSingleLink(sliceForAgentMentionSuppression);
-  }, [sliceForAgentMentionSuppression]);
+    var suppressForAgentMention = shouldSuppressPasteActionsForAgentMention(sliceForAgentMentionSuppression);
+    var suppressForSingleLink = shouldSuppressPasteActionsForSingleLink(sliceForAgentMentionSuppression) && !hasVisibleAiActions;
+    return suppressForAgentMention || suppressForSingleLink;
+  }, [sliceForAgentMentionSuppression, hasVisibleAiActions]);
   var prevShowToolbarRef = (0, _react.useRef)(false);
   var popupContentRef = (0, _react.useRef)(null);
   (0, _react.useEffect)(function () {
@@ -347,27 +360,15 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
   // onPositionCalculated with fresh viewport coordinates.
   var overflowScrollParent = shouldRenderToolbar ? (0, _ui.findOverflowScrollParent)(editorView.dom) : false;
   var effectiveScrollableElement = overflowScrollParent || scrollableElement;
-  var pasteMenuComponents = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(_toolbar.PASTE_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
   var anyComponentVisible = (0, _hasVisibleButton.hasVisibleButton)(pasteMenuComponents);
 
-  // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- pasteMenuComponents changes by reference each render; filter is small (< 10 items)
-  var aiMenuItems = pasteMenuComponents.filter(function (c) {
-    var _c$parents;
-    return c.type === 'menu-item' && ((_c$parents = c.parents) === null || _c$parents === void 0 ? void 0 : _c$parents.some(function (p) {
-      return p.key === _toolbar.AI_PASTE_MENU_SECTION.key;
-    }));
-  });
-  var visibleAiActionKeys = (0, _hasVisibleButton.getVisibleKeys)(aiMenuItems, ['menu-item']);
-
   // Whether the card plugin's "Display as" section is visible when the menu opens.
   var displayAsVisible = (0, _hasVisibleButton.getVisibleKeys)(pasteMenuComponents, ['menu-section']).includes(_toolbar.SMART_LINK_DISPLAY_AS_PASTE_MENU_SECTION.key);
-
   // Two positioning modes:
   // 1. Inline: no AI actions visible — menu appears to the right of the cursor,
   //    vertically centered with the text line.
   // 2. Block-anchored: AI actions are visible — menu appears at the right edge
   //    of the content block, aligned with paste start.
-  var hasVisibleAiActions = visibleAiActionKeys.length > 0;
   (0, _react.useEffect)(function () {
     if (!prevShowToolbarRef.current && shouldRenderToolbar) {
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.fireAnalyticsEvent({

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

@@ -247,7 +247,20 @@ export const PasteActionsMenu = ({
     };
   });
   const sliceForAgentMentionSuppression = lastContentPasted === null || lastContentPasted === void 0 ? void 0 : lastContentPasted.sourcePastedSlice;
-  const shouldSuppressPasteActions = useMemo(() => shouldSuppressPasteActionsForAgentMention(sliceForAgentMentionSuppression) || shouldSuppressPasteActionsForSingleLink(sliceForAgentMentionSuppression), [sliceForAgentMentionSuppression]);
+  const pasteMenuComponents = (_api$uiControlRegistr = api === null || api === void 0 ? void 0 : (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(PASTE_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
+
+  // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- pasteMenuComponents changes by reference each render; filter is small (< 10 items)
+  const aiMenuItems = pasteMenuComponents.filter(c => {
+    var _c$parents;
+    return c.type === 'menu-item' && ((_c$parents = c.parents) === null || _c$parents === void 0 ? void 0 : _c$parents.some(p => p.key === AI_PASTE_MENU_SECTION.key));
+  });
+  const visibleAiActionKeys = getVisibleKeys(aiMenuItems, ['menu-item']);
+  const hasVisibleAiActions = visibleAiActionKeys.length > 0;
+  const shouldSuppressPasteActions = useMemo(() => {
+    const suppressForAgentMention = shouldSuppressPasteActionsForAgentMention(sliceForAgentMentionSuppression);
+    const suppressForSingleLink = shouldSuppressPasteActionsForSingleLink(sliceForAgentMentionSuppression) && !hasVisibleAiActions;
+    return suppressForAgentMention || suppressForSingleLink;
+  }, [sliceForAgentMentionSuppression, hasVisibleAiActions]);
   const prevShowToolbarRef = useRef(false);
   const popupContentRef = useRef(null);
   useEffect(() => {
@@ -325,25 +338,15 @@ export const PasteActionsMenu = ({
   // onPositionCalculated with fresh viewport coordinates.
   const overflowScrollParent = shouldRenderToolbar ? findOverflowScrollParent(editorView.dom) : false;
   const effectiveScrollableElement = overflowScrollParent || scrollableElement;
-  const pasteMenuComponents = (_api$uiControlRegistr = api === null || api === void 0 ? void 0 : (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(PASTE_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
   const anyComponentVisible = hasVisibleButton(pasteMenuComponents);
 
-  // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- pasteMenuComponents changes by reference each render; filter is small (< 10 items)
-  const aiMenuItems = pasteMenuComponents.filter(c => {
-    var _c$parents;
-    return c.type === 'menu-item' && ((_c$parents = c.parents) === null || _c$parents === void 0 ? void 0 : _c$parents.some(p => p.key === AI_PASTE_MENU_SECTION.key));
-  });
-  const visibleAiActionKeys = getVisibleKeys(aiMenuItems, ['menu-item']);
-
   // Whether the card plugin's "Display as" section is visible when the menu opens.
   const displayAsVisible = getVisibleKeys(pasteMenuComponents, ['menu-section']).includes(SMART_LINK_DISPLAY_AS_PASTE_MENU_SECTION.key);
-
   // Two positioning modes:
   // 1. Inline: no AI actions visible — menu appears to the right of the cursor,
   //    vertically centered with the text line.
   // 2. Block-anchored: AI actions are visible — menu appears at the right edge
   //    of the content block, aligned with paste start.
-  const hasVisibleAiActions = visibleAiActionKeys.length > 0;
   useEffect(() => {
     if (!prevShowToolbarRef.current && shouldRenderToolbar) {
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent({

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

@@ -252,9 +252,22 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
     }),
     lastContentPasted = _useSharedPluginState.lastContentPasted;
   var sliceForAgentMentionSuppression = lastContentPasted === null || lastContentPasted === void 0 ? void 0 : lastContentPasted.sourcePastedSlice;
+  var pasteMenuComponents = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(PASTE_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
+
+  // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- pasteMenuComponents changes by reference each render; filter is small (< 10 items)
+  var aiMenuItems = pasteMenuComponents.filter(function (c) {
+    var _c$parents;
+    return c.type === 'menu-item' && ((_c$parents = c.parents) === null || _c$parents === void 0 ? void 0 : _c$parents.some(function (p) {
+      return p.key === AI_PASTE_MENU_SECTION.key;
+    }));
+  });
+  var visibleAiActionKeys = getVisibleKeys(aiMenuItems, ['menu-item']);
+  var hasVisibleAiActions = visibleAiActionKeys.length > 0;
   var shouldSuppressPasteActions = useMemo(function () {
-    return shouldSuppressPasteActionsForAgentMention(sliceForAgentMentionSuppression) || shouldSuppressPasteActionsForSingleLink(sliceForAgentMentionSuppression);
-  }, [sliceForAgentMentionSuppression]);
+    var suppressForAgentMention = shouldSuppressPasteActionsForAgentMention(sliceForAgentMentionSuppression);
+    var suppressForSingleLink = shouldSuppressPasteActionsForSingleLink(sliceForAgentMentionSuppression) && !hasVisibleAiActions;
+    return suppressForAgentMention || suppressForSingleLink;
+  }, [sliceForAgentMentionSuppression, hasVisibleAiActions]);
   var prevShowToolbarRef = useRef(false);
   var popupContentRef = useRef(null);
   useEffect(function () {
@@ -331,27 +344,15 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
   // onPositionCalculated with fresh viewport coordinates.
   var overflowScrollParent = shouldRenderToolbar ? findOverflowScrollParent(editorView.dom) : false;
   var effectiveScrollableElement = overflowScrollParent || scrollableElement;
-  var pasteMenuComponents = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(PASTE_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
   var anyComponentVisible = hasVisibleButton(pasteMenuComponents);
 
-  // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- pasteMenuComponents changes by reference each render; filter is small (< 10 items)
-  var aiMenuItems = pasteMenuComponents.filter(function (c) {
-    var _c$parents;
-    return c.type === 'menu-item' && ((_c$parents = c.parents) === null || _c$parents === void 0 ? void 0 : _c$parents.some(function (p) {
-      return p.key === AI_PASTE_MENU_SECTION.key;
-    }));
-  });
-  var visibleAiActionKeys = getVisibleKeys(aiMenuItems, ['menu-item']);
-
   // Whether the card plugin's "Display as" section is visible when the menu opens.
   var displayAsVisible = getVisibleKeys(pasteMenuComponents, ['menu-section']).includes(SMART_LINK_DISPLAY_AS_PASTE_MENU_SECTION.key);
-
   // Two positioning modes:
   // 1. Inline: no AI actions visible — menu appears to the right of the cursor,
   //    vertically centered with the text line.
   // 2. Block-anchored: AI actions are visible — menu appears at the right edge
   //    of the content block, aligned with paste start.
-  var hasVisibleAiActions = visibleAiActionKeys.length > 0;
   useEffect(function () {
     if (!prevShowToolbarRef.current && shouldRenderToolbar) {
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.fireAnalyticsEvent({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste-options-toolbar",
-	"version": "13.1.5",
+	"version": "13.1.7",
 	"description": "Paste options toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,14 +34,14 @@
 		"@atlaskit/icon": "^37.0.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
 		"@atlaskit/primitives": "^20.6.0",
-		"@atlaskit/tmp-editor-statsig": "^124.1.0",
-		"@atlaskit/tokens": "^15.6.0",
+		"@atlaskit/tmp-editor-statsig": "^125.0.0",
+		"@atlaskit/tokens": "^15.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.26.0",
+		"@atlaskit/editor-common": "^116.30.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"