@atlaskit/smart-card 26.48.3 → 26.48.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/dist/cjs/utils/analytics/analytics.js +1 -1
- package/dist/cjs/utils/index.js +15 -2
- package/dist/cjs/view/CardWithUrl/component.js +2 -2
- package/dist/cjs/view/EmbedCard/components/ExpandedFrame.js +6 -11
- package/dist/cjs/view/EmbedCard/index.js +4 -3
- package/dist/cjs/view/EmbedCard/views/ResolvedView.js +0 -2
- package/dist/cjs/view/EmbedCard/views/unresolved-view/index.js +10 -2
- package/dist/cjs/view/FlexibleCard/components/actions/action/preview-action/index.js +1 -4
- package/dist/cjs/view/FlexibleCard/components/blocks/title-block/errored/index.js +2 -3
- package/dist/cjs/view/FlexibleCard/components/container/index.js +1 -2
- package/dist/cjs/view/FlexibleCard/components/elements/badge/index.js +2 -3
- package/dist/cjs/view/FlexibleCard/components/elements/date-time/index.js +1 -2
- package/dist/cjs/view/FlexibleCard/components/elements/link/index.js +2 -3
- package/dist/cjs/view/FlexibleCard/components/elements/text/index.js +1 -2
- package/dist/cjs/view/LinkUrl/index.js +1 -1
- package/dist/es2019/utils/analytics/analytics.js +1 -1
- package/dist/es2019/utils/index.js +13 -0
- package/dist/es2019/view/CardWithUrl/component.js +3 -3
- package/dist/es2019/view/EmbedCard/components/ExpandedFrame.js +4 -6
- package/dist/es2019/view/EmbedCard/index.js +4 -3
- package/dist/es2019/view/EmbedCard/views/ResolvedView.js +0 -2
- package/dist/es2019/view/EmbedCard/views/unresolved-view/index.js +10 -2
- package/dist/es2019/view/FlexibleCard/components/actions/action/preview-action/index.js +1 -4
- package/dist/es2019/view/FlexibleCard/components/blocks/title-block/errored/index.js +3 -4
- package/dist/es2019/view/FlexibleCard/components/container/index.js +1 -2
- package/dist/es2019/view/FlexibleCard/components/elements/badge/index.js +2 -3
- package/dist/es2019/view/FlexibleCard/components/elements/date-time/index.js +1 -2
- package/dist/es2019/view/FlexibleCard/components/elements/link/index.js +6 -7
- package/dist/es2019/view/FlexibleCard/components/elements/text/index.js +1 -2
- package/dist/es2019/view/LinkUrl/index.js +1 -1
- package/dist/esm/utils/analytics/analytics.js +1 -1
- package/dist/esm/utils/index.js +14 -1
- package/dist/esm/view/CardWithUrl/component.js +3 -3
- package/dist/esm/view/EmbedCard/components/ExpandedFrame.js +5 -8
- package/dist/esm/view/EmbedCard/index.js +4 -3
- package/dist/esm/view/EmbedCard/views/ResolvedView.js +0 -2
- package/dist/esm/view/EmbedCard/views/unresolved-view/index.js +10 -2
- package/dist/esm/view/FlexibleCard/components/actions/action/preview-action/index.js +1 -4
- package/dist/esm/view/FlexibleCard/components/blocks/title-block/errored/index.js +2 -3
- package/dist/esm/view/FlexibleCard/components/container/index.js +1 -2
- package/dist/esm/view/FlexibleCard/components/elements/badge/index.js +2 -3
- package/dist/esm/view/FlexibleCard/components/elements/date-time/index.js +1 -2
- package/dist/esm/view/FlexibleCard/components/elements/link/index.js +2 -3
- package/dist/esm/view/FlexibleCard/components/elements/text/index.js +1 -2
- package/dist/esm/view/LinkUrl/index.js +1 -1
- package/dist/types/utils/index.d.ts +7 -1
- package/dist/types/view/EmbedCard/components/ExpandedFrame.d.ts +0 -2
- package/dist/types/view/EmbedCard/types.d.ts +0 -1
- package/dist/types/view/EmbedCard/views/ResolvedView.d.ts +0 -2
- package/dist/types/view/EmbedCard/views/forbidden-view/types.d.ts +4 -4
- package/dist/types/view/EmbedCard/views/not-found-view/types.d.ts +4 -4
- package/dist/types/view/EmbedCard/views/unauthorized-view/types.d.ts +3 -3
- package/dist/types/view/EmbedCard/views/unresolved-view/types.d.ts +5 -12
- package/dist/types-ts4.5/utils/index.d.ts +7 -1
- package/dist/types-ts4.5/view/EmbedCard/components/ExpandedFrame.d.ts +0 -2
- package/dist/types-ts4.5/view/EmbedCard/types.d.ts +0 -1
- package/dist/types-ts4.5/view/EmbedCard/views/ResolvedView.d.ts +0 -2
- package/dist/types-ts4.5/view/EmbedCard/views/forbidden-view/types.d.ts +4 -4
- package/dist/types-ts4.5/view/EmbedCard/views/not-found-view/types.d.ts +4 -4
- package/dist/types-ts4.5/view/EmbedCard/views/unauthorized-view/types.d.ts +3 -3
- package/dist/types-ts4.5/view/EmbedCard/views/unresolved-view/types.d.ts +5 -12
- package/package.json +1 -1
- package/dist/cjs/utils/token.js +0 -27
- package/dist/cjs/view/EmbedCard/views/UnresolvedView.js +0 -82
- package/dist/es2019/utils/token.js +0 -21
- package/dist/es2019/view/EmbedCard/views/UnresolvedView.js +0 -75
- package/dist/esm/utils/token.js +0 -21
- package/dist/esm/view/EmbedCard/views/UnresolvedView.js +0 -74
- package/dist/types/utils/token.d.ts +0 -21
- package/dist/types/view/EmbedCard/views/UnresolvedView.d.ts +0 -22
- package/dist/types-ts4.5/utils/token.d.ts +0 -21
- package/dist/types-ts4.5/view/EmbedCard/views/UnresolvedView.d.ts +0 -22
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @atlaskit/smart-card
|
|
2
2
|
|
|
3
|
+
## 26.48.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#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
|
|
8
|
+
|
|
3
9
|
## 26.48.3
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
|
@@ -22,7 +22,7 @@ var ANALYTICS_CHANNEL = exports.ANALYTICS_CHANNEL = 'media';
|
|
|
22
22
|
var context = exports.context = {
|
|
23
23
|
componentName: 'smart-cards',
|
|
24
24
|
packageName: "@atlaskit/smart-card",
|
|
25
|
-
packageVersion: "26.48.
|
|
25
|
+
packageVersion: "26.48.4"
|
|
26
26
|
};
|
|
27
27
|
var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
|
|
28
28
|
TrackQuickActionType["StatusUpdate"] = "StatusUpdate";
|
package/dist/cjs/utils/index.js
CHANGED
|
@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
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;
|
|
8
|
+
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;
|
|
9
9
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
10
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
11
11
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
@@ -451,4 +451,17 @@ var openUrl = exports.openUrl = /*#__PURE__*/function () {
|
|
|
451
451
|
return function openUrl(_x3) {
|
|
452
452
|
return _ref3.apply(this, arguments);
|
|
453
453
|
};
|
|
454
|
-
}();
|
|
454
|
+
}();
|
|
455
|
+
|
|
456
|
+
/**
|
|
457
|
+
* Migrate internal usages of the deprecated isFrameVisible to frameStyle
|
|
458
|
+
* This function is to be removed on deprecation of isFrameVisible.
|
|
459
|
+
*/
|
|
460
|
+
var combineFrameStyle = exports.combineFrameStyle = function combineFrameStyle(frameStyle, isFrameVisible) {
|
|
461
|
+
if (frameStyle !== undefined) {
|
|
462
|
+
return frameStyle;
|
|
463
|
+
}
|
|
464
|
+
if (isFrameVisible) {
|
|
465
|
+
return 'show';
|
|
466
|
+
}
|
|
467
|
+
};
|
|
@@ -30,7 +30,7 @@ function Component(_ref) {
|
|
|
30
30
|
isSelected = _ref.isSelected,
|
|
31
31
|
isHovered = _ref.isHovered,
|
|
32
32
|
isFrameVisible = _ref.isFrameVisible,
|
|
33
|
-
|
|
33
|
+
frameStyleProp = _ref.frameStyle,
|
|
34
34
|
platform = _ref.platform,
|
|
35
35
|
onClick = _ref.onClick,
|
|
36
36
|
appearance = _ref.appearance,
|
|
@@ -75,6 +75,7 @@ function Component(_ref) {
|
|
|
75
75
|
}, [children]);
|
|
76
76
|
var enableFlexibleBlockCardFlag = Boolean((0, _linkProvider.useFeatureFlag)('enableFlexibleBlockCard'));
|
|
77
77
|
var actionOptions = (0, _combineActionOptions.combineActionOptions)(actionOptionsProp, showServerActions, showActions, platform);
|
|
78
|
+
var frameStyle = (0, _utils.combineFrameStyle)(frameStyleProp, isFrameVisible);
|
|
78
79
|
|
|
79
80
|
// Setup UI handlers.
|
|
80
81
|
var handleClickWrapper = (0, _react.useCallback)(function (event) {
|
|
@@ -261,7 +262,6 @@ function Component(_ref) {
|
|
|
261
262
|
handleInvoke: handleInvoke,
|
|
262
263
|
analytics: analytics,
|
|
263
264
|
isSelected: isSelected,
|
|
264
|
-
isFrameVisible: isFrameVisible,
|
|
265
265
|
frameStyle: frameStyle,
|
|
266
266
|
platform: platform,
|
|
267
267
|
onResolve: onResolve,
|
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.ExpandedFrame = void 0;
|
|
8
|
-
var _react =
|
|
8
|
+
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
var _styled = require("./styled");
|
|
10
10
|
var _handlers = require("../../BlockCard/utils/handlers");
|
|
11
11
|
var _useLinkClicked = require("../../../state/analytics/useLinkClicked");
|
|
12
|
-
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); }
|
|
13
|
-
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; }
|
|
14
12
|
var ExpandedFrame = exports.ExpandedFrame = function ExpandedFrame(_ref) {
|
|
15
13
|
var _ref$isPlaceholder = _ref.isPlaceholder,
|
|
16
14
|
isPlaceholder = _ref$isPlaceholder === void 0 ? false : _ref$isPlaceholder,
|
|
@@ -19,8 +17,8 @@ var ExpandedFrame = exports.ExpandedFrame = function ExpandedFrame(_ref) {
|
|
|
19
17
|
icon = _ref.icon,
|
|
20
18
|
text = _ref.text,
|
|
21
19
|
isSelected = _ref.isSelected,
|
|
22
|
-
|
|
23
|
-
frameStyle = _ref
|
|
20
|
+
_ref$frameStyle = _ref.frameStyle,
|
|
21
|
+
frameStyle = _ref$frameStyle === void 0 ? 'showOnHover' : _ref$frameStyle,
|
|
24
22
|
href = _ref.href,
|
|
25
23
|
minWidth = _ref.minWidth,
|
|
26
24
|
maxWidth = _ref.maxWidth,
|
|
@@ -36,9 +34,6 @@ var ExpandedFrame = exports.ExpandedFrame = function ExpandedFrame(_ref) {
|
|
|
36
34
|
return (0, _handlers.handleClickCommon)(event, onClick);
|
|
37
35
|
};
|
|
38
36
|
var handleMouseDown = (0, _useLinkClicked.useMouseDownEvent)();
|
|
39
|
-
var calculatedFrameStyle = (0, _react.useMemo)(function () {
|
|
40
|
-
return frameStyle !== undefined ? frameStyle : isFrameVisible ? 'show' : 'showOnHover';
|
|
41
|
-
}, [frameStyle, isFrameVisible]);
|
|
42
37
|
var renderHeader = function renderHeader() {
|
|
43
38
|
return /*#__PURE__*/_react.default.createElement(_styled.Header, {
|
|
44
39
|
className: "embed-header",
|
|
@@ -66,7 +61,7 @@ var ExpandedFrame = exports.ExpandedFrame = function ExpandedFrame(_ref) {
|
|
|
66
61
|
className: _styled.className,
|
|
67
62
|
isInteractive: isInteractive(),
|
|
68
63
|
isSelected: isSelected,
|
|
69
|
-
frameStyle:
|
|
64
|
+
frameStyle: frameStyle,
|
|
70
65
|
minWidth: minWidth,
|
|
71
66
|
maxWidth: maxWidth,
|
|
72
67
|
"data-testid": testId,
|
|
@@ -82,7 +77,7 @@ var ExpandedFrame = exports.ExpandedFrame = function ExpandedFrame(_ref) {
|
|
|
82
77
|
isInteractive: isInteractive(),
|
|
83
78
|
isSelected: isSelected,
|
|
84
79
|
minWidth: minWidth,
|
|
85
|
-
frameStyle:
|
|
80
|
+
frameStyle: frameStyle,
|
|
86
81
|
maxWidth: maxWidth,
|
|
87
82
|
"data-testid": testId,
|
|
88
83
|
"data-trello-do-not-use-override": testId,
|
|
@@ -33,7 +33,6 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
|
|
|
33
33
|
analytics = _ref.analytics,
|
|
34
34
|
handleInvoke = _ref.handleInvoke,
|
|
35
35
|
isSelected = _ref.isSelected,
|
|
36
|
-
isFrameVisible = _ref.isFrameVisible,
|
|
37
36
|
frameStyle = _ref.frameStyle,
|
|
38
37
|
platform = _ref.platform,
|
|
39
38
|
onResolve = _ref.onResolve,
|
|
@@ -71,7 +70,6 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
|
|
|
71
70
|
if (resolvedViewProps.preview) {
|
|
72
71
|
return /*#__PURE__*/_react.default.createElement(_ResolvedView2.EmbedCardResolvedView, (0, _extends2.default)({}, resolvedViewProps, {
|
|
73
72
|
isSelected: isSelected,
|
|
74
|
-
isFrameVisible: isFrameVisible,
|
|
75
73
|
frameStyle: frameStyle,
|
|
76
74
|
inheritDimensions: inheritDimensions,
|
|
77
75
|
onClick: handleFrameClick,
|
|
@@ -114,6 +112,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
|
|
|
114
112
|
analytics: analytics,
|
|
115
113
|
context: unauthorisedViewProps.context,
|
|
116
114
|
extensionKey: extensionKey,
|
|
115
|
+
frameStyle: frameStyle,
|
|
117
116
|
isProductIntegrationSupported: isProductIntegrationSupported,
|
|
118
117
|
inheritDimensions: inheritDimensions,
|
|
119
118
|
isSelected: isSelected,
|
|
@@ -134,8 +133,8 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
|
|
|
134
133
|
if (forbiddenViewProps.preview) {
|
|
135
134
|
return /*#__PURE__*/_react.default.createElement(_ResolvedView2.EmbedCardResolvedView, (0, _extends2.default)({}, forbiddenViewProps, {
|
|
136
135
|
title: forbiddenViewProps.link,
|
|
136
|
+
frameStyle: frameStyle,
|
|
137
137
|
isSelected: isSelected,
|
|
138
|
-
isFrameVisible: isFrameVisible,
|
|
139
138
|
inheritDimensions: inheritDimensions,
|
|
140
139
|
onClick: handleFrameClick,
|
|
141
140
|
ref: iframeRef
|
|
@@ -149,6 +148,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
|
|
|
149
148
|
});
|
|
150
149
|
return /*#__PURE__*/_react.default.createElement(_forbiddenView.default, {
|
|
151
150
|
context: forbiddenViewProps.context,
|
|
151
|
+
frameStyle: frameStyle,
|
|
152
152
|
inheritDimensions: inheritDimensions,
|
|
153
153
|
isSelected: isSelected,
|
|
154
154
|
onAuthorize: handleAuthorize,
|
|
@@ -172,6 +172,7 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
|
|
|
172
172
|
}) : undefined;
|
|
173
173
|
return /*#__PURE__*/_react.default.createElement(_notFoundView.default, {
|
|
174
174
|
context: notFoundViewProps.context,
|
|
175
|
+
frameStyle: frameStyle,
|
|
175
176
|
inheritDimensions: inheritDimensions,
|
|
176
177
|
isSelected: isSelected,
|
|
177
178
|
onClick: handleFrameClick,
|
|
@@ -19,7 +19,6 @@ var EmbedCardResolvedView = exports.EmbedCardResolvedView = /*#__PURE__*/_react2
|
|
|
19
19
|
context = _ref.context,
|
|
20
20
|
onClick = _ref.onClick,
|
|
21
21
|
isSelected = _ref.isSelected,
|
|
22
|
-
isFrameVisible = _ref.isFrameVisible,
|
|
23
22
|
frameStyle = _ref.frameStyle,
|
|
24
23
|
preview = _ref.preview,
|
|
25
24
|
title = _ref.title,
|
|
@@ -57,7 +56,6 @@ var EmbedCardResolvedView = exports.EmbedCardResolvedView = /*#__PURE__*/_react2
|
|
|
57
56
|
}
|
|
58
57
|
return (0, _react.jsx)(_ExpandedFrame.ExpandedFrame, {
|
|
59
58
|
isSelected: isSelected,
|
|
60
|
-
isFrameVisible: isFrameVisible,
|
|
61
59
|
frameStyle: frameStyle,
|
|
62
60
|
href: link,
|
|
63
61
|
testId: testId,
|
|
@@ -19,6 +19,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
19
19
|
var UnresolvedView = function UnresolvedView(_ref) {
|
|
20
20
|
var button = _ref.button,
|
|
21
21
|
description = _ref.description,
|
|
22
|
+
frameStyle = _ref.frameStyle,
|
|
22
23
|
iconUrlOrElement = _ref.icon,
|
|
23
24
|
image = _ref.image,
|
|
24
25
|
inheritDimensions = _ref.inheritDimensions,
|
|
@@ -42,8 +43,15 @@ var UnresolvedView = function UnresolvedView(_ref) {
|
|
|
42
43
|
});
|
|
43
44
|
}, [iconUrlOrElement]);
|
|
44
45
|
return (0, _react.jsx)(_ExpandedFrame.ExpandedFrame, {
|
|
45
|
-
allowScrollBar: true
|
|
46
|
-
|
|
46
|
+
allowScrollBar: true
|
|
47
|
+
// EDM-9259: Fix embed frame showing on unresolved views when frameStyle is set to hide.
|
|
48
|
+
// Set fallback to 'show' here to maintain the current behaviour when platform.editor.show-embed-card-frame-renderer is OFF.
|
|
49
|
+
// Remove 'show' on platform.editor.show-embed-card-frame-renderer cleanup as frameStyle will be set to 'show' both in renderer and editor.
|
|
50
|
+
// We want all views to be consistent and respect frameStyle instead of
|
|
51
|
+
// having resolved view default to showOnHover and unresolved view default to show.
|
|
52
|
+
// Default frameStyle is set inside <ExpandedFrame />
|
|
53
|
+
,
|
|
54
|
+
frameStyle: frameStyle !== null && frameStyle !== void 0 ? frameStyle : 'show',
|
|
47
55
|
href: url,
|
|
48
56
|
icon: icon,
|
|
49
57
|
inheritDimensions: inheritDimensions,
|
|
@@ -12,8 +12,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
12
12
|
var _react = _interopRequireDefault(require("react"));
|
|
13
13
|
var _index = _interopRequireDefault(require("../index"));
|
|
14
14
|
var _flexibleUiContext = require("../../../../../../state/flexible-ui-context");
|
|
15
|
-
var _reactIntlNext = require("react-intl-next");
|
|
16
|
-
var _messages = require("../../../../../../messages");
|
|
17
15
|
var _utils = require("../../../utils");
|
|
18
16
|
var _useInvokeClientAction = _interopRequireDefault(require("../../../../../../state/hooks/use-invoke-client-action"));
|
|
19
17
|
var _constants = require("../../../../../../constants");
|
|
@@ -75,8 +73,7 @@ var PreviewAction = function PreviewAction(props) {
|
|
|
75
73
|
if (_onClick) {
|
|
76
74
|
_onClick();
|
|
77
75
|
}
|
|
78
|
-
}
|
|
79
|
-
content: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.messages.preview_improved)
|
|
76
|
+
}
|
|
80
77
|
});
|
|
81
78
|
return /*#__PURE__*/_react.default.createElement(_index.default, (0, _extends2.default)({}, action, {
|
|
82
79
|
appearance: appearance,
|
|
@@ -16,14 +16,13 @@ var _block = _interopRequireDefault(require("../../block"));
|
|
|
16
16
|
var _constants = require("../../../../../../constants");
|
|
17
17
|
var _utils = require("../../../utils");
|
|
18
18
|
var _elementGroup = _interopRequireDefault(require("../../element-group"));
|
|
19
|
-
var _token = require("../../../../../../utils/token");
|
|
20
19
|
var _excluded = ["actionGroup", "retry", "position", "testId", "title", "hideIcon"];
|
|
21
20
|
var _templateObject, _templateObject2;
|
|
22
21
|
/** @jsx jsx */
|
|
23
|
-
var actionStyles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n cursor: pointer;\n :hover {\n color: ", ";\n text-decoration: underline;\n }\n"])),
|
|
22
|
+
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)");
|
|
24
23
|
var getMessageStyles = function getMessageStyles(size, hasAction) {
|
|
25
24
|
var sizeStyles = (0, _utils.getLinkSizeStyles)(size);
|
|
26
|
-
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)),
|
|
25
|
+
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)");
|
|
27
26
|
};
|
|
28
27
|
|
|
29
28
|
/**
|
|
@@ -11,7 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
11
11
|
var _react2 = require("@emotion/react");
|
|
12
12
|
var _constants = require("../../../../constants");
|
|
13
13
|
var _flexible = require("../../../../utils/flexible");
|
|
14
|
-
var _token = require("../../../../utils/token");
|
|
15
14
|
var _flexibleUiContext = require("../../../../state/flexible-ui-context");
|
|
16
15
|
var _layeredLink = _interopRequireDefault(require("./layered-link"));
|
|
17
16
|
var _hoverCardControl = _interopRequireDefault(require("./hover-card-control"));
|
|
@@ -78,7 +77,7 @@ var getChildrenOptions = function getChildrenOptions(children, context) {
|
|
|
78
77
|
};
|
|
79
78
|
var getContainerStyles = exports.getContainerStyles = function getContainerStyles(size, hideBackground, hideElevation, hidePadding, clickableContainer, childrenOptions) {
|
|
80
79
|
var paddingCss = getContainerPaddingStyles(size, hidePadding, childrenOptions);
|
|
81
|
-
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(
|
|
80
|
+
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 : '');
|
|
82
81
|
};
|
|
83
82
|
var renderChildren = function renderChildren(children, containerSize, containerTheme, status, retry, onClick) {
|
|
84
83
|
return _react.default.Children.map(children, function (child) {
|
|
@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
9
9
|
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
|
|
10
10
|
var _react = _interopRequireDefault(require("react"));
|
|
11
11
|
var _react2 = require("@emotion/react");
|
|
12
|
-
var _token = require("../../../../../utils/token");
|
|
13
12
|
var _utils = require("../../utils");
|
|
14
13
|
var _constants = require("../../../../../constants");
|
|
15
14
|
var _messages = require("../../../../../messages");
|
|
@@ -18,8 +17,8 @@ var _atlaskitIcon = _interopRequireDefault(require("../../common/atlaskit-icon")
|
|
|
18
17
|
var _templateObject, _templateObject2, _templateObject3, _messageMapper;
|
|
19
18
|
/** @jsx jsx */
|
|
20
19
|
var badgeStyles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n align-items: center;\n display: inline-flex;\n min-width: fit-content;\n"])));
|
|
21
|
-
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"])),
|
|
22
|
-
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"])),
|
|
20
|
+
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'));
|
|
21
|
+
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)");
|
|
23
22
|
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);
|
|
24
23
|
var getFormattedMessageFromIcon = function getFormattedMessageFromIcon(icon) {
|
|
25
24
|
if (icon) {
|
|
@@ -11,12 +11,11 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
11
11
|
var _reactIntlNext = require("react-intl-next");
|
|
12
12
|
var _react2 = require("@emotion/react");
|
|
13
13
|
var _utils = require("../../utils");
|
|
14
|
-
var _token = require("../../../../../utils/token");
|
|
15
14
|
var _intlUtils = require("@formatjs/intl-utils");
|
|
16
15
|
var _messages = require("../../../../../messages");
|
|
17
16
|
var _templateObject;
|
|
18
17
|
/** @jsx jsx */
|
|
19
|
-
var styles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n color: ", ";\n font-size: 0.75rem;\n line-height: 1rem;\n ", "\n"])),
|
|
18
|
+
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));
|
|
20
19
|
var typeToDescriptorMap = {
|
|
21
20
|
created: {
|
|
22
21
|
relative: _messages.messages.created_on_relative,
|
|
@@ -13,7 +13,6 @@ var _react2 = require("@emotion/react");
|
|
|
13
13
|
var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
|
|
14
14
|
var _constants = require("../../../../../constants");
|
|
15
15
|
var _utils = require("../../utils");
|
|
16
|
-
var _token = require("../../../../../utils/token");
|
|
17
16
|
var _useLinkClicked = require("../../../../../state/analytics/useLinkClicked");
|
|
18
17
|
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
|
|
19
18
|
/** @jsx jsx */
|
|
@@ -31,10 +30,10 @@ var getThemeStyles = function getThemeStyles(theme) {
|
|
|
31
30
|
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)");
|
|
32
31
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
|
|
33
32
|
case _constants.SmartLinkTheme.Black:
|
|
34
|
-
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 "])),
|
|
33
|
+
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)");
|
|
35
34
|
case _constants.SmartLinkTheme.Link:
|
|
36
35
|
default:
|
|
37
|
-
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 "])),
|
|
36
|
+
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)");
|
|
38
37
|
}
|
|
39
38
|
};
|
|
40
39
|
var getAnchorStyles = function getAnchorStyles(size, theme, maxLines, hasSpace) {
|
|
@@ -9,11 +9,10 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
|
|
|
9
9
|
var _react = _interopRequireDefault(require("react"));
|
|
10
10
|
var _react2 = require("@emotion/react");
|
|
11
11
|
var _utils = require("../../utils");
|
|
12
|
-
var _token = require("../../../../../utils/token");
|
|
13
12
|
var _templateObject;
|
|
14
13
|
/** @jsx jsx */
|
|
15
14
|
var getStyles = function getStyles(maxLines) {
|
|
16
|
-
return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n color: ", ";\n font-size: 0.75rem;\n line-height: 1rem;\n white-space: normal;\n ", "\n"])),
|
|
15
|
+
return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n color: ", ";\n font-size: 0.75rem;\n line-height: 1rem;\n white-space: normal;\n ", "\n"])), "var(--ds-text-subtlest, #626F86)", (0, _utils.getTruncateStyles)(maxLines));
|
|
17
16
|
};
|
|
18
17
|
|
|
19
18
|
/**
|
|
@@ -17,7 +17,7 @@ var _excluded = ["href", "children", "checkSafety", "onClick", "testId"],
|
|
|
17
17
|
_excluded2 = ["isLinkSafe", "showSafetyWarningModal"];
|
|
18
18
|
var PACKAGE_DATA = {
|
|
19
19
|
packageName: "@atlaskit/smart-card",
|
|
20
|
-
packageVersion: "26.48.
|
|
20
|
+
packageVersion: "26.48.4",
|
|
21
21
|
componentName: 'linkUrl'
|
|
22
22
|
};
|
|
23
23
|
var Link = (0, _click.withLinkClickedEvent)('a');
|
|
@@ -4,7 +4,7 @@ export const ANALYTICS_CHANNEL = 'media';
|
|
|
4
4
|
export const context = {
|
|
5
5
|
componentName: 'smart-cards',
|
|
6
6
|
packageName: "@atlaskit/smart-card",
|
|
7
|
-
packageVersion: "26.48.
|
|
7
|
+
packageVersion: "26.48.4"
|
|
8
8
|
};
|
|
9
9
|
export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
|
|
10
10
|
TrackQuickActionType["StatusUpdate"] = "StatusUpdate";
|
|
@@ -154,4 +154,17 @@ export const openUrl = async url => {
|
|
|
154
154
|
return;
|
|
155
155
|
}
|
|
156
156
|
window.open(url, '_blank', 'noopener=yes');
|
|
157
|
+
};
|
|
158
|
+
|
|
159
|
+
/**
|
|
160
|
+
* Migrate internal usages of the deprecated isFrameVisible to frameStyle
|
|
161
|
+
* This function is to be removed on deprecation of isFrameVisible.
|
|
162
|
+
*/
|
|
163
|
+
export const combineFrameStyle = (frameStyle, isFrameVisible) => {
|
|
164
|
+
if (frameStyle !== undefined) {
|
|
165
|
+
return frameStyle;
|
|
166
|
+
}
|
|
167
|
+
if (isFrameVisible) {
|
|
168
|
+
return 'show';
|
|
169
|
+
}
|
|
157
170
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { useEffect, useCallback, useMemo } from 'react';
|
|
2
2
|
import { useAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
3
3
|
import { useFeatureFlag } from '@atlaskit/link-provider';
|
|
4
|
-
import { isSpecialEvent } from '../../utils';
|
|
4
|
+
import { combineFrameStyle, isSpecialEvent } from '../../utils';
|
|
5
5
|
import * as measure from '../../utils/performance';
|
|
6
6
|
import { getDefinitionId, getServices, isFinalState, getClickUrl, getResourceType, getExtensionKey, getSubproduct, getProduct, getCanBeDatasource } from '../../state/helpers';
|
|
7
7
|
import { useSmartLink } from '../../state';
|
|
@@ -20,7 +20,7 @@ function Component({
|
|
|
20
20
|
isSelected,
|
|
21
21
|
isHovered,
|
|
22
22
|
isFrameVisible,
|
|
23
|
-
frameStyle,
|
|
23
|
+
frameStyle: frameStyleProp,
|
|
24
24
|
platform,
|
|
25
25
|
onClick,
|
|
26
26
|
appearance,
|
|
@@ -66,6 +66,7 @@ function Component({
|
|
|
66
66
|
let isFlexibleUi = useMemo(() => isFlexibleUiCard(children), [children]);
|
|
67
67
|
const enableFlexibleBlockCardFlag = Boolean(useFeatureFlag('enableFlexibleBlockCard'));
|
|
68
68
|
const actionOptions = combineActionOptions(actionOptionsProp, showServerActions, showActions, platform);
|
|
69
|
+
const frameStyle = combineFrameStyle(frameStyleProp, isFrameVisible);
|
|
69
70
|
|
|
70
71
|
// Setup UI handlers.
|
|
71
72
|
const handleClickWrapper = useCallback(event => {
|
|
@@ -248,7 +249,6 @@ function Component({
|
|
|
248
249
|
handleInvoke: handleInvoke,
|
|
249
250
|
analytics: analytics,
|
|
250
251
|
isSelected: isSelected,
|
|
251
|
-
isFrameVisible: isFrameVisible,
|
|
252
252
|
frameStyle: frameStyle,
|
|
253
253
|
platform: platform,
|
|
254
254
|
onResolve: onResolve,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React
|
|
1
|
+
import React from 'react';
|
|
2
2
|
import { className, LinkWrapper, Wrapper, Header, IconWrapper, TextWrapper, Content } from './styled';
|
|
3
3
|
import { handleClickCommon } from '../../BlockCard/utils/handlers';
|
|
4
4
|
import { useMouseDownEvent } from '../../../state/analytics/useLinkClicked';
|
|
@@ -9,8 +9,7 @@ export const ExpandedFrame = ({
|
|
|
9
9
|
icon,
|
|
10
10
|
text,
|
|
11
11
|
isSelected,
|
|
12
|
-
|
|
13
|
-
frameStyle,
|
|
12
|
+
frameStyle = 'showOnHover',
|
|
14
13
|
href,
|
|
15
14
|
minWidth,
|
|
16
15
|
maxWidth,
|
|
@@ -21,7 +20,6 @@ export const ExpandedFrame = ({
|
|
|
21
20
|
const isInteractive = () => !isPlaceholder && (Boolean(href) || Boolean(onClick));
|
|
22
21
|
const handleClick = event => handleClickCommon(event, onClick);
|
|
23
22
|
const handleMouseDown = useMouseDownEvent();
|
|
24
|
-
const calculatedFrameStyle = useMemo(() => frameStyle !== undefined ? frameStyle : isFrameVisible ? 'show' : 'showOnHover', [frameStyle, isFrameVisible]);
|
|
25
23
|
const renderHeader = () => /*#__PURE__*/React.createElement(Header, {
|
|
26
24
|
className: "embed-header",
|
|
27
25
|
frameStyle: frameStyle
|
|
@@ -45,7 +43,7 @@ export const ExpandedFrame = ({
|
|
|
45
43
|
className: className,
|
|
46
44
|
isInteractive: isInteractive(),
|
|
47
45
|
isSelected: isSelected,
|
|
48
|
-
frameStyle:
|
|
46
|
+
frameStyle: frameStyle,
|
|
49
47
|
minWidth: minWidth,
|
|
50
48
|
maxWidth: maxWidth,
|
|
51
49
|
"data-testid": testId,
|
|
@@ -61,7 +59,7 @@ export const ExpandedFrame = ({
|
|
|
61
59
|
isInteractive: isInteractive(),
|
|
62
60
|
isSelected: isSelected,
|
|
63
61
|
minWidth: minWidth,
|
|
64
|
-
frameStyle:
|
|
62
|
+
frameStyle: frameStyle,
|
|
65
63
|
maxWidth: maxWidth,
|
|
66
64
|
"data-testid": testId,
|
|
67
65
|
"data-trello-do-not-use-override": testId,
|
|
@@ -26,7 +26,6 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
|
|
|
26
26
|
analytics,
|
|
27
27
|
handleInvoke,
|
|
28
28
|
isSelected,
|
|
29
|
-
isFrameVisible,
|
|
30
29
|
frameStyle,
|
|
31
30
|
platform,
|
|
32
31
|
onResolve,
|
|
@@ -67,7 +66,6 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
|
|
|
67
66
|
if (resolvedViewProps.preview) {
|
|
68
67
|
return /*#__PURE__*/React.createElement(EmbedCardResolvedView, _extends({}, resolvedViewProps, {
|
|
69
68
|
isSelected: isSelected,
|
|
70
|
-
isFrameVisible: isFrameVisible,
|
|
71
69
|
frameStyle: frameStyle,
|
|
72
70
|
inheritDimensions: inheritDimensions,
|
|
73
71
|
onClick: handleFrameClick,
|
|
@@ -110,6 +108,7 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
|
|
|
110
108
|
analytics: analytics,
|
|
111
109
|
context: unauthorisedViewProps.context,
|
|
112
110
|
extensionKey: extensionKey,
|
|
111
|
+
frameStyle: frameStyle,
|
|
113
112
|
isProductIntegrationSupported: isProductIntegrationSupported,
|
|
114
113
|
inheritDimensions: inheritDimensions,
|
|
115
114
|
isSelected: isSelected,
|
|
@@ -130,8 +129,8 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
|
|
|
130
129
|
if (forbiddenViewProps.preview) {
|
|
131
130
|
return /*#__PURE__*/React.createElement(EmbedCardResolvedView, _extends({}, forbiddenViewProps, {
|
|
132
131
|
title: forbiddenViewProps.link,
|
|
132
|
+
frameStyle: frameStyle,
|
|
133
133
|
isSelected: isSelected,
|
|
134
|
-
isFrameVisible: isFrameVisible,
|
|
135
134
|
inheritDimensions: inheritDimensions,
|
|
136
135
|
onClick: handleFrameClick,
|
|
137
136
|
ref: iframeRef
|
|
@@ -145,6 +144,7 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
|
|
|
145
144
|
});
|
|
146
145
|
return /*#__PURE__*/React.createElement(ForbiddenView, {
|
|
147
146
|
context: forbiddenViewProps.context,
|
|
147
|
+
frameStyle: frameStyle,
|
|
148
148
|
inheritDimensions: inheritDimensions,
|
|
149
149
|
isSelected: isSelected,
|
|
150
150
|
onAuthorize: handleAuthorize,
|
|
@@ -168,6 +168,7 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
|
|
|
168
168
|
}) : undefined;
|
|
169
169
|
return /*#__PURE__*/React.createElement(NotFoundView, {
|
|
170
170
|
context: notFoundViewProps.context,
|
|
171
|
+
frameStyle: frameStyle,
|
|
171
172
|
inheritDimensions: inheritDimensions,
|
|
172
173
|
isSelected: isSelected,
|
|
173
174
|
onClick: handleFrameClick,
|
|
@@ -11,7 +11,6 @@ export const EmbedCardResolvedView = /*#__PURE__*/React.forwardRef(({
|
|
|
11
11
|
context,
|
|
12
12
|
onClick,
|
|
13
13
|
isSelected,
|
|
14
|
-
isFrameVisible,
|
|
15
14
|
frameStyle,
|
|
16
15
|
preview,
|
|
17
16
|
title,
|
|
@@ -48,7 +47,6 @@ export const EmbedCardResolvedView = /*#__PURE__*/React.forwardRef(({
|
|
|
48
47
|
}
|
|
49
48
|
return jsx(ExpandedFrame, {
|
|
50
49
|
isSelected: isSelected,
|
|
51
|
-
isFrameVisible: isFrameVisible,
|
|
52
50
|
frameStyle: frameStyle,
|
|
53
51
|
href: link,
|
|
54
52
|
testId: testId,
|
|
@@ -8,6 +8,7 @@ import { containerStyles, contentStyles, descriptionStyles, imageStyles, titleSt
|
|
|
8
8
|
const UnresolvedView = ({
|
|
9
9
|
button,
|
|
10
10
|
description,
|
|
11
|
+
frameStyle,
|
|
11
12
|
icon: iconUrlOrElement,
|
|
12
13
|
image,
|
|
13
14
|
inheritDimensions,
|
|
@@ -32,8 +33,15 @@ const UnresolvedView = ({
|
|
|
32
33
|
});
|
|
33
34
|
}, [iconUrlOrElement]);
|
|
34
35
|
return jsx(ExpandedFrame, {
|
|
35
|
-
allowScrollBar: true
|
|
36
|
-
|
|
36
|
+
allowScrollBar: true
|
|
37
|
+
// EDM-9259: Fix embed frame showing on unresolved views when frameStyle is set to hide.
|
|
38
|
+
// Set fallback to 'show' here to maintain the current behaviour when platform.editor.show-embed-card-frame-renderer is OFF.
|
|
39
|
+
// Remove 'show' on platform.editor.show-embed-card-frame-renderer cleanup as frameStyle will be set to 'show' both in renderer and editor.
|
|
40
|
+
// We want all views to be consistent and respect frameStyle instead of
|
|
41
|
+
// having resolved view default to showOnHover and unresolved view default to show.
|
|
42
|
+
// Default frameStyle is set inside <ExpandedFrame />
|
|
43
|
+
,
|
|
44
|
+
frameStyle: frameStyle !== null && frameStyle !== void 0 ? frameStyle : 'show',
|
|
37
45
|
href: url,
|
|
38
46
|
icon: icon,
|
|
39
47
|
inheritDimensions: inheritDimensions,
|
|
@@ -2,8 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
|
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import Action from '../index';
|
|
4
4
|
import { useFlexibleUiAnalyticsContext } from '../../../../../../state/flexible-ui-context';
|
|
5
|
-
import { FormattedMessage } from 'react-intl-next';
|
|
6
|
-
import { messages } from '../../../../../../messages';
|
|
7
5
|
import { openEmbedModalWithFlexibleUiIcon } from '../../../utils';
|
|
8
6
|
import useInvokeClientAction from '../../../../../../state/hooks/use-invoke-client-action';
|
|
9
7
|
import { ActionName } from '../../../../../../constants';
|
|
@@ -51,8 +49,7 @@ const PreviewAction = props => {
|
|
|
51
49
|
if (onClick) {
|
|
52
50
|
onClick();
|
|
53
51
|
}
|
|
54
|
-
}
|
|
55
|
-
content: /*#__PURE__*/React.createElement(FormattedMessage, messages.preview_improved)
|
|
52
|
+
}
|
|
56
53
|
};
|
|
57
54
|
return /*#__PURE__*/React.createElement(Action, _extends({}, action, {
|
|
58
55
|
appearance: appearance,
|
|
@@ -8,11 +8,10 @@ import Block from '../../block';
|
|
|
8
8
|
import { SmartLinkAlignment, SmartLinkDirection, SmartLinkSize } from '../../../../../../constants';
|
|
9
9
|
import { getLinkLineHeight, getLinkSizeStyles, getTruncateStyles } from '../../../utils';
|
|
10
10
|
import ElementGroup from '../../element-group';
|
|
11
|
-
import { tokens } from '../../../../../../utils/token';
|
|
12
11
|
const actionStyles = css`
|
|
13
12
|
cursor: pointer;
|
|
14
13
|
:hover {
|
|
15
|
-
color: ${
|
|
14
|
+
color: ${"var(--ds-text-subtle, #8993A4)"};
|
|
16
15
|
text-decoration: underline;
|
|
17
16
|
}
|
|
18
17
|
`;
|
|
@@ -24,9 +23,9 @@ const getMessageStyles = (size, hasAction) => {
|
|
|
24
23
|
${hasAction ? actionStyles : ''}
|
|
25
24
|
${sizeStyles}
|
|
26
25
|
${getTruncateStyles(1, getLinkLineHeight(size))}
|
|
27
|
-
color: ${
|
|
26
|
+
color: ${"var(--ds-text-disabled, #6B778C)"};
|
|
28
27
|
:focus {
|
|
29
|
-
outline: ${
|
|
28
|
+
outline: ${"var(--ds-border-focused, #388BFF)"} solid 2px;
|
|
30
29
|
}
|
|
31
30
|
`;
|
|
32
31
|
};
|
|
@@ -3,7 +3,6 @@ import React, { useContext } from 'react';
|
|
|
3
3
|
import { css, jsx } from '@emotion/react';
|
|
4
4
|
import { MediaPlacement, SmartLinkSize, SmartLinkTheme } from '../../../../constants';
|
|
5
5
|
import { isFlexibleUiBlock, isFlexibleUiPreviewBlock, isFlexibleUiTitleBlock } from '../../../../utils/flexible';
|
|
6
|
-
import { tokens } from '../../../../utils/token';
|
|
7
6
|
import { FlexibleUiContext } from '../../../../state/flexible-ui-context';
|
|
8
7
|
import LayeredLink from './layered-link';
|
|
9
8
|
import HoverCardControl from './hover-card-control';
|
|
@@ -99,7 +98,7 @@ export const getContainerStyles = (size, hideBackground, hideElevation, hidePadd
|
|
|
99
98
|
min-width: 0;
|
|
100
99
|
overflow-x: hidden;
|
|
101
100
|
position: relative;
|
|
102
|
-
${hideBackground ? '' : `background-color: ${
|
|
101
|
+
${hideBackground ? '' : `background-color: ${"var(--ds-surface-raised, #FFFFFF)"};`}
|
|
103
102
|
${paddingCss}
|
|
104
103
|
${hideElevation ? '' : elevationStyles}
|
|
105
104
|
${clickableContainer ? clickableContainerStyles : ''}
|