@atlaskit/smart-card 32.3.0 → 32.4.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/smart-card
 
+## 32.4.0
+
+### Minor Changes
+
+- [#170865](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/170865)
+  [`774efa325781c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/774efa325781c) -
+  [ux] Removes the legacy block card views from the embed card for the resolving and fallback states
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 32.3.0
 
 ### Minor Changes

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

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

package/dist/cjs/view/CardWithUrl/component.js

@@ -255,6 +255,7 @@ function Component(_ref) {
       return /*#__PURE__*/_react.default.createElement(_EmbedCard.EmbedCard, {
         id: id,
         url: url,
+        renderers: renderers,
         cardState: state,
         iframeUrlType: embedIframeUrlType,
         handleAuthorize: services.length && handleAuthorize || undefined,

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

@@ -8,6 +8,7 @@ exports.EmbedCard = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _analyticsNext = require("@atlaskit/analytics-next");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _block = require("../../extractors/block");
 var _extractAccessContext = require("../../extractors/common/context/extractAccessContext");
 var _embed = require("../../extractors/embed");
@@ -15,6 +16,7 @@ var _inline = require("../../extractors/inline");
 var _helpers = require("../../state/helpers");
 var _jsonld = require("../../utils/jsonld");
 var _BlockCard = require("../BlockCard");
+var _FlexibleResolvedView = _interopRequireDefault(require("../BlockCard/views/flexible/FlexibleResolvedView"));
 var _ResolvedView = require("../InlineCard/ResolvedView");
 var _ErroredView = require("./views/ErroredView");
 var _forbiddenView = _interopRequireDefault(require("./views/forbidden-view"));
@@ -24,9 +26,7 @@ var _unauthorizedView = _interopRequireDefault(require("./views/unauthorized-vie
 var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(function (_ref, iframeRef) {
   var _details$meta, _forbiddenViewProps$c, _forbiddenViewProps$c2, _notFoundViewProps$co, _notFoundViewProps$co2;
   var url = _ref.url,
-    _ref$cardState = _ref.cardState,
-    status = _ref$cardState.status,
-    details = _ref$cardState.details,
+    cardState = _ref.cardState,
     handleAuthorize = _ref.handleAuthorize,
     handleErrorRetry = _ref.handleErrorRetry,
     handleFrameClick = _ref.handleFrameClick,
@@ -42,9 +42,12 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
     onIframeDwell = _ref.onIframeDwell,
     onIframeFocus = _ref.onIframeFocus,
     iframeUrlType = _ref.iframeUrlType,
-    actionOptions = _ref.actionOptions;
+    actionOptions = _ref.actionOptions,
+    renderers = _ref.renderers;
   var _useAnalyticsEvents = (0, _analyticsNext.useAnalyticsEvents)(),
     createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
+  var status = cardState.status,
+    details = cardState.details;
   var data = details && details.data || (0, _jsonld.getEmptyJsonLd)();
   var meta = details && details.meta;
   var extensionKey = (0, _helpers.getExtensionKey)(details);
@@ -52,6 +55,19 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
   switch (status) {
     case 'pending':
     case 'resolving':
+      if ((0, _platformFeatureFlags.fg)('smart-card-remove-block-card-from-embed')) {
+        return /*#__PURE__*/_react.default.createElement(_FlexibleResolvedView.default, {
+          url: url,
+          cardState: cardState,
+          onClick: handleFrameClick,
+          onError: onError,
+          onResolve: onResolve,
+          renderers: renderers,
+          actionOptions: actionOptions,
+          analytics: analytics,
+          testId: testId
+        });
+      }
       return /*#__PURE__*/_react.default.createElement(_BlockCard.BlockCardResolvingView, {
         testId: "embed-card-resolving-view",
         inheritDimensions: inheritDimensions,
@@ -87,6 +103,19 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
             onClick: handleFrameClick
           }));
         }
+        if ((0, _platformFeatureFlags.fg)('smart-card-remove-block-card-from-embed')) {
+          return /*#__PURE__*/_react.default.createElement(_FlexibleResolvedView.default, {
+            url: url,
+            cardState: cardState,
+            onClick: handleFrameClick,
+            onError: onError,
+            onResolve: onResolve,
+            renderers: renderers,
+            actionOptions: actionOptions,
+            analytics: analytics,
+            testId: testId
+          });
+        }
         var resolvedBlockViewProps = (0, _block.extractBlockProps)(data, meta, {
           analytics: analytics,
           origin: 'smartLinkEmbed',

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: "32.3.0",
+  packageVersion: "32.4.0",
   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: "32.3.0"
+  packageVersion: "32.4.0"
 };
 export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/es2019/view/CardWithUrl/component.js

@@ -243,6 +243,7 @@ function Component({
       return /*#__PURE__*/React.createElement(EmbedCard, {
         id: id,
         url: url,
+        renderers: renderers,
         cardState: state,
         iframeUrlType: embedIframeUrlType,
         handleAuthorize: services.length && handleAuthorize || undefined,

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

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { extractBlockProps } from '../../extractors/block';
 import { extractRequestAccessContextImproved } from '../../extractors/common/context/extractAccessContext';
 import { extractEmbedProps } from '../../extractors/embed';
@@ -8,6 +9,7 @@ import { extractInlineProps } from '../../extractors/inline';
 import { getExtensionKey, hasAuthScopeOverrides } from '../../state/helpers';
 import { getEmptyJsonLd, getForbiddenJsonLd } from '../../utils/jsonld';
 import { BlockCardResolvedView, BlockCardResolvingView } from '../BlockCard';
+import FlexibleResolvedView from '../BlockCard/views/flexible/FlexibleResolvedView';
 import { InlineCardResolvedView } from '../InlineCard/ResolvedView';
 import { EmbedCardErroredView } from './views/ErroredView';
 import ForbiddenView from './views/forbidden-view';
@@ -16,10 +18,7 @@ import { EmbedCardResolvedView } from './views/ResolvedView';
 import UnauthorizedView from './views/unauthorized-view';
 export const EmbedCard = /*#__PURE__*/React.forwardRef(({
   url,
-  cardState: {
-    status,
-    details
-  },
+  cardState,
   handleAuthorize,
   handleErrorRetry,
   handleFrameClick,
@@ -35,12 +34,17 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
   onIframeDwell,
   onIframeFocus,
   iframeUrlType,
-  actionOptions
+  actionOptions,
+  renderers
 }, iframeRef) => {
   var _details$meta, _forbiddenViewProps$c, _forbiddenViewProps$c2, _notFoundViewProps$co, _notFoundViewProps$co2;
   const {
     createAnalyticsEvent
   } = useAnalyticsEvents();
+  const {
+    status,
+    details
+  } = cardState;
   const data = details && details.data || getEmptyJsonLd();
   const meta = details && details.meta;
   const extensionKey = getExtensionKey(details);
@@ -48,6 +52,19 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
   switch (status) {
     case 'pending':
     case 'resolving':
+      if (fg('smart-card-remove-block-card-from-embed')) {
+        return /*#__PURE__*/React.createElement(FlexibleResolvedView, {
+          url: url,
+          cardState: cardState,
+          onClick: handleFrameClick,
+          onError: onError,
+          onResolve: onResolve,
+          renderers: renderers,
+          actionOptions: actionOptions,
+          analytics: analytics,
+          testId: testId
+        });
+      }
       return /*#__PURE__*/React.createElement(BlockCardResolvingView, {
         testId: "embed-card-resolving-view",
         inheritDimensions: inheritDimensions,
@@ -83,6 +100,19 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
             onClick: handleFrameClick
           }));
         }
+        if (fg('smart-card-remove-block-card-from-embed')) {
+          return /*#__PURE__*/React.createElement(FlexibleResolvedView, {
+            url: url,
+            cardState: cardState,
+            onClick: handleFrameClick,
+            onError: onError,
+            onResolve: onResolve,
+            renderers: renderers,
+            actionOptions: actionOptions,
+            analytics: analytics,
+            testId: testId
+          });
+        }
         const resolvedBlockViewProps = extractBlockProps(data, meta, {
           analytics,
           origin: 'smartLinkEmbed',

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

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

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

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

package/dist/esm/view/CardWithUrl/component.js

@@ -245,6 +245,7 @@ function Component(_ref) {
       return /*#__PURE__*/React.createElement(EmbedCard, {
         id: id,
         url: url,
+        renderers: renderers,
         cardState: state,
         iframeUrlType: embedIframeUrlType,
         handleAuthorize: services.length && handleAuthorize || undefined,

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

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { extractBlockProps } from '../../extractors/block';
 import { extractRequestAccessContextImproved } from '../../extractors/common/context/extractAccessContext';
 import { extractEmbedProps } from '../../extractors/embed';
@@ -8,6 +9,7 @@ import { extractInlineProps } from '../../extractors/inline';
 import { getExtensionKey, hasAuthScopeOverrides } from '../../state/helpers';
 import { getEmptyJsonLd, getForbiddenJsonLd } from '../../utils/jsonld';
 import { BlockCardResolvedView, BlockCardResolvingView } from '../BlockCard';
+import FlexibleResolvedView from '../BlockCard/views/flexible/FlexibleResolvedView';
 import { InlineCardResolvedView } from '../InlineCard/ResolvedView';
 import { EmbedCardErroredView } from './views/ErroredView';
 import ForbiddenView from './views/forbidden-view';
@@ -17,9 +19,7 @@ import UnauthorizedView from './views/unauthorized-view';
 export var EmbedCard = /*#__PURE__*/React.forwardRef(function (_ref, iframeRef) {
   var _details$meta, _forbiddenViewProps$c, _forbiddenViewProps$c2, _notFoundViewProps$co, _notFoundViewProps$co2;
   var url = _ref.url,
-    _ref$cardState = _ref.cardState,
-    status = _ref$cardState.status,
-    details = _ref$cardState.details,
+    cardState = _ref.cardState,
     handleAuthorize = _ref.handleAuthorize,
     handleErrorRetry = _ref.handleErrorRetry,
     handleFrameClick = _ref.handleFrameClick,
@@ -35,9 +35,12 @@ export var EmbedCard = /*#__PURE__*/React.forwardRef(function (_ref, iframeRef)
     onIframeDwell = _ref.onIframeDwell,
     onIframeFocus = _ref.onIframeFocus,
     iframeUrlType = _ref.iframeUrlType,
-    actionOptions = _ref.actionOptions;
+    actionOptions = _ref.actionOptions,
+    renderers = _ref.renderers;
   var _useAnalyticsEvents = useAnalyticsEvents(),
     createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
+  var status = cardState.status,
+    details = cardState.details;
   var data = details && details.data || getEmptyJsonLd();
   var meta = details && details.meta;
   var extensionKey = getExtensionKey(details);
@@ -45,6 +48,19 @@ export var EmbedCard = /*#__PURE__*/React.forwardRef(function (_ref, iframeRef)
   switch (status) {
     case 'pending':
     case 'resolving':
+      if (fg('smart-card-remove-block-card-from-embed')) {
+        return /*#__PURE__*/React.createElement(FlexibleResolvedView, {
+          url: url,
+          cardState: cardState,
+          onClick: handleFrameClick,
+          onError: onError,
+          onResolve: onResolve,
+          renderers: renderers,
+          actionOptions: actionOptions,
+          analytics: analytics,
+          testId: testId
+        });
+      }
       return /*#__PURE__*/React.createElement(BlockCardResolvingView, {
         testId: "embed-card-resolving-view",
         inheritDimensions: inheritDimensions,
@@ -80,6 +96,19 @@ export var EmbedCard = /*#__PURE__*/React.forwardRef(function (_ref, iframeRef)
             onClick: handleFrameClick
           }));
         }
+        if (fg('smart-card-remove-block-card-from-embed')) {
+          return /*#__PURE__*/React.createElement(FlexibleResolvedView, {
+            url: url,
+            cardState: cardState,
+            onClick: handleFrameClick,
+            onError: onError,
+            onResolve: onResolve,
+            renderers: renderers,
+            actionOptions: actionOptions,
+            analytics: analytics,
+            testId: testId
+          });
+        }
         var resolvedBlockViewProps = extractBlockProps(data, meta, {
           analytics: analytics,
           origin: 'smartLinkEmbed',

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

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

package/dist/types/view/EmbedCard/types.d.ts

@@ -1,4 +1,5 @@
 import { type ReactNode } from 'react';
+import { type CardProviderRenderers } from '@atlaskit/link-provider';
 import { type RequestAccessMessageKey } from '../../messages';
 import { type InvokeHandler } from '../../model/invoke-handler';
 import { type AnalyticsFacade } from '../../state/analytics';
@@ -26,6 +27,7 @@ export type EmbedCardProps = {
     onIframeDwell?: (dwellTime: number, dwellPercentVisible: number) => void;
     onIframeFocus?: () => void;
     iframeUrlType?: EmbedIframeUrlType;
+    renderers?: CardProviderRenderers;
 };
 export interface WithShowControlMethodProp {
     showControls?: () => void;

package/dist/types-ts4.5/view/EmbedCard/types.d.ts

@@ -1,4 +1,5 @@
 import { type ReactNode } from 'react';
+import { type CardProviderRenderers } from '@atlaskit/link-provider';
 import { type RequestAccessMessageKey } from '../../messages';
 import { type InvokeHandler } from '../../model/invoke-handler';
 import { type AnalyticsFacade } from '../../state/analytics';
@@ -26,6 +27,7 @@ export type EmbedCardProps = {
     onIframeDwell?: (dwellTime: number, dwellPercentVisible: number) => void;
     onIframeFocus?: () => void;
     iframeUrlType?: EmbedIframeUrlType;
+    renderers?: CardProviderRenderers;
 };
 export interface WithShowControlMethodProp {
     showControls?: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "32.3.0",
+	"version": "32.4.0",
 	"description": "Smart card component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,7 +35,7 @@
 		"@atlaskit/dropdown-menu": "^12.23.0",
 		"@atlaskit/form": "^10.6.0",
 		"@atlaskit/frontend-utilities": "^2.7.0",
-		"@atlaskit/heading": "^3.1.0",
+		"@atlaskit/heading": "^4.0.0",
 		"@atlaskit/icon": "^22.28.0",
 		"@atlaskit/icon-file-type": "^6.7.0",
 		"@atlaskit/icon-object": "^6.8.0",
@@ -173,6 +173,9 @@
 		},
 		"smart_links_for_plans_platform": {
 			"type": "boolean"
+		},
+		"smart-card-remove-block-card-from-embed": {
+			"type": "boolean"
 		}
 	}
 }