@atlaskit/editor-plugin-card 5.4.23 → 5.4.25

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-card
 
+## 5.4.25
+
+### Patch Changes
+
+- [#149184](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/149184)
+  [`2df75499ccc98`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2df75499ccc98) -
+  Cleanup feature gate to fix plugin state on card plugin.
+- [#149530](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/149530)
+  [`a432884180253`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a432884180253) -
+  Sends SmartLink Visited event with additional input methods depending on the way the link was
+  opened.
+- Updated dependencies
+
+## 5.4.24
+
+### Patch Changes
+
+- [#148769](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/148769)
+  [`4d875576ce223`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4d875576ce223) -
+  [ux] Update link button to be an anchor
+- Updated dependencies
+
 ## 5.4.23
 
 ### Patch Changes

package/dist/cjs/nodeviews/blockCard.js

@@ -18,7 +18,6 @@ var _v = _interopRequireDefault(require("uuid/v4"));
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _smartCard = require("@atlaskit/smart-card");
 var _datasource = require("../nodeviews/datasource");
 var _actions = require("../pm-plugins/actions");
@@ -186,9 +185,7 @@ var BlockCard = exports.BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     value: function destroy() {
       var _this$unsubscribe;
       (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 || _this$unsubscribe.call(this);
-      if ((0, _platformFeatureFlags.fg)('platform_editor_fix_card_plugin_state')) {
-        this.removeCard();
-      }
+      this.removeCard();
     }
   }, {
     key: "removeCard",

package/dist/cjs/nodeviews/embedCard.js

@@ -22,7 +22,6 @@ var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/rea
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _smartCard = require("@atlaskit/smart-card");
 var _actions = require("../pm-plugins/actions");
 var _ResizableEmbedCard = _interopRequireDefault(require("../ui/ResizableEmbedCard"));
@@ -401,9 +400,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
     value: function destroy() {
       var _this$unsubscribe;
       (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 || _this$unsubscribe.call(this);
-      if ((0, _platformFeatureFlags.fg)('platform_editor_fix_card_plugin_state')) {
-        this.removeCard();
-      }
+      this.removeCard();
     }
   }, {
     key: "removeCard",

package/dist/cjs/nodeviews/inlineCard.js

@@ -48,13 +48,11 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
   (0, _react.useEffect)(function () {
     var id = refId.current;
     return function () {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_fix_card_plugin_state')) {
-        var tr = view.state.tr;
-        (0, _actions.removeCard)({
-          id: id
-        })(tr);
-        view.dispatch(tr);
-      }
+      var tr = view.state.tr;
+      (0, _actions.removeCard)({
+        id: id
+      })(tr);
+      view.dispatch(tr);
     };
   }, [getPos, view]);
   var scrollContainer = (0, _react.useMemo)(

package/dist/cjs/nodeviews/inlineCardWithAwareness.js

@@ -19,7 +19,7 @@ var _inlineCard = require("./inlineCard");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var InlineCardWithAwareness = exports.InlineCardWithAwareness = /*#__PURE__*/(0, _react.memo)(function (_ref) {
-  var _pluginInjectionApi$c;
+  var _pluginInjectionApi$c, _pluginInjectionApi$a;
   var node = _ref.node,
     cardContext = _ref.cardContext,
     actionOptions = _ref.actionOptions,
@@ -46,18 +46,14 @@ var InlineCardWithAwareness = exports.InlineCardWithAwareness = /*#__PURE__*/(0,
     isResolvedViewRendered = _useState6[0],
     setIsResolvedViewRendered = _useState6[1];
   var editorAppearance = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.card.sharedState.currentState()) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.editorAppearance;
+  var _ref2 = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
+    editorAnalyticsApi = _ref2.actions;
   var onResolve = (0, _react.useCallback)(function (tr, title) {
-    if ((0, _platformFeatureFlags.fg)('platform_editor_fix_card_plugin_state')) {
-      var metadata = tr.getMeta(_pluginKey.pluginKey);
-      if (metadata && metadata.type === 'REGISTER') {
-        (0, _actions.registerRemoveOverlay)(function () {
-          return setIsInserted(false);
-        }, metadata.info)(tr);
-      } else {
-        (0, _actions.registerRemoveOverlay)(function () {
-          return setIsInserted(false);
-        })(tr);
-      }
+    var metadata = tr.getMeta(_pluginKey.pluginKey);
+    if (metadata && metadata.type === 'REGISTER') {
+      (0, _actions.registerRemoveOverlay)(function () {
+        return setIsInserted(false);
+      }, metadata.info)(tr);
     } else {
       (0, _actions.registerRemoveOverlay)(function () {
         return setIsInserted(false);
@@ -83,7 +79,9 @@ var InlineCardWithAwareness = exports.InlineCardWithAwareness = /*#__PURE__*/(0,
     return /*#__PURE__*/_react.default.createElement(_OpenButtonOverlay.default, {
       isVisible: isResolvedViewRendered,
       url: node.attrs.url,
-      editorAppearance: editorAppearance
+      editorAppearance: editorAppearance,
+      editorAnalyticsApi: editorAnalyticsApi,
+      view: view
     }, /*#__PURE__*/_react.default.createElement(_inlineCard.InlineCard, {
       node: node,
       view: view,
@@ -96,7 +94,7 @@ var InlineCardWithAwareness = exports.InlineCardWithAwareness = /*#__PURE__*/(0,
       isHovered: isHovered,
       isPageSSRed: isPageSSRed
     }));
-  }, [isResolvedViewRendered, node, editorAppearance, view, getPos, useAlternativePreloader, actionOptions, onResolve, onClick, cardContext, isHovered, isPageSSRed]);
+  }, [isResolvedViewRendered, node, editorAppearance, view, getPos, useAlternativePreloader, actionOptions, onResolve, onClick, cardContext, isHovered, isPageSSRed, editorAnalyticsApi]);
   var innerCardOriginal = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react.default.createElement(_inlineCard.InlineCard, {
       node: node,

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

@@ -7,23 +7,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _linkExternal = _interopRequireDefault(require("@atlaskit/icon/core/link-external"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
-var _excluded = ["children", "isVisible", "url", "editorAppearance"];
+var _toolbar = require("../toolbar");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /* eslint-disable @atlaskit/design-system/no-nested-styles */
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
+
 // eslint-disable-line @atlaskit/ui-styling-standard/use-compiled
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+
 var containerStyles = (0, _react2.css)({
   position: 'relative'
 });
@@ -75,7 +78,8 @@ var OpenButtonOverlay = function OpenButtonOverlay(_ref) {
     isVisible = _ref$isVisible === void 0 ? false : _ref$isVisible,
     url = _ref.url,
     editorAppearance = _ref.editorAppearance,
-    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+    editorAnalyticsApi = _ref.editorAnalyticsApi,
+    view = _ref.view;
   // TODO: ED-26961 - add translation
   var label = 'Open';
   var containerRef = (0, _react.useRef)(null);
@@ -90,10 +94,6 @@ var OpenButtonOverlay = function OpenButtonOverlay(_ref) {
     isHovered = _useState4[0],
     setHovered = _useState4[1];
   var openTextWidthRef = (0, _react.useRef)(DEFAULT_OPEN_TEXT_WIDTH);
-  var handleDoubleClick = function handleDoubleClick() {
-    // Double click opens the link in a new tab
-    window.open(url, '_blank');
-  };
   (0, _react.useLayoutEffect)(function () {
     var hiddenText = hiddenTextRef.current;
     if (!hiddenText) {
@@ -130,6 +130,22 @@ var OpenButtonOverlay = function OpenButtonOverlay(_ref) {
   var handleOverlayChange = function handleOverlayChange(isHovered) {
     setHovered(isHovered);
   };
+  var sendVisitLinkAnalytics = function sendVisitLinkAnalytics(inputMethod) {
+    if (editorAnalyticsApi && view) {
+      (0, _toolbar.visitCardLink)(editorAnalyticsApi, inputMethod)(view.state, view.dispatch);
+    }
+  };
+  var handleDoubleClick = function handleDoubleClick() {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics')) {
+      sendVisitLinkAnalytics(_analytics.INPUT_METHOD.DOUBLE_CLICK);
+    }
+
+    // Double click opens the link in a new tab
+    window.open(url, '_blank');
+  };
+  var handleClick = function handleClick() {
+    sendVisitLinkAnalytics(_analytics.INPUT_METHOD.BUTTON);
+  };
   return (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions
     (0, _react2.jsx)("span", {
@@ -156,7 +172,8 @@ var OpenButtonOverlay = function OpenButtonOverlay(_ref) {
       target: "_blank",
       style: {
         paddingBlock: editorAppearance === 'comment' && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6') ? '1px' : "var(--ds-space-025, 2px)"
-      }
+      },
+      onClick: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics') ? handleClick : undefined
     }, (0, _react2.jsx)(_primitives.Box, {
       xcss: iconWrapperStyles,
       "data-inlinecard-button-overlay": "icon-wrapper-line-height"

package/dist/cjs/ui/toolbar.js

@@ -75,21 +75,23 @@ var removeCard = exports.removeCard = function removeCard(editorAnalyticsApi) {
     action: _analytics.ACTION.DELETED
   });
 };
-var visitCardLink = exports.visitCardLink = function visitCardLink(editorAnalyticsApi) {
+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;
-    var _titleUrlPairFromNode = (0, _utils3.titleUrlPairFromNode)(state.selection.node),
-      url = _titleUrlPairFromNode.url;
+    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);
+      // 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.buildVisitedLinkPayload)(type.name))(tr);
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _analytics.buildVisitedNonHyperLinkPayload)(type.name, inputMethod))(tr);
       dispatch(tr);
     }
     return true;
@@ -303,7 +305,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       }, {
         type: 'separator'
       }] : [];
-      var toolbarItems = (0, _experiments.editorExperiment)('platform_editor_controls', 'control') ? [].concat(editItems, commentItems, [{
+      var openLinkInputMethod = (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics') ? _analytics.INPUT_METHOD.FLOATING_TB : _analytics.INPUT_METHOD.TOOLBAR;
+      var toolbarItems = (0, _experiments.editorExperiment)('platform_editor_controls', 'control') ? [].concat(editItems, commentItems, [_objectSpread({
         id: 'editor.link.openLink',
         type: 'button',
         icon: _linkExternal.default,
@@ -311,8 +314,11 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         metadata: metadata,
         className: 'hyperlink-open-link',
         title: intl.formatMessage(_messages.linkMessages.openLink),
-        onClick: visitCardLink(editorAnalyticsApi)
-      }, {
+        onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod)
+      }, (0, _platformFeatureFlags.fg)('smart_link_editor_update_toolbar_open_link') && {
+        href: url,
+        target: '_blank'
+      }), {
         type: 'separator'
       }], (0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
         type: 'copy-button',
@@ -349,7 +355,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         onClick: (0, _EditLinkToolbar.getEditLinkCallback)(editorAnalyticsApi, true)
       }].concat((0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6') ? [] : [{
         type: 'separator'
-      }]), (0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
+      }]), (0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [_objectSpread({
         id: 'editor.link.openLink',
         type: 'button',
         icon: _linkExternal.default,
@@ -357,8 +363,11 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         metadata: metadata,
         className: 'hyperlink-open-link',
         title: intl.formatMessage(_messages.linkMessages.openLink),
-        onClick: visitCardLink(editorAnalyticsApi)
-      }], (0, _toConsumableArray2.default)(commentItems.length > 1 ? [{
+        onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod)
+      }, (0, _platformFeatureFlags.fg)('smart_link_editor_update_toolbar_open_link') && {
+        href: url,
+        target: '_blank'
+      })], (0, _toConsumableArray2.default)(commentItems.length > 1 ? [{
         type: 'separator',
         fullHeight: true
       }, commentItems[0]] : commentItems));
@@ -559,6 +568,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       });
     }
   }
+  var openLinkInputMethod = (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics') ? _analytics.INPUT_METHOD.FLOATING_TB : _analytics.INPUT_METHOD.TOOLBAR;
   toolbarItems.push({
     type: 'custom',
     fallback: [],
@@ -577,7 +587,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({
+    toolbarItems.push(_objectSpread({
       id: 'editor.link.openLink',
       type: 'button',
       icon: _linkExternal.default,
@@ -585,8 +595,11 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       metadata: metadata,
       className: 'hyperlink-open-link',
       title: intl.formatMessage(_messages.linkMessages.openLink),
-      onClick: visitCardLink(editorAnalyticsApi)
-    });
+      onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod)
+    }, (0, _platformFeatureFlags.fg)('smart_link_editor_update_toolbar_open_link') && {
+      href: node.attrs.url,
+      target: '_blank'
+    }));
     if ((0, _experiments.editorExperiment)('platform_editor_controls', 'control')) {
       toolbarItems.push({
         type: 'separator'

package/dist/es2019/nodeviews/blockCard.js

@@ -5,7 +5,6 @@ import uuid from 'uuid/v4';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { findOverflowScrollParent, UnsupportedBlock } from '@atlaskit/editor-common/ui';
 import { browser, canRenderDatasource } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
 import { Datasource } from '../nodeviews/datasource';
 import { registerCard, removeCard } from '../pm-plugins/actions';
@@ -150,9 +149,7 @@ export class BlockCard extends ReactNodeView {
   destroy() {
     var _this$unsubscribe;
     (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 ? void 0 : _this$unsubscribe.call(this);
-    if (fg('platform_editor_fix_card_plugin_state')) {
-      this.removeCard();
-    }
+    this.removeCard();
   }
   removeCard() {
     const {

package/dist/es2019/nodeviews/embedCard.js

@@ -9,7 +9,6 @@ import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { findOverflowScrollParent, MediaSingle as RichMediaWrapper, UnsupportedBlock } from '@atlaskit/editor-common/ui';
 import { floatingLayouts, isRichMediaInsideOfBlockNode } from '@atlaskit/editor-common/utils';
 import { DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { EmbedResizeMessageListener, Card as SmartCard } from '@atlaskit/smart-card';
 import { registerCard, removeCard } from '../pm-plugins/actions';
 import ResizableEmbedCard from '../ui/ResizableEmbedCard';
@@ -376,9 +375,7 @@ export class EmbedCard extends ReactNodeView {
   destroy() {
     var _this$unsubscribe;
     (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 ? void 0 : _this$unsubscribe.call(this);
-    if (fg('platform_editor_fix_card_plugin_state')) {
-      this.removeCard();
-    }
+    this.removeCard();
   }
   removeCard() {
     const {

package/dist/es2019/nodeviews/inlineCard.js

@@ -37,15 +37,13 @@ export const InlineCard = /*#__PURE__*/memo(({
   useEffect(() => {
     const id = refId.current;
     return () => {
-      if (fg('platform_editor_fix_card_plugin_state')) {
-        const {
-          tr
-        } = view.state;
-        removeCard({
-          id
-        })(tr);
-        view.dispatch(tr);
-      }
+      const {
+        tr
+      } = view.state;
+      removeCard({
+        id
+      })(tr);
+      view.dispatch(tr);
     };
   }, [getPos, view]);
   const scrollContainer = useMemo(

package/dist/es2019/nodeviews/inlineCardWithAwareness.js

@@ -22,19 +22,18 @@ export const InlineCardWithAwareness = /*#__PURE__*/memo(({
   isPageSSRed,
   appearance
 }) => {
-  var _pluginInjectionApi$c;
+  var _pluginInjectionApi$c, _pluginInjectionApi$a;
   const [isHovered, setIsHovered] = useState(false);
   const [isInserted, setIsInserted] = useState(false);
   const [isResolvedViewRendered, setIsResolvedViewRendered] = useState(false);
   const editorAppearance = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.card.sharedState.currentState()) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.editorAppearance;
+  const {
+    actions: editorAnalyticsApi
+  } = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {};
   const onResolve = useCallback((tr, title) => {
-    if (fg('platform_editor_fix_card_plugin_state')) {
-      const metadata = tr.getMeta(pluginKey);
-      if (metadata && metadata.type === 'REGISTER') {
-        registerRemoveOverlay(() => setIsInserted(false), metadata.info)(tr);
-      } else {
-        registerRemoveOverlay(() => setIsInserted(false))(tr);
-      }
+    const metadata = tr.getMeta(pluginKey);
+    if (metadata && metadata.type === 'REGISTER') {
+      registerRemoveOverlay(() => setIsInserted(false), metadata.info)(tr);
     } else {
       registerRemoveOverlay(() => setIsInserted(false))(tr);
     }
@@ -58,7 +57,9 @@ export const InlineCardWithAwareness = /*#__PURE__*/memo(({
   const innerCardWithOpenButtonOverlay = useMemo(() => /*#__PURE__*/React.createElement(OpenButtonOverlay, {
     isVisible: isResolvedViewRendered,
     url: node.attrs.url,
-    editorAppearance: editorAppearance
+    editorAppearance: editorAppearance,
+    editorAnalyticsApi: editorAnalyticsApi,
+    view: view
   }, /*#__PURE__*/React.createElement(InlineCard, {
     node: node,
     view: view,
@@ -70,7 +71,7 @@ export const InlineCardWithAwareness = /*#__PURE__*/memo(({
     cardContext: cardContext,
     isHovered: isHovered,
     isPageSSRed: isPageSSRed
-  })), [isResolvedViewRendered, node, editorAppearance, view, getPos, useAlternativePreloader, actionOptions, onResolve, onClick, cardContext, isHovered, isPageSSRed]);
+  })), [isResolvedViewRendered, node, editorAppearance, view, getPos, useAlternativePreloader, actionOptions, onResolve, onClick, cardContext, isHovered, isPageSSRed, editorAnalyticsApi]);
   const innerCardOriginal = useMemo(() => /*#__PURE__*/React.createElement(InlineCard, {
     node: node,
     view: view,

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

@@ -7,10 +7,12 @@
 import React, { useLayoutEffect, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react'; // eslint-disable-line @atlaskit/ui-styling-standard/use-compiled
 
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Anchor, Box, Text, xcss } from '@atlaskit/primitives';
+import { visitCardLink } from '../toolbar';
 const containerStyles = css({
   position: 'relative'
 });
@@ -61,7 +63,8 @@ const OpenButtonOverlay = ({
   isVisible = false,
   url,
   editorAppearance,
-  ...props
+  editorAnalyticsApi,
+  view
 }) => {
   // TODO: ED-26961 - add translation
   const label = 'Open';
@@ -71,10 +74,6 @@ const OpenButtonOverlay = ({
   const [showLabel, setShowLabel] = useState(true);
   const [isHovered, setHovered] = useState(false);
   const openTextWidthRef = useRef(DEFAULT_OPEN_TEXT_WIDTH);
-  const handleDoubleClick = () => {
-    // Double click opens the link in a new tab
-    window.open(url, '_blank');
-  };
   useLayoutEffect(() => {
     const hiddenText = hiddenTextRef.current;
     if (!hiddenText) {
@@ -111,6 +110,22 @@ const OpenButtonOverlay = ({
   const handleOverlayChange = isHovered => {
     setHovered(isHovered);
   };
+  const sendVisitLinkAnalytics = inputMethod => {
+    if (editorAnalyticsApi && view) {
+      visitCardLink(editorAnalyticsApi, inputMethod)(view.state, view.dispatch);
+    }
+  };
+  const handleDoubleClick = () => {
+    if (fg('platform_editor_controls_patch_analytics')) {
+      sendVisitLinkAnalytics(INPUT_METHOD.DOUBLE_CLICK);
+    }
+
+    // Double click opens the link in a new tab
+    window.open(url, '_blank');
+  };
+  const handleClick = () => {
+    sendVisitLinkAnalytics(INPUT_METHOD.BUTTON);
+  };
   return (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions
     jsx("span", {
@@ -133,7 +148,8 @@ const OpenButtonOverlay = ({
       target: "_blank",
       style: {
         paddingBlock: editorAppearance === 'comment' && fg('platform_editor_controls_patch_6') ? '1px' : "var(--ds-space-025, 2px)"
-      }
+      },
+      onClick: fg('platform_editor_controls_patch_analytics') ? handleClick : undefined
     }, jsx(Box, {
       xcss: iconWrapperStyles,
       "data-inlinecard-button-overlay": "icon-wrapper-line-height"

package/dist/es2019/ui/toolbar.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { isSafeUrl } from '@atlaskit/adf-schema';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID as ACTION_SUBJECTID, buildOpenedSettingsPayload, buildVisitedLinkPayload, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID as ACTION_SUBJECTID, buildOpenedSettingsPayload, buildVisitedNonHyperLinkPayload, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { buildLayoutButtons, buildLayoutDropdown, commandWithMetadata } from '@atlaskit/editor-common/card';
 import { getLinkPreferencesURLFromENV } from '@atlaskit/editor-common/link';
 import commonMessages, { annotationMessages, linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
@@ -61,25 +61,27 @@ export const removeCard = editorAnalyticsApi => commandWithMetadata((state, disp
 }, {
   action: ACTION.DELETED
 });
-export const visitCardLink = editorAnalyticsApi => (state, dispatch) => {
+export const visitCardLink = (editorAnalyticsApi, inputMethod) => (state, dispatch) => {
   if (!(state.selection instanceof NodeSelection)) {
     return false;
   }
   const {
     type
   } = state.selection.node;
-  const {
-    url
-  } = titleUrlPairFromNode(state.selection.node);
+  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);
+    // 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(buildVisitedLinkPayload(type.name))(tr);
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent(buildVisitedNonHyperLinkPayload(type.name, inputMethod))(tr);
     dispatch(tr);
   }
   return true;
@@ -295,6 +297,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
     }, {
       type: 'separator'
     }] : [];
+    const openLinkInputMethod = fg('platform_editor_controls_patch_analytics') ? INPUT_METHOD.FLOATING_TB : INPUT_METHOD.TOOLBAR;
     const toolbarItems = editorExperiment('platform_editor_controls', 'control') ? [...editItems, ...commentItems, {
       id: 'editor.link.openLink',
       type: 'button',
@@ -303,7 +306,11 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       metadata: metadata,
       className: 'hyperlink-open-link',
       title: intl.formatMessage(linkMessages.openLink),
-      onClick: visitCardLink(editorAnalyticsApi)
+      onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod),
+      ...(fg('smart_link_editor_update_toolbar_open_link') && {
+        href: url,
+        target: '_blank'
+      })
     }, {
       type: 'separator'
     }, ...getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi), {
@@ -349,7 +356,11 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       metadata: metadata,
       className: 'hyperlink-open-link',
       title: intl.formatMessage(linkMessages.openLink),
-      onClick: visitCardLink(editorAnalyticsApi)
+      onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod),
+      ...(fg('smart_link_editor_update_toolbar_open_link') && {
+        href: url,
+        target: '_blank'
+      })
     }, ...(commentItems.length > 1 ? [{
       type: 'separator',
       fullHeight: true
@@ -550,6 +561,7 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
       });
     }
   }
+  const openLinkInputMethod = fg('platform_editor_controls_patch_analytics') ? INPUT_METHOD.FLOATING_TB : INPUT_METHOD.TOOLBAR;
   toolbarItems.push({
     type: 'custom',
     fallback: [],
@@ -574,7 +586,11 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
       metadata: metadata,
       className: 'hyperlink-open-link',
       title: intl.formatMessage(linkMessages.openLink),
-      onClick: visitCardLink(editorAnalyticsApi)
+      onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod),
+      ...(fg('smart_link_editor_update_toolbar_open_link') && {
+        href: node.attrs.url,
+        target: '_blank'
+      })
     });
     if (editorExperiment('platform_editor_controls', 'control')) {
       toolbarItems.push({

package/dist/esm/nodeviews/blockCard.js

@@ -14,7 +14,6 @@ import uuid from 'uuid/v4';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { findOverflowScrollParent, UnsupportedBlock } from '@atlaskit/editor-common/ui';
 import { browser, canRenderDatasource } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
 import { Datasource } from '../nodeviews/datasource';
 import { registerCard, removeCard as _removeCard } from '../pm-plugins/actions';
@@ -180,9 +179,7 @@ export var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     value: function destroy() {
       var _this$unsubscribe;
       (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 || _this$unsubscribe.call(this);
-      if (fg('platform_editor_fix_card_plugin_state')) {
-        this.removeCard();
-      }
+      this.removeCard();
     }
   }, {
     key: "removeCard",

package/dist/esm/nodeviews/embedCard.js

@@ -20,7 +20,6 @@ import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { findOverflowScrollParent, MediaSingle as RichMediaWrapper, UnsupportedBlock } from '@atlaskit/editor-common/ui';
 import { floatingLayouts, isRichMediaInsideOfBlockNode } from '@atlaskit/editor-common/utils';
 import { DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { EmbedResizeMessageListener, Card as SmartCard } from '@atlaskit/smart-card';
 import { registerCard, removeCard as _removeCard } from '../pm-plugins/actions';
 import ResizableEmbedCard from '../ui/ResizableEmbedCard';
@@ -394,9 +393,7 @@ export var EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
     value: function destroy() {
       var _this$unsubscribe;
       (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 || _this$unsubscribe.call(this);
-      if (fg('platform_editor_fix_card_plugin_state')) {
-        this.removeCard();
-      }
+      this.removeCard();
     }
   }, {
     key: "removeCard",

package/dist/esm/nodeviews/inlineCard.js

@@ -36,13 +36,11 @@ export var InlineCard = /*#__PURE__*/memo(function (_ref) {
   useEffect(function () {
     var id = refId.current;
     return function () {
-      if (fg('platform_editor_fix_card_plugin_state')) {
-        var tr = view.state.tr;
-        removeCard({
-          id: id
-        })(tr);
-        view.dispatch(tr);
-      }
+      var tr = view.state.tr;
+      removeCard({
+        id: id
+      })(tr);
+      view.dispatch(tr);
     };
   }, [getPos, view]);
   var scrollContainer = useMemo(

package/dist/esm/nodeviews/inlineCardWithAwareness.js

@@ -9,7 +9,7 @@ import { AwarenessWrapper } from '../ui/AwarenessWrapper';
 import OpenButtonOverlay from '../ui/OpenButtonOverlay';
 import { InlineCard } from './inlineCard';
 export var InlineCardWithAwareness = /*#__PURE__*/memo(function (_ref) {
-  var _pluginInjectionApi$c;
+  var _pluginInjectionApi$c, _pluginInjectionApi$a;
   var node = _ref.node,
     cardContext = _ref.cardContext,
     actionOptions = _ref.actionOptions,
@@ -36,18 +36,14 @@ export var InlineCardWithAwareness = /*#__PURE__*/memo(function (_ref) {
     isResolvedViewRendered = _useState6[0],
     setIsResolvedViewRendered = _useState6[1];
   var editorAppearance = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.card.sharedState.currentState()) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.editorAppearance;
+  var _ref2 = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
+    editorAnalyticsApi = _ref2.actions;
   var onResolve = useCallback(function (tr, title) {
-    if (fg('platform_editor_fix_card_plugin_state')) {
-      var metadata = tr.getMeta(pluginKey);
-      if (metadata && metadata.type === 'REGISTER') {
-        registerRemoveOverlay(function () {
-          return setIsInserted(false);
-        }, metadata.info)(tr);
-      } else {
-        registerRemoveOverlay(function () {
-          return setIsInserted(false);
-        })(tr);
-      }
+    var metadata = tr.getMeta(pluginKey);
+    if (metadata && metadata.type === 'REGISTER') {
+      registerRemoveOverlay(function () {
+        return setIsInserted(false);
+      }, metadata.info)(tr);
     } else {
       registerRemoveOverlay(function () {
         return setIsInserted(false);
@@ -73,7 +69,9 @@ export var InlineCardWithAwareness = /*#__PURE__*/memo(function (_ref) {
     return /*#__PURE__*/React.createElement(OpenButtonOverlay, {
       isVisible: isResolvedViewRendered,
       url: node.attrs.url,
-      editorAppearance: editorAppearance
+      editorAppearance: editorAppearance,
+      editorAnalyticsApi: editorAnalyticsApi,
+      view: view
     }, /*#__PURE__*/React.createElement(InlineCard, {
       node: node,
       view: view,
@@ -86,7 +84,7 @@ export var InlineCardWithAwareness = /*#__PURE__*/memo(function (_ref) {
       isHovered: isHovered,
       isPageSSRed: isPageSSRed
     }));
-  }, [isResolvedViewRendered, node, editorAppearance, view, getPos, useAlternativePreloader, actionOptions, onResolve, onClick, cardContext, isHovered, isPageSSRed]);
+  }, [isResolvedViewRendered, node, editorAppearance, view, getPos, useAlternativePreloader, actionOptions, onResolve, onClick, cardContext, isHovered, isPageSSRed, editorAnalyticsApi]);
   var innerCardOriginal = useMemo(function () {
     return /*#__PURE__*/React.createElement(InlineCard, {
       node: node,

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

@@ -1,6 +1,4 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "isVisible", "url", "editorAppearance"];
 /* eslint-disable @atlaskit/design-system/no-nested-styles */
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
 /**
@@ -10,10 +8,12 @@ var _excluded = ["children", "isVisible", "url", "editorAppearance"];
 import React, { useLayoutEffect, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react'; // eslint-disable-line @atlaskit/ui-styling-standard/use-compiled
 
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Anchor, Box, Text, xcss } from '@atlaskit/primitives';
+import { visitCardLink } from '../toolbar';
 var containerStyles = css({
   position: 'relative'
 });
@@ -65,7 +65,8 @@ var OpenButtonOverlay = function OpenButtonOverlay(_ref) {
     isVisible = _ref$isVisible === void 0 ? false : _ref$isVisible,
     url = _ref.url,
     editorAppearance = _ref.editorAppearance,
-    props = _objectWithoutProperties(_ref, _excluded);
+    editorAnalyticsApi = _ref.editorAnalyticsApi,
+    view = _ref.view;
   // TODO: ED-26961 - add translation
   var label = 'Open';
   var containerRef = useRef(null);
@@ -80,10 +81,6 @@ var OpenButtonOverlay = function OpenButtonOverlay(_ref) {
     isHovered = _useState4[0],
     setHovered = _useState4[1];
   var openTextWidthRef = useRef(DEFAULT_OPEN_TEXT_WIDTH);
-  var handleDoubleClick = function handleDoubleClick() {
-    // Double click opens the link in a new tab
-    window.open(url, '_blank');
-  };
   useLayoutEffect(function () {
     var hiddenText = hiddenTextRef.current;
     if (!hiddenText) {
@@ -120,6 +117,22 @@ var OpenButtonOverlay = function OpenButtonOverlay(_ref) {
   var handleOverlayChange = function handleOverlayChange(isHovered) {
     setHovered(isHovered);
   };
+  var sendVisitLinkAnalytics = function sendVisitLinkAnalytics(inputMethod) {
+    if (editorAnalyticsApi && view) {
+      visitCardLink(editorAnalyticsApi, inputMethod)(view.state, view.dispatch);
+    }
+  };
+  var handleDoubleClick = function handleDoubleClick() {
+    if (fg('platform_editor_controls_patch_analytics')) {
+      sendVisitLinkAnalytics(INPUT_METHOD.DOUBLE_CLICK);
+    }
+
+    // Double click opens the link in a new tab
+    window.open(url, '_blank');
+  };
+  var handleClick = function handleClick() {
+    sendVisitLinkAnalytics(INPUT_METHOD.BUTTON);
+  };
   return (
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions
     jsx("span", {
@@ -146,7 +159,8 @@ var OpenButtonOverlay = function OpenButtonOverlay(_ref) {
       target: "_blank",
       style: {
         paddingBlock: editorAppearance === 'comment' && fg('platform_editor_controls_patch_6') ? '1px' : "var(--ds-space-025, 2px)"
-      }
+      },
+      onClick: fg('platform_editor_controls_patch_analytics') ? handleClick : undefined
     }, jsx(Box, {
       xcss: iconWrapperStyles,
       "data-inlinecard-button-overlay": "icon-wrapper-line-height"

package/dist/esm/ui/toolbar.js

@@ -4,7 +4,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
 import { isSafeUrl } from '@atlaskit/adf-schema';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID as ACTION_SUBJECTID, buildOpenedSettingsPayload, buildVisitedLinkPayload, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID as ACTION_SUBJECTID, buildOpenedSettingsPayload, buildVisitedNonHyperLinkPayload, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { buildLayoutButtons, buildLayoutDropdown, commandWithMetadata } from '@atlaskit/editor-common/card';
 import { getLinkPreferencesURLFromENV } from '@atlaskit/editor-common/link';
 import commonMessages, { annotationMessages, linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
@@ -65,21 +65,23 @@ export var removeCard = function removeCard(editorAnalyticsApi) {
     action: ACTION.DELETED
   });
 };
-export var visitCardLink = function visitCardLink(editorAnalyticsApi) {
+export var visitCardLink = function visitCardLink(editorAnalyticsApi, inputMethod) {
   return function (state, dispatch) {
     if (!(state.selection instanceof NodeSelection)) {
       return false;
     }
     var type = state.selection.node.type;
-    var _titleUrlPairFromNode = titleUrlPairFromNode(state.selection.node),
-      url = _titleUrlPairFromNode.url;
+    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);
+      // 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(buildVisitedLinkPayload(type.name))(tr);
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent(buildVisitedNonHyperLinkPayload(type.name, inputMethod))(tr);
       dispatch(tr);
     }
     return true;
@@ -293,7 +295,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       }, {
         type: 'separator'
       }] : [];
-      var toolbarItems = editorExperiment('platform_editor_controls', 'control') ? [].concat(editItems, commentItems, [{
+      var openLinkInputMethod = fg('platform_editor_controls_patch_analytics') ? INPUT_METHOD.FLOATING_TB : INPUT_METHOD.TOOLBAR;
+      var toolbarItems = editorExperiment('platform_editor_controls', 'control') ? [].concat(editItems, commentItems, [_objectSpread({
         id: 'editor.link.openLink',
         type: 'button',
         icon: LinkExternalIcon,
@@ -301,8 +304,11 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         metadata: metadata,
         className: 'hyperlink-open-link',
         title: intl.formatMessage(linkMessages.openLink),
-        onClick: visitCardLink(editorAnalyticsApi)
-      }, {
+        onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod)
+      }, fg('smart_link_editor_update_toolbar_open_link') && {
+        href: url,
+        target: '_blank'
+      }), {
         type: 'separator'
       }], _toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
         type: 'copy-button',
@@ -339,7 +345,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         onClick: getEditLinkCallback(editorAnalyticsApi, true)
       }].concat(_toConsumableArray(fg('platform_editor_controls_patch_6') ? [] : [{
         type: 'separator'
-      }]), _toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
+      }]), _toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [_objectSpread({
         id: 'editor.link.openLink',
         type: 'button',
         icon: LinkExternalIcon,
@@ -347,8 +353,11 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         metadata: metadata,
         className: 'hyperlink-open-link',
         title: intl.formatMessage(linkMessages.openLink),
-        onClick: visitCardLink(editorAnalyticsApi)
-      }], _toConsumableArray(commentItems.length > 1 ? [{
+        onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod)
+      }, fg('smart_link_editor_update_toolbar_open_link') && {
+        href: url,
+        target: '_blank'
+      })], _toConsumableArray(commentItems.length > 1 ? [{
         type: 'separator',
         fullHeight: true
       }, commentItems[0]] : commentItems));
@@ -549,6 +558,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       });
     }
   }
+  var openLinkInputMethod = fg('platform_editor_controls_patch_analytics') ? INPUT_METHOD.FLOATING_TB : INPUT_METHOD.TOOLBAR;
   toolbarItems.push({
     type: 'custom',
     fallback: [],
@@ -567,7 +577,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({
+    toolbarItems.push(_objectSpread({
       id: 'editor.link.openLink',
       type: 'button',
       icon: LinkExternalIcon,
@@ -575,8 +585,11 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       metadata: metadata,
       className: 'hyperlink-open-link',
       title: intl.formatMessage(linkMessages.openLink),
-      onClick: visitCardLink(editorAnalyticsApi)
-    });
+      onClick: visitCardLink(editorAnalyticsApi, openLinkInputMethod)
+    }, fg('smart_link_editor_update_toolbar_open_link') && {
+      href: node.attrs.url,
+      target: '_blank'
+    }));
     if (editorExperiment('platform_editor_controls', 'control')) {
       toolbarItems.push({
         type: 'separator'

package/dist/types/ui/OpenButtonOverlay/index.d.ts

@@ -5,5 +5,5 @@
 import React from 'react';
 import { jsx } from '@emotion/react';
 import type { OpenButtonOverlayProps } from './types';
-declare const OpenButtonOverlay: ({ children, isVisible, url, editorAppearance, ...props }: React.PropsWithChildren<OpenButtonOverlayProps>) => jsx.JSX.Element;
+declare const OpenButtonOverlay: ({ children, isVisible, url, editorAppearance, editorAnalyticsApi, view, }: React.PropsWithChildren<OpenButtonOverlayProps>) => jsx.JSX.Element;
 export default OpenButtonOverlay;

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

@@ -1,7 +1,11 @@
 /// <reference types="react" />
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { EditorAppearance } from '@atlaskit/editor-common/types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export type OpenButtonOverlayProps = React.HTMLAttributes<HTMLSpanElement> & {
     isVisible?: boolean;
     url: string;
     editorAppearance?: EditorAppearance;
+    editorAnalyticsApi?: EditorAnalyticsAPI;
+    view?: EditorView;
 };

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

@@ -1,12 +1,13 @@
 import type { IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { Command, ExtractInjectionAPI, FloatingToolbarHandler, FloatingToolbarItem, LinkPickerOptions } from '@atlaskit/editor-common/types';
 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) => Command;
+export declare const visitCardLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, inputMethod: INPUT_METHOD.BUTTON | INPUT_METHOD.DOUBLE_CLICK | INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TOOLBAR) => 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/OpenButtonOverlay/index.d.ts

@@ -5,5 +5,5 @@
 import React from 'react';
 import { jsx } from '@emotion/react';
 import type { OpenButtonOverlayProps } from './types';
-declare const OpenButtonOverlay: ({ children, isVisible, url, editorAppearance, ...props }: React.PropsWithChildren<OpenButtonOverlayProps>) => jsx.JSX.Element;
+declare const OpenButtonOverlay: ({ children, isVisible, url, editorAppearance, editorAnalyticsApi, view, }: React.PropsWithChildren<OpenButtonOverlayProps>) => jsx.JSX.Element;
 export default OpenButtonOverlay;

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

@@ -1,7 +1,11 @@
 /// <reference types="react" />
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { EditorAppearance } from '@atlaskit/editor-common/types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export type OpenButtonOverlayProps = React.HTMLAttributes<HTMLSpanElement> & {
     isVisible?: boolean;
     url: string;
     editorAppearance?: EditorAppearance;
+    editorAnalyticsApi?: EditorAnalyticsAPI;
+    view?: EditorView;
 };

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

@@ -1,12 +1,13 @@
 import type { IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { Command, ExtractInjectionAPI, FloatingToolbarHandler, FloatingToolbarItem, LinkPickerOptions } from '@atlaskit/editor-common/types';
 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) => Command;
+export declare const visitCardLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, inputMethod: INPUT_METHOD.BUTTON | INPUT_METHOD.DOUBLE_CLICK | INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TOOLBAR) => 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": "5.4.23",
+	"version": "5.4.25",
 	"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": "^103.21.0",
+		"@atlaskit/editor-common": "^103.22.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-base": "^2.3.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -54,13 +54,13 @@
 		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/link-analytics": "^9.1.0",
 		"@atlaskit/link-client-extension": "^4.0.0",
-		"@atlaskit/link-datasource": "^4.8.0",
+		"@atlaskit/link-datasource": "^4.9.0",
 		"@atlaskit/linking-common": "^8.0.0",
 		"@atlaskit/linking-types": "^9.10.0",
 		"@atlaskit/menu": "^5.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^14.4.0",
-		"@atlaskit/smart-card": "^36.12.0",
+		"@atlaskit/primitives": "^14.7.0",
+		"@atlaskit/smart-card": "^36.14.0",
 		"@atlaskit/theme": "^18.0.0",
 		"@atlaskit/tmp-editor-statsig": "^4.15.0",
 		"@atlaskit/tokens": "^4.8.0",
@@ -122,9 +122,6 @@
 		"linking_platform_smart_links_in_live_pages": {
 			"type": "boolean"
 		},
-		"platform_editor_fix_card_plugin_state": {
-			"type": "boolean"
-		},
 		"confluence-issue-terminology-refresh": {
 			"type": "boolean"
 		},
@@ -142,6 +139,12 @@
 		},
 		"platform_editor_controls_patch_6": {
 			"type": "boolean"
+		},
+		"smart_link_editor_update_toolbar_open_link": {
+			"type": "boolean"
+		},
+		"platform_editor_controls_patch_analytics": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {