@atlaskit/smart-card 26.5.14 → 26.5.16

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/smart-card
 
+## 26.5.16
+
+### Patch Changes
+
+- Updated dependencies
+
+## 26.5.15
+
+### Patch Changes
+
+- [`7b2d54a82d0`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7b2d54a82d0) - Cleans up a FF introduced in 26.3.3 & Fixes HoverCard component providing hover card analytics context to the wrapped trigger component
+
 ## 26.5.14
 
 ### Patch Changes

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "26.5.14",
+	"version": "26.5.16",
 	"sideEffects": false
 }

package/dist/cjs/view/HoverCard/components/HoverCardComponent.js

@@ -7,9 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.HoverCardComponent = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _popup = _interopRequireDefault(require("@atlaskit/popup"));
 var _react = require("@emotion/react");
 var _react2 = _interopRequireWildcard(require("react"));
@@ -22,15 +20,14 @@ var _constants = require("../../../constants");
 var _SmartLinkAnalyticsContext = require("../../../utils/analytics/SmartLinkAnalyticsContext");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } /** @jsx jsx */
+/** @jsx jsx */
+
 var HOVER_CARD_SOURCE = 'smartLinkPreviewHoverCard';
 var HoverCardComponent = function HoverCardComponent(_ref) {
   var children = _ref.children,
     url = _ref.url,
     id = _ref.id,
     analyticsHandler = _ref.analyticsHandler,
-    analytics = _ref.analytics,
     _ref$canOpen = _ref.canOpen,
     canOpen = _ref$canOpen === void 0 ? true : _ref$canOpen,
     _ref$closeOnChildClic = _ref.closeOnChildClick,
@@ -46,15 +43,11 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
     setIsOpen = _React$useState2[1];
   var fadeOutTimeoutId = (0, _react2.useRef)();
   var fadeInTimeoutId = (0, _react2.useRef)();
-  var cardOpenTime = (0, _react2.useRef)();
   var mousePos = (0, _react2.useRef)();
   var popupOffset = (0, _react2.useRef)();
   var parentSpan = (0, _react2.useRef)(null);
   var renderers = (0, _renderers.useSmartLinkRenderers)();
   var linkState = (0, _store.useSmartCardState)(url);
-  var linkStatus = linkState.status;
-  var hoverDisplay = 'card';
-  var invokeMethod = 'mouse_hover';
   var setMousePosition = (0, _react2.useCallback)(function (event) {
     if (isOpen) {
       return;
@@ -65,24 +58,8 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
     };
   }, [isOpen]);
   var hideCard = (0, _react2.useCallback)(function () {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.refactor-hover-card-analytics')) {
-      /**
-       * Defer to inner HoverCardContent to fire this event
-       */
-    } else {
-      //Check its previously open to avoid firing events when moving between the child and hover card components
-      if (isOpen === true && cardOpenTime.current) {
-        var hoverTime = Date.now() - cardOpenTime.current;
-        analytics === null || analytics === void 0 ? void 0 : analytics.ui.hoverCardDismissedEvent({
-          previewDisplay: 'card',
-          hoverTime: hoverTime,
-          previewInvokeMethod: 'mouse_hover',
-          status: linkStatus
-        });
-      }
-    }
     setIsOpen(false);
-  }, [analytics, isOpen, linkStatus]);
+  }, []);
   var initHideCard = (0, _react2.useCallback)(function () {
     if (fadeInTimeoutId.current) {
       clearTimeout(fadeInTimeoutId.current);
@@ -98,21 +75,6 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
     //Set mouse position in the case it's not already set by onMouseMove, as in the case of scrolling
     setMousePosition(event);
     fadeInTimeoutId.current = setTimeout(function () {
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.refactor-hover-card-analytics')) {
-        /**
-         * Defer to inner HoverCardContent to fire this event
-         */
-      } else {
-        //Check if its previously closed to avoid firing events when moving between the child and hover card components
-        if (isOpen === false) {
-          cardOpenTime.current = Date.now();
-          analytics === null || analytics === void 0 ? void 0 : analytics.ui.hoverCardViewedEvent({
-            previewDisplay: hoverDisplay,
-            previewInvokeMethod: invokeMethod,
-            status: linkStatus
-          });
-        }
-      }
       //If these are undefined then popupOffset is undefined and we fallback to default bottom-start placement
       if (parentSpan.current && mousePos.current) {
         var _parentSpan$current$g = parentSpan.current.getBoundingClientRect(),
@@ -122,7 +84,7 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
       }
       setIsOpen(true);
     }, delay);
-  }, [isOpen, setMousePosition, analytics, linkStatus]);
+  }, [setMousePosition]);
   var linkActions = (0, _useSmartLinkActions.useSmartLinkActions)({
     url: url,
     appearance: _constants.CardDisplay.HoverCardPreview,
@@ -150,7 +112,7 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
   }, [closeOnChildClick, hideCard]);
   var content = (0, _react2.useCallback)(function (_ref2) {
     var update = _ref2.update;
-    var hoverCardContentProps = _objectSpread({
+    var hoverCardContentProps = {
       onMouseEnter: initShowCard,
       onMouseLeave: initHideCard,
       cardActions: filteredActions,
@@ -161,16 +123,14 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
       showServerActions: showServerActions,
       url: url,
       id: id
-    }, (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.refactor-hover-card-analytics') ? {} : {
-      analytics: analytics
-    });
-    return (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.enable-analytics-context') ? (0, _react.jsx)(_SmartLinkAnalyticsContext.SmartLinkAnalyticsContext, {
+    };
+    return (0, _react.jsx)(_SmartLinkAnalyticsContext.SmartLinkAnalyticsContext, {
       url: url,
       display: _constants.CardDisplay.HoverCardPreview,
       id: id,
       source: HOVER_CARD_SOURCE
-    }, (0, _react.jsx)(_HoverCardContent.default, hoverCardContentProps)) : (0, _react.jsx)(_HoverCardContent.default, hoverCardContentProps);
-  }, [analytics, initHideCard, initShowCard, filteredActions, linkState, onActionClick, renderers, showServerActions, url, id]);
+    }, (0, _react.jsx)(_HoverCardContent.default, hoverCardContentProps));
+  }, [initHideCard, initShowCard, filteredActions, linkState, onActionClick, renderers, showServerActions, url, id]);
   var trigger = (0, _react2.useCallback)(function (triggerProps) {
     return (0, _react.jsx)("span", {
       ref: parentSpan

package/dist/cjs/view/HoverCard/components/HoverCardContent.js

@@ -10,7 +10,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = require("@emotion/react");
 var _analyticsNext = require("@atlaskit/analytics-next");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _shortcut = _interopRequireDefault(require("@atlaskit/icon/glyph/shortcut"));
 var _copy = _interopRequireDefault(require("@atlaskit/icon/glyph/copy"));
 var _react2 = _interopRequireWildcard(require("react"));
@@ -135,25 +134,23 @@ var HoverCardContent = function HoverCardContent(_ref) {
     }
   }, [analytics, linkStatus]);
   (0, _react2.useEffect)(function () {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.refactor-hover-card-analytics')) {
-      var previewDisplay = 'card';
-      var previewInvokeMethod = 'mouse_hover';
-      var cardOpenTime = Date.now();
-      analyticsRef.current.ui.hoverCardViewedEvent({
+    var previewDisplay = 'card';
+    var previewInvokeMethod = 'mouse_hover';
+    var cardOpenTime = Date.now();
+    analyticsRef.current.ui.hoverCardViewedEvent({
+      previewDisplay: previewDisplay,
+      previewInvokeMethod: previewInvokeMethod,
+      status: statusRef.current
+    });
+    return function () {
+      var hoverTime = Date.now() - cardOpenTime;
+      analyticsRef.current.ui.hoverCardDismissedEvent({
         previewDisplay: previewDisplay,
         previewInvokeMethod: previewInvokeMethod,
+        hoverTime: hoverTime,
         status: statusRef.current
       });
-      return function () {
-        var hoverTime = Date.now() - cardOpenTime;
-        analyticsRef.current.ui.hoverCardDismissedEvent({
-          previewDisplay: previewDisplay,
-          previewInvokeMethod: previewInvokeMethod,
-          hoverTime: hoverTime,
-          status: statusRef.current
-        });
-      };
-    }
+    };
   }, []);
   var onClick = (0, _react2.useCallback)(function (event) {
     var isModifierKeyPressed = (0, _utils.isSpecialEvent)(event);

package/dist/cjs/view/HoverCard/index.js

@@ -1,18 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.HoverCard = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _react = require("@emotion/react");
 var _react2 = require("react");
 var _reactErrorBoundary = require("react-error-boundary");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../../state/analytics");
-var _analytics2 = require("../../utils/analytics");
 var _HoverCardComponent = require("./components/HoverCardComponent");
 var _constants = require("../../constants");
 /** @jsx jsx */
@@ -20,16 +16,8 @@ var _constants = require("../../constants");
 var HoverCardWithErrorBoundary = function HoverCardWithErrorBoundary(props) {
   var url = props.url,
     id = props.id,
-    children = props.children,
-    createAnalyticsEvent = props.createAnalyticsEvent;
-  var analyticsHandler = (0, _react2.useCallback)(function (analyticsPayload) {
-    (0, _analytics2.fireSmartLinkEvent)(analyticsPayload, createAnalyticsEvent);
-  }, [createAnalyticsEvent]);
-
-  /**
-   * Feature flag disables prop drilling of analytics handlers
-   */
-  var analytics = (0, _analytics.useSmartLinkAnalytics)(url, (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.refactor-hover-card-analytics') ? undefined : analyticsHandler, id);
+    children = props.children;
+  var analytics = (0, _analytics.useSmartLinkAnalytics)(url, undefined, id);
   var onError = (0, _react2.useCallback)(function (error, info) {
     analytics.ui.renderFailedEvent({
       display: _constants.CardDisplay.HoverCardPreview,
@@ -38,30 +26,13 @@ var HoverCardWithErrorBoundary = function HoverCardWithErrorBoundary(props) {
       errorInfo: info
     });
   }, [analytics.ui, id]);
-
-  /**
-   * Feature flag disables the prop drilling of analytics handlers to hover card component
-   */
-  var analyticsProps = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.refactor-hover-card-analytics') ? {} : {
-    analyticsHandler: analyticsHandler,
-    analytics: analytics
-  };
   return (0, _react.jsx)(_reactErrorBoundary.ErrorBoundary, {
     fallback: children,
     onError: onError
-  }, (0, _react.jsx)(_HoverCardComponent.HoverCardComponent, (0, _extends2.default)({}, props, analyticsProps), children));
+  }, (0, _react.jsx)(_HoverCardComponent.HoverCardComponent, props, children));
 };
-var HoverCardWithAnalyticsContext = (0, _analyticsNext.withAnalyticsContext)({
-  source: 'smartLinkPreviewHoverCard',
-  attributes: {
-    display: _constants.CardDisplay.HoverCardPreview
-  }
-})((0, _analyticsNext.withAnalyticsEvents)()(HoverCardWithErrorBoundary));
 var HoverCardWithoutAnalyticsContext = (0, _analyticsNext.withAnalyticsEvents)()(HoverCardWithErrorBoundary);
 var HoverCard = function HoverCard(props) {
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.refactor-hover-card-analytics')) {
-    return (0, _react.jsx)(HoverCardWithoutAnalyticsContext, props);
-  }
-  return (0, _react.jsx)(HoverCardWithAnalyticsContext, props);
+  return (0, _react.jsx)(HoverCardWithoutAnalyticsContext, props);
 };
 exports.HoverCard = HoverCard;

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "26.5.14",
+	"version": "26.5.16",
 	"sideEffects": false
 }

package/dist/es2019/view/HoverCard/components/HoverCardComponent.js

@@ -1,6 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import Popup from '@atlaskit/popup';
 import { jsx } from '@emotion/react';
 import React, { useCallback, useMemo, useRef } from 'react';
@@ -17,7 +16,6 @@ export const HoverCardComponent = ({
   url,
   id,
   analyticsHandler,
-  analytics,
   canOpen = true,
   closeOnChildClick = false,
   hidePreviewButton = false,
@@ -27,15 +25,11 @@ export const HoverCardComponent = ({
   const [isOpen, setIsOpen] = React.useState(false);
   const fadeOutTimeoutId = useRef();
   const fadeInTimeoutId = useRef();
-  const cardOpenTime = useRef();
   const mousePos = useRef();
   const popupOffset = useRef();
   const parentSpan = useRef(null);
   const renderers = useSmartLinkRenderers();
   const linkState = useLinkState(url);
-  const linkStatus = linkState.status;
-  const hoverDisplay = 'card';
-  const invokeMethod = 'mouse_hover';
   const setMousePosition = useCallback(event => {
     if (isOpen) {
       return;
@@ -46,24 +40,8 @@ export const HoverCardComponent = ({
     };
   }, [isOpen]);
   const hideCard = useCallback(() => {
-    if (getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics')) {
-      /**
-       * Defer to inner HoverCardContent to fire this event
-       */
-    } else {
-      //Check its previously open to avoid firing events when moving between the child and hover card components
-      if (isOpen === true && cardOpenTime.current) {
-        const hoverTime = Date.now() - cardOpenTime.current;
-        analytics === null || analytics === void 0 ? void 0 : analytics.ui.hoverCardDismissedEvent({
-          previewDisplay: 'card',
-          hoverTime,
-          previewInvokeMethod: 'mouse_hover',
-          status: linkStatus
-        });
-      }
-    }
     setIsOpen(false);
-  }, [analytics, isOpen, linkStatus]);
+  }, []);
   const initHideCard = useCallback(() => {
     if (fadeInTimeoutId.current) {
       clearTimeout(fadeInTimeoutId.current);
@@ -77,21 +55,6 @@ export const HoverCardComponent = ({
     //Set mouse position in the case it's not already set by onMouseMove, as in the case of scrolling
     setMousePosition(event);
     fadeInTimeoutId.current = setTimeout(() => {
-      if (getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics')) {
-        /**
-         * Defer to inner HoverCardContent to fire this event
-         */
-      } else {
-        //Check if its previously closed to avoid firing events when moving between the child and hover card components
-        if (isOpen === false) {
-          cardOpenTime.current = Date.now();
-          analytics === null || analytics === void 0 ? void 0 : analytics.ui.hoverCardViewedEvent({
-            previewDisplay: hoverDisplay,
-            previewInvokeMethod: invokeMethod,
-            status: linkStatus
-          });
-        }
-      }
       //If these are undefined then popupOffset is undefined and we fallback to default bottom-start placement
       if (parentSpan.current && mousePos.current) {
         const {
@@ -102,7 +65,7 @@ export const HoverCardComponent = ({
       }
       setIsOpen(true);
     }, delay);
-  }, [isOpen, setMousePosition, analytics, linkStatus]);
+  }, [setMousePosition]);
   const linkActions = useSmartLinkActions({
     url,
     appearance: CardDisplay.HoverCardPreview,
@@ -139,18 +102,15 @@ export const HoverCardComponent = ({
       renderers,
       showServerActions,
       url,
-      id,
-      ...(getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics') ? {} : {
-        analytics
-      })
+      id
     };
-    return getBooleanFF('platform.linking-platform.smart-card.enable-analytics-context') ? jsx(SmartLinkAnalyticsContext, {
+    return jsx(SmartLinkAnalyticsContext, {
       url: url,
       display: CardDisplay.HoverCardPreview,
       id: id,
       source: HOVER_CARD_SOURCE
-    }, jsx(HoverCardContent, hoverCardContentProps)) : jsx(HoverCardContent, hoverCardContentProps);
-  }, [analytics, initHideCard, initShowCard, filteredActions, linkState, onActionClick, renderers, showServerActions, url, id]);
+    }, jsx(HoverCardContent, hoverCardContentProps));
+  }, [initHideCard, initShowCard, filteredActions, linkState, onActionClick, renderers, showServerActions, url, id]);
   const trigger = useCallback(triggerProps => jsx("span", {
     ref: parentSpan
   }, jsx("span", _extends({}, triggerProps, {

package/dist/es2019/view/HoverCard/components/HoverCardContent.js

@@ -1,7 +1,6 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import ShortcutIcon from '@atlaskit/icon/glyph/shortcut';
 import CopyIcon from '@atlaskit/icon/glyph/copy';
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
@@ -94,25 +93,23 @@ const HoverCardContent = ({
     }
   }, [analytics, linkStatus]);
   useEffect(() => {
-    if (getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics')) {
-      const previewDisplay = 'card';
-      const previewInvokeMethod = 'mouse_hover';
-      const cardOpenTime = Date.now();
-      analyticsRef.current.ui.hoverCardViewedEvent({
+    const previewDisplay = 'card';
+    const previewInvokeMethod = 'mouse_hover';
+    const cardOpenTime = Date.now();
+    analyticsRef.current.ui.hoverCardViewedEvent({
+      previewDisplay,
+      previewInvokeMethod,
+      status: statusRef.current
+    });
+    return () => {
+      const hoverTime = Date.now() - cardOpenTime;
+      analyticsRef.current.ui.hoverCardDismissedEvent({
         previewDisplay,
         previewInvokeMethod,
+        hoverTime,
         status: statusRef.current
       });
-      return () => {
-        const hoverTime = Date.now() - cardOpenTime;
-        analyticsRef.current.ui.hoverCardDismissedEvent({
-          previewDisplay,
-          previewInvokeMethod,
-          hoverTime,
-          status: statusRef.current
-        });
-      };
-    }
+    };
   }, []);
   const onClick = useCallback(event => {
     const isModifierKeyPressed = isSpecialEvent(event);

package/dist/es2019/view/HoverCard/index.js

@@ -1,29 +1,18 @@
-import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
-import { withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
+import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { jsx } from '@emotion/react';
 import { useCallback } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { useSmartLinkAnalytics } from '../../state/analytics';
-import { fireSmartLinkEvent } from '../../utils/analytics';
 import { HoverCardComponent } from './components/HoverCardComponent';
 import { CardDisplay } from '../../constants';
 const HoverCardWithErrorBoundary = props => {
   const {
     url,
     id,
-    children,
-    createAnalyticsEvent
+    children
   } = props;
-  const analyticsHandler = useCallback(analyticsPayload => {
-    fireSmartLinkEvent(analyticsPayload, createAnalyticsEvent);
-  }, [createAnalyticsEvent]);
-
-  /**
-   * Feature flag disables prop drilling of analytics handlers
-   */
-  const analytics = useSmartLinkAnalytics(url, getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics') ? undefined : analyticsHandler, id);
+  const analytics = useSmartLinkAnalytics(url, undefined, id);
   const onError = useCallback((error, info) => {
     analytics.ui.renderFailedEvent({
       display: CardDisplay.HoverCardPreview,
@@ -32,29 +21,12 @@ const HoverCardWithErrorBoundary = props => {
       errorInfo: info
     });
   }, [analytics.ui, id]);
-
-  /**
-   * Feature flag disables the prop drilling of analytics handlers to hover card component
-   */
-  const analyticsProps = getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics') ? {} : {
-    analyticsHandler,
-    analytics
-  };
   return jsx(ErrorBoundary, {
     fallback: children,
     onError: onError
-  }, jsx(HoverCardComponent, _extends({}, props, analyticsProps), children));
+  }, jsx(HoverCardComponent, props, children));
 };
-const HoverCardWithAnalyticsContext = withAnalyticsContext({
-  source: 'smartLinkPreviewHoverCard',
-  attributes: {
-    display: CardDisplay.HoverCardPreview
-  }
-})(withAnalyticsEvents()(HoverCardWithErrorBoundary));
 const HoverCardWithoutAnalyticsContext = withAnalyticsEvents()(HoverCardWithErrorBoundary);
 export const HoverCard = props => {
-  if (getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics')) {
-    return jsx(HoverCardWithoutAnalyticsContext, props);
-  }
-  return jsx(HoverCardWithAnalyticsContext, props);
+  return jsx(HoverCardWithoutAnalyticsContext, props);
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "26.5.14",
+	"version": "26.5.16",
 	"sideEffects": false
 }

package/dist/esm/view/HoverCard/components/HoverCardComponent.js

@@ -1,10 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /** @jsx jsx */
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import Popup from '@atlaskit/popup';
 import { jsx } from '@emotion/react';
 import React, { useCallback, useMemo, useRef } from 'react';
@@ -21,7 +17,6 @@ export var HoverCardComponent = function HoverCardComponent(_ref) {
     url = _ref.url,
     id = _ref.id,
     analyticsHandler = _ref.analyticsHandler,
-    analytics = _ref.analytics,
     _ref$canOpen = _ref.canOpen,
     canOpen = _ref$canOpen === void 0 ? true : _ref$canOpen,
     _ref$closeOnChildClic = _ref.closeOnChildClick,
@@ -37,15 +32,11 @@ export var HoverCardComponent = function HoverCardComponent(_ref) {
     setIsOpen = _React$useState2[1];
   var fadeOutTimeoutId = useRef();
   var fadeInTimeoutId = useRef();
-  var cardOpenTime = useRef();
   var mousePos = useRef();
   var popupOffset = useRef();
   var parentSpan = useRef(null);
   var renderers = useSmartLinkRenderers();
   var linkState = useLinkState(url);
-  var linkStatus = linkState.status;
-  var hoverDisplay = 'card';
-  var invokeMethod = 'mouse_hover';
   var setMousePosition = useCallback(function (event) {
     if (isOpen) {
       return;
@@ -56,24 +47,8 @@ export var HoverCardComponent = function HoverCardComponent(_ref) {
     };
   }, [isOpen]);
   var hideCard = useCallback(function () {
-    if (getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics')) {
-      /**
-       * Defer to inner HoverCardContent to fire this event
-       */
-    } else {
-      //Check its previously open to avoid firing events when moving between the child and hover card components
-      if (isOpen === true && cardOpenTime.current) {
-        var hoverTime = Date.now() - cardOpenTime.current;
-        analytics === null || analytics === void 0 ? void 0 : analytics.ui.hoverCardDismissedEvent({
-          previewDisplay: 'card',
-          hoverTime: hoverTime,
-          previewInvokeMethod: 'mouse_hover',
-          status: linkStatus
-        });
-      }
-    }
     setIsOpen(false);
-  }, [analytics, isOpen, linkStatus]);
+  }, []);
   var initHideCard = useCallback(function () {
     if (fadeInTimeoutId.current) {
       clearTimeout(fadeInTimeoutId.current);
@@ -89,21 +64,6 @@ export var HoverCardComponent = function HoverCardComponent(_ref) {
     //Set mouse position in the case it's not already set by onMouseMove, as in the case of scrolling
     setMousePosition(event);
     fadeInTimeoutId.current = setTimeout(function () {
-      if (getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics')) {
-        /**
-         * Defer to inner HoverCardContent to fire this event
-         */
-      } else {
-        //Check if its previously closed to avoid firing events when moving between the child and hover card components
-        if (isOpen === false) {
-          cardOpenTime.current = Date.now();
-          analytics === null || analytics === void 0 ? void 0 : analytics.ui.hoverCardViewedEvent({
-            previewDisplay: hoverDisplay,
-            previewInvokeMethod: invokeMethod,
-            status: linkStatus
-          });
-        }
-      }
       //If these are undefined then popupOffset is undefined and we fallback to default bottom-start placement
       if (parentSpan.current && mousePos.current) {
         var _parentSpan$current$g = parentSpan.current.getBoundingClientRect(),
@@ -113,7 +73,7 @@ export var HoverCardComponent = function HoverCardComponent(_ref) {
       }
       setIsOpen(true);
     }, delay);
-  }, [isOpen, setMousePosition, analytics, linkStatus]);
+  }, [setMousePosition]);
   var linkActions = useSmartLinkActions({
     url: url,
     appearance: CardDisplay.HoverCardPreview,
@@ -141,7 +101,7 @@ export var HoverCardComponent = function HoverCardComponent(_ref) {
   }, [closeOnChildClick, hideCard]);
   var content = useCallback(function (_ref2) {
     var update = _ref2.update;
-    var hoverCardContentProps = _objectSpread({
+    var hoverCardContentProps = {
       onMouseEnter: initShowCard,
       onMouseLeave: initHideCard,
       cardActions: filteredActions,
@@ -152,16 +112,14 @@ export var HoverCardComponent = function HoverCardComponent(_ref) {
       showServerActions: showServerActions,
       url: url,
       id: id
-    }, getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics') ? {} : {
-      analytics: analytics
-    });
-    return getBooleanFF('platform.linking-platform.smart-card.enable-analytics-context') ? jsx(SmartLinkAnalyticsContext, {
+    };
+    return jsx(SmartLinkAnalyticsContext, {
       url: url,
       display: CardDisplay.HoverCardPreview,
       id: id,
       source: HOVER_CARD_SOURCE
-    }, jsx(HoverCardContent, hoverCardContentProps)) : jsx(HoverCardContent, hoverCardContentProps);
-  }, [analytics, initHideCard, initShowCard, filteredActions, linkState, onActionClick, renderers, showServerActions, url, id]);
+    }, jsx(HoverCardContent, hoverCardContentProps));
+  }, [initHideCard, initShowCard, filteredActions, linkState, onActionClick, renderers, showServerActions, url, id]);
   var trigger = useCallback(function (triggerProps) {
     return jsx("span", {
       ref: parentSpan

package/dist/esm/view/HoverCard/components/HoverCardContent.js

@@ -3,7 +3,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import ShortcutIcon from '@atlaskit/icon/glyph/shortcut';
 import CopyIcon from '@atlaskit/icon/glyph/copy';
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
@@ -121,25 +120,23 @@ var HoverCardContent = function HoverCardContent(_ref) {
     }
   }, [analytics, linkStatus]);
   useEffect(function () {
-    if (getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics')) {
-      var previewDisplay = 'card';
-      var previewInvokeMethod = 'mouse_hover';
-      var cardOpenTime = Date.now();
-      analyticsRef.current.ui.hoverCardViewedEvent({
+    var previewDisplay = 'card';
+    var previewInvokeMethod = 'mouse_hover';
+    var cardOpenTime = Date.now();
+    analyticsRef.current.ui.hoverCardViewedEvent({
+      previewDisplay: previewDisplay,
+      previewInvokeMethod: previewInvokeMethod,
+      status: statusRef.current
+    });
+    return function () {
+      var hoverTime = Date.now() - cardOpenTime;
+      analyticsRef.current.ui.hoverCardDismissedEvent({
         previewDisplay: previewDisplay,
         previewInvokeMethod: previewInvokeMethod,
+        hoverTime: hoverTime,
         status: statusRef.current
       });
-      return function () {
-        var hoverTime = Date.now() - cardOpenTime;
-        analyticsRef.current.ui.hoverCardDismissedEvent({
-          previewDisplay: previewDisplay,
-          previewInvokeMethod: previewInvokeMethod,
-          hoverTime: hoverTime,
-          status: statusRef.current
-        });
-      };
-    }
+    };
   }, []);
   var onClick = useCallback(function (event) {
     var isModifierKeyPressed = isSpecialEvent(event);

package/dist/esm/view/HoverCard/index.js

@@ -1,27 +1,16 @@
-import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
-import { withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
+import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { jsx } from '@emotion/react';
 import { useCallback } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { useSmartLinkAnalytics } from '../../state/analytics';
-import { fireSmartLinkEvent } from '../../utils/analytics';
 import { HoverCardComponent } from './components/HoverCardComponent';
 import { CardDisplay } from '../../constants';
 var HoverCardWithErrorBoundary = function HoverCardWithErrorBoundary(props) {
   var url = props.url,
     id = props.id,
-    children = props.children,
-    createAnalyticsEvent = props.createAnalyticsEvent;
-  var analyticsHandler = useCallback(function (analyticsPayload) {
-    fireSmartLinkEvent(analyticsPayload, createAnalyticsEvent);
-  }, [createAnalyticsEvent]);
-
-  /**
-   * Feature flag disables prop drilling of analytics handlers
-   */
-  var analytics = useSmartLinkAnalytics(url, getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics') ? undefined : analyticsHandler, id);
+    children = props.children;
+  var analytics = useSmartLinkAnalytics(url, undefined, id);
   var onError = useCallback(function (error, info) {
     analytics.ui.renderFailedEvent({
       display: CardDisplay.HoverCardPreview,
@@ -30,29 +19,12 @@ var HoverCardWithErrorBoundary = function HoverCardWithErrorBoundary(props) {
       errorInfo: info
     });
   }, [analytics.ui, id]);
-
-  /**
-   * Feature flag disables the prop drilling of analytics handlers to hover card component
-   */
-  var analyticsProps = getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics') ? {} : {
-    analyticsHandler: analyticsHandler,
-    analytics: analytics
-  };
   return jsx(ErrorBoundary, {
     fallback: children,
     onError: onError
-  }, jsx(HoverCardComponent, _extends({}, props, analyticsProps), children));
+  }, jsx(HoverCardComponent, props, children));
 };
-var HoverCardWithAnalyticsContext = withAnalyticsContext({
-  source: 'smartLinkPreviewHoverCard',
-  attributes: {
-    display: CardDisplay.HoverCardPreview
-  }
-})(withAnalyticsEvents()(HoverCardWithErrorBoundary));
 var HoverCardWithoutAnalyticsContext = withAnalyticsEvents()(HoverCardWithErrorBoundary);
 export var HoverCard = function HoverCard(props) {
-  if (getBooleanFF('platform.linking-platform.smart-card.refactor-hover-card-analytics')) {
-    return jsx(HoverCardWithoutAnalyticsContext, props);
-  }
-  return jsx(HoverCardWithAnalyticsContext, props);
+  return jsx(HoverCardWithoutAnalyticsContext, props);
 };

package/dist/types/view/Card/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import { CardAppearance, CardPlatform, CardProps } from './types';
 import { WrappedComponentProps } from 'react-intl-next';
-export declare const Card: React.ForwardRefExoticComponent<Pick<Omit<React.PropsWithChildren<import("react-intl-next").WithIntlProps<CardProps & WrappedComponentProps<"intl">>>, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps> & React.RefAttributes<any> & import("@atlaskit/analytics-next").WithContextProps, "url" | "children" | "data" | "key" | "id" | "placeholder" | "onError" | "onClick" | "appearance" | "testId" | "analyticsContext" | "isSelected" | "inheritDimensions" | "ui" | "showActions" | "showHoverPreview" | "showServerActions" | "showAuthTooltip" | "onResolve" | "platform" | "frameStyle" | "embedIframeRef" | "inlinePreloaderStyle" | "isFrameVisible" | "importer" | "container" | "fallbackComponent" | "embedIframeUrlType" | "analyticsEvents" | "forwardedRef"> & React.RefAttributes<any>>;
+export declare const Card: React.ForwardRefExoticComponent<Pick<Omit<React.PropsWithChildren<import("react-intl-next").WithIntlProps<CardProps & WrappedComponentProps<"intl">>>, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps> & React.RefAttributes<any> & import("@atlaskit/analytics-next").WithContextProps, "url" | "children" | "data" | "key" | "id" | "placeholder" | "onError" | "onClick" | "appearance" | "testId" | "analyticsContext" | "isSelected" | "inheritDimensions" | "showActions" | "showHoverPreview" | "showServerActions" | "showAuthTooltip" | "onResolve" | "ui" | "platform" | "frameStyle" | "embedIframeRef" | "inlinePreloaderStyle" | "isFrameVisible" | "importer" | "container" | "fallbackComponent" | "embedIframeUrlType" | "analyticsEvents" | "forwardedRef"> & React.RefAttributes<any>>;
 export type { CardAppearance, CardProps, CardPlatform };

package/dist/types-ts4.5/view/Card/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import { CardAppearance, CardPlatform, CardProps } from './types';
 import { WrappedComponentProps } from 'react-intl-next';
-export declare const Card: React.ForwardRefExoticComponent<Pick<Omit<React.PropsWithChildren<import("react-intl-next").WithIntlProps<CardProps & WrappedComponentProps<"intl">>>, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps> & React.RefAttributes<any> & import("@atlaskit/analytics-next").WithContextProps, "url" | "children" | "data" | "key" | "id" | "placeholder" | "onError" | "onClick" | "appearance" | "testId" | "analyticsContext" | "isSelected" | "inheritDimensions" | "ui" | "showActions" | "showHoverPreview" | "showServerActions" | "showAuthTooltip" | "onResolve" | "platform" | "frameStyle" | "embedIframeRef" | "inlinePreloaderStyle" | "isFrameVisible" | "importer" | "container" | "fallbackComponent" | "embedIframeUrlType" | "analyticsEvents" | "forwardedRef"> & React.RefAttributes<any>>;
+export declare const Card: React.ForwardRefExoticComponent<Pick<Omit<React.PropsWithChildren<import("react-intl-next").WithIntlProps<CardProps & WrappedComponentProps<"intl">>>, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps> & React.RefAttributes<any> & import("@atlaskit/analytics-next").WithContextProps, "url" | "children" | "data" | "key" | "id" | "placeholder" | "onError" | "onClick" | "appearance" | "testId" | "analyticsContext" | "isSelected" | "inheritDimensions" | "showActions" | "showHoverPreview" | "showServerActions" | "showAuthTooltip" | "onResolve" | "ui" | "platform" | "frameStyle" | "embedIframeRef" | "inlinePreloaderStyle" | "isFrameVisible" | "importer" | "container" | "fallbackComponent" | "embedIframeUrlType" | "analyticsEvents" | "forwardedRef"> & React.RefAttributes<any>>;
 export type { CardAppearance, CardProps, CardPlatform };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/smart-card",
-  "version": "26.5.14",
+  "version": "26.5.16",
   "description": "Smart card component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -34,8 +34,8 @@
     "@atlaskit/analytics-next": "^9.1.0",
     "@atlaskit/avatar": "^21.3.0",
     "@atlaskit/avatar-group": "^9.3.0",
-    "@atlaskit/button": "^16.7.0",
-    "@atlaskit/dropdown-menu": "^11.9.0",
+    "@atlaskit/button": "^16.8.0",
+    "@atlaskit/dropdown-menu": "^11.10.0",
     "@atlaskit/frontend-utilities": "^2.7.0",
     "@atlaskit/icon": "^21.12.0",
     "@atlaskit/icon-file-type": "^6.4.0",
@@ -44,7 +44,7 @@
     "@atlaskit/in-product-testing": "^0.2.0",
     "@atlaskit/link-analytics": "^8.0.2",
     "@atlaskit/link-client-extension": "^1.2.1",
-    "@atlaskit/linking-common": "^2.15.0",
+    "@atlaskit/linking-common": "^3.0.0",
     "@atlaskit/linking-types": "^6.0.0",
     "@atlaskit/logo": "^13.14.0",
     "@atlaskit/lozenge": "^11.4.0",
@@ -52,10 +52,10 @@
     "@atlaskit/modal-dialog": "^12.6.0",
     "@atlaskit/outbound-auth-flow-client": "^3.4.0",
     "@atlaskit/platform-feature-flags": "^0.2.1",
-    "@atlaskit/popup": "^1.7.0",
+    "@atlaskit/popup": "^1.8.0",
     "@atlaskit/spinner": "^15.5.0",
     "@atlaskit/theme": "^12.5.0",
-    "@atlaskit/tokens": "^1.6.0",
+    "@atlaskit/tokens": "^1.9.0",
     "@atlaskit/tooltip": "^17.8.0",
     "@atlaskit/ufo": "^0.2.0",
     "@babel/runtime": "^7.0.0",
@@ -141,9 +141,6 @@
     "platform.linking-platform.smart-card.enable-analytics-context": {
       "type": "boolean"
     },
-    "platform.linking-platform.smart-card.refactor-hover-card-analytics": {
-      "type": "boolean"
-    },
     "platform.linking-platform.smart-card.remove-dispatch-analytics-as-prop": {
       "type": "boolean"
     },