@atlaskit/editor-plugin-card 18.1.6 → 18.2.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-card
 
+## 18.2.0
+
+### Minor Changes
+
+- [`06c7a1c8b9f35`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/06c7a1c8b9f35) -
+  Fix Ask Rovo context for pasted Smart Links and hide single-link AI actions in comments
+
+## 18.1.7
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 18.1.6
 
 ### Patch Changes

package/dist/cjs/ui/PasteDisplayAsMenu.js

@@ -220,6 +220,7 @@ var PasteDisplayAsMenuHorizontalView = function PasteDisplayAsMenuHorizontalView
   var currentAppearance = editorView && pasteRange ? (_getCardAtPasteRange$ = (_getCardAtPasteRange = (0, _pasteDisplayAsUtils.getCardAtPasteRange)(editorView.state, pasteRange.pasteStartPos, pasteRange.pasteEndPos)) === null || _getCardAtPasteRange === void 0 ? void 0 : _getCardAtPasteRange.appearance) !== null && _getCardAtPasteRange$ !== void 0 ? _getCardAtPasteRange$ : 'url' : undefined;
   var handleClick = (0, _react.useCallback)(function (appearance) {
     return function () {
+      var _state$doc$nodeAt2, _targetNodeAttrs$url, _targetNodeAttrs$data;
       if (!editorView || !pasteRange || !pastedLinkUrl || !currentAppearance || isApplyingRef.current) {
         return;
       }
@@ -239,7 +240,10 @@ var PasteDisplayAsMenuHorizontalView = function PasteDisplayAsMenuHorizontalView
         return;
       }
       var targetPos = cardAtPasteRange === null || cardAtPasteRange === void 0 ? void 0 : cardAtPasteRange.pos;
-      if (targetPos !== undefined && targetPos < pasteStartPos) {
+      var targetNodeAttrs = targetPos === undefined ? undefined : (_state$doc$nodeAt2 = state.doc.nodeAt(targetPos)) === null || _state$doc$nodeAt2 === void 0 ? void 0 : _state$doc$nodeAt2.attrs;
+      var targetNodeUrl = (_targetNodeAttrs$url = targetNodeAttrs === null || targetNodeAttrs === void 0 ? void 0 : targetNodeAttrs.url) !== null && _targetNodeAttrs$url !== void 0 ? _targetNodeAttrs$url : targetNodeAttrs === null || targetNodeAttrs === void 0 || (_targetNodeAttrs$data = targetNodeAttrs.data) === null || _targetNodeAttrs$data === void 0 ? void 0 : _targetNodeAttrs$data.url;
+      var isRecoveredAdjacentPastedCard = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('confluence_editor_paste_3p_link_actions_menu', 'isEnabled', true) && targetPos === pasteStartPos - 1 && pasteStartPos === pasteEndPos && targetNodeUrl === pastedLinkUrl;
+      if (targetPos !== undefined && targetPos < pasteStartPos && !isRecoveredAdjacentPastedCard) {
         isApplyingRef.current = false;
         return;
       }
@@ -406,6 +410,10 @@ var getPasteDisplayAsMenuComponents = exports.getPasteDisplayAsMenuComponents =
       if (!rules || rules.notSingleLinkRule()) {
         return true;
       }
+      var urlFromSlice = (0, _currentPastedSmartLink.getSingleSmartLinkUrlFromSlice)(getCurrentPastedSlice(api));
+      if (urlFromSlice) {
+        return false;
+      }
 
       // Fallback: plain-text URL paste that the card plugin already resolved into a card node in the doc.
       var urlFromCard = getCardUrlAtPasteRange({

package/dist/cjs/ui/currentPastedSmartLink.js

@@ -12,12 +12,12 @@ var getUrlFromTextLinkNode = function getUrlFromTextLinkNode(node) {
   var href = (_node$marks$0$attrs = node.marks[0].attrs) === null || _node$marks$0$attrs === void 0 ? void 0 : _node$marks$0$attrs.href;
   return typeof href === 'string' && node.text === href ? href : undefined;
 };
-var getUrlFromInlineCardNode = function getUrlFromInlineCardNode(node) {
-  var _node$attrs;
-  if (node.type.name !== 'inlineCard') {
+var getUrlFromCardNode = function getUrlFromCardNode(node) {
+  var _node$attrs$url, _node$attrs, _node$attrs2;
+  if (node.type.name !== 'inlineCard' && node.type.name !== 'blockCard' && node.type.name !== 'embedCard') {
     return undefined;
   }
-  var url = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url;
+  var url = (_node$attrs$url = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url) !== null && _node$attrs$url !== void 0 ? _node$attrs$url : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.data) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.url;
   return typeof url === 'string' ? url : undefined;
 };
 var significantChildren = function significantChildren(fragment) {
@@ -37,7 +37,7 @@ var getSingleSmartLinkUrlFromSlice = exports.getSingleSmartLinkUrlFromSlice = fu
     return undefined;
   }
   var topNode = slice.content.child(0);
-  var topNodeUrl = (_getUrlFromTextLinkNo = getUrlFromTextLinkNode(topNode)) !== null && _getUrlFromTextLinkNo !== void 0 ? _getUrlFromTextLinkNo : getUrlFromInlineCardNode(topNode);
+  var topNodeUrl = (_getUrlFromTextLinkNo = getUrlFromTextLinkNode(topNode)) !== null && _getUrlFromTextLinkNo !== void 0 ? _getUrlFromTextLinkNo : getUrlFromCardNode(topNode);
   if (topNodeUrl) {
     return topNodeUrl;
   }
@@ -48,5 +48,5 @@ var getSingleSmartLinkUrlFromSlice = exports.getSingleSmartLinkUrlFromSlice = fu
   if (children.length !== 1) {
     return undefined;
   }
-  return (_getUrlFromTextLinkNo2 = getUrlFromTextLinkNode(children[0])) !== null && _getUrlFromTextLinkNo2 !== void 0 ? _getUrlFromTextLinkNo2 : getUrlFromInlineCardNode(children[0]);
+  return (_getUrlFromTextLinkNo2 = getUrlFromTextLinkNode(children[0])) !== null && _getUrlFromTextLinkNo2 !== void 0 ? _getUrlFromTextLinkNo2 : getUrlFromCardNode(children[0]);
 };

package/dist/cjs/ui/pasteDisplayAsUtils.js

@@ -13,6 +13,21 @@ var getCardAtPasteRange = exports.getCardAtPasteRange = function getCardAtPasteR
   var from = Math.min(clampedStart, clampedEnd);
   var to = Math.max(clampedStart, clampedEnd);
   try {
+    if (from === to) {
+      for (var _i = 0, _arr = [from - 1, from]; _i < _arr.length; _i++) {
+        var pos = _arr[_i];
+        if (pos < 0 || pos >= docContentSize) {
+          continue;
+        }
+        var node = state.doc.nodeAt(pos);
+        if ((node === null || node === void 0 ? void 0 : node.type.name) === 'inlineCard' || (node === null || node === void 0 ? void 0 : node.type.name) === 'blockCard' || (node === null || node === void 0 ? void 0 : node.type.name) === 'embedCard') {
+          return {
+            appearance: node.type.name === 'inlineCard' ? 'inline' : node.type.name === 'blockCard' ? 'block' : 'embed',
+            pos: pos
+          };
+        }
+      }
+    }
     state.doc.nodesBetween(from, to, function (node, pos) {
       if (node.type.name === 'inlineCard' || node.type.name === 'blockCard' || node.type.name === 'embedCard') {
         result = {

package/dist/es2019/ui/PasteDisplayAsMenu.js

@@ -215,6 +215,7 @@ const PasteDisplayAsMenuHorizontalView = ({
   const hasResolvedSmartLinkData = Boolean(pastedLinkUrlState === null || pastedLinkUrlState === void 0 ? void 0 : pastedLinkUrlState.details);
   const currentAppearance = editorView && pasteRange ? (_getCardAtPasteRange$ = (_getCardAtPasteRange = getCardAtPasteRange(editorView.state, pasteRange.pasteStartPos, pasteRange.pasteEndPos)) === null || _getCardAtPasteRange === void 0 ? void 0 : _getCardAtPasteRange.appearance) !== null && _getCardAtPasteRange$ !== void 0 ? _getCardAtPasteRange$ : 'url' : undefined;
   const handleClick = useCallback(appearance => () => {
+    var _state$doc$nodeAt2, _targetNodeAttrs$url, _targetNodeAttrs$data;
     if (!editorView || !pasteRange || !pastedLinkUrl || !currentAppearance || isApplyingRef.current) {
       return;
     }
@@ -238,7 +239,10 @@ const PasteDisplayAsMenuHorizontalView = ({
       return;
     }
     const targetPos = cardAtPasteRange === null || cardAtPasteRange === void 0 ? void 0 : cardAtPasteRange.pos;
-    if (targetPos !== undefined && targetPos < pasteStartPos) {
+    const targetNodeAttrs = targetPos === undefined ? undefined : (_state$doc$nodeAt2 = state.doc.nodeAt(targetPos)) === null || _state$doc$nodeAt2 === void 0 ? void 0 : _state$doc$nodeAt2.attrs;
+    const targetNodeUrl = (_targetNodeAttrs$url = targetNodeAttrs === null || targetNodeAttrs === void 0 ? void 0 : targetNodeAttrs.url) !== null && _targetNodeAttrs$url !== void 0 ? _targetNodeAttrs$url : targetNodeAttrs === null || targetNodeAttrs === void 0 ? void 0 : (_targetNodeAttrs$data = targetNodeAttrs.data) === null || _targetNodeAttrs$data === void 0 ? void 0 : _targetNodeAttrs$data.url;
+    const isRecoveredAdjacentPastedCard = expValEqualsNoExposure('confluence_editor_paste_3p_link_actions_menu', 'isEnabled', true) && targetPos === pasteStartPos - 1 && pasteStartPos === pasteEndPos && targetNodeUrl === pastedLinkUrl;
+    if (targetPos !== undefined && targetPos < pasteStartPos && !isRecoveredAdjacentPastedCard) {
       isApplyingRef.current = false;
       return;
     }
@@ -386,6 +390,10 @@ export const getPasteDisplayAsMenuComponents = ({
       if (!rules || rules.notSingleLinkRule()) {
         return true;
       }
+      const urlFromSlice = getSingleSmartLinkUrlFromSlice(getCurrentPastedSlice(api));
+      if (urlFromSlice) {
+        return false;
+      }
 
       // Fallback: plain-text URL paste that the card plugin already resolved into a card node in the doc.
       const urlFromCard = getCardUrlAtPasteRange({

package/dist/es2019/ui/currentPastedSmartLink.js

@@ -6,12 +6,12 @@ const getUrlFromTextLinkNode = node => {
   const href = (_node$marks$0$attrs = node.marks[0].attrs) === null || _node$marks$0$attrs === void 0 ? void 0 : _node$marks$0$attrs.href;
   return typeof href === 'string' && node.text === href ? href : undefined;
 };
-const getUrlFromInlineCardNode = node => {
-  var _node$attrs;
-  if (node.type.name !== 'inlineCard') {
+const getUrlFromCardNode = node => {
+  var _node$attrs$url, _node$attrs, _node$attrs2, _node$attrs2$data;
+  if (node.type.name !== 'inlineCard' && node.type.name !== 'blockCard' && node.type.name !== 'embedCard') {
     return undefined;
   }
-  const url = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url;
+  const url = (_node$attrs$url = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url) !== null && _node$attrs$url !== void 0 ? _node$attrs$url : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : (_node$attrs2$data = _node$attrs2.data) === null || _node$attrs2$data === void 0 ? void 0 : _node$attrs2$data.url;
   return typeof url === 'string' ? url : undefined;
 };
 const significantChildren = fragment => {
@@ -31,7 +31,7 @@ export const getSingleSmartLinkUrlFromSlice = slice => {
     return undefined;
   }
   const topNode = slice.content.child(0);
-  const topNodeUrl = (_getUrlFromTextLinkNo = getUrlFromTextLinkNode(topNode)) !== null && _getUrlFromTextLinkNo !== void 0 ? _getUrlFromTextLinkNo : getUrlFromInlineCardNode(topNode);
+  const topNodeUrl = (_getUrlFromTextLinkNo = getUrlFromTextLinkNode(topNode)) !== null && _getUrlFromTextLinkNo !== void 0 ? _getUrlFromTextLinkNo : getUrlFromCardNode(topNode);
   if (topNodeUrl) {
     return topNodeUrl;
   }
@@ -42,5 +42,5 @@ export const getSingleSmartLinkUrlFromSlice = slice => {
   if (children.length !== 1) {
     return undefined;
   }
-  return (_getUrlFromTextLinkNo2 = getUrlFromTextLinkNode(children[0])) !== null && _getUrlFromTextLinkNo2 !== void 0 ? _getUrlFromTextLinkNo2 : getUrlFromInlineCardNode(children[0]);
+  return (_getUrlFromTextLinkNo2 = getUrlFromTextLinkNode(children[0])) !== null && _getUrlFromTextLinkNo2 !== void 0 ? _getUrlFromTextLinkNo2 : getUrlFromCardNode(children[0]);
 };

package/dist/es2019/ui/pasteDisplayAsUtils.js

@@ -7,6 +7,20 @@ export const getCardAtPasteRange = (state, pasteStartPos, pasteEndPos) => {
   const from = Math.min(clampedStart, clampedEnd);
   const to = Math.max(clampedStart, clampedEnd);
   try {
+    if (from === to) {
+      for (const pos of [from - 1, from]) {
+        if (pos < 0 || pos >= docContentSize) {
+          continue;
+        }
+        const node = state.doc.nodeAt(pos);
+        if ((node === null || node === void 0 ? void 0 : node.type.name) === 'inlineCard' || (node === null || node === void 0 ? void 0 : node.type.name) === 'blockCard' || (node === null || node === void 0 ? void 0 : node.type.name) === 'embedCard') {
+          return {
+            appearance: node.type.name === 'inlineCard' ? 'inline' : node.type.name === 'blockCard' ? 'block' : 'embed',
+            pos
+          };
+        }
+      }
+    }
     state.doc.nodesBetween(from, to, (node, pos) => {
       if (node.type.name === 'inlineCard' || node.type.name === 'blockCard' || node.type.name === 'embedCard') {
         result = {

package/dist/esm/ui/PasteDisplayAsMenu.js

@@ -211,6 +211,7 @@ var PasteDisplayAsMenuHorizontalView = function PasteDisplayAsMenuHorizontalView
   var currentAppearance = editorView && pasteRange ? (_getCardAtPasteRange$ = (_getCardAtPasteRange = getCardAtPasteRange(editorView.state, pasteRange.pasteStartPos, pasteRange.pasteEndPos)) === null || _getCardAtPasteRange === void 0 ? void 0 : _getCardAtPasteRange.appearance) !== null && _getCardAtPasteRange$ !== void 0 ? _getCardAtPasteRange$ : 'url' : undefined;
   var handleClick = useCallback(function (appearance) {
     return function () {
+      var _state$doc$nodeAt2, _targetNodeAttrs$url, _targetNodeAttrs$data;
       if (!editorView || !pasteRange || !pastedLinkUrl || !currentAppearance || isApplyingRef.current) {
         return;
       }
@@ -230,7 +231,10 @@ var PasteDisplayAsMenuHorizontalView = function PasteDisplayAsMenuHorizontalView
         return;
       }
       var targetPos = cardAtPasteRange === null || cardAtPasteRange === void 0 ? void 0 : cardAtPasteRange.pos;
-      if (targetPos !== undefined && targetPos < pasteStartPos) {
+      var targetNodeAttrs = targetPos === undefined ? undefined : (_state$doc$nodeAt2 = state.doc.nodeAt(targetPos)) === null || _state$doc$nodeAt2 === void 0 ? void 0 : _state$doc$nodeAt2.attrs;
+      var targetNodeUrl = (_targetNodeAttrs$url = targetNodeAttrs === null || targetNodeAttrs === void 0 ? void 0 : targetNodeAttrs.url) !== null && _targetNodeAttrs$url !== void 0 ? _targetNodeAttrs$url : targetNodeAttrs === null || targetNodeAttrs === void 0 || (_targetNodeAttrs$data = targetNodeAttrs.data) === null || _targetNodeAttrs$data === void 0 ? void 0 : _targetNodeAttrs$data.url;
+      var isRecoveredAdjacentPastedCard = expValEqualsNoExposure('confluence_editor_paste_3p_link_actions_menu', 'isEnabled', true) && targetPos === pasteStartPos - 1 && pasteStartPos === pasteEndPos && targetNodeUrl === pastedLinkUrl;
+      if (targetPos !== undefined && targetPos < pasteStartPos && !isRecoveredAdjacentPastedCard) {
         isApplyingRef.current = false;
         return;
       }
@@ -397,6 +401,10 @@ export var getPasteDisplayAsMenuComponents = function getPasteDisplayAsMenuCompo
       if (!rules || rules.notSingleLinkRule()) {
         return true;
       }
+      var urlFromSlice = getSingleSmartLinkUrlFromSlice(getCurrentPastedSlice(api));
+      if (urlFromSlice) {
+        return false;
+      }
 
       // Fallback: plain-text URL paste that the card plugin already resolved into a card node in the doc.
       var urlFromCard = getCardUrlAtPasteRange({

package/dist/esm/ui/currentPastedSmartLink.js

@@ -6,12 +6,12 @@ var getUrlFromTextLinkNode = function getUrlFromTextLinkNode(node) {
   var href = (_node$marks$0$attrs = node.marks[0].attrs) === null || _node$marks$0$attrs === void 0 ? void 0 : _node$marks$0$attrs.href;
   return typeof href === 'string' && node.text === href ? href : undefined;
 };
-var getUrlFromInlineCardNode = function getUrlFromInlineCardNode(node) {
-  var _node$attrs;
-  if (node.type.name !== 'inlineCard') {
+var getUrlFromCardNode = function getUrlFromCardNode(node) {
+  var _node$attrs$url, _node$attrs, _node$attrs2;
+  if (node.type.name !== 'inlineCard' && node.type.name !== 'blockCard' && node.type.name !== 'embedCard') {
     return undefined;
   }
-  var url = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url;
+  var url = (_node$attrs$url = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url) !== null && _node$attrs$url !== void 0 ? _node$attrs$url : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.data) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.url;
   return typeof url === 'string' ? url : undefined;
 };
 var significantChildren = function significantChildren(fragment) {
@@ -31,7 +31,7 @@ export var getSingleSmartLinkUrlFromSlice = function getSingleSmartLinkUrlFromSl
     return undefined;
   }
   var topNode = slice.content.child(0);
-  var topNodeUrl = (_getUrlFromTextLinkNo = getUrlFromTextLinkNode(topNode)) !== null && _getUrlFromTextLinkNo !== void 0 ? _getUrlFromTextLinkNo : getUrlFromInlineCardNode(topNode);
+  var topNodeUrl = (_getUrlFromTextLinkNo = getUrlFromTextLinkNode(topNode)) !== null && _getUrlFromTextLinkNo !== void 0 ? _getUrlFromTextLinkNo : getUrlFromCardNode(topNode);
   if (topNodeUrl) {
     return topNodeUrl;
   }
@@ -42,5 +42,5 @@ export var getSingleSmartLinkUrlFromSlice = function getSingleSmartLinkUrlFromSl
   if (children.length !== 1) {
     return undefined;
   }
-  return (_getUrlFromTextLinkNo2 = getUrlFromTextLinkNode(children[0])) !== null && _getUrlFromTextLinkNo2 !== void 0 ? _getUrlFromTextLinkNo2 : getUrlFromInlineCardNode(children[0]);
+  return (_getUrlFromTextLinkNo2 = getUrlFromTextLinkNode(children[0])) !== null && _getUrlFromTextLinkNo2 !== void 0 ? _getUrlFromTextLinkNo2 : getUrlFromCardNode(children[0]);
 };

package/dist/esm/ui/pasteDisplayAsUtils.js

@@ -7,6 +7,21 @@ export var getCardAtPasteRange = function getCardAtPasteRange(state, pasteStartP
   var from = Math.min(clampedStart, clampedEnd);
   var to = Math.max(clampedStart, clampedEnd);
   try {
+    if (from === to) {
+      for (var _i = 0, _arr = [from - 1, from]; _i < _arr.length; _i++) {
+        var pos = _arr[_i];
+        if (pos < 0 || pos >= docContentSize) {
+          continue;
+        }
+        var node = state.doc.nodeAt(pos);
+        if ((node === null || node === void 0 ? void 0 : node.type.name) === 'inlineCard' || (node === null || node === void 0 ? void 0 : node.type.name) === 'blockCard' || (node === null || node === void 0 ? void 0 : node.type.name) === 'embedCard') {
+          return {
+            appearance: node.type.name === 'inlineCard' ? 'inline' : node.type.name === 'blockCard' ? 'block' : 'embed',
+            pos: pos
+          };
+        }
+      }
+    }
     state.doc.nodesBetween(from, to, function (node, pos) {
       if (node.type.name === 'inlineCard' || node.type.name === 'blockCard' || node.type.name === 'embedCard') {
         result = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "18.1.6",
+	"version": "18.2.0",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -59,7 +59,7 @@
 		"@atlaskit/primitives": "^21.0.0",
 		"@atlaskit/prosemirror-history": "^1.0.0",
 		"@atlaskit/smart-card": "^45.9.0",
-		"@atlaskit/tmp-editor-statsig": "^125.2.0",
+		"@atlaskit/tmp-editor-statsig": "^126.1.0",
 		"@atlaskit/tokens": "^15.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",