@atlaskit/editor-plugin-card 5.4.10 → 5.4.11

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-card
 
+## 5.4.11
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 5.4.10
 
 ### Patch Changes

package/dist/cjs/pm-plugins/doc.js

@@ -11,10 +11,12 @@ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
+var _link = require("@atlaskit/editor-common/link");
 var _utils = require("@atlaskit/editor-common/utils");
 var _history = require("@atlaskit/editor-prosemirror/history");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _actions = require("./actions");
 var _pluginKey = require("./plugin-key");
 var _shouldReplaceLink = require("./shouldReplaceLink");
@@ -237,23 +239,38 @@ var convertHyperlinkToSmartCard = exports.convertHyperlinkToSmartCard = function
   var schema = state.schema;
   var link = schema.marks.link;
   var requests = [];
-  state.tr.doc.nodesBetween(state.selection.from, state.selection.to, function (node, pos) {
-    var linkMark = node.marks.find(function (mark) {
-      return mark.type === link;
-    });
-    if (linkMark) {
-      requests.push({
-        url: linkMark.attrs.href,
-        pos: pos,
-        appearance: appearance,
-        previousAppearance: 'url',
-        compareLinkText: normalizeLinkText,
-        source: source,
-        analyticsAction: _analytics.ACTION.CHANGED_TYPE,
-        shouldReplaceLink: true
+  var createRequest = function createRequest(linkMark, pos) {
+    return {
+      url: linkMark.attrs.href,
+      pos: pos,
+      appearance: appearance,
+      previousAppearance: 'url',
+      compareLinkText: normalizeLinkText,
+      source: source,
+      analyticsAction: _analytics.ACTION.CHANGED_TYPE,
+      shouldReplaceLink: true
+    };
+  };
+  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_3')) {
+    var activeLinkMark = (0, _link.getActiveLinkMark)(state);
+    if (activeLinkMark) {
+      var linkMark = activeLinkMark.node.marks.find(function (mark) {
+        return mark.type === link;
       });
+      if (linkMark) {
+        requests.push(createRequest(linkMark, activeLinkMark.pos));
+      }
     }
-  });
+  } else {
+    state.tr.doc.nodesBetween(state.selection.from, state.selection.to, function (node, pos) {
+      var linkMark = node.marks.find(function (mark) {
+        return mark.type === link;
+      });
+      if (linkMark) {
+        requests.push(createRequest(linkMark, pos));
+      }
+    });
+  }
   (0, _card.addLinkMetadata)(state.selection, state.tr, {
     action: _analytics.ACTION.CHANGED_TYPE
   });

package/dist/es2019/pm-plugins/doc.js

@@ -2,10 +2,12 @@ import isEqual from 'lodash/isEqual';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, SMART_LINK_TYPE, unlinkPayload } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
+import { getActiveLinkMark } from '@atlaskit/editor-common/link';
 import { getAnnotationMarksForPos, getLinkCreationAnalyticsEvent, isFromCurrentDomain, nodesBetweenChanged, processRawValue } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { hideDatasourceModal, queueCards, removeDatasourceStash, resolveCard, setDatasourceStash } from './actions';
 import { pluginKey } from './plugin-key';
 import { shouldReplaceLink } from './shouldReplaceLink';
@@ -218,21 +220,32 @@ export const convertHyperlinkToSmartCard = (state, source, appearance, normalize
     link
   } = schema.marks;
   const requests = [];
-  state.tr.doc.nodesBetween(state.selection.from, state.selection.to, (node, pos) => {
-    const linkMark = node.marks.find(mark => mark.type === link);
-    if (linkMark) {
-      requests.push({
-        url: linkMark.attrs.href,
-        pos,
-        appearance,
-        previousAppearance: 'url',
-        compareLinkText: normalizeLinkText,
-        source,
-        analyticsAction: ACTION.CHANGED_TYPE,
-        shouldReplaceLink: true
-      });
-    }
+  const createRequest = (linkMark, pos) => ({
+    url: linkMark.attrs.href,
+    pos,
+    appearance,
+    previousAppearance: 'url',
+    compareLinkText: normalizeLinkText,
+    source,
+    analyticsAction: ACTION.CHANGED_TYPE,
+    shouldReplaceLink: true
   });
+  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_3')) {
+    const activeLinkMark = getActiveLinkMark(state);
+    if (activeLinkMark) {
+      const linkMark = activeLinkMark.node.marks.find(mark => mark.type === link);
+      if (linkMark) {
+        requests.push(createRequest(linkMark, activeLinkMark.pos));
+      }
+    }
+  } else {
+    state.tr.doc.nodesBetween(state.selection.from, state.selection.to, (node, pos) => {
+      const linkMark = node.marks.find(mark => mark.type === link);
+      if (linkMark) {
+        requests.push(createRequest(linkMark, pos));
+      }
+    });
+  }
   addLinkMetadata(state.selection, state.tr, {
     action: ACTION.CHANGED_TYPE
   });

package/dist/esm/pm-plugins/doc.js

@@ -6,10 +6,12 @@ import isEqual from 'lodash/isEqual';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, SMART_LINK_TYPE, unlinkPayload } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
+import { getActiveLinkMark } from '@atlaskit/editor-common/link';
 import { getAnnotationMarksForPos, getLinkCreationAnalyticsEvent, isFromCurrentDomain, nodesBetweenChanged, processRawValue } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { hideDatasourceModal, queueCards, removeDatasourceStash, resolveCard, setDatasourceStash } from './actions';
 import { pluginKey } from './plugin-key';
 import { shouldReplaceLink } from './shouldReplaceLink';
@@ -231,23 +233,38 @@ export var convertHyperlinkToSmartCard = function convertHyperlinkToSmartCard(st
   var schema = state.schema;
   var link = schema.marks.link;
   var requests = [];
-  state.tr.doc.nodesBetween(state.selection.from, state.selection.to, function (node, pos) {
-    var linkMark = node.marks.find(function (mark) {
-      return mark.type === link;
-    });
-    if (linkMark) {
-      requests.push({
-        url: linkMark.attrs.href,
-        pos: pos,
-        appearance: appearance,
-        previousAppearance: 'url',
-        compareLinkText: normalizeLinkText,
-        source: source,
-        analyticsAction: ACTION.CHANGED_TYPE,
-        shouldReplaceLink: true
+  var createRequest = function createRequest(linkMark, pos) {
+    return {
+      url: linkMark.attrs.href,
+      pos: pos,
+      appearance: appearance,
+      previousAppearance: 'url',
+      compareLinkText: normalizeLinkText,
+      source: source,
+      analyticsAction: ACTION.CHANGED_TYPE,
+      shouldReplaceLink: true
+    };
+  };
+  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_3')) {
+    var activeLinkMark = getActiveLinkMark(state);
+    if (activeLinkMark) {
+      var linkMark = activeLinkMark.node.marks.find(function (mark) {
+        return mark.type === link;
       });
+      if (linkMark) {
+        requests.push(createRequest(linkMark, activeLinkMark.pos));
+      }
     }
-  });
+  } else {
+    state.tr.doc.nodesBetween(state.selection.from, state.selection.to, function (node, pos) {
+      var linkMark = node.marks.find(function (mark) {
+        return mark.type === link;
+      });
+      if (linkMark) {
+        requests.push(createRequest(linkMark, pos));
+      }
+    });
+  }
   addLinkMetadata(state.selection, state.tr, {
     action: ACTION.CHANGED_TYPE
   });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "5.4.10",
+	"version": "5.4.11",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,7 +37,7 @@
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/button": "^23.0.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^102.18.0",
+		"@atlaskit/editor-common": "^103.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-base": "^2.3.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -63,7 +63,7 @@
 		"@atlaskit/smart-card": "^36.2.0",
 		"@atlaskit/theme": "^18.0.0",
 		"@atlaskit/tmp-editor-statsig": "^4.6.0",
-		"@atlaskit/tokens": "^4.6.0",
+		"@atlaskit/tokens": "^4.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"lodash": "^4.17.21",
@@ -134,9 +134,6 @@
 		"platform-editor-plugin-card-icon-migration": {
 			"type": "boolean"
 		},
-		"platform_editor_lego__inline_node_virtualization": {
-			"type": "boolean"
-		},
 		"confluence-issue-terminology-refresh": {
 			"type": "boolean"
 		},
@@ -148,6 +145,9 @@
 		},
 		"platform_editor_controls_patch_2": {
 			"type": "boolean"
+		},
+		"platform_editor_controls_patch_3": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {