@atlaskit/smart-card 26.48.2 → 26.48.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/smart-card
 
+## 26.48.4
+
+### Patch Changes
+
+- [#76818](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/76818) [`0752383c4c98`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0752383c4c98) - Fix embed unresolved view not respecting frameStyle prop
+
+## 26.48.3
+
+### Patch Changes
+
+- [#76801](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/76801) [`22c2b23f0f4a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/22c2b23f0f4a) - Allow multiple subscribers to the same AI Summary Service.
+
 ## 26.48.2
 
 ### Patch Changes

package/dist/cjs/state/hooks/use-ai-summary/ai-summary-service/index.js

@@ -11,6 +11,9 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utils = require("./utils");
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 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) { (0, _defineProperty2.default)(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; }
 function _asyncIterator(r) { var n, t, o, e = 2; for ("undefined" != typeof Symbol && (t = Symbol.asyncIterator, o = Symbol.iterator); e--;) { if (t && null != (n = r[t])) return n.call(r); if (o && null != (n = r[o])) return new AsyncFromSyncIterator(n.call(r)); t = "@@asyncIterator", o = "@@iterator"; } throw new TypeError("Object is not async iterable"); }
@@ -23,7 +26,7 @@ var AISummaryService = exports.AISummaryService = /*#__PURE__*/function () {
       content: '',
       status: 'ready'
     });
-    (0, _defineProperty2.default)(this, "subscribedStateSetter", function (state) {});
+    (0, _defineProperty2.default)(this, "subscribedStateSetters", new Set());
     (0, _defineProperty2.default)(this, "fetchStream", /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(summaryStyle) {
         var payload, options, path, requestUrl, response;
@@ -79,6 +82,9 @@ var AISummaryService = exports.AISummaryService = /*#__PURE__*/function () {
     value: function () {
       var _summariseUrl = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var summaryStyle,
+          _iterator2,
+          _step2,
+          _subscriber,
           stream,
           bufferContent,
           _iteratorAbruptCompletion,
@@ -87,6 +93,12 @@ var AISummaryService = exports.AISummaryService = /*#__PURE__*/function () {
           _iterator,
           _step,
           chunk,
+          _iterator3,
+          _step3,
+          subscriber,
+          _iterator4,
+          _step4,
+          _subscriber2,
           _args2 = arguments;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -95,74 +107,104 @@ var AISummaryService = exports.AISummaryService = /*#__PURE__*/function () {
               this.state = _objectSpread(_objectSpread({}, this.state), {}, {
                 status: 'loading'
               });
-              this.subscribedStateSetter(this.state);
-              _context2.next = 5;
+              _iterator2 = _createForOfIteratorHelper(this.subscribedStateSetters);
+              try {
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  _subscriber = _step2.value;
+                  _subscriber(this.state);
+                }
+              } catch (err) {
+                _iterator2.e(err);
+              } finally {
+                _iterator2.f();
+              }
+              _context2.next = 6;
               return this.fetchStream(summaryStyle);
-            case 5:
+            case 6:
               stream = _context2.sent;
               bufferContent = '';
               _iteratorAbruptCompletion = false;
               _didIteratorError = false;
-              _context2.prev = 9;
+              _context2.prev = 10;
               _iterator = _asyncIterator(stream);
-            case 11:
-              _context2.next = 13;
+            case 12:
+              _context2.next = 14;
               return _iterator.next();
-            case 13:
+            case 14:
               if (!(_iteratorAbruptCompletion = !(_step = _context2.sent).done)) {
-                _context2.next = 19;
+                _context2.next = 20;
                 break;
               }
               chunk = _step.value;
               if (chunk.type === 'ANSWER_PART') {
                 bufferContent += chunk.message.content;
-                this.subscribedStateSetter(_objectSpread(_objectSpread({}, this.state), {}, {
-                  content: bufferContent
-                }));
+                _iterator3 = _createForOfIteratorHelper(this.subscribedStateSetters);
+                try {
+                  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    subscriber = _step3.value;
+                    subscriber(_objectSpread(_objectSpread({}, this.state), {}, {
+                      content: bufferContent
+                    }));
+                  }
+                } catch (err) {
+                  _iterator3.e(err);
+                } finally {
+                  _iterator3.f();
+                }
               }
-            case 16:
+            case 17:
               _iteratorAbruptCompletion = false;
-              _context2.next = 11;
+              _context2.next = 12;
               break;
-            case 19:
-              _context2.next = 25;
+            case 20:
+              _context2.next = 26;
               break;
-            case 21:
-              _context2.prev = 21;
-              _context2.t0 = _context2["catch"](9);
+            case 22:
+              _context2.prev = 22;
+              _context2.t0 = _context2["catch"](10);
               _didIteratorError = true;
               _iteratorError = _context2.t0;
-            case 25:
-              _context2.prev = 25;
+            case 26:
               _context2.prev = 26;
+              _context2.prev = 27;
               if (!(_iteratorAbruptCompletion && _iterator.return != null)) {
-                _context2.next = 30;
+                _context2.next = 31;
                 break;
               }
-              _context2.next = 30;
+              _context2.next = 31;
               return _iterator.return();
-            case 30:
-              _context2.prev = 30;
+            case 31:
+              _context2.prev = 31;
               if (!_didIteratorError) {
-                _context2.next = 33;
+                _context2.next = 34;
                 break;
               }
               throw _iteratorError;
-            case 33:
-              return _context2.finish(30);
             case 34:
-              return _context2.finish(25);
+              return _context2.finish(31);
             case 35:
+              return _context2.finish(26);
+            case 36:
               this.state = {
                 status: 'done',
                 content: bufferContent
               };
-              this.subscribedStateSetter(this.state);
-            case 37:
+              _iterator4 = _createForOfIteratorHelper(this.subscribedStateSetters);
+              try {
+                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                  _subscriber2 = _step4.value;
+                  _subscriber2(this.state);
+                }
+              } catch (err) {
+                _iterator4.e(err);
+              } finally {
+                _iterator4.f();
+              }
+            case 39:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[9, 21, 25, 35], [26,, 30, 34]]);
+        }, _callee2, this, [[10, 22, 26, 36], [27,, 31, 35]]);
       }));
       function summariseUrl() {
         return _summariseUrl.apply(this, arguments);
@@ -172,7 +214,11 @@ var AISummaryService = exports.AISummaryService = /*#__PURE__*/function () {
   }, {
     key: "subscribe",
     value: function subscribe(stateSetter) {
-      this.subscribedStateSetter = stateSetter;
+      var _this2 = this;
+      this.subscribedStateSetters.add(stateSetter);
+      return function () {
+        _this2.subscribedStateSetters.delete(stateSetter);
+      };
     }
   }]);
   return AISummaryService;

package/dist/cjs/state/hooks/use-ai-summary/index.js

@@ -10,34 +10,59 @@ var _react = require("react");
 var _store = require("./ai-summary-service/store");
 var _aiSummaryService = require("./ai-summary-service");
 var useAISummary = exports.useAISummary = function useAISummary(props) {
-  var url = props.url;
-  var aISummaryService = _store.AISummariesStore.get(url);
-  var isAISummaryServiceInitiated = !!aISummaryService;
-  var _useState = (0, _react.useState)(isAISummaryServiceInitiated ? aISummaryService.state : {
+  var _AISummariesStore$get;
+  var url = props.url,
+    baseUrl = props.baseUrl,
+    product = props.product,
+    headers = props.headers;
+  var _useState = (0, _react.useState)(((_AISummariesStore$get = _store.AISummariesStore.get(url)) === null || _AISummariesStore$get === void 0 ? void 0 : _AISummariesStore$get.state) || {
       status: 'ready',
       content: ''
     }),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
-  var isSummarised = isAISummaryServiceInitiated && state.status === 'done';
+
+  // Can be used to know the summary status upon mounting a component (HoverCard UI state for example).
+  // For other scenarios, opt for dynamic status updates via state.status.
+  var isSummarisedOnMount = (0, _react.useMemo)(function () {
+    var _AISummariesStore$get2;
+    return ((_AISummariesStore$get2 = _store.AISummariesStore.get(url)) === null || _AISummariesStore$get2 === void 0 ? void 0 : _AISummariesStore$get2.state.status) === 'done';
+  }, [url]);
   (0, _react.useEffect)(function () {
-    if (!isSummarised) {
-      var _AISummariesStore$get;
-      if (!isAISummaryServiceInitiated) {
-        _store.AISummariesStore.set(url, new _aiSummaryService.AISummaryService(props));
+    // Create or subscribe to an AI service only if a summary has not been previously generated.
+    // Otherwise, use the data from the current state synchronized with a cache (AISummariesStore).
+    if (!isSummarisedOnMount) {
+      var aISummaryService = _store.AISummariesStore.get(url);
+      var isAISummaryServiceInitiated = !!aISummaryService;
+      if (isAISummaryServiceInitiated) {
+        //if we want to subscribe to updates from an existing AI service that has not yet provided a summary or is currently in progress.
+        var unsubscribe = aISummaryService.subscribe(setState);
+        return function () {
+          return unsubscribe();
+        };
+      } else {
+        var _AISummariesStore$get3;
+        //if we want to create a new AI service and wish to subscribe for updates
+        _store.AISummariesStore.set(url, new _aiSummaryService.AISummaryService({
+          url: url,
+          baseUrl: baseUrl,
+          product: product,
+          headers: headers
+        }));
+        var _unsubscribe = (_AISummariesStore$get3 = _store.AISummariesStore.get(url)) === null || _AISummariesStore$get3 === void 0 ? void 0 : _AISummariesStore$get3.subscribe(setState);
+        return function () {
+          return _unsubscribe && _unsubscribe();
+        };
       }
-      return (_AISummariesStore$get = _store.AISummariesStore.get(url)) === null || _AISummariesStore$get === void 0 ? void 0 : _AISummariesStore$get.subscribe(setState);
     }
-  }, [isSummarised, isAISummaryServiceInitiated, url, props]);
+  }, [isSummarisedOnMount, url, baseUrl, product, headers]);
   var summariseUrl = function summariseUrl() {
-    if (isAISummaryServiceInitiated) {
-      return aISummaryService.summariseUrl();
-    }
-    return;
+    var _AISummariesStore$get4;
+    return (_AISummariesStore$get4 = _store.AISummariesStore.get(url)) === null || _AISummariesStore$get4 === void 0 ? void 0 : _AISummariesStore$get4.summariseUrl();
   };
   return {
-    isSummarised: isSummarised,
+    isSummarisedOnMount: isSummarisedOnMount,
     summariseUrl: summariseUrl,
     state: state
   };

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.2"
+  packageVersion: "26.48.4"
 };
 var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/cjs/utils/index.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sleep = exports.openUrl = exports.isSpecialKey = exports.isSpecialEvent = exports.isSpecialClick = exports.isIntersectionObserverSupported = exports.isIframe = exports.isCardWithData = exports.importWithRetry = exports.handleOnClick = exports.getLabelForFileType = exports.getIframeSandboxAttribute = exports.getIconForFileType = exports.downloadUrl = void 0;
+exports.sleep = exports.openUrl = exports.isSpecialKey = exports.isSpecialEvent = exports.isSpecialClick = exports.isIntersectionObserverSupported = exports.isIframe = exports.isCardWithData = exports.importWithRetry = exports.handleOnClick = exports.getLabelForFileType = exports.getIframeSandboxAttribute = exports.getIconForFileType = exports.downloadUrl = exports.combineFrameStyle = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -451,4 +451,17 @@ var openUrl = exports.openUrl = /*#__PURE__*/function () {
   return function openUrl(_x3) {
     return _ref3.apply(this, arguments);
   };
-}();
+}();
+
+/**
+ * Migrate internal usages of the deprecated isFrameVisible to frameStyle
+ * This function is to be removed on deprecation of isFrameVisible.
+ */
+var combineFrameStyle = exports.combineFrameStyle = function combineFrameStyle(frameStyle, isFrameVisible) {
+  if (frameStyle !== undefined) {
+    return frameStyle;
+  }
+  if (isFrameVisible) {
+    return 'show';
+  }
+};

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

@@ -30,7 +30,7 @@ function Component(_ref) {
     isSelected = _ref.isSelected,
     isHovered = _ref.isHovered,
     isFrameVisible = _ref.isFrameVisible,
-    frameStyle = _ref.frameStyle,
+    frameStyleProp = _ref.frameStyle,
     platform = _ref.platform,
     onClick = _ref.onClick,
     appearance = _ref.appearance,
@@ -75,6 +75,7 @@ function Component(_ref) {
   }, [children]);
   var enableFlexibleBlockCardFlag = Boolean((0, _linkProvider.useFeatureFlag)('enableFlexibleBlockCard'));
   var actionOptions = (0, _combineActionOptions.combineActionOptions)(actionOptionsProp, showServerActions, showActions, platform);
+  var frameStyle = (0, _utils.combineFrameStyle)(frameStyleProp, isFrameVisible);
 
   // Setup UI handlers.
   var handleClickWrapper = (0, _react.useCallback)(function (event) {
@@ -261,7 +262,6 @@ function Component(_ref) {
         handleInvoke: handleInvoke,
         analytics: analytics,
         isSelected: isSelected,
-        isFrameVisible: isFrameVisible,
         frameStyle: frameStyle,
         platform: platform,
         onResolve: onResolve,

package/dist/cjs/view/EmbedCard/components/ExpandedFrame.js

@@ -1,16 +1,14 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ExpandedFrame = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _styled = require("./styled");
 var _handlers = require("../../BlockCard/utils/handlers");
 var _useLinkClicked = require("../../../state/analytics/useLinkClicked");
-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; }
 var ExpandedFrame = exports.ExpandedFrame = function ExpandedFrame(_ref) {
   var _ref$isPlaceholder = _ref.isPlaceholder,
     isPlaceholder = _ref$isPlaceholder === void 0 ? false : _ref$isPlaceholder,
@@ -19,8 +17,8 @@ var ExpandedFrame = exports.ExpandedFrame = function ExpandedFrame(_ref) {
     icon = _ref.icon,
     text = _ref.text,
     isSelected = _ref.isSelected,
-    isFrameVisible = _ref.isFrameVisible,
-    frameStyle = _ref.frameStyle,
+    _ref$frameStyle = _ref.frameStyle,
+    frameStyle = _ref$frameStyle === void 0 ? 'showOnHover' : _ref$frameStyle,
     href = _ref.href,
     minWidth = _ref.minWidth,
     maxWidth = _ref.maxWidth,
@@ -36,9 +34,6 @@ var ExpandedFrame = exports.ExpandedFrame = function ExpandedFrame(_ref) {
     return (0, _handlers.handleClickCommon)(event, onClick);
   };
   var handleMouseDown = (0, _useLinkClicked.useMouseDownEvent)();
-  var calculatedFrameStyle = (0, _react.useMemo)(function () {
-    return frameStyle !== undefined ? frameStyle : isFrameVisible ? 'show' : 'showOnHover';
-  }, [frameStyle, isFrameVisible]);
   var renderHeader = function renderHeader() {
     return /*#__PURE__*/_react.default.createElement(_styled.Header, {
       className: "embed-header",
@@ -66,7 +61,7 @@ var ExpandedFrame = exports.ExpandedFrame = function ExpandedFrame(_ref) {
       className: _styled.className,
       isInteractive: isInteractive(),
       isSelected: isSelected,
-      frameStyle: calculatedFrameStyle,
+      frameStyle: frameStyle,
       minWidth: minWidth,
       maxWidth: maxWidth,
       "data-testid": testId,
@@ -82,7 +77,7 @@ var ExpandedFrame = exports.ExpandedFrame = function ExpandedFrame(_ref) {
       isInteractive: isInteractive(),
       isSelected: isSelected,
       minWidth: minWidth,
-      frameStyle: calculatedFrameStyle,
+      frameStyle: frameStyle,
       maxWidth: maxWidth,
       "data-testid": testId,
       "data-trello-do-not-use-override": testId,

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

@@ -33,7 +33,6 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
     analytics = _ref.analytics,
     handleInvoke = _ref.handleInvoke,
     isSelected = _ref.isSelected,
-    isFrameVisible = _ref.isFrameVisible,
     frameStyle = _ref.frameStyle,
     platform = _ref.platform,
     onResolve = _ref.onResolve,
@@ -71,7 +70,6 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
       if (resolvedViewProps.preview) {
         return /*#__PURE__*/_react.default.createElement(_ResolvedView2.EmbedCardResolvedView, (0, _extends2.default)({}, resolvedViewProps, {
           isSelected: isSelected,
-          isFrameVisible: isFrameVisible,
           frameStyle: frameStyle,
           inheritDimensions: inheritDimensions,
           onClick: handleFrameClick,
@@ -114,6 +112,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
         analytics: analytics,
         context: unauthorisedViewProps.context,
         extensionKey: extensionKey,
+        frameStyle: frameStyle,
         isProductIntegrationSupported: isProductIntegrationSupported,
         inheritDimensions: inheritDimensions,
         isSelected: isSelected,
@@ -134,8 +133,8 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
       if (forbiddenViewProps.preview) {
         return /*#__PURE__*/_react.default.createElement(_ResolvedView2.EmbedCardResolvedView, (0, _extends2.default)({}, forbiddenViewProps, {
           title: forbiddenViewProps.link,
+          frameStyle: frameStyle,
           isSelected: isSelected,
-          isFrameVisible: isFrameVisible,
           inheritDimensions: inheritDimensions,
           onClick: handleFrameClick,
           ref: iframeRef
@@ -149,6 +148,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
       });
       return /*#__PURE__*/_react.default.createElement(_forbiddenView.default, {
         context: forbiddenViewProps.context,
+        frameStyle: frameStyle,
         inheritDimensions: inheritDimensions,
         isSelected: isSelected,
         onAuthorize: handleAuthorize,
@@ -172,6 +172,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
       }) : undefined;
       return /*#__PURE__*/_react.default.createElement(_notFoundView.default, {
         context: notFoundViewProps.context,
+        frameStyle: frameStyle,
         inheritDimensions: inheritDimensions,
         isSelected: isSelected,
         onClick: handleFrameClick,

package/dist/cjs/view/EmbedCard/views/ResolvedView.js

@@ -19,7 +19,6 @@ var EmbedCardResolvedView = exports.EmbedCardResolvedView = /*#__PURE__*/_react2
     context = _ref.context,
     onClick = _ref.onClick,
     isSelected = _ref.isSelected,
-    isFrameVisible = _ref.isFrameVisible,
     frameStyle = _ref.frameStyle,
     preview = _ref.preview,
     title = _ref.title,
@@ -57,7 +56,6 @@ var EmbedCardResolvedView = exports.EmbedCardResolvedView = /*#__PURE__*/_react2
   }
   return (0, _react.jsx)(_ExpandedFrame.ExpandedFrame, {
     isSelected: isSelected,
-    isFrameVisible: isFrameVisible,
     frameStyle: frameStyle,
     href: link,
     testId: testId,

package/dist/cjs/view/EmbedCard/views/unresolved-view/index.js

@@ -19,6 +19,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var UnresolvedView = function UnresolvedView(_ref) {
   var button = _ref.button,
     description = _ref.description,
+    frameStyle = _ref.frameStyle,
     iconUrlOrElement = _ref.icon,
     image = _ref.image,
     inheritDimensions = _ref.inheritDimensions,
@@ -42,8 +43,15 @@ var UnresolvedView = function UnresolvedView(_ref) {
     });
   }, [iconUrlOrElement]);
   return (0, _react.jsx)(_ExpandedFrame.ExpandedFrame, {
-    allowScrollBar: true,
-    frameStyle: "show",
+    allowScrollBar: true
+    // EDM-9259: Fix embed frame showing on unresolved views when frameStyle is set to hide.
+    // Set fallback to 'show' here to maintain the current behaviour when platform.editor.show-embed-card-frame-renderer is OFF.
+    // Remove 'show' on platform.editor.show-embed-card-frame-renderer cleanup as frameStyle will be set to 'show' both in renderer and editor.
+    // We want all views to be consistent and respect frameStyle instead of
+    // having resolved view default to showOnHover and unresolved view default to show.
+    // Default frameStyle is set inside <ExpandedFrame />
+    ,
+    frameStyle: frameStyle !== null && frameStyle !== void 0 ? frameStyle : 'show',
     href: url,
     icon: icon,
     inheritDimensions: inheritDimensions,

package/dist/cjs/view/FlexibleCard/components/actions/action/preview-action/index.js

@@ -12,8 +12,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _react = _interopRequireDefault(require("react"));
 var _index = _interopRequireDefault(require("../index"));
 var _flexibleUiContext = require("../../../../../../state/flexible-ui-context");
-var _reactIntlNext = require("react-intl-next");
-var _messages = require("../../../../../../messages");
 var _utils = require("../../../utils");
 var _useInvokeClientAction = _interopRequireDefault(require("../../../../../../state/hooks/use-invoke-client-action"));
 var _constants = require("../../../../../../constants");
@@ -75,8 +73,7 @@ var PreviewAction = function PreviewAction(props) {
         if (_onClick) {
           _onClick();
         }
-      },
-      content: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.messages.preview_improved)
+      }
     });
     return /*#__PURE__*/_react.default.createElement(_index.default, (0, _extends2.default)({}, action, {
       appearance: appearance,

package/dist/cjs/view/FlexibleCard/components/blocks/title-block/errored/index.js

@@ -16,14 +16,13 @@ var _block = _interopRequireDefault(require("../../block"));
 var _constants = require("../../../../../../constants");
 var _utils = require("../../../utils");
 var _elementGroup = _interopRequireDefault(require("../../element-group"));
-var _token = require("../../../../../../utils/token");
 var _excluded = ["actionGroup", "retry", "position", "testId", "title", "hideIcon"];
 var _templateObject, _templateObject2;
 /** @jsx jsx */
-var actionStyles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  cursor: pointer;\n  :hover {\n    color: ", ";\n    text-decoration: underline;\n  }\n"])), _token.tokens.errorMessageHover);
+var actionStyles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  cursor: pointer;\n  :hover {\n    color: ", ";\n    text-decoration: underline;\n  }\n"])), "var(--ds-text-subtle, #8993A4)");
 var getMessageStyles = function getMessageStyles(size, hasAction) {
   var sizeStyles = (0, _utils.getLinkSizeStyles)(size);
-  return (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n    flex: 1 1 auto;\n    justify-content: flex-end;\n    ", "\n    ", "\n    ", "\n    color: ", ";\n    :focus {\n      outline: ", " solid 2px;\n    }\n  "])), hasAction ? actionStyles : '', sizeStyles, (0, _utils.getTruncateStyles)(1, (0, _utils.getLinkLineHeight)(size)), _token.tokens.errorMessage, _token.tokens.focus);
+  return (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n    flex: 1 1 auto;\n    justify-content: flex-end;\n    ", "\n    ", "\n    ", "\n    color: ", ";\n    :focus {\n      outline: ", " solid 2px;\n    }\n  "])), hasAction ? actionStyles : '', sizeStyles, (0, _utils.getTruncateStyles)(1, (0, _utils.getLinkLineHeight)(size)), "var(--ds-text-disabled, #6B778C)", "var(--ds-border-focused, #388BFF)");
 };
 
 /**

package/dist/cjs/view/FlexibleCard/components/container/index.js

@@ -11,7 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _constants = require("../../../../constants");
 var _flexible = require("../../../../utils/flexible");
-var _token = require("../../../../utils/token");
 var _flexibleUiContext = require("../../../../state/flexible-ui-context");
 var _layeredLink = _interopRequireDefault(require("./layered-link"));
 var _hoverCardControl = _interopRequireDefault(require("./hover-card-control"));
@@ -78,7 +77,7 @@ var getChildrenOptions = function getChildrenOptions(children, context) {
 };
 var getContainerStyles = exports.getContainerStyles = function getContainerStyles(size, hideBackground, hideElevation, hidePadding, clickableContainer, childrenOptions) {
   var paddingCss = getContainerPaddingStyles(size, hidePadding, childrenOptions);
-  return (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n    display: flex;\n    gap: ", " 0;\n    flex-direction: column;\n    min-width: 0;\n    overflow-x: hidden;\n    position: relative;\n    ", "\n    ", "\n    ", "\n    ", "\n    &:hover ~ .actions-button-group {\n      opacity: 1;\n    }\n    a:focus,\n    .has-action:focus {\n      outline-offset: -2px;\n    }\n  "])), getGap(size), hideBackground ? '' : "background-color: ".concat(_token.tokens.background, ";"), paddingCss, hideElevation ? '' : elevationStyles, clickableContainer ? clickableContainerStyles : '');
+  return (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n    display: flex;\n    gap: ", " 0;\n    flex-direction: column;\n    min-width: 0;\n    overflow-x: hidden;\n    position: relative;\n    ", "\n    ", "\n    ", "\n    ", "\n    &:hover ~ .actions-button-group {\n      opacity: 1;\n    }\n    a:focus,\n    .has-action:focus {\n      outline-offset: -2px;\n    }\n  "])), getGap(size), hideBackground ? '' : "background-color: ".concat("var(--ds-surface-raised, #FFFFFF)", ";"), paddingCss, hideElevation ? '' : elevationStyles, clickableContainer ? clickableContainerStyles : '');
 };
 var renderChildren = function renderChildren(children, containerSize, containerTheme, status, retry, onClick) {
   return _react.default.Children.map(children, function (child) {

package/dist/cjs/view/FlexibleCard/components/elements/badge/index.js

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
-var _token = require("../../../../../utils/token");
 var _utils = require("../../utils");
 var _constants = require("../../../../../constants");
 var _messages = require("../../../../../messages");
@@ -18,8 +17,8 @@ var _atlaskitIcon = _interopRequireDefault(require("../../common/atlaskit-icon")
 var _templateObject, _templateObject2, _templateObject3, _messageMapper;
 /** @jsx jsx */
 var badgeStyles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  align-items: center;\n  display: inline-flex;\n  min-width: fit-content;\n"])));
-var iconStyles = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  line-height: 0;\n  vertical-align: middle;\n  ", "\n  img,\n  span,\n  svg {\n    line-height: 0;\n    vertical-align: middle;\n  }\n"])), _token.tokens.badgeIcon, (0, _utils.getIconSizeStyles)('1rem'));
-var labelStyles = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  font-size: 0.75rem;\n  line-height: 1rem;\n  padding-left: 0.125rem;\n  vertical-align: middle;\n"])), _token.tokens.badgeText);
+var iconStyles = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  line-height: 0;\n  vertical-align: middle;\n  ", "\n  img,\n  span,\n  svg {\n    line-height: 0;\n    vertical-align: middle;\n  }\n"])), "var(--ds-icon-subtle, #626F86)", (0, _utils.getIconSizeStyles)('1rem'));
+var labelStyles = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  font-size: 0.75rem;\n  line-height: 1rem;\n  padding-left: 0.125rem;\n  vertical-align: middle;\n"])), "var(--ds-text-subtlest, #626F86)");
 var messageMapper = (_messageMapper = {}, (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityBlocker, _messages.messages.priority_blocker), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityCritical, _messages.messages.priority_critical), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityHigh, _messages.messages.priority_high), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityHighest, _messages.messages.priority_highest), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityLow, _messages.messages.priority_low), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityLowest, _messages.messages.priority_lowest), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityMajor, _messages.messages.priority_major), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityMedium, _messages.messages.priority_medium), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityMinor, _messages.messages.priority_minor), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityTrivial, _messages.messages.priority_trivial), (0, _defineProperty2.default)(_messageMapper, _constants.IconType.PriorityUndefined, _messages.messages.priority_undefined), _messageMapper);
 var getFormattedMessageFromIcon = function getFormattedMessageFromIcon(icon) {
   if (icon) {

package/dist/cjs/view/FlexibleCard/components/elements/date-time/index.js

@@ -11,12 +11,11 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _react2 = require("@emotion/react");
 var _utils = require("../../utils");
-var _token = require("../../../../../utils/token");
 var _intlUtils = require("@formatjs/intl-utils");
 var _messages = require("../../../../../messages");
 var _templateObject;
 /** @jsx jsx */
-var styles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  font-size: 0.75rem;\n  line-height: 1rem;\n  ", "\n"])), _token.tokens.text, (0, _utils.getTruncateStyles)(1));
+var styles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  font-size: 0.75rem;\n  line-height: 1rem;\n  ", "\n"])), "var(--ds-text-subtlest, #626F86)", (0, _utils.getTruncateStyles)(1));
 var typeToDescriptorMap = {
   created: {
     relative: _messages.messages.created_on_relative,

package/dist/cjs/view/FlexibleCard/components/elements/link/index.js

@@ -13,7 +13,6 @@ var _react2 = require("@emotion/react");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _constants = require("../../../../../constants");
 var _utils = require("../../utils");
-var _token = require("../../../../../utils/token");
 var _useLinkClicked = require("../../../../../state/analytics/useLinkClicked");
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 /** @jsx jsx */
@@ -31,10 +30,10 @@ var getThemeStyles = function getThemeStyles(theme) {
       return (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n        a& {\n          color: ", ";\n          &:active,\n          &:visited,\n          &:focus,\n          &:hover {\n            color: ", ";\n            text-decoration: underline;\n          }\n          font-size: 12px;\n        }\n      "])), "var(--ds-text-subtlest, #626F86)", "var(--ds-text-subtlest, #626F86)");
     // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
     case _constants.SmartLinkTheme.Black:
-      return (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n        color: ", ";\n        :active {\n          color: ", ";\n        }\n        :hover {\n          color: ", ";\n          text-decoration: underline;\n        }\n      "])), _token.tokens.blackLink, _token.tokens.blackLinkPressed, _token.tokens.blackLink);
+      return (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n        color: ", ";\n        :active {\n          color: ", ";\n        }\n        :hover {\n          color: ", ";\n          text-decoration: underline;\n        }\n      "])), "var(--ds-text-subtle, #44546F)", "var(--ds-text, #172B4D)", "var(--ds-text-subtle, #44546F)");
     case _constants.SmartLinkTheme.Link:
     default:
-      return (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n        color: ", ";\n        :active {\n          color: ", ";\n        }\n        :hover {\n          color: ", ";\n          text-decoration: underline;\n        }\n      "])), _token.tokens.blueLink, _token.tokens.blueLinkPressed, _token.tokens.blueLink);
+      return (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n        color: ", ";\n        :active {\n          color: ", ";\n        }\n        :hover {\n          color: ", ";\n          text-decoration: underline;\n        }\n      "])), "var(--ds-link, #0C66E4)", "var(--ds-link-pressed, #0055CC)", "var(--ds-link, #0C66E4)");
   }
 };
 var getAnchorStyles = function getAnchorStyles(size, theme, maxLines, hasSpace) {