@atlaskit/editor-plugin-card 6.6.10 → 6.6.12

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-card
 
+## 6.6.12
+
+### Patch Changes
+
+- [#174371](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/174371)
+  [`05fc53f9168ae`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/05fc53f9168ae) -
+  Merge visitCardLink and visitCardLinkAnalyticsOnly functions
+
+## 6.6.11
+
+### Patch Changes
+
+- [#174579](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/174579)
+  [`523619ae64bbd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/523619ae64bbd) -
+  [ux] Clean up feature gate smart_link_editor_update_toolbar_open_link
+- Updated dependencies
+
 ## 6.6.10
 
 ### Patch Changes

package/dist/cjs/nodeviews/inlineCard.js

@@ -104,7 +104,7 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
       var _pluginInjectionApi$a;
       var _ref2 = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
         editorAnalyticsApi = _ref2.actions;
-      (0, _toolbar.visitCardLinkAnalyticsOnly)(editorAnalyticsApi, _analytics.INPUT_METHOD.META_CLICK)(view.state, view.dispatch);
+      (0, _toolbar.visitCardLinkAnalytics)(editorAnalyticsApi, _analytics.INPUT_METHOD.META_CLICK)(view.state, view.dispatch);
       window.open(url, '_blank');
     } else {
       // only trigger the provided onClick callback if the meta key or ctrl key is not pressed

package/dist/cjs/ui/OpenButtonOverlay/index.js

@@ -155,7 +155,7 @@ var OpenButtonOverlay = function OpenButtonOverlay(_ref) {
   };
   var sendVisitLinkAnalytics = function sendVisitLinkAnalytics(inputMethod) {
     if (editorAnalyticsApi && view) {
-      (0, _toolbar.visitCardLinkAnalyticsOnly)(editorAnalyticsApi, inputMethod)(view.state, view.dispatch);
+      (0, _toolbar.visitCardLinkAnalytics)(editorAnalyticsApi, inputMethod)(view.state, view.dispatch);
     }
   };
   var handleDoubleClick = function handleDoubleClick() {

package/dist/cjs/ui/toolbar.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.visitCardLinkAnalyticsOnly = exports.visitCardLink = exports.shouldRenderToolbarPulse = exports.removeCard = exports.openLinkSettings = exports.getStartingToolbarItems = exports.getSettingsButton = exports.getEndingToolbarItems = exports.floatingToolbar = void 0;
+exports.visitCardLinkAnalytics = exports.shouldRenderToolbarPulse = exports.removeCard = exports.openLinkSettings = exports.getStartingToolbarItems = exports.getSettingsButton = exports.getEndingToolbarItems = exports.floatingToolbar = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
@@ -75,34 +75,7 @@ var removeCard = exports.removeCard = function removeCard(editorAnalyticsApi) {
     action: _analytics.ACTION.DELETED
   });
 };
-var visitCardLink = exports.visitCardLink = function visitCardLink(editorAnalyticsApi, inputMethod) {
-  return function (state, dispatch) {
-    if (!(state.selection instanceof _state.NodeSelection)) {
-      return false;
-    }
-    var type = state.selection.node.type;
-
-    // EDM-12466:
-    // During smart_link_editor_update_toolbar_open_link clean up
-    // Consider updating the code to use visitCardLink or visitCardLinkAnalyticsOnly for all input methods:
-    // INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TOOLBAR | INPUT_METHOD.BUTTON | INPUT_METHOD.DOUBLE_CLICK || INPUT_METHOD.META_CLICK
-    if (!(0, _platformFeatureFlags.fg)('smart_link_editor_update_toolbar_open_link')) {
-      var _titleUrlPairFromNode = (0, _utils3.titleUrlPairFromNode)(state.selection.node),
-        url = _titleUrlPairFromNode.url;
-
-      // All card links should open in the same tab per https://product-fabric.atlassian.net/browse/MS-1583.
-      // We are in edit mode here, open the smart card URL in a new window.
-      window.open(url);
-    }
-    if (dispatch) {
-      var tr = state.tr;
-      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _analytics.buildVisitedNonHyperLinkPayload)(type.name, inputMethod))(tr);
-      dispatch(tr);
-    }
-    return true;
-  };
-};
-var visitCardLinkAnalyticsOnly = exports.visitCardLinkAnalyticsOnly = function visitCardLinkAnalyticsOnly(editorAnalyticsApi, inputMethod) {
+var visitCardLinkAnalytics = exports.visitCardLinkAnalytics = function visitCardLinkAnalytics(editorAnalyticsApi, inputMethod) {
   return function (state, dispatch) {
     if (!(state.selection instanceof _state.NodeSelection)) {
       return false;
@@ -226,8 +199,8 @@ var getToolbarViewedItem = function getToolbarViewedItem(url, display) {
 var generateToolbarItems = function generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, linkPicker, pluginInjectionApi) {
   return function (node) {
     var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$a2, _node$attrs;
-    var _titleUrlPairFromNode2 = (0, _utils3.titleUrlPairFromNode)(node),
-      url = _titleUrlPairFromNode2.url;
+    var _titleUrlPairFromNode = (0, _utils3.titleUrlPairFromNode)(node),
+      url = _titleUrlPairFromNode.url;
     var _ref = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
       editorAnalyticsApi = _ref.actions;
     var metadata = {};
@@ -349,7 +322,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         testId: 'link-toolbar-edit-link-button',
         onClick: (0, _EditLinkToolbar.getEditLinkCallback)(editorAnalyticsApi, true)
       }];
-      var toolbarItems = (0, _experiments.editorExperiment)('platform_editor_controls', 'control') ? [].concat(editItems, commentItems, [_objectSpread({
+      var toolbarItems = (0, _experiments.editorExperiment)('platform_editor_controls', 'control') ? [].concat(editItems, commentItems, [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: _linkExternal.default,
@@ -357,11 +330,10 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         metadata: metadata,
         className: 'hyperlink-open-link',
         title: intl.formatMessage(_messages.linkMessages.openLink),
-        onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod)
-      }, (0, _platformFeatureFlags.fg)('smart_link_editor_update_toolbar_open_link') && {
+        onClick: visitCardLinkAnalytics(editorAnalyticsApi, openLinkInputMethod),
         href: url,
         target: '_blank'
-      }), {
+      }, {
         type: 'separator'
       }], (0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
         type: 'copy-button',
@@ -387,7 +359,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
         title: intl.formatMessage(_messages.default.remove),
         onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
-      }]) : [].concat(editButtonItems, (0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [_objectSpread({
+      }]) : [].concat(editButtonItems, (0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: _linkExternal.default,
@@ -395,11 +367,10 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         metadata: metadata,
         className: 'hyperlink-open-link',
         title: intl.formatMessage(_messages.linkMessages.openLink),
-        onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod)
-      }, (0, _platformFeatureFlags.fg)('smart_link_editor_update_toolbar_open_link') && {
+        onClick: visitCardLinkAnalytics(editorAnalyticsApi, openLinkInputMethod),
         href: url,
         target: '_blank'
-      })], (0, _toConsumableArray2.default)(commentItems.length > 1 ? [{
+      }], (0, _toConsumableArray2.default)(commentItems.length > 1 ? [{
         type: 'separator',
         fullHeight: true
       }, commentItems[0]] : commentItems));
@@ -623,7 +594,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
     }
   });
   if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
-    toolbarItems.push(_objectSpread({
+    toolbarItems.push({
       id: 'editor.link.openLink',
       type: 'button',
       icon: _linkExternal.default,
@@ -631,11 +602,10 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       metadata: metadata,
       className: 'hyperlink-open-link',
       title: intl.formatMessage(_messages.linkMessages.openLink),
-      onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod)
-    }, (0, _platformFeatureFlags.fg)('smart_link_editor_update_toolbar_open_link') && {
+      onClick: visitCardLinkAnalytics(editorAnalyticsApi, openLinkInputMethod),
       href: node.attrs.url,
       target: '_blank'
-    }));
+    });
     if ((0, _experiments.editorExperiment)('platform_editor_controls', 'control')) {
       toolbarItems.push({
         type: 'separator'

package/dist/es2019/nodeviews/inlineCard.js

@@ -15,7 +15,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { registerCard, removeCard } from '../pm-plugins/actions';
 import { getAwarenessProps } from '../pm-plugins/utils';
 import OverlayWrapper from '../ui/ConfigureOverlay';
-import { visitCardLinkAnalyticsOnly } from '../ui/toolbar';
+import { visitCardLinkAnalytics } from '../ui/toolbar';
 import { Card } from './genericCard';
 import { InlineCardWithAwareness } from './inlineCardWithAwareness';
 export const InlineCard = /*#__PURE__*/memo(({
@@ -99,7 +99,7 @@ export const InlineCard = /*#__PURE__*/memo(({
       const {
         actions: editorAnalyticsApi
       } = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {};
-      visitCardLinkAnalyticsOnly(editorAnalyticsApi, INPUT_METHOD.META_CLICK)(view.state, view.dispatch);
+      visitCardLinkAnalytics(editorAnalyticsApi, INPUT_METHOD.META_CLICK)(view.state, view.dispatch);
       window.open(url, '_blank');
     } else {
       // only trigger the provided onClick callback if the meta key or ctrl key is not pressed

package/dist/es2019/ui/OpenButtonOverlay/index.js

@@ -13,7 +13,7 @@ import { cardMessages } from '@atlaskit/editor-common/messages';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import { Anchor, Box, Text, xcss } from '@atlaskit/primitives';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { visitCardLinkAnalyticsOnly } from '../toolbar';
+import { visitCardLinkAnalytics } from '../toolbar';
 const containerStyles = css({
   position: 'relative'
 });
@@ -136,7 +136,7 @@ const OpenButtonOverlay = ({
   };
   const sendVisitLinkAnalytics = inputMethod => {
     if (editorAnalyticsApi && view) {
-      visitCardLinkAnalyticsOnly(editorAnalyticsApi, inputMethod)(view.state, view.dispatch);
+      visitCardLinkAnalytics(editorAnalyticsApi, inputMethod)(view.state, view.dispatch);
     }
   };
   const handleDoubleClick = () => {

package/dist/es2019/ui/toolbar.js

@@ -62,37 +62,7 @@ export const removeCard = editorAnalyticsApi => commandWithMetadata((state, disp
 }, {
   action: ACTION.DELETED
 });
-export const visitCardLink = (editorAnalyticsApi, inputMethod) => (state, dispatch) => {
-  if (!(state.selection instanceof NodeSelection)) {
-    return false;
-  }
-  const {
-    type
-  } = state.selection.node;
-
-  // EDM-12466:
-  // During smart_link_editor_update_toolbar_open_link clean up
-  // Consider updating the code to use visitCardLink or visitCardLinkAnalyticsOnly for all input methods:
-  // INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TOOLBAR | INPUT_METHOD.BUTTON | INPUT_METHOD.DOUBLE_CLICK || INPUT_METHOD.META_CLICK
-  if (!fg('smart_link_editor_update_toolbar_open_link')) {
-    const {
-      url
-    } = titleUrlPairFromNode(state.selection.node);
-
-    // All card links should open in the same tab per https://product-fabric.atlassian.net/browse/MS-1583.
-    // We are in edit mode here, open the smart card URL in a new window.
-    window.open(url);
-  }
-  if (dispatch) {
-    const {
-      tr
-    } = state;
-    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent(buildVisitedNonHyperLinkPayload(type.name, inputMethod))(tr);
-    dispatch(tr);
-  }
-  return true;
-};
-export const visitCardLinkAnalyticsOnly = (editorAnalyticsApi, inputMethod) => (state, dispatch) => {
+export const visitCardLinkAnalytics = (editorAnalyticsApi, inputMethod) => (state, dispatch) => {
   if (!(state.selection instanceof NodeSelection)) {
     return false;
   }
@@ -350,11 +320,9 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       metadata: metadata,
       className: 'hyperlink-open-link',
       title: intl.formatMessage(linkMessages.openLink),
-      onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod),
-      ...(fg('smart_link_editor_update_toolbar_open_link') && {
-        href: url,
-        target: '_blank'
-      })
+      onClick: visitCardLinkAnalytics(editorAnalyticsApi, openLinkInputMethod),
+      href: url,
+      target: '_blank'
     }, {
       type: 'separator'
     }, ...getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi), {
@@ -389,11 +357,9 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       metadata: metadata,
       className: 'hyperlink-open-link',
       title: intl.formatMessage(linkMessages.openLink),
-      onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod),
-      ...(fg('smart_link_editor_update_toolbar_open_link') && {
-        href: url,
-        target: '_blank'
-      })
+      onClick: visitCardLinkAnalytics(editorAnalyticsApi, openLinkInputMethod),
+      href: url,
+      target: '_blank'
     }, ...(commentItems.length > 1 ? [{
       type: 'separator',
       fullHeight: true
@@ -623,11 +589,9 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
       metadata: metadata,
       className: 'hyperlink-open-link',
       title: intl.formatMessage(linkMessages.openLink),
-      onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod),
-      ...(fg('smart_link_editor_update_toolbar_open_link') && {
-        href: node.attrs.url,
-        target: '_blank'
-      })
+      onClick: visitCardLinkAnalytics(editorAnalyticsApi, openLinkInputMethod),
+      href: node.attrs.url,
+      target: '_blank'
     });
     if (editorExperiment('platform_editor_controls', 'control')) {
       toolbarItems.push({

package/dist/esm/nodeviews/inlineCard.js

@@ -16,7 +16,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { registerCard, removeCard } from '../pm-plugins/actions';
 import { getAwarenessProps } from '../pm-plugins/utils';
 import OverlayWrapper from '../ui/ConfigureOverlay';
-import { visitCardLinkAnalyticsOnly } from '../ui/toolbar';
+import { visitCardLinkAnalytics } from '../ui/toolbar';
 import { Card } from './genericCard';
 import { InlineCardWithAwareness } from './inlineCardWithAwareness';
 export var InlineCard = /*#__PURE__*/memo(function (_ref) {
@@ -93,7 +93,7 @@ export var InlineCard = /*#__PURE__*/memo(function (_ref) {
       var _pluginInjectionApi$a;
       var _ref2 = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
         editorAnalyticsApi = _ref2.actions;
-      visitCardLinkAnalyticsOnly(editorAnalyticsApi, INPUT_METHOD.META_CLICK)(view.state, view.dispatch);
+      visitCardLinkAnalytics(editorAnalyticsApi, INPUT_METHOD.META_CLICK)(view.state, view.dispatch);
       window.open(url, '_blank');
     } else {
       // only trigger the provided onClick callback if the meta key or ctrl key is not pressed

package/dist/esm/ui/OpenButtonOverlay/index.js

@@ -14,7 +14,7 @@ import { cardMessages } from '@atlaskit/editor-common/messages';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import { Anchor, Box, Text, xcss } from '@atlaskit/primitives';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { visitCardLinkAnalyticsOnly } from '../toolbar';
+import { visitCardLinkAnalytics } from '../toolbar';
 var containerStyles = css({
   position: 'relative'
 });
@@ -142,7 +142,7 @@ var OpenButtonOverlay = function OpenButtonOverlay(_ref) {
   };
   var sendVisitLinkAnalytics = function sendVisitLinkAnalytics(inputMethod) {
     if (editorAnalyticsApi && view) {
-      visitCardLinkAnalyticsOnly(editorAnalyticsApi, inputMethod)(view.state, view.dispatch);
+      visitCardLinkAnalytics(editorAnalyticsApi, inputMethod)(view.state, view.dispatch);
     }
   };
   var handleDoubleClick = function handleDoubleClick() {

package/dist/esm/ui/toolbar.js

@@ -66,34 +66,7 @@ export var removeCard = function removeCard(editorAnalyticsApi) {
     action: ACTION.DELETED
   });
 };
-export var visitCardLink = function visitCardLink(editorAnalyticsApi, inputMethod) {
-  return function (state, dispatch) {
-    if (!(state.selection instanceof NodeSelection)) {
-      return false;
-    }
-    var type = state.selection.node.type;
-
-    // EDM-12466:
-    // During smart_link_editor_update_toolbar_open_link clean up
-    // Consider updating the code to use visitCardLink or visitCardLinkAnalyticsOnly for all input methods:
-    // INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TOOLBAR | INPUT_METHOD.BUTTON | INPUT_METHOD.DOUBLE_CLICK || INPUT_METHOD.META_CLICK
-    if (!fg('smart_link_editor_update_toolbar_open_link')) {
-      var _titleUrlPairFromNode = titleUrlPairFromNode(state.selection.node),
-        url = _titleUrlPairFromNode.url;
-
-      // All card links should open in the same tab per https://product-fabric.atlassian.net/browse/MS-1583.
-      // We are in edit mode here, open the smart card URL in a new window.
-      window.open(url);
-    }
-    if (dispatch) {
-      var tr = state.tr;
-      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent(buildVisitedNonHyperLinkPayload(type.name, inputMethod))(tr);
-      dispatch(tr);
-    }
-    return true;
-  };
-};
-export var visitCardLinkAnalyticsOnly = function visitCardLinkAnalyticsOnly(editorAnalyticsApi, inputMethod) {
+export var visitCardLinkAnalytics = function visitCardLinkAnalytics(editorAnalyticsApi, inputMethod) {
   return function (state, dispatch) {
     if (!(state.selection instanceof NodeSelection)) {
       return false;
@@ -217,8 +190,8 @@ var getToolbarViewedItem = function getToolbarViewedItem(url, display) {
 var generateToolbarItems = function generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, linkPicker, pluginInjectionApi) {
   return function (node) {
     var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$a2, _node$attrs;
-    var _titleUrlPairFromNode2 = titleUrlPairFromNode(node),
-      url = _titleUrlPairFromNode2.url;
+    var _titleUrlPairFromNode = titleUrlPairFromNode(node),
+      url = _titleUrlPairFromNode.url;
     var _ref = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
       editorAnalyticsApi = _ref.actions;
     var metadata = {};
@@ -340,7 +313,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         testId: 'link-toolbar-edit-link-button',
         onClick: getEditLinkCallback(editorAnalyticsApi, true)
       }];
-      var toolbarItems = editorExperiment('platform_editor_controls', 'control') ? [].concat(editItems, commentItems, [_objectSpread({
+      var toolbarItems = editorExperiment('platform_editor_controls', 'control') ? [].concat(editItems, commentItems, [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: LinkExternalIcon,
@@ -348,11 +321,10 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         metadata: metadata,
         className: 'hyperlink-open-link',
         title: intl.formatMessage(linkMessages.openLink),
-        onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod)
-      }, fg('smart_link_editor_update_toolbar_open_link') && {
+        onClick: visitCardLinkAnalytics(editorAnalyticsApi, openLinkInputMethod),
         href: url,
         target: '_blank'
-      }), {
+      }, {
         type: 'separator'
       }], _toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
         type: 'copy-button',
@@ -378,7 +350,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
         title: intl.formatMessage(commonMessages.remove),
         onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
-      }]) : [].concat(editButtonItems, _toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [_objectSpread({
+      }]) : [].concat(editButtonItems, _toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: LinkExternalIcon,
@@ -386,11 +358,10 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         metadata: metadata,
         className: 'hyperlink-open-link',
         title: intl.formatMessage(linkMessages.openLink),
-        onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod)
-      }, fg('smart_link_editor_update_toolbar_open_link') && {
+        onClick: visitCardLinkAnalytics(editorAnalyticsApi, openLinkInputMethod),
         href: url,
         target: '_blank'
-      })], _toConsumableArray(commentItems.length > 1 ? [{
+      }], _toConsumableArray(commentItems.length > 1 ? [{
         type: 'separator',
         fullHeight: true
       }, commentItems[0]] : commentItems));
@@ -614,7 +585,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
     }
   });
   if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
-    toolbarItems.push(_objectSpread({
+    toolbarItems.push({
       id: 'editor.link.openLink',
       type: 'button',
       icon: LinkExternalIcon,
@@ -622,11 +593,10 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       metadata: metadata,
       className: 'hyperlink-open-link',
       title: intl.formatMessage(linkMessages.openLink),
-      onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod)
-    }, fg('smart_link_editor_update_toolbar_open_link') && {
+      onClick: visitCardLinkAnalytics(editorAnalyticsApi, openLinkInputMethod),
       href: node.attrs.url,
       target: '_blank'
-    }));
+    });
     if (editorExperiment('platform_editor_controls', 'control')) {
       toolbarItems.push({
         type: 'separator'

package/dist/types/ui/toolbar.d.ts

@@ -7,8 +7,7 @@ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { cardPlugin } from '../index';
 import type { CardPluginOptions } from '../types';
 export declare const removeCard: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
-export declare const visitCardLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, inputMethod: INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TOOLBAR) => Command;
-export declare const visitCardLinkAnalyticsOnly: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, inputMethod: INPUT_METHOD.BUTTON | INPUT_METHOD.DOUBLE_CLICK | INPUT_METHOD.META_CLICK) => Command;
+export declare const visitCardLinkAnalytics: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, inputMethod: INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TOOLBAR | INPUT_METHOD.BUTTON | INPUT_METHOD.DOUBLE_CLICK | INPUT_METHOD.META_CLICK) => Command;
 export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
 export declare const floatingToolbar: (cardOptions: CardOptions, lpLinkPicker: boolean, linkPickerOptions?: LinkPickerOptions, pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>, disableFloatingToolbar?: boolean) => FloatingToolbarHandler;
 export declare const getSettingsButton: (intl: IntlShape, editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink?: string) => FloatingToolbarItem<Command>;

package/dist/types-ts4.5/ui/toolbar.d.ts

@@ -7,8 +7,7 @@ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { cardPlugin } from '../index';
 import type { CardPluginOptions } from '../types';
 export declare const removeCard: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
-export declare const visitCardLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, inputMethod: INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TOOLBAR) => Command;
-export declare const visitCardLinkAnalyticsOnly: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, inputMethod: INPUT_METHOD.BUTTON | INPUT_METHOD.DOUBLE_CLICK | INPUT_METHOD.META_CLICK) => Command;
+export declare const visitCardLinkAnalytics: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, inputMethod: INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TOOLBAR | INPUT_METHOD.BUTTON | INPUT_METHOD.DOUBLE_CLICK | INPUT_METHOD.META_CLICK) => Command;
 export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
 export declare const floatingToolbar: (cardOptions: CardOptions, lpLinkPicker: boolean, linkPickerOptions?: LinkPickerOptions, pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>, disableFloatingToolbar?: boolean) => FloatingToolbarHandler;
 export declare const getSettingsButton: (intl: IntlShape, editorAnalyticsApi: EditorAnalyticsAPI | undefined, userPreferencesLink?: string) => FloatingToolbarItem<Command>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "6.6.10",
+	"version": "6.6.12",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,7 +37,7 @@
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^107.0.0",
+		"@atlaskit/editor-common": "^107.1.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-base": "^3.0.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -51,7 +51,7 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/frontend-utilities": "^3.0.0",
-		"@atlaskit/icon": "^27.0.0",
+		"@atlaskit/icon": "^27.1.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/link-analytics": "^10.0.0",
 		"@atlaskit/link-client-extension": "^5.0.0",
@@ -64,7 +64,7 @@
 		"@atlaskit/smart-card": "^38.13.0",
 		"@atlaskit/theme": "^18.0.0",
 		"@atlaskit/tmp-editor-statsig": "^8.0.0",
-		"@atlaskit/tokens": "^5.3.0",
+		"@atlaskit/tokens": "^5.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"lodash": "^4.17.21",
@@ -132,9 +132,6 @@
 		"platform_editor_controls_patch_12": {
 			"type": "boolean"
 		},
-		"smart_link_editor_update_toolbar_open_link": {
-			"type": "boolean"
-		},
 		"platform_editor_fix_advanced_code_crash": {
 			"type": "boolean"
 		},