@atlaskit/smart-card 26.48.0 → 26.48.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/smart-card
 
+## 26.48.1
+
+### Patch Changes
+
+- [#75710](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75710) [`48a473f02139`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/48a473f02139) - Fixes intersection observer not being disconnected when component not intersecting, behind ff platform.linking-platform.smart-card.fix-intersection-observer
+
 ## 26.48.0
 
 ### Minor Changes

package/dist/cjs/utils/analytics/analytics.js

@@ -22,7 +22,7 @@ var ANALYTICS_CHANNEL = exports.ANALYTICS_CHANNEL = 'media';
 var context = exports.context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.48.0"
+  packageVersion: "26.48.1"
 };
 var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/cjs/view/CardWithUrl/component-lazy/LazyIntersectionObserverCard.js

@@ -5,9 +5,10 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.LazyIntersectionObserverCard = LazyIntersectionObserverCard;
+exports.LazyIntersectionObserverCard = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _state = require("../../../state");
 var _component = require("../component");
 var _LoadingCardLink = require("./LoadingCardLink");
@@ -19,7 +20,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // being compared to. Since the default container is the `document`, we set this
 // up to check once a Smart Link is within `X` px from the bottom of the viewport.
 var ROOT_MARGIN_VERTICAL = '360px';
-function LazyIntersectionObserverCard(props) {
+function LazyIntersectionObserverCardLegacy(props) {
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isIntersecting = _useState2[0],
@@ -60,4 +61,51 @@ function LazyIntersectionObserverCard(props) {
   return /*#__PURE__*/_react.default.createElement(Component, {
     className: "loader-wrapper"
   }, content);
-}
+}
+function LazyIntersectionObserverCardNext(props) {
+  var ref = (0, _react.useRef)(null);
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    isIntersecting = _useState4[0],
+    setIsIntersecting = _useState4[1];
+  var appearance = props.appearance,
+    url = props.url,
+    id = props.id;
+  var prefetch = (0, _state.usePrefetch)(url);
+  var Component = appearance === 'inline' ? 'span' : 'div';
+  var ComponentObserver = Component;
+  var onIntersection = (0, _react.useCallback)(function (entries, observer) {
+    var isVisible = entries.some(function (entry) {
+      return entry.isIntersecting;
+    });
+    if (isVisible) {
+      (0, _ufoExperiences.startUfoExperience)('smart-link-rendered', id);
+      setIsIntersecting(true);
+      observer.disconnect();
+    } else {
+      prefetch();
+    }
+  }, [prefetch, id]);
+  (0, _react.useEffect)(function () {
+    if (!ref.current) {
+      return;
+    }
+    var intersectionObserver = new IntersectionObserver(onIntersection, {
+      rootMargin: "".concat(ROOT_MARGIN_VERTICAL, " 0px ").concat(ROOT_MARGIN_VERTICAL, " 0px")
+    });
+    intersectionObserver.observe(ref.current);
+    return function () {
+      return intersectionObserver.disconnect();
+    };
+  }, [ref, onIntersection]);
+  var content = isIntersecting ? /*#__PURE__*/_react.default.createElement(_component.CardWithUrlContent, props) : /*#__PURE__*/_react.default.createElement(ComponentObserver, {
+    ref: ref
+  }, /*#__PURE__*/_react.default.createElement(_LoadingCardLink.LoadingCardLink, props));
+  return /*#__PURE__*/_react.default.createElement(Component, {
+    className: "loader-wrapper"
+  }, content);
+}
+var LazyIntersectionObserverCard = exports.LazyIntersectionObserverCard = function LazyIntersectionObserverCard(props) {
+  var Component = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.fix-intersection-observer') ? LazyIntersectionObserverCardNext : LazyIntersectionObserverCardLegacy;
+  return /*#__PURE__*/_react.default.createElement(Component, props);
+};

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

@@ -17,7 +17,7 @@ var _excluded = ["href", "children", "checkSafety", "onClick", "testId"],
   _excluded2 = ["isLinkSafe", "showSafetyWarningModal"];
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.48.0",
+  packageVersion: "26.48.1",
   componentName: 'linkUrl'
 };
 var Link = (0, _click.withLinkClickedEvent)('a');

package/dist/es2019/utils/analytics/analytics.js

@@ -4,7 +4,7 @@ export const ANALYTICS_CHANNEL = 'media';
 export const context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.48.0"
+  packageVersion: "26.48.1"
 };
 export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/es2019/view/CardWithUrl/component-lazy/LazyIntersectionObserverCard.js

@@ -1,4 +1,5 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { usePrefetch } from '../../../state';
 import { CardWithUrlContent } from '../component';
 import { LoadingCardLink } from './LoadingCardLink';
@@ -9,7 +10,7 @@ import { startUfoExperience } from '../../../state/analytics/ufoExperiences';
 // being compared to. Since the default container is the `document`, we set this
 // up to check once a Smart Link is within `X` px from the bottom of the viewport.
 const ROOT_MARGIN_VERTICAL = '360px';
-export function LazyIntersectionObserverCard(props) {
+function LazyIntersectionObserverCardLegacy(props) {
   const [isIntersecting, setIsIntersecting] = useState(false);
   const {
     appearance,
@@ -45,4 +46,46 @@ export function LazyIntersectionObserverCard(props) {
   return /*#__PURE__*/React.createElement(Component, {
     className: "loader-wrapper"
   }, content);
-}
+}
+function LazyIntersectionObserverCardNext(props) {
+  const ref = useRef(null);
+  const [isIntersecting, setIsIntersecting] = useState(false);
+  const {
+    appearance,
+    url,
+    id
+  } = props;
+  const prefetch = usePrefetch(url);
+  const Component = appearance === 'inline' ? 'span' : 'div';
+  const ComponentObserver = Component;
+  const onIntersection = useCallback((entries, observer) => {
+    const isVisible = entries.some(entry => entry.isIntersecting);
+    if (isVisible) {
+      startUfoExperience('smart-link-rendered', id);
+      setIsIntersecting(true);
+      observer.disconnect();
+    } else {
+      prefetch();
+    }
+  }, [prefetch, id]);
+  useEffect(() => {
+    if (!ref.current) {
+      return;
+    }
+    const intersectionObserver = new IntersectionObserver(onIntersection, {
+      rootMargin: `${ROOT_MARGIN_VERTICAL} 0px ${ROOT_MARGIN_VERTICAL} 0px`
+    });
+    intersectionObserver.observe(ref.current);
+    return () => intersectionObserver.disconnect();
+  }, [ref, onIntersection]);
+  const content = isIntersecting ? /*#__PURE__*/React.createElement(CardWithUrlContent, props) : /*#__PURE__*/React.createElement(ComponentObserver, {
+    ref: ref
+  }, /*#__PURE__*/React.createElement(LoadingCardLink, props));
+  return /*#__PURE__*/React.createElement(Component, {
+    className: "loader-wrapper"
+  }, content);
+}
+export const LazyIntersectionObserverCard = props => {
+  const Component = getBooleanFF('platform.linking-platform.smart-card.fix-intersection-observer') ? LazyIntersectionObserverCardNext : LazyIntersectionObserverCardLegacy;
+  return /*#__PURE__*/React.createElement(Component, props);
+};

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

@@ -7,7 +7,7 @@ import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-m
 import LinkWarningModal from './LinkWarningModal';
 const PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.48.0",
+  packageVersion: "26.48.1",
   componentName: 'linkUrl'
 };
 const Link = withLinkClickedEvent('a');

package/dist/esm/utils/analytics/analytics.js

@@ -15,7 +15,7 @@ export var ANALYTICS_CHANNEL = 'media';
 export var context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.48.0"
+  packageVersion: "26.48.1"
 };
 export var TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/esm/view/CardWithUrl/component-lazy/LazyIntersectionObserverCard.js

@@ -1,5 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { usePrefetch } from '../../../state';
 import { CardWithUrlContent } from '../component';
 import { LoadingCardLink } from './LoadingCardLink';
@@ -10,7 +11,7 @@ import { startUfoExperience } from '../../../state/analytics/ufoExperiences';
 // being compared to. Since the default container is the `document`, we set this
 // up to check once a Smart Link is within `X` px from the bottom of the viewport.
 var ROOT_MARGIN_VERTICAL = '360px';
-export function LazyIntersectionObserverCard(props) {
+function LazyIntersectionObserverCardLegacy(props) {
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isIntersecting = _useState2[0],
@@ -51,4 +52,51 @@ export function LazyIntersectionObserverCard(props) {
   return /*#__PURE__*/React.createElement(Component, {
     className: "loader-wrapper"
   }, content);
-}
+}
+function LazyIntersectionObserverCardNext(props) {
+  var ref = useRef(null);
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isIntersecting = _useState4[0],
+    setIsIntersecting = _useState4[1];
+  var appearance = props.appearance,
+    url = props.url,
+    id = props.id;
+  var prefetch = usePrefetch(url);
+  var Component = appearance === 'inline' ? 'span' : 'div';
+  var ComponentObserver = Component;
+  var onIntersection = useCallback(function (entries, observer) {
+    var isVisible = entries.some(function (entry) {
+      return entry.isIntersecting;
+    });
+    if (isVisible) {
+      startUfoExperience('smart-link-rendered', id);
+      setIsIntersecting(true);
+      observer.disconnect();
+    } else {
+      prefetch();
+    }
+  }, [prefetch, id]);
+  useEffect(function () {
+    if (!ref.current) {
+      return;
+    }
+    var intersectionObserver = new IntersectionObserver(onIntersection, {
+      rootMargin: "".concat(ROOT_MARGIN_VERTICAL, " 0px ").concat(ROOT_MARGIN_VERTICAL, " 0px")
+    });
+    intersectionObserver.observe(ref.current);
+    return function () {
+      return intersectionObserver.disconnect();
+    };
+  }, [ref, onIntersection]);
+  var content = isIntersecting ? /*#__PURE__*/React.createElement(CardWithUrlContent, props) : /*#__PURE__*/React.createElement(ComponentObserver, {
+    ref: ref
+  }, /*#__PURE__*/React.createElement(LoadingCardLink, props));
+  return /*#__PURE__*/React.createElement(Component, {
+    className: "loader-wrapper"
+  }, content);
+}
+export var LazyIntersectionObserverCard = function LazyIntersectionObserverCard(props) {
+  var Component = getBooleanFF('platform.linking-platform.smart-card.fix-intersection-observer') ? LazyIntersectionObserverCardNext : LazyIntersectionObserverCardLegacy;
+  return /*#__PURE__*/React.createElement(Component, props);
+};

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

@@ -10,7 +10,7 @@ import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-m
 import LinkWarningModal from './LinkWarningModal';
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.48.0",
+  packageVersion: "26.48.1",
   componentName: 'linkUrl'
 };
 var Link = withLinkClickedEvent('a');

package/dist/types/view/CardWithUrl/component-lazy/LazyIntersectionObserverCard.d.ts

@@ -1,3 +1,6 @@
 /// <reference types="react" />
 import { CardWithUrlContentProps } from '../types';
-export declare function LazyIntersectionObserverCard(props: CardWithUrlContentProps): JSX.Element;
+declare function LazyIntersectionObserverCardLegacy(props: CardWithUrlContentProps): JSX.Element;
+declare function LazyIntersectionObserverCardNext(props: CardWithUrlContentProps): JSX.Element;
+export declare const LazyIntersectionObserverCard: typeof LazyIntersectionObserverCardNext | typeof LazyIntersectionObserverCardLegacy;
+export {};

package/dist/types-ts4.5/view/CardWithUrl/component-lazy/LazyIntersectionObserverCard.d.ts

@@ -1,3 +1,6 @@
 /// <reference types="react" />
 import { CardWithUrlContentProps } from '../types';
-export declare function LazyIntersectionObserverCard(props: CardWithUrlContentProps): JSX.Element;
+declare function LazyIntersectionObserverCardLegacy(props: CardWithUrlContentProps): JSX.Element;
+declare function LazyIntersectionObserverCardNext(props: CardWithUrlContentProps): JSX.Element;
+export declare const LazyIntersectionObserverCard: typeof LazyIntersectionObserverCardNext | typeof LazyIntersectionObserverCardLegacy;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/smart-card",
-  "version": "26.48.0",
+  "version": "26.48.1",
   "description": "Smart card component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -77,11 +77,13 @@
     "react-intl-next": "npm:react-intl@^5.18.1"
   },
   "devDependencies": {
+    "@af/integration-testing": "*",
     "@af/visual-regression": "*",
     "@atlaskit/analytics-listeners": "^8.9.0",
     "@atlaskit/css-reset": "^6.6.0",
     "@atlaskit/link-test-helpers": "^6.2.0",
     "@atlaskit/media-test-helpers": "^33.0.0",
+    "@atlaskit/ssr": "*",
     "@atlaskit/visual-regression": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@atlassian/feature-flags-test-utils": "^0.2.0",
@@ -153,6 +155,9 @@
     },
     "platform.linking-platform.smart-card.hover-card-ai-summaries": {
       "type": "boolean"
+    },
+    "platform.linking-platform.smart-card.fix-intersection-observer": {
+      "type": "boolean"
     }
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.1"