@atlaskit/renderer 125.1.1 → 125.3.0
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 +20 -0
- package/dist/cjs/react/index.js +14 -2
- package/dist/cjs/react/nodes/blockCard.js +6 -3
- package/dist/cjs/react/nodes/embedCard.js +12 -6
- package/dist/cjs/react/nodes/fallback.js +26 -4
- package/dist/cjs/react/nodes/inlineCard.js +6 -3
- package/dist/cjs/ui/Renderer/RendererStyleContainer.js +15 -5
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/cjs/ui/annotations/element/mark.js +0 -1
- package/dist/es2019/react/index.js +12 -2
- package/dist/es2019/react/nodes/blockCard.js +6 -3
- package/dist/es2019/react/nodes/embedCard.js +12 -6
- package/dist/es2019/react/nodes/fallback.js +26 -5
- package/dist/es2019/react/nodes/inlineCard.js +6 -3
- package/dist/es2019/ui/Renderer/RendererStyleContainer.js +16 -4
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/es2019/ui/annotations/element/mark.js +0 -1
- package/dist/esm/react/index.js +14 -2
- package/dist/esm/react/nodes/blockCard.js +6 -3
- package/dist/esm/react/nodes/embedCard.js +12 -6
- package/dist/esm/react/nodes/fallback.js +26 -4
- package/dist/esm/react/nodes/inlineCard.js +6 -3
- package/dist/esm/ui/Renderer/RendererStyleContainer.js +15 -5
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/dist/esm/ui/annotations/element/mark.js +0 -1
- package/dist/types/react/index.d.ts +1 -0
- package/dist/types/react/nodes/blockCard.d.ts +1 -0
- package/dist/types/react/nodes/embedCard.d.ts +2 -1
- package/dist/types/react/nodes/extension.d.ts +1 -1
- package/dist/types/react/nodes/fallback.d.ts +1 -0
- package/dist/types/react/nodes/index.d.ts +2 -0
- package/dist/types/react/nodes/inlineCard.d.ts +1 -0
- package/dist/types-ts4.5/react/index.d.ts +1 -0
- package/dist/types-ts4.5/react/nodes/blockCard.d.ts +1 -0
- package/dist/types-ts4.5/react/nodes/embedCard.d.ts +2 -1
- package/dist/types-ts4.5/react/nodes/extension.d.ts +1 -1
- package/dist/types-ts4.5/react/nodes/fallback.d.ts +1 -0
- package/dist/types-ts4.5/react/nodes/index.d.ts +2 -0
- package/dist/types-ts4.5/react/nodes/inlineCard.d.ts +1 -0
- package/package.json +11 -14
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 125.3.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`8702c4d80694c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8702c4d80694c) -
|
|
8
|
+
[https://hello.jira.atlassian.cloud/browse/EDITOR-4103](EDITOR-4103) - clean up
|
|
9
|
+
annotations_align_editor_and_renderer_styles
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies
|
|
14
|
+
|
|
15
|
+
## 125.2.0
|
|
16
|
+
|
|
17
|
+
### Minor Changes
|
|
18
|
+
|
|
19
|
+
- [`2cb77d624e5f5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2cb77d624e5f5) -
|
|
20
|
+
Configure fallback links shown for errors from smartlinks to respect the optional renderer
|
|
21
|
+
onSetLinkTarget callback used to show/hide external link icon
|
|
22
|
+
|
|
3
23
|
## 125.1.1
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
package/dist/cjs/react/index.js
CHANGED
|
@@ -264,6 +264,8 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
|
|
|
264
264
|
return this.getEmbedCardProps(node, path);
|
|
265
265
|
case 'blockCard':
|
|
266
266
|
return this.getBlockCardProps(node, path);
|
|
267
|
+
case 'inlineCard':
|
|
268
|
+
return this.getInlineCardProps(node, path);
|
|
267
269
|
case 'expand':
|
|
268
270
|
return this.getExpandProps(node, path);
|
|
269
271
|
case 'unsupportedBlock':
|
|
@@ -540,7 +542,8 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
|
|
|
540
542
|
var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
541
543
|
var isInsideOfBlockNode = (0, _rendererNode.insideBlockNode)(path, node.type.schema);
|
|
542
544
|
return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
|
|
543
|
-
isInsideOfBlockNode: isInsideOfBlockNode
|
|
545
|
+
isInsideOfBlockNode: isInsideOfBlockNode,
|
|
546
|
+
onSetLinkTarget: this.onSetLinkTarget
|
|
544
547
|
});
|
|
545
548
|
}
|
|
546
549
|
}, {
|
|
@@ -548,7 +551,16 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
|
|
|
548
551
|
value: function getBlockCardProps(node) {
|
|
549
552
|
var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
550
553
|
return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
|
|
551
|
-
isNodeNested: path.length > 0
|
|
554
|
+
isNodeNested: path.length > 0,
|
|
555
|
+
onSetLinkTarget: this.onSetLinkTarget
|
|
556
|
+
});
|
|
557
|
+
}
|
|
558
|
+
}, {
|
|
559
|
+
key: "getInlineCardProps",
|
|
560
|
+
value: function getInlineCardProps(node) {
|
|
561
|
+
var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
562
|
+
return _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
|
|
563
|
+
onSetLinkTarget: this.onSetLinkTarget
|
|
552
564
|
});
|
|
553
565
|
}
|
|
554
566
|
}, {
|
|
@@ -41,7 +41,8 @@ function BlockCard(props) {
|
|
|
41
41
|
eventHandlers = props.eventHandlers,
|
|
42
42
|
smartLinks = props.smartLinks,
|
|
43
43
|
isNodeNested = props.isNodeNested,
|
|
44
|
-
localId = props.localId
|
|
44
|
+
localId = props.localId,
|
|
45
|
+
onSetLinkTarget = props.onSetLinkTarget;
|
|
45
46
|
var portal = (0, _PortalContext.usePortal)(props);
|
|
46
47
|
var _ref = smartLinks || {},
|
|
47
48
|
actionOptions = _ref.actionOptions;
|
|
@@ -101,7 +102,8 @@ function BlockCard(props) {
|
|
|
101
102
|
data: analyticsData
|
|
102
103
|
}, (0, _react.jsx)(_fallback.CardErrorBoundary, (0, _extends2.default)({
|
|
103
104
|
unsupportedComponent: _ui.UnsupportedInline,
|
|
104
|
-
datasourceId: props.datasource.id
|
|
105
|
+
datasourceId: props.datasource.id,
|
|
106
|
+
onSetLinkTarget: onSetLinkTarget
|
|
105
107
|
// Ignored via go/ees005
|
|
106
108
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
107
109
|
}, cardProps), (0, _react.jsx)(_ui.WidthConsumer, null, function (_ref5) {
|
|
@@ -161,7 +163,8 @@ function BlockCard(props) {
|
|
|
161
163
|
"data-card-url": url,
|
|
162
164
|
"data-local-id": localId
|
|
163
165
|
}, (0, _react.jsx)(_fallback.CardErrorBoundary, (0, _extends2.default)({
|
|
164
|
-
unsupportedComponent: _ui.UnsupportedBlock
|
|
166
|
+
unsupportedComponent: _ui.UnsupportedBlock,
|
|
167
|
+
onSetLinkTarget: onSetLinkTarget
|
|
165
168
|
// Ignored via go/ees005
|
|
166
169
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
167
170
|
}, cardProps), cardComponent)));
|
|
@@ -27,6 +27,7 @@ var _blockCard = _interopRequireDefault(require("./blockCard"));
|
|
|
27
27
|
* @jsxRuntime classic
|
|
28
28
|
* @jsx jsx
|
|
29
29
|
*/
|
|
30
|
+
/* eslint-disable jsdoc/check-tag-names */
|
|
30
31
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
31
32
|
|
|
32
33
|
var embedCardWrapperStyles = (0, _react.css)({
|
|
@@ -59,7 +60,8 @@ function EmbedCardInternal(props) {
|
|
|
59
60
|
isInsideOfBlockNode = props.isInsideOfBlockNode,
|
|
60
61
|
rendererAppearance = props.rendererAppearance,
|
|
61
62
|
smartLinks = props.smartLinks,
|
|
62
|
-
isInsideOfInlineExtension = props.isInsideOfInlineExtension
|
|
63
|
+
isInsideOfInlineExtension = props.isInsideOfInlineExtension,
|
|
64
|
+
onSetLinkTarget = props.onSetLinkTarget;
|
|
63
65
|
var portal = (0, _PortalContext.usePortal)(props);
|
|
64
66
|
var embedIframeRef = (0, _react2.useRef)(null);
|
|
65
67
|
var onClick = (0, _getCardClickHandler.getCardClickHandler)(eventHandlers, url);
|
|
@@ -190,9 +192,10 @@ function EmbedCardInternal(props) {
|
|
|
190
192
|
}
|
|
191
193
|
return (
|
|
192
194
|
// Ignored via go/ees005
|
|
193
|
-
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
194
195
|
(0, _react.jsx)(_fallback.CardErrorBoundary, (0, _extends2.default)({
|
|
195
|
-
unsupportedComponent: _ui.UnsupportedBlock
|
|
196
|
+
unsupportedComponent: _ui.UnsupportedBlock,
|
|
197
|
+
onSetLinkTarget: onSetLinkTarget
|
|
198
|
+
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
196
199
|
}, cardProps), (0, _react.jsx)(_smartCard.EmbedResizeMessageListener, {
|
|
197
200
|
embedIframeRef: embedIframeRef,
|
|
198
201
|
onHeightUpdate: setLiveHeight
|
|
@@ -235,7 +238,8 @@ var EmbedOrBlockCardInternal = exports.EmbedOrBlockCardInternal = function Embed
|
|
|
235
238
|
rendererAppearance = _ref5.rendererAppearance,
|
|
236
239
|
isInsideOfBlockNode = _ref5.isInsideOfBlockNode,
|
|
237
240
|
smartLinks = _ref5.smartLinks,
|
|
238
|
-
isInsideOfInlineExtension = _ref5.isInsideOfInlineExtension
|
|
241
|
+
isInsideOfInlineExtension = _ref5.isInsideOfInlineExtension,
|
|
242
|
+
onSetLinkTarget = _ref5.onSetLinkTarget;
|
|
239
243
|
var _useContext = (0, _react2.useContext)(_ui.WidthContext),
|
|
240
244
|
width = _useContext.width;
|
|
241
245
|
var viewAsBlockCard = width && width <= _editorSharedStyles.akEditorFullPageNarrowBreakout;
|
|
@@ -246,7 +250,8 @@ var EmbedOrBlockCardInternal = exports.EmbedOrBlockCardInternal = function Embed
|
|
|
246
250
|
portal: portal,
|
|
247
251
|
layout: layout,
|
|
248
252
|
rendererAppearance: rendererAppearance,
|
|
249
|
-
smartLinks: smartLinks
|
|
253
|
+
smartLinks: smartLinks,
|
|
254
|
+
onSetLinkTarget: onSetLinkTarget
|
|
250
255
|
}) : (0, _react.jsx)(EmbedCardInternal, {
|
|
251
256
|
url: url,
|
|
252
257
|
data: data,
|
|
@@ -259,7 +264,8 @@ var EmbedOrBlockCardInternal = exports.EmbedOrBlockCardInternal = function Embed
|
|
|
259
264
|
rendererAppearance: rendererAppearance,
|
|
260
265
|
isInsideOfBlockNode: isInsideOfBlockNode,
|
|
261
266
|
smartLinks: smartLinks,
|
|
262
|
-
isInsideOfInlineExtension: isInsideOfInlineExtension
|
|
267
|
+
isInsideOfInlineExtension: isInsideOfInlineExtension,
|
|
268
|
+
onSetLinkTarget: onSetLinkTarget
|
|
263
269
|
});
|
|
264
270
|
};
|
|
265
271
|
var EmbedCardWithCondition = (0, _platformFeatureFlagsReact.componentWithCondition)(function () {
|
|
@@ -17,6 +17,8 @@ var _linkDatasource = require("@atlaskit/link-datasource");
|
|
|
17
17
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
18
18
|
var _react = _interopRequireDefault(require("react"));
|
|
19
19
|
var _ = require("./");
|
|
20
|
+
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; }
|
|
21
|
+
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; }
|
|
20
22
|
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
|
|
21
23
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
22
24
|
// Ignored via go/ees005
|
|
@@ -53,17 +55,37 @@ var CardErrorBoundary = exports.CardErrorBoundary = /*#__PURE__*/function (_Reac
|
|
|
53
55
|
url = _this$props2.url,
|
|
54
56
|
isDatasource = _this$props2.isDatasource,
|
|
55
57
|
UnsupportedComponent = _this$props2.unsupportedComponent,
|
|
56
|
-
datasourceId = _this$props2.datasourceId
|
|
58
|
+
datasourceId = _this$props2.datasourceId,
|
|
59
|
+
onSetLinkTarget = _this$props2.onSetLinkTarget;
|
|
57
60
|
if (url) {
|
|
58
|
-
var
|
|
61
|
+
var actualTarget;
|
|
62
|
+
if (onSetLinkTarget && (0, _platformFeatureFlags.fg)('rovo_chat_deep_linking_enabled')) {
|
|
63
|
+
try {
|
|
64
|
+
actualTarget = onSetLinkTarget(url);
|
|
65
|
+
} catch (_unused) {
|
|
66
|
+
// If URL parsing fails, use the original target
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
var linkProps = _objectSpread({
|
|
59
70
|
href: url,
|
|
60
71
|
onClick: this.onClickFallback
|
|
72
|
+
}, actualTarget === '_blank' && {
|
|
73
|
+
target: '_blank',
|
|
74
|
+
rel: 'noreferrer noopener'
|
|
75
|
+
});
|
|
76
|
+
var fallback = (0, _platformFeatureFlags.fg)('dst-a11y__replace-anchor-with-link__editor') ? /*#__PURE__*/_react.default.createElement(_link.default, {
|
|
77
|
+
href: linkProps.href,
|
|
78
|
+
onClick: linkProps.onClick,
|
|
79
|
+
target: linkProps.target,
|
|
80
|
+
rel: linkProps.rel
|
|
61
81
|
}, url) :
|
|
62
82
|
/*#__PURE__*/
|
|
63
83
|
// eslint-disable-next-line @atlaskit/design-system/no-html-anchor
|
|
64
84
|
_react.default.createElement("a", {
|
|
65
|
-
href:
|
|
66
|
-
onClick:
|
|
85
|
+
href: linkProps.href,
|
|
86
|
+
onClick: linkProps.onClick,
|
|
87
|
+
target: linkProps.target,
|
|
88
|
+
rel: linkProps.rel
|
|
67
89
|
}, url);
|
|
68
90
|
if (isDatasource) {
|
|
69
91
|
if ((0, _adfSchema.isSafeUrl)(url)) {
|
|
@@ -145,7 +145,8 @@ var InlineCard = function InlineCard(props) {
|
|
|
145
145
|
eventHandlers = props.eventHandlers,
|
|
146
146
|
fireAnalyticsEvent = props.fireAnalyticsEvent,
|
|
147
147
|
smartLinks = props.smartLinks,
|
|
148
|
-
rendererAppearance = props.rendererAppearance
|
|
148
|
+
rendererAppearance = props.rendererAppearance,
|
|
149
|
+
onSetLinkTarget = props.onSetLinkTarget;
|
|
149
150
|
var portal = (0, _PortalContext.usePortal)(props);
|
|
150
151
|
var cardContext = (0, _linkProvider.useSmartCardContext)();
|
|
151
152
|
var _useState = (0, _react.useState)(false),
|
|
@@ -279,7 +280,7 @@ var InlineCard = function InlineCard(props) {
|
|
|
279
280
|
},
|
|
280
281
|
onError: onError,
|
|
281
282
|
disablePreviewPanel: true
|
|
282
|
-
})));
|
|
283
|
+
})), CompetitorPromptComponent);
|
|
283
284
|
}
|
|
284
285
|
return (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
|
|
285
286
|
data: analyticsData
|
|
@@ -293,7 +294,9 @@ var InlineCard = function InlineCard(props) {
|
|
|
293
294
|
unsupportedComponent: _ui.UnsupportedInline
|
|
294
295
|
// Ignored via go/ees005
|
|
295
296
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
296
|
-
}, cardProps
|
|
297
|
+
}, cardProps, {
|
|
298
|
+
onSetLinkTarget: onSetLinkTarget
|
|
299
|
+
}), (0, _react2.jsx)(MaybeOverlay, {
|
|
297
300
|
url: url || '',
|
|
298
301
|
rendererAppearance: rendererAppearance,
|
|
299
302
|
isResolvedViewRendered: isResolvedViewRendered,
|
|
@@ -1624,11 +1624,21 @@ var denseStyles = (0, _react.css)((0, _defineProperty2.default)((0, _definePrope
|
|
|
1624
1624
|
marginTop: RENDERER_LIST_DENSE_GAP
|
|
1625
1625
|
}
|
|
1626
1626
|
}));
|
|
1627
|
-
var syncBlockStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_syncBlock.SyncBlockSharedCssClassName.renderer, ", .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.renderer, ", .").concat(_syncBlock.SyncBlockSharedCssClassName.error, ", .").concat(_syncBlock.SyncBlockSharedCssClassName.loading), {
|
|
1627
|
+
var syncBlockStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_syncBlock.SyncBlockSharedCssClassName.renderer, ", .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.renderer, ", .").concat(_syncBlock.SyncBlockSharedCssClassName.error, ", .").concat(_syncBlock.SyncBlockSharedCssClassName.loading), {
|
|
1628
1628
|
borderRadius: "var(--ds-radius-small, 3px)",
|
|
1629
|
-
|
|
1630
|
-
|
|
1631
|
-
|
|
1629
|
+
paddingBlock: "var(--ds-space-150, 12px)"
|
|
1630
|
+
}), ".".concat(_syncBlock.SyncBlockSharedCssClassName.renderer), {
|
|
1631
|
+
// First child node in syncBlock in editor is overridden with marginTop: 0, hence apply the same style in renderer for consistency
|
|
1632
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
|
|
1633
|
+
'.ak-renderer-document > :first-child': {
|
|
1634
|
+
marginTop: 0
|
|
1635
|
+
}
|
|
1636
|
+
}), ".".concat(_syncBlock.BodiedSyncBlockSharedCssClassName.renderer), {
|
|
1637
|
+
// First child node in bodiedSyncBlock in editor is overridden with marginTop: 0, hence apply the same style in renderer for consistency
|
|
1638
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
|
|
1639
|
+
'> :first-child': {
|
|
1640
|
+
marginTop: 0
|
|
1641
|
+
}
|
|
1632
1642
|
}), ".".concat(_syncBlock.SyncBlockSharedCssClassName.error), {
|
|
1633
1643
|
backgroundColor: "var(--ds-background-disabled, #17171708)"
|
|
1634
1644
|
}), ".".concat(_syncBlock.SyncBlockSharedCssClassName.loading), {
|
|
@@ -1676,7 +1686,7 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
|
|
|
1676
1686
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
1677
1687
|
textHighlightPaddingStyles, tasksAndDecisionsStyles, smartCardStyles, smartCardStylesAvatarFix, (0, _experiments.editorExperiment)('platform_editor_preview_panel_linking_exp', true) && headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') && rendererAnnotationStyles,
|
|
1678
1688
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
1679
|
-
(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') &&
|
|
1689
|
+
(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle,
|
|
1680
1690
|
// merge firstWrappedMediaStyles with mediaSingleSharedStyle when clean up platform_editor_fix_media_in_renderer
|
|
1681
1691
|
(0, _platformFeatureFlags.fg)('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles, tableSharedStyle, tableRendererHeaderStylesForTableCellOnly, (0, _platformFeatureFlags.fg)('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ? firstNodeWithNotMarginTopWithNestedDnD : firstNodeWithNotMarginTop, rendererTableStyles, (0, _table.isStickyScrollbarEnabled)(appearance) && stickyScrollbarStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && allowNestedHeaderLinks && rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks, rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max' && ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true))) && responsiveBreakoutWidthFullWidth, (0, _expValEquals.expValEquals)('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? isCompactModeEnabled ? scaledDenseEmojiStyles : scaledEmojiStyles : isCompactModeEnabled ? denseStyles : undefined, (0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true) && syncBlockStyles],
|
|
1682
1692
|
"data-testid": testId
|
|
@@ -70,7 +70,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
70
70
|
var TABLE_INFO_TIMEOUT = 10000;
|
|
71
71
|
var RENDER_EVENT_SAMPLE_RATE = 0.2;
|
|
72
72
|
var packageName = "@atlaskit/renderer";
|
|
73
|
-
var packageVersion = "
|
|
73
|
+
var packageVersion = "125.3.0";
|
|
74
74
|
var setAsQueryContainerStyles = (0, _react2.css)({
|
|
75
75
|
containerName: 'ak-renderer-wrapper',
|
|
76
76
|
containerType: 'inline-size'
|
|
@@ -62,7 +62,6 @@ var markStylesWithInlineComments = (0, _react2.css)((0, _defineProperty2.default
|
|
|
62
62
|
borderBottom: "var(--ds-border-width-selected, 2px)".concat(" solid transparent"),
|
|
63
63
|
cursor: 'pointer',
|
|
64
64
|
padding: "1px 0 ".concat("var(--ds-space-025, 2px)"),
|
|
65
|
-
// it was under fg(annotations_align_editor_and_renderer_styles) from AnnotationSharedCSSByState().common, assume it's on as already rolled out
|
|
66
65
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
67
66
|
'&:has(.card), &:has([data-inline-card])': {
|
|
68
67
|
padding: '5px 0 3px 0'
|
|
@@ -247,6 +247,8 @@ export default class ReactSerializer {
|
|
|
247
247
|
return this.getEmbedCardProps(node, path);
|
|
248
248
|
case 'blockCard':
|
|
249
249
|
return this.getBlockCardProps(node, path);
|
|
250
|
+
case 'inlineCard':
|
|
251
|
+
return this.getInlineCardProps(node, path);
|
|
250
252
|
case 'expand':
|
|
251
253
|
return this.getExpandProps(node, path);
|
|
252
254
|
case 'unsupportedBlock':
|
|
@@ -486,13 +488,21 @@ export default class ReactSerializer {
|
|
|
486
488
|
const isInsideOfBlockNode = insideBlockNode(path, node.type.schema);
|
|
487
489
|
return {
|
|
488
490
|
...this.getProps(node),
|
|
489
|
-
isInsideOfBlockNode
|
|
491
|
+
isInsideOfBlockNode,
|
|
492
|
+
onSetLinkTarget: this.onSetLinkTarget
|
|
490
493
|
};
|
|
491
494
|
}
|
|
492
495
|
getBlockCardProps(node, path = []) {
|
|
493
496
|
return {
|
|
494
497
|
...this.getProps(node),
|
|
495
|
-
isNodeNested: path.length > 0
|
|
498
|
+
isNodeNested: path.length > 0,
|
|
499
|
+
onSetLinkTarget: this.onSetLinkTarget
|
|
500
|
+
};
|
|
501
|
+
}
|
|
502
|
+
getInlineCardProps(node, path = []) {
|
|
503
|
+
return {
|
|
504
|
+
...this.getProps(node, path),
|
|
505
|
+
onSetLinkTarget: this.onSetLinkTarget
|
|
496
506
|
};
|
|
497
507
|
}
|
|
498
508
|
getMediaGroupProps(node) {
|
|
@@ -34,7 +34,8 @@ export default function BlockCard(props) {
|
|
|
34
34
|
eventHandlers,
|
|
35
35
|
smartLinks,
|
|
36
36
|
isNodeNested,
|
|
37
|
-
localId
|
|
37
|
+
localId,
|
|
38
|
+
onSetLinkTarget
|
|
38
39
|
} = props;
|
|
39
40
|
const portal = usePortal(props);
|
|
40
41
|
const {
|
|
@@ -89,7 +90,8 @@ export default function BlockCard(props) {
|
|
|
89
90
|
data: analyticsData
|
|
90
91
|
}, jsx(CardErrorBoundary, _extends({
|
|
91
92
|
unsupportedComponent: UnsupportedInline,
|
|
92
|
-
datasourceId: props.datasource.id
|
|
93
|
+
datasourceId: props.datasource.id,
|
|
94
|
+
onSetLinkTarget: onSetLinkTarget
|
|
93
95
|
// Ignored via go/ees005
|
|
94
96
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
95
97
|
}, cardProps), jsx(WidthConsumer, null, ({
|
|
@@ -148,7 +150,8 @@ export default function BlockCard(props) {
|
|
|
148
150
|
"data-card-url": url,
|
|
149
151
|
"data-local-id": localId
|
|
150
152
|
}, jsx(CardErrorBoundary, _extends({
|
|
151
|
-
unsupportedComponent: UnsupportedBlock
|
|
153
|
+
unsupportedComponent: UnsupportedBlock,
|
|
154
|
+
onSetLinkTarget: onSetLinkTarget
|
|
152
155
|
// Ignored via go/ees005
|
|
153
156
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
154
157
|
}, cardProps), cardComponent)));
|
|
@@ -3,6 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
|
|
|
3
3
|
* @jsxRuntime classic
|
|
4
4
|
* @jsx jsx
|
|
5
5
|
*/
|
|
6
|
+
/* eslint-disable jsdoc/check-tag-names */
|
|
6
7
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
7
8
|
import { css, jsx } from '@emotion/react';
|
|
8
9
|
import { useContext, useState, useRef } from 'react';
|
|
@@ -51,7 +52,8 @@ function EmbedCardInternal(props) {
|
|
|
51
52
|
isInsideOfBlockNode,
|
|
52
53
|
rendererAppearance,
|
|
53
54
|
smartLinks,
|
|
54
|
-
isInsideOfInlineExtension
|
|
55
|
+
isInsideOfInlineExtension,
|
|
56
|
+
onSetLinkTarget
|
|
55
57
|
} = props;
|
|
56
58
|
const portal = usePortal(props);
|
|
57
59
|
const embedIframeRef = useRef(null);
|
|
@@ -178,9 +180,10 @@ function EmbedCardInternal(props) {
|
|
|
178
180
|
}
|
|
179
181
|
return (
|
|
180
182
|
// Ignored via go/ees005
|
|
181
|
-
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
182
183
|
jsx(CardErrorBoundary, _extends({
|
|
183
|
-
unsupportedComponent: UnsupportedBlock
|
|
184
|
+
unsupportedComponent: UnsupportedBlock,
|
|
185
|
+
onSetLinkTarget: onSetLinkTarget
|
|
186
|
+
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
184
187
|
}, cardProps), jsx(EmbedResizeMessageListener, {
|
|
185
188
|
embedIframeRef: embedIframeRef,
|
|
186
189
|
onHeightUpdate: setLiveHeight
|
|
@@ -223,7 +226,8 @@ export const EmbedOrBlockCardInternal = ({
|
|
|
223
226
|
rendererAppearance,
|
|
224
227
|
isInsideOfBlockNode,
|
|
225
228
|
smartLinks,
|
|
226
|
-
isInsideOfInlineExtension
|
|
229
|
+
isInsideOfInlineExtension,
|
|
230
|
+
onSetLinkTarget
|
|
227
231
|
}) => {
|
|
228
232
|
const {
|
|
229
233
|
width
|
|
@@ -236,7 +240,8 @@ export const EmbedOrBlockCardInternal = ({
|
|
|
236
240
|
portal: portal,
|
|
237
241
|
layout: layout,
|
|
238
242
|
rendererAppearance: rendererAppearance,
|
|
239
|
-
smartLinks: smartLinks
|
|
243
|
+
smartLinks: smartLinks,
|
|
244
|
+
onSetLinkTarget: onSetLinkTarget
|
|
240
245
|
}) : jsx(EmbedCardInternal, {
|
|
241
246
|
url: url,
|
|
242
247
|
data: data,
|
|
@@ -249,7 +254,8 @@ export const EmbedOrBlockCardInternal = ({
|
|
|
249
254
|
rendererAppearance: rendererAppearance,
|
|
250
255
|
isInsideOfBlockNode: isInsideOfBlockNode,
|
|
251
256
|
smartLinks: smartLinks,
|
|
252
|
-
isInsideOfInlineExtension: isInsideOfInlineExtension
|
|
257
|
+
isInsideOfInlineExtension: isInsideOfInlineExtension,
|
|
258
|
+
onSetLinkTarget: onSetLinkTarget
|
|
253
259
|
});
|
|
254
260
|
};
|
|
255
261
|
const EmbedCardWithCondition = componentWithCondition(() => editorExperiment('platform_editor_preview_panel_responsiveness', true, {
|
|
@@ -37,18 +37,39 @@ export class CardErrorBoundary extends React.PureComponent {
|
|
|
37
37
|
url,
|
|
38
38
|
isDatasource,
|
|
39
39
|
unsupportedComponent: UnsupportedComponent,
|
|
40
|
-
datasourceId
|
|
40
|
+
datasourceId,
|
|
41
|
+
onSetLinkTarget
|
|
41
42
|
} = this.props;
|
|
42
43
|
if (url) {
|
|
43
|
-
|
|
44
|
+
let actualTarget;
|
|
45
|
+
if (onSetLinkTarget && fg('rovo_chat_deep_linking_enabled')) {
|
|
46
|
+
try {
|
|
47
|
+
actualTarget = onSetLinkTarget(url);
|
|
48
|
+
} catch {
|
|
49
|
+
// If URL parsing fails, use the original target
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
const linkProps = {
|
|
44
53
|
href: url,
|
|
45
|
-
onClick: this.onClickFallback
|
|
54
|
+
onClick: this.onClickFallback,
|
|
55
|
+
...(actualTarget === '_blank' && {
|
|
56
|
+
target: '_blank',
|
|
57
|
+
rel: 'noreferrer noopener'
|
|
58
|
+
})
|
|
59
|
+
};
|
|
60
|
+
const fallback = fg('dst-a11y__replace-anchor-with-link__editor') ? /*#__PURE__*/React.createElement(Link, {
|
|
61
|
+
href: linkProps.href,
|
|
62
|
+
onClick: linkProps.onClick,
|
|
63
|
+
target: linkProps.target,
|
|
64
|
+
rel: linkProps.rel
|
|
46
65
|
}, url) :
|
|
47
66
|
/*#__PURE__*/
|
|
48
67
|
// eslint-disable-next-line @atlaskit/design-system/no-html-anchor
|
|
49
68
|
React.createElement("a", {
|
|
50
|
-
href:
|
|
51
|
-
onClick:
|
|
69
|
+
href: linkProps.href,
|
|
70
|
+
onClick: linkProps.onClick,
|
|
71
|
+
target: linkProps.target,
|
|
72
|
+
rel: linkProps.rel
|
|
52
73
|
}, url);
|
|
53
74
|
if (isDatasource) {
|
|
54
75
|
if (isSafeUrl(url)) {
|
|
@@ -129,7 +129,8 @@ const InlineCard = props => {
|
|
|
129
129
|
eventHandlers,
|
|
130
130
|
fireAnalyticsEvent,
|
|
131
131
|
smartLinks,
|
|
132
|
-
rendererAppearance
|
|
132
|
+
rendererAppearance,
|
|
133
|
+
onSetLinkTarget
|
|
133
134
|
} = props;
|
|
134
135
|
const portal = usePortal(props);
|
|
135
136
|
const cardContext = useSmartCardContext();
|
|
@@ -263,7 +264,7 @@ const InlineCard = props => {
|
|
|
263
264
|
},
|
|
264
265
|
onError: onError,
|
|
265
266
|
disablePreviewPanel: true
|
|
266
|
-
})));
|
|
267
|
+
})), CompetitorPromptComponent);
|
|
267
268
|
}
|
|
268
269
|
return jsx(AnalyticsContext, {
|
|
269
270
|
data: analyticsData
|
|
@@ -277,7 +278,9 @@ const InlineCard = props => {
|
|
|
277
278
|
unsupportedComponent: UnsupportedInline
|
|
278
279
|
// Ignored via go/ees005
|
|
279
280
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
280
|
-
}, cardProps
|
|
281
|
+
}, cardProps, {
|
|
282
|
+
onSetLinkTarget: onSetLinkTarget
|
|
283
|
+
}), jsx(MaybeOverlay, {
|
|
281
284
|
url: url || '',
|
|
282
285
|
rendererAppearance: rendererAppearance,
|
|
283
286
|
isResolvedViewRendered: isResolvedViewRendered,
|
|
@@ -2050,9 +2050,21 @@ const denseStyles = css({
|
|
|
2050
2050
|
const syncBlockStyles = css({
|
|
2051
2051
|
[`.${SyncBlockSharedCssClassName.renderer}, .${BodiedSyncBlockSharedCssClassName.renderer}, .${SyncBlockSharedCssClassName.error}, .${SyncBlockSharedCssClassName.loading}`]: {
|
|
2052
2052
|
borderRadius: "var(--ds-radius-small, 3px)",
|
|
2053
|
-
|
|
2054
|
-
|
|
2055
|
-
|
|
2053
|
+
paddingBlock: "var(--ds-space-150, 12px)"
|
|
2054
|
+
},
|
|
2055
|
+
[`.${SyncBlockSharedCssClassName.renderer}`]: {
|
|
2056
|
+
// First child node in syncBlock in editor is overridden with marginTop: 0, hence apply the same style in renderer for consistency
|
|
2057
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
|
|
2058
|
+
'.ak-renderer-document > :first-child': {
|
|
2059
|
+
marginTop: 0
|
|
2060
|
+
}
|
|
2061
|
+
},
|
|
2062
|
+
[`.${BodiedSyncBlockSharedCssClassName.renderer}`]: {
|
|
2063
|
+
// First child node in bodiedSyncBlock in editor is overridden with marginTop: 0, hence apply the same style in renderer for consistency
|
|
2064
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
|
|
2065
|
+
'> :first-child': {
|
|
2066
|
+
marginTop: 0
|
|
2067
|
+
}
|
|
2056
2068
|
},
|
|
2057
2069
|
[`.${SyncBlockSharedCssClassName.error}`]: {
|
|
2058
2070
|
backgroundColor: "var(--ds-background-disabled, #17171708)"
|
|
@@ -2105,7 +2117,7 @@ export const RendererStyleContainer = props => {
|
|
|
2105
2117
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
2106
2118
|
textHighlightPaddingStyles, tasksAndDecisionsStyles, smartCardStyles, smartCardStylesAvatarFix, editorExperiment('platform_editor_preview_panel_linking_exp', true) && headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStyles,
|
|
2107
2119
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
2108
|
-
fg('editor_inline_comments_on_inline_nodes') &&
|
|
2120
|
+
fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle,
|
|
2109
2121
|
// merge firstWrappedMediaStyles with mediaSingleSharedStyle when clean up platform_editor_fix_media_in_renderer
|
|
2110
2122
|
fg('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles, tableSharedStyle, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, fg('platform_editor_nested_dnd_styles_changes') ? firstNodeWithNotMarginTopWithNestedDnD : firstNodeWithNotMarginTop, rendererTableStyles, isStickyScrollbarEnabled(appearance) && stickyScrollbarStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && allowNestedHeaderLinks && rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks, rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && responsiveBreakoutWidthFullWidth, expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? isCompactModeEnabled ? scaledDenseEmojiStyles : scaledEmojiStyles : isCompactModeEnabled ? denseStyles : undefined, expValEquals('platform_synced_block', 'isEnabled', true) && syncBlockStyles],
|
|
2111
2123
|
"data-testid": testId
|
|
@@ -56,7 +56,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
56
56
|
const TABLE_INFO_TIMEOUT = 10000;
|
|
57
57
|
const RENDER_EVENT_SAMPLE_RATE = 0.2;
|
|
58
58
|
const packageName = "@atlaskit/renderer";
|
|
59
|
-
const packageVersion = "
|
|
59
|
+
const packageVersion = "125.3.0";
|
|
60
60
|
const setAsQueryContainerStyles = css({
|
|
61
61
|
containerName: 'ak-renderer-wrapper',
|
|
62
62
|
containerType: 'inline-size'
|
|
@@ -64,7 +64,6 @@ const markStylesWithInlineComments = css({
|
|
|
64
64
|
borderBottom: `${"var(--ds-border-width-selected, 2px)"} solid transparent`,
|
|
65
65
|
cursor: 'pointer',
|
|
66
66
|
padding: `1px 0 ${"var(--ds-space-025, 2px)"}`,
|
|
67
|
-
// it was under fg(annotations_align_editor_and_renderer_styles) from AnnotationSharedCSSByState().common, assume it's on as already rolled out
|
|
68
67
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
69
68
|
'&:has(.card), &:has([data-inline-card])': {
|
|
70
69
|
padding: '5px 0 3px 0'
|
package/dist/esm/react/index.js
CHANGED
|
@@ -257,6 +257,8 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
257
257
|
return this.getEmbedCardProps(node, path);
|
|
258
258
|
case 'blockCard':
|
|
259
259
|
return this.getBlockCardProps(node, path);
|
|
260
|
+
case 'inlineCard':
|
|
261
|
+
return this.getInlineCardProps(node, path);
|
|
260
262
|
case 'expand':
|
|
261
263
|
return this.getExpandProps(node, path);
|
|
262
264
|
case 'unsupportedBlock':
|
|
@@ -533,7 +535,8 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
533
535
|
var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
534
536
|
var isInsideOfBlockNode = insideBlockNode(path, node.type.schema);
|
|
535
537
|
return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
|
|
536
|
-
isInsideOfBlockNode: isInsideOfBlockNode
|
|
538
|
+
isInsideOfBlockNode: isInsideOfBlockNode,
|
|
539
|
+
onSetLinkTarget: this.onSetLinkTarget
|
|
537
540
|
});
|
|
538
541
|
}
|
|
539
542
|
}, {
|
|
@@ -541,7 +544,16 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
541
544
|
value: function getBlockCardProps(node) {
|
|
542
545
|
var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
543
546
|
return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
|
|
544
|
-
isNodeNested: path.length > 0
|
|
547
|
+
isNodeNested: path.length > 0,
|
|
548
|
+
onSetLinkTarget: this.onSetLinkTarget
|
|
549
|
+
});
|
|
550
|
+
}
|
|
551
|
+
}, {
|
|
552
|
+
key: "getInlineCardProps",
|
|
553
|
+
value: function getInlineCardProps(node) {
|
|
554
|
+
var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
555
|
+
return _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
|
|
556
|
+
onSetLinkTarget: this.onSetLinkTarget
|
|
545
557
|
});
|
|
546
558
|
}
|
|
547
559
|
}, {
|
|
@@ -33,7 +33,8 @@ export default function BlockCard(props) {
|
|
|
33
33
|
eventHandlers = props.eventHandlers,
|
|
34
34
|
smartLinks = props.smartLinks,
|
|
35
35
|
isNodeNested = props.isNodeNested,
|
|
36
|
-
localId = props.localId
|
|
36
|
+
localId = props.localId,
|
|
37
|
+
onSetLinkTarget = props.onSetLinkTarget;
|
|
37
38
|
var portal = usePortal(props);
|
|
38
39
|
var _ref = smartLinks || {},
|
|
39
40
|
actionOptions = _ref.actionOptions;
|
|
@@ -93,7 +94,8 @@ export default function BlockCard(props) {
|
|
|
93
94
|
data: analyticsData
|
|
94
95
|
}, jsx(CardErrorBoundary, _extends({
|
|
95
96
|
unsupportedComponent: UnsupportedInline,
|
|
96
|
-
datasourceId: props.datasource.id
|
|
97
|
+
datasourceId: props.datasource.id,
|
|
98
|
+
onSetLinkTarget: onSetLinkTarget
|
|
97
99
|
// Ignored via go/ees005
|
|
98
100
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
99
101
|
}, cardProps), jsx(WidthConsumer, null, function (_ref5) {
|
|
@@ -153,7 +155,8 @@ export default function BlockCard(props) {
|
|
|
153
155
|
"data-card-url": url,
|
|
154
156
|
"data-local-id": localId
|
|
155
157
|
}, jsx(CardErrorBoundary, _extends({
|
|
156
|
-
unsupportedComponent: UnsupportedBlock
|
|
158
|
+
unsupportedComponent: UnsupportedBlock,
|
|
159
|
+
onSetLinkTarget: onSetLinkTarget
|
|
157
160
|
// Ignored via go/ees005
|
|
158
161
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
159
162
|
}, cardProps), cardComponent)));
|
|
@@ -4,6 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
|
4
4
|
* @jsxRuntime classic
|
|
5
5
|
* @jsx jsx
|
|
6
6
|
*/
|
|
7
|
+
/* eslint-disable jsdoc/check-tag-names */
|
|
7
8
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
8
9
|
import { css, jsx } from '@emotion/react';
|
|
9
10
|
import { useContext, useState, useRef } from 'react';
|
|
@@ -51,7 +52,8 @@ function EmbedCardInternal(props) {
|
|
|
51
52
|
isInsideOfBlockNode = props.isInsideOfBlockNode,
|
|
52
53
|
rendererAppearance = props.rendererAppearance,
|
|
53
54
|
smartLinks = props.smartLinks,
|
|
54
|
-
isInsideOfInlineExtension = props.isInsideOfInlineExtension
|
|
55
|
+
isInsideOfInlineExtension = props.isInsideOfInlineExtension,
|
|
56
|
+
onSetLinkTarget = props.onSetLinkTarget;
|
|
55
57
|
var portal = usePortal(props);
|
|
56
58
|
var embedIframeRef = useRef(null);
|
|
57
59
|
var onClick = getCardClickHandler(eventHandlers, url);
|
|
@@ -182,9 +184,10 @@ function EmbedCardInternal(props) {
|
|
|
182
184
|
}
|
|
183
185
|
return (
|
|
184
186
|
// Ignored via go/ees005
|
|
185
|
-
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
186
187
|
jsx(CardErrorBoundary, _extends({
|
|
187
|
-
unsupportedComponent: UnsupportedBlock
|
|
188
|
+
unsupportedComponent: UnsupportedBlock,
|
|
189
|
+
onSetLinkTarget: onSetLinkTarget
|
|
190
|
+
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
188
191
|
}, cardProps), jsx(EmbedResizeMessageListener, {
|
|
189
192
|
embedIframeRef: embedIframeRef,
|
|
190
193
|
onHeightUpdate: setLiveHeight
|
|
@@ -227,7 +230,8 @@ export var EmbedOrBlockCardInternal = function EmbedOrBlockCardInternal(_ref5) {
|
|
|
227
230
|
rendererAppearance = _ref5.rendererAppearance,
|
|
228
231
|
isInsideOfBlockNode = _ref5.isInsideOfBlockNode,
|
|
229
232
|
smartLinks = _ref5.smartLinks,
|
|
230
|
-
isInsideOfInlineExtension = _ref5.isInsideOfInlineExtension
|
|
233
|
+
isInsideOfInlineExtension = _ref5.isInsideOfInlineExtension,
|
|
234
|
+
onSetLinkTarget = _ref5.onSetLinkTarget;
|
|
231
235
|
var _useContext = useContext(WidthContext),
|
|
232
236
|
width = _useContext.width;
|
|
233
237
|
var viewAsBlockCard = width && width <= akEditorFullPageNarrowBreakout;
|
|
@@ -238,7 +242,8 @@ export var EmbedOrBlockCardInternal = function EmbedOrBlockCardInternal(_ref5) {
|
|
|
238
242
|
portal: portal,
|
|
239
243
|
layout: layout,
|
|
240
244
|
rendererAppearance: rendererAppearance,
|
|
241
|
-
smartLinks: smartLinks
|
|
245
|
+
smartLinks: smartLinks,
|
|
246
|
+
onSetLinkTarget: onSetLinkTarget
|
|
242
247
|
}) : jsx(EmbedCardInternal, {
|
|
243
248
|
url: url,
|
|
244
249
|
data: data,
|
|
@@ -251,7 +256,8 @@ export var EmbedOrBlockCardInternal = function EmbedOrBlockCardInternal(_ref5) {
|
|
|
251
256
|
rendererAppearance: rendererAppearance,
|
|
252
257
|
isInsideOfBlockNode: isInsideOfBlockNode,
|
|
253
258
|
smartLinks: smartLinks,
|
|
254
|
-
isInsideOfInlineExtension: isInsideOfInlineExtension
|
|
259
|
+
isInsideOfInlineExtension: isInsideOfInlineExtension,
|
|
260
|
+
onSetLinkTarget: onSetLinkTarget
|
|
255
261
|
});
|
|
256
262
|
};
|
|
257
263
|
var EmbedCardWithCondition = componentWithCondition(function () {
|
|
@@ -4,6 +4,8 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
|
|
|
4
4
|
import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
5
5
|
import _inherits from "@babel/runtime/helpers/inherits";
|
|
6
6
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
7
|
+
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; }
|
|
8
|
+
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) { _defineProperty(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; }
|
|
7
9
|
function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
|
|
8
10
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
9
11
|
import { isSafeUrl } from '@atlaskit/adf-schema';
|
|
@@ -46,17 +48,37 @@ export var CardErrorBoundary = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
46
48
|
url = _this$props2.url,
|
|
47
49
|
isDatasource = _this$props2.isDatasource,
|
|
48
50
|
UnsupportedComponent = _this$props2.unsupportedComponent,
|
|
49
|
-
datasourceId = _this$props2.datasourceId
|
|
51
|
+
datasourceId = _this$props2.datasourceId,
|
|
52
|
+
onSetLinkTarget = _this$props2.onSetLinkTarget;
|
|
50
53
|
if (url) {
|
|
51
|
-
var
|
|
54
|
+
var actualTarget;
|
|
55
|
+
if (onSetLinkTarget && fg('rovo_chat_deep_linking_enabled')) {
|
|
56
|
+
try {
|
|
57
|
+
actualTarget = onSetLinkTarget(url);
|
|
58
|
+
} catch (_unused) {
|
|
59
|
+
// If URL parsing fails, use the original target
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
var linkProps = _objectSpread({
|
|
52
63
|
href: url,
|
|
53
64
|
onClick: this.onClickFallback
|
|
65
|
+
}, actualTarget === '_blank' && {
|
|
66
|
+
target: '_blank',
|
|
67
|
+
rel: 'noreferrer noopener'
|
|
68
|
+
});
|
|
69
|
+
var fallback = fg('dst-a11y__replace-anchor-with-link__editor') ? /*#__PURE__*/React.createElement(Link, {
|
|
70
|
+
href: linkProps.href,
|
|
71
|
+
onClick: linkProps.onClick,
|
|
72
|
+
target: linkProps.target,
|
|
73
|
+
rel: linkProps.rel
|
|
54
74
|
}, url) :
|
|
55
75
|
/*#__PURE__*/
|
|
56
76
|
// eslint-disable-next-line @atlaskit/design-system/no-html-anchor
|
|
57
77
|
React.createElement("a", {
|
|
58
|
-
href:
|
|
59
|
-
onClick:
|
|
78
|
+
href: linkProps.href,
|
|
79
|
+
onClick: linkProps.onClick,
|
|
80
|
+
target: linkProps.target,
|
|
81
|
+
rel: linkProps.rel
|
|
60
82
|
}, url);
|
|
61
83
|
if (isDatasource) {
|
|
62
84
|
if (isSafeUrl(url)) {
|
|
@@ -136,7 +136,8 @@ var InlineCard = function InlineCard(props) {
|
|
|
136
136
|
eventHandlers = props.eventHandlers,
|
|
137
137
|
fireAnalyticsEvent = props.fireAnalyticsEvent,
|
|
138
138
|
smartLinks = props.smartLinks,
|
|
139
|
-
rendererAppearance = props.rendererAppearance
|
|
139
|
+
rendererAppearance = props.rendererAppearance,
|
|
140
|
+
onSetLinkTarget = props.onSetLinkTarget;
|
|
140
141
|
var portal = usePortal(props);
|
|
141
142
|
var cardContext = useSmartCardContext();
|
|
142
143
|
var _useState = useState(false),
|
|
@@ -270,7 +271,7 @@ var InlineCard = function InlineCard(props) {
|
|
|
270
271
|
},
|
|
271
272
|
onError: onError,
|
|
272
273
|
disablePreviewPanel: true
|
|
273
|
-
})));
|
|
274
|
+
})), CompetitorPromptComponent);
|
|
274
275
|
}
|
|
275
276
|
return jsx(AnalyticsContext, {
|
|
276
277
|
data: analyticsData
|
|
@@ -284,7 +285,9 @@ var InlineCard = function InlineCard(props) {
|
|
|
284
285
|
unsupportedComponent: UnsupportedInline
|
|
285
286
|
// Ignored via go/ees005
|
|
286
287
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
287
|
-
}, cardProps
|
|
288
|
+
}, cardProps, {
|
|
289
|
+
onSetLinkTarget: onSetLinkTarget
|
|
290
|
+
}), jsx(MaybeOverlay, {
|
|
288
291
|
url: url || '',
|
|
289
292
|
rendererAppearance: rendererAppearance,
|
|
290
293
|
isResolvedViewRendered: isResolvedViewRendered,
|
|
@@ -1617,11 +1617,21 @@ var denseStyles = css(_defineProperty(_defineProperty(_defineProperty({}, ".".co
|
|
|
1617
1617
|
marginTop: RENDERER_LIST_DENSE_GAP
|
|
1618
1618
|
}
|
|
1619
1619
|
}));
|
|
1620
|
-
var syncBlockStyles = css(_defineProperty(_defineProperty(_defineProperty({}, ".".concat(SyncBlockSharedCssClassName.renderer, ", .").concat(BodiedSyncBlockSharedCssClassName.renderer, ", .").concat(SyncBlockSharedCssClassName.error, ", .").concat(SyncBlockSharedCssClassName.loading), {
|
|
1620
|
+
var syncBlockStyles = css(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".".concat(SyncBlockSharedCssClassName.renderer, ", .").concat(BodiedSyncBlockSharedCssClassName.renderer, ", .").concat(SyncBlockSharedCssClassName.error, ", .").concat(SyncBlockSharedCssClassName.loading), {
|
|
1621
1621
|
borderRadius: "var(--ds-radius-small, 3px)",
|
|
1622
|
-
|
|
1623
|
-
|
|
1624
|
-
|
|
1622
|
+
paddingBlock: "var(--ds-space-150, 12px)"
|
|
1623
|
+
}), ".".concat(SyncBlockSharedCssClassName.renderer), {
|
|
1624
|
+
// First child node in syncBlock in editor is overridden with marginTop: 0, hence apply the same style in renderer for consistency
|
|
1625
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
|
|
1626
|
+
'.ak-renderer-document > :first-child': {
|
|
1627
|
+
marginTop: 0
|
|
1628
|
+
}
|
|
1629
|
+
}), ".".concat(BodiedSyncBlockSharedCssClassName.renderer), {
|
|
1630
|
+
// First child node in bodiedSyncBlock in editor is overridden with marginTop: 0, hence apply the same style in renderer for consistency
|
|
1631
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
|
|
1632
|
+
'> :first-child': {
|
|
1633
|
+
marginTop: 0
|
|
1634
|
+
}
|
|
1625
1635
|
}), ".".concat(SyncBlockSharedCssClassName.error), {
|
|
1626
1636
|
backgroundColor: "var(--ds-background-disabled, #17171708)"
|
|
1627
1637
|
}), ".".concat(SyncBlockSharedCssClassName.loading), {
|
|
@@ -1669,7 +1679,7 @@ export var RendererStyleContainer = function RendererStyleContainer(props) {
|
|
|
1669
1679
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
1670
1680
|
textHighlightPaddingStyles, tasksAndDecisionsStyles, smartCardStyles, smartCardStylesAvatarFix, editorExperiment('platform_editor_preview_panel_linking_exp', true) && headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStyles,
|
|
1671
1681
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
1672
|
-
fg('editor_inline_comments_on_inline_nodes') &&
|
|
1682
|
+
fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle,
|
|
1673
1683
|
// merge firstWrappedMediaStyles with mediaSingleSharedStyle when clean up platform_editor_fix_media_in_renderer
|
|
1674
1684
|
fg('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles, tableSharedStyle, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, fg('platform_editor_nested_dnd_styles_changes') ? firstNodeWithNotMarginTopWithNestedDnD : firstNodeWithNotMarginTop, rendererTableStyles, isStickyScrollbarEnabled(appearance) && stickyScrollbarStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && allowNestedHeaderLinks && rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks, rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && responsiveBreakoutWidthFullWidth, expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? isCompactModeEnabled ? scaledDenseEmojiStyles : scaledEmojiStyles : isCompactModeEnabled ? denseStyles : undefined, expValEquals('platform_synced_block', 'isEnabled', true) && syncBlockStyles],
|
|
1675
1685
|
"data-testid": testId
|
|
@@ -61,7 +61,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
61
61
|
var TABLE_INFO_TIMEOUT = 10000;
|
|
62
62
|
var RENDER_EVENT_SAMPLE_RATE = 0.2;
|
|
63
63
|
var packageName = "@atlaskit/renderer";
|
|
64
|
-
var packageVersion = "
|
|
64
|
+
var packageVersion = "125.3.0";
|
|
65
65
|
var setAsQueryContainerStyles = css({
|
|
66
66
|
containerName: 'ak-renderer-wrapper',
|
|
67
67
|
containerType: 'inline-size'
|
|
@@ -58,7 +58,6 @@ var markStylesWithInlineComments = css(_defineProperty({}, "&[data-mark-annotati
|
|
|
58
58
|
borderBottom: "var(--ds-border-width-selected, 2px)".concat(" solid transparent"),
|
|
59
59
|
cursor: 'pointer',
|
|
60
60
|
padding: "1px 0 ".concat("var(--ds-space-025, 2px)"),
|
|
61
|
-
// it was under fg(annotations_align_editor_and_renderer_styles) from AnnotationSharedCSSByState().common, assume it's on as already rolled out
|
|
62
61
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
63
62
|
'&:has(.card), &:has([data-inline-card])': {
|
|
64
63
|
padding: '5px 0 3px 0'
|
|
@@ -131,6 +131,7 @@ export default class ReactSerializer implements Serializer<JSX.Element> {
|
|
|
131
131
|
private getEmojiProps;
|
|
132
132
|
private getEmbedCardProps;
|
|
133
133
|
private getBlockCardProps;
|
|
134
|
+
private getInlineCardProps;
|
|
134
135
|
private getMediaGroupProps;
|
|
135
136
|
private getMediaInlineProps;
|
|
136
137
|
private getTaskItemProps;
|
|
@@ -14,6 +14,7 @@ export default function BlockCard(props: {
|
|
|
14
14
|
isNodeNested?: boolean;
|
|
15
15
|
layout?: string;
|
|
16
16
|
localId?: string;
|
|
17
|
+
onSetLinkTarget?: (url: string) => '_blank' | undefined;
|
|
17
18
|
portal?: HTMLElement;
|
|
18
19
|
rendererAppearance?: RendererAppearance;
|
|
19
20
|
smartLinks?: SmartLinksOptions;
|
|
@@ -13,6 +13,7 @@ type EmbedCardInternalProps = {
|
|
|
13
13
|
isInsideOfBlockNode?: boolean;
|
|
14
14
|
isInsideOfInlineExtension?: boolean;
|
|
15
15
|
layout: RichMediaLayout;
|
|
16
|
+
onSetLinkTarget?: (url: string) => '_blank' | undefined;
|
|
16
17
|
originalHeight?: number;
|
|
17
18
|
originalWidth?: number;
|
|
18
19
|
portal?: HTMLElement;
|
|
@@ -21,6 +22,6 @@ type EmbedCardInternalProps = {
|
|
|
21
22
|
url?: string;
|
|
22
23
|
width?: number;
|
|
23
24
|
};
|
|
24
|
-
export declare const EmbedOrBlockCardInternal: ({ url, data, eventHandlers, portal, originalHeight, originalWidth, width: embedWidth, layout, rendererAppearance, isInsideOfBlockNode, smartLinks, isInsideOfInlineExtension, }: EmbedCardInternalProps) => jsx.JSX.Element;
|
|
25
|
+
export declare const EmbedOrBlockCardInternal: ({ url, data, eventHandlers, portal, originalHeight, originalWidth, width: embedWidth, layout, rendererAppearance, isInsideOfBlockNode, smartLinks, isInsideOfInlineExtension, onSetLinkTarget, }: EmbedCardInternalProps) => jsx.JSX.Element;
|
|
25
26
|
declare const EmbedCardWithCondition: import("react").FC<EmbedCardInternalProps>;
|
|
26
27
|
export default EmbedCardWithCondition;
|
|
@@ -32,7 +32,7 @@ type RenderExtensionOptions = {
|
|
|
32
32
|
} & AllOrNone<OverflowShadowProps>;
|
|
33
33
|
export declare const renderExtension: (content: any, layout: string, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodeHeight?: string, localId?: string) => React.JSX.Element;
|
|
34
34
|
declare const _default: {
|
|
35
|
-
new (props:
|
|
35
|
+
new (props: Props & OverflowShadowProps): {
|
|
36
36
|
overflowContainer?: HTMLElement | null;
|
|
37
37
|
container?: HTMLElement;
|
|
38
38
|
shadowObserver?: import("@atlaskit/editor-common/ui").ShadowObserver;
|
|
@@ -7,6 +7,7 @@ export declare class CardErrorBoundary extends React.PureComponent<{
|
|
|
7
7
|
datasourceId?: string;
|
|
8
8
|
isDatasource?: boolean;
|
|
9
9
|
onClick?: (e: React.MouseEvent<HTMLElement>, url?: string) => void;
|
|
10
|
+
onSetLinkTarget?: (url: string) => '_blank' | undefined;
|
|
10
11
|
url?: string;
|
|
11
12
|
} & CardErrorBoundaryProps> {
|
|
12
13
|
state: {
|
|
@@ -40,6 +40,7 @@ declare const EmbedCard: React.ComponentType<{
|
|
|
40
40
|
isInsideOfBlockNode?: boolean;
|
|
41
41
|
isInsideOfInlineExtension?: boolean;
|
|
42
42
|
layout: import("@atlaskit/adf-schema").RichMediaLayout;
|
|
43
|
+
onSetLinkTarget?: (url: string) => "_blank" | undefined;
|
|
43
44
|
originalHeight?: number;
|
|
44
45
|
originalWidth?: number;
|
|
45
46
|
portal?: HTMLElement;
|
|
@@ -56,6 +57,7 @@ declare const BlockCard: React.ComponentType<{
|
|
|
56
57
|
isNodeNested?: boolean;
|
|
57
58
|
layout?: string;
|
|
58
59
|
localId?: string;
|
|
60
|
+
onSetLinkTarget?: (url: string) => "_blank" | undefined;
|
|
59
61
|
portal?: HTMLElement;
|
|
60
62
|
rendererAppearance?: import("../../ui/Renderer/types").RendererAppearance;
|
|
61
63
|
smartLinks?: import("../../types/smartLinksOptions").SmartLinksOptions;
|
|
@@ -10,6 +10,7 @@ export interface InlineCardProps extends MarkDataAttributes {
|
|
|
10
10
|
eventHandlers?: EventHandlers;
|
|
11
11
|
fireAnalyticsEvent?: (event: AnalyticsEventPayload) => void;
|
|
12
12
|
marks?: Mark[];
|
|
13
|
+
onSetLinkTarget?: (url: string) => '_blank' | undefined;
|
|
13
14
|
portal?: HTMLElement;
|
|
14
15
|
rendererAppearance?: RendererAppearance;
|
|
15
16
|
smartLinks?: SmartLinksOptions;
|
|
@@ -131,6 +131,7 @@ export default class ReactSerializer implements Serializer<JSX.Element> {
|
|
|
131
131
|
private getEmojiProps;
|
|
132
132
|
private getEmbedCardProps;
|
|
133
133
|
private getBlockCardProps;
|
|
134
|
+
private getInlineCardProps;
|
|
134
135
|
private getMediaGroupProps;
|
|
135
136
|
private getMediaInlineProps;
|
|
136
137
|
private getTaskItemProps;
|
|
@@ -14,6 +14,7 @@ export default function BlockCard(props: {
|
|
|
14
14
|
isNodeNested?: boolean;
|
|
15
15
|
layout?: string;
|
|
16
16
|
localId?: string;
|
|
17
|
+
onSetLinkTarget?: (url: string) => '_blank' | undefined;
|
|
17
18
|
portal?: HTMLElement;
|
|
18
19
|
rendererAppearance?: RendererAppearance;
|
|
19
20
|
smartLinks?: SmartLinksOptions;
|
|
@@ -13,6 +13,7 @@ type EmbedCardInternalProps = {
|
|
|
13
13
|
isInsideOfBlockNode?: boolean;
|
|
14
14
|
isInsideOfInlineExtension?: boolean;
|
|
15
15
|
layout: RichMediaLayout;
|
|
16
|
+
onSetLinkTarget?: (url: string) => '_blank' | undefined;
|
|
16
17
|
originalHeight?: number;
|
|
17
18
|
originalWidth?: number;
|
|
18
19
|
portal?: HTMLElement;
|
|
@@ -21,6 +22,6 @@ type EmbedCardInternalProps = {
|
|
|
21
22
|
url?: string;
|
|
22
23
|
width?: number;
|
|
23
24
|
};
|
|
24
|
-
export declare const EmbedOrBlockCardInternal: ({ url, data, eventHandlers, portal, originalHeight, originalWidth, width: embedWidth, layout, rendererAppearance, isInsideOfBlockNode, smartLinks, isInsideOfInlineExtension, }: EmbedCardInternalProps) => jsx.JSX.Element;
|
|
25
|
+
export declare const EmbedOrBlockCardInternal: ({ url, data, eventHandlers, portal, originalHeight, originalWidth, width: embedWidth, layout, rendererAppearance, isInsideOfBlockNode, smartLinks, isInsideOfInlineExtension, onSetLinkTarget, }: EmbedCardInternalProps) => jsx.JSX.Element;
|
|
25
26
|
declare const EmbedCardWithCondition: import("react").FC<EmbedCardInternalProps>;
|
|
26
27
|
export default EmbedCardWithCondition;
|
|
@@ -32,7 +32,7 @@ type RenderExtensionOptions = {
|
|
|
32
32
|
} & AllOrNone<OverflowShadowProps>;
|
|
33
33
|
export declare const renderExtension: (content: any, layout: string, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodeHeight?: string, localId?: string) => React.JSX.Element;
|
|
34
34
|
declare const _default: {
|
|
35
|
-
new (props:
|
|
35
|
+
new (props: Props & OverflowShadowProps): {
|
|
36
36
|
overflowContainer?: HTMLElement | null;
|
|
37
37
|
container?: HTMLElement;
|
|
38
38
|
shadowObserver?: import("@atlaskit/editor-common/ui").ShadowObserver;
|
|
@@ -7,6 +7,7 @@ export declare class CardErrorBoundary extends React.PureComponent<{
|
|
|
7
7
|
datasourceId?: string;
|
|
8
8
|
isDatasource?: boolean;
|
|
9
9
|
onClick?: (e: React.MouseEvent<HTMLElement>, url?: string) => void;
|
|
10
|
+
onSetLinkTarget?: (url: string) => '_blank' | undefined;
|
|
10
11
|
url?: string;
|
|
11
12
|
} & CardErrorBoundaryProps> {
|
|
12
13
|
state: {
|
|
@@ -40,6 +40,7 @@ declare const EmbedCard: React.ComponentType<{
|
|
|
40
40
|
isInsideOfBlockNode?: boolean;
|
|
41
41
|
isInsideOfInlineExtension?: boolean;
|
|
42
42
|
layout: import("@atlaskit/adf-schema").RichMediaLayout;
|
|
43
|
+
onSetLinkTarget?: (url: string) => "_blank" | undefined;
|
|
43
44
|
originalHeight?: number;
|
|
44
45
|
originalWidth?: number;
|
|
45
46
|
portal?: HTMLElement;
|
|
@@ -56,6 +57,7 @@ declare const BlockCard: React.ComponentType<{
|
|
|
56
57
|
isNodeNested?: boolean;
|
|
57
58
|
layout?: string;
|
|
58
59
|
localId?: string;
|
|
60
|
+
onSetLinkTarget?: (url: string) => "_blank" | undefined;
|
|
59
61
|
portal?: HTMLElement;
|
|
60
62
|
rendererAppearance?: import("../../ui/Renderer/types").RendererAppearance;
|
|
61
63
|
smartLinks?: import("../../types/smartLinksOptions").SmartLinksOptions;
|
|
@@ -10,6 +10,7 @@ export interface InlineCardProps extends MarkDataAttributes {
|
|
|
10
10
|
eventHandlers?: EventHandlers;
|
|
11
11
|
fireAnalyticsEvent?: (event: AnalyticsEventPayload) => void;
|
|
12
12
|
marks?: Mark[];
|
|
13
|
+
onSetLinkTarget?: (url: string) => '_blank' | undefined;
|
|
13
14
|
portal?: HTMLElement;
|
|
14
15
|
rendererAppearance?: RendererAppearance;
|
|
15
16
|
smartLinks?: SmartLinksOptions;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/renderer",
|
|
3
|
-
"version": "125.
|
|
3
|
+
"version": "125.3.0",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -36,30 +36,30 @@
|
|
|
36
36
|
"@atlaskit/editor-palette": "^2.1.0",
|
|
37
37
|
"@atlaskit/editor-prosemirror": "^7.2.0",
|
|
38
38
|
"@atlaskit/editor-shared-styles": "^3.10.0",
|
|
39
|
-
"@atlaskit/emoji": "^69.
|
|
39
|
+
"@atlaskit/emoji": "^69.10.0",
|
|
40
40
|
"@atlaskit/feature-gate-js-client": "^5.5.0",
|
|
41
|
-
"@atlaskit/icon": "^29.
|
|
41
|
+
"@atlaskit/icon": "^29.4.0",
|
|
42
42
|
"@atlaskit/link": "^3.3.0",
|
|
43
|
-
"@atlaskit/link-datasource": "^4.
|
|
43
|
+
"@atlaskit/link-datasource": "^4.32.0",
|
|
44
44
|
"@atlaskit/link-extractors": "^2.4.0",
|
|
45
45
|
"@atlaskit/linking-common": "^9.9.0",
|
|
46
|
-
"@atlaskit/media-card": "^79.
|
|
46
|
+
"@atlaskit/media-card": "^79.13.0",
|
|
47
47
|
"@atlaskit/media-client": "^35.7.0",
|
|
48
48
|
"@atlaskit/media-client-react": "^4.1.0",
|
|
49
49
|
"@atlaskit/media-common": "^12.3.0",
|
|
50
50
|
"@atlaskit/media-filmstrip": "^51.1.0",
|
|
51
51
|
"@atlaskit/media-ui": "^28.7.0",
|
|
52
|
-
"@atlaskit/media-viewer": "^52.
|
|
52
|
+
"@atlaskit/media-viewer": "^52.6.0",
|
|
53
53
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
54
54
|
"@atlaskit/platform-feature-flags-react": "^0.4.0",
|
|
55
55
|
"@atlaskit/react-ufo": "^4.16.0",
|
|
56
|
-
"@atlaskit/smart-card": "^43.
|
|
56
|
+
"@atlaskit/smart-card": "^43.20.0",
|
|
57
57
|
"@atlaskit/status": "^3.0.0",
|
|
58
58
|
"@atlaskit/task-decision": "^19.2.0",
|
|
59
59
|
"@atlaskit/theme": "^21.0.0",
|
|
60
|
-
"@atlaskit/tmp-editor-statsig": "^16.
|
|
60
|
+
"@atlaskit/tmp-editor-statsig": "^16.12.0",
|
|
61
61
|
"@atlaskit/tokens": "^9.1.0",
|
|
62
|
-
"@atlaskit/tooltip": "^20.
|
|
62
|
+
"@atlaskit/tooltip": "^20.12.0",
|
|
63
63
|
"@atlaskit/visually-hidden": "^3.0.0",
|
|
64
64
|
"@babel/runtime": "^7.0.0",
|
|
65
65
|
"@emotion/react": "^11.7.1",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"uuid": "^3.1.0"
|
|
72
72
|
},
|
|
73
73
|
"peerDependencies": {
|
|
74
|
-
"@atlaskit/editor-common": "^111.
|
|
74
|
+
"@atlaskit/editor-common": "^111.7.0",
|
|
75
75
|
"@atlaskit/link-provider": "^4.1.0",
|
|
76
76
|
"@atlaskit/media-core": "^37.0.0",
|
|
77
77
|
"react": "^18.2.0",
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"@atlaskit/modal-dialog": "^14.9.0",
|
|
92
92
|
"@atlaskit/navigation-next": "patch:@atlaskit/navigation-next@npm%3A9.0.17#~/.yarn/patches/@atlaskit-navigation-next-npm-9.0.17-958ca0ab9d.patch",
|
|
93
93
|
"@atlaskit/profilecard": "^24.27.0",
|
|
94
|
-
"@atlaskit/util-data-test": "^18.
|
|
94
|
+
"@atlaskit/util-data-test": "^18.4.0",
|
|
95
95
|
"@atlassian/feature-flags-test-utils": "^1.0.0",
|
|
96
96
|
"@testing-library/react": "^16.3.0",
|
|
97
97
|
"@testing-library/user-event": "^14.4.3",
|
|
@@ -143,9 +143,6 @@
|
|
|
143
143
|
"editor_inline_comments_on_inline_nodes": {
|
|
144
144
|
"type": "boolean"
|
|
145
145
|
},
|
|
146
|
-
"annotations_align_editor_and_renderer_styles": {
|
|
147
|
-
"type": "boolean"
|
|
148
|
-
},
|
|
149
146
|
"platform-fix-table-ssr-resizing": {
|
|
150
147
|
"type": "boolean"
|
|
151
148
|
},
|