@atlaskit/renderer 153.0.2 → 153.0.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 +22 -0
- package/dist/cjs/react/nodes/media/index.js +54 -24
- package/dist/cjs/ui/MediaCard.js +31 -28
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/es2019/react/nodes/media/index.js +51 -23
- package/dist/es2019/ui/MediaCard.js +31 -28
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/esm/react/nodes/media/index.js +54 -24
- package/dist/esm/ui/MediaCard.js +31 -28
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/dist/types/react/nodes/media/index.d.ts +1 -0
- package/dist/types/ui/MediaCard.d.ts +1 -0
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 153.0.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
|
|
9
|
+
## 153.0.3
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [`800e9d2b92528`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/800e9d2b92528) -
|
|
14
|
+
Add viewport-aware rendered events for MAUI embeds and Remix media behind
|
|
15
|
+
`platform_maui_retention_analytics`, deduplicated per result within each tracker.
|
|
16
|
+
|
|
17
|
+
Native embeds opt in through `uiConfig.deferRenderedEventUntilVisible` and can provide
|
|
18
|
+
`getRenderedResultId` for analytics attribution. Other embeds retain existing timing.
|
|
19
|
+
|
|
20
|
+
Media tracking preserves preview readiness across replacements and observes only eligible Remix
|
|
21
|
+
media. Analytics prefer the matching Remix source regardless of tracking eligibility.
|
|
22
|
+
|
|
23
|
+
- Updated dependencies
|
|
24
|
+
|
|
3
25
|
## 153.0.2
|
|
4
26
|
|
|
5
27
|
### Patch Changes
|
|
@@ -27,8 +27,10 @@ var _ExternalImageBadge = require("@atlaskit/editor-common/media-single/External
|
|
|
27
27
|
var _MediaBadges = require("@atlaskit/editor-common/media-single/MediaBadges");
|
|
28
28
|
var _styled = require("@atlaskit/editor-common/MediaSingle/styled");
|
|
29
29
|
var _withProviders = require("@atlaskit/editor-common/provider-factory/with-providers");
|
|
30
|
+
var _renderedResultTracker = require("@atlaskit/editor-common/rendered-result-tracker");
|
|
30
31
|
var _emitter = require("@atlaskit/editor-common/types/emitter");
|
|
31
32
|
var _border = require("@atlaskit/editor-palette/border");
|
|
33
|
+
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
32
34
|
var _events = require("../../../analytics/events");
|
|
33
35
|
var _AnnotationRangeContext = require("../../../ui/annotations/contexts/AnnotationRangeContext");
|
|
34
36
|
var _useInlineCommentSubscriber = require("../../../ui/annotations/hooks/use-inline-comment-subscriber");
|
|
@@ -249,13 +251,23 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
249
251
|
(0, _classCallCheck2.default)(this, Media);
|
|
250
252
|
_this = _callSuper(this, Media, [_props]);
|
|
251
253
|
(0, _defineProperty2.default)(_this, "mediaInstance", {});
|
|
252
|
-
(0, _defineProperty2.default)(_this, "
|
|
253
|
-
|
|
254
|
+
(0, _defineProperty2.default)(_this, "mediaElement", null);
|
|
255
|
+
(0, _defineProperty2.default)(_this, "setMediaElement", function (element) {
|
|
256
|
+
_this.mediaElement = element;
|
|
257
|
+
_this.updateRenderedTracking();
|
|
258
|
+
});
|
|
259
|
+
(0, _defineProperty2.default)(_this, "updateRenderedTracking", function () {
|
|
260
|
+
var _this$renderedTracker, _this$props$id, _this$renderedTracker2;
|
|
261
|
+
(_this$renderedTracker = _this.renderedTracker) === null || _this$renderedTracker === void 0 || _this$renderedTracker.setResult((_this$props$id = _this.props.id) !== null && _this$props$id !== void 0 ? _this$props$id : '');
|
|
262
|
+
(_this$renderedTracker2 = _this.renderedTracker) === null || _this$renderedTracker2 === void 0 || _this$renderedTracker2.observe(_this.props.deferRenderedEventUntilVisible ? _this.mediaElement : null);
|
|
254
263
|
});
|
|
255
264
|
(0, _defineProperty2.default)(_this, "getDataConsumerSource", function () {
|
|
256
|
-
var _getDataConsumerMark;
|
|
265
|
+
var _getDataConsumerMark, _sources$find;
|
|
257
266
|
var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _this.props;
|
|
258
|
-
|
|
267
|
+
var sources = (_getDataConsumerMark = getDataConsumerMark(props.marks)) === null || _getDataConsumerMark === void 0 ? void 0 : _getDataConsumerMark.attrs.sources;
|
|
268
|
+
return (_sources$find = sources === null || sources === void 0 ? void 0 : sources.find(function (source) {
|
|
269
|
+
return source.startsWith('remix:');
|
|
270
|
+
})) !== null && _sources$find !== void 0 ? _sources$find : sources === null || sources === void 0 ? void 0 : sources[0];
|
|
259
271
|
});
|
|
260
272
|
(0, _defineProperty2.default)(_this, "emitMediaRenderEvent", function (event) {
|
|
261
273
|
var _props$onMediaRenderE;
|
|
@@ -266,8 +278,26 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
266
278
|
mediaInstance: _this.mediaInstance
|
|
267
279
|
}));
|
|
268
280
|
});
|
|
281
|
+
(0, _defineProperty2.default)(_this, "fireRenderedEvent", function () {
|
|
282
|
+
var infographicType = _this.getDataConsumerSource();
|
|
283
|
+
if (infographicType && _this.props.fireAnalyticsEvent) {
|
|
284
|
+
_this.props.fireAnalyticsEvent({
|
|
285
|
+
action: _enums.ACTION.RENDERED,
|
|
286
|
+
actionSubject: _enums.ACTION_SUBJECT.MEDIA,
|
|
287
|
+
actionSubjectId: _this.props.id,
|
|
288
|
+
eventType: _enums.EVENT_TYPE.TRACK,
|
|
289
|
+
attributes: {
|
|
290
|
+
infographicType: infographicType,
|
|
291
|
+
pageMode: 'view',
|
|
292
|
+
mediaId: _this.props.id
|
|
293
|
+
}
|
|
294
|
+
});
|
|
295
|
+
}
|
|
296
|
+
});
|
|
269
297
|
(0, _defineProperty2.default)(_this, "onPreviewRender", function (renderedMediaId) {
|
|
270
|
-
var _this$props$onPreview, _this$props;
|
|
298
|
+
var _this$renderedTracker3, _this$props$onPreview, _this$props;
|
|
299
|
+
_this.updateRenderedTracking();
|
|
300
|
+
(_this$renderedTracker3 = _this.renderedTracker) === null || _this$renderedTracker3 === void 0 || _this$renderedTracker3.ready(renderedMediaId);
|
|
271
301
|
(_this$props$onPreview = (_this$props = _this.props).onPreviewRender) === null || _this$props$onPreview === void 0 || _this$props$onPreview.call(_this$props, renderedMediaId);
|
|
272
302
|
_this.emitMediaRenderEvent({
|
|
273
303
|
renderedMediaId: renderedMediaId,
|
|
@@ -283,7 +313,6 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
283
313
|
});
|
|
284
314
|
});
|
|
285
315
|
(0, _defineProperty2.default)(_this, "renderCard", function () {
|
|
286
|
-
var _dataConsumerMark$att;
|
|
287
316
|
var providers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
288
317
|
var contextIdentifierProvider = providers.contextIdentifierProvider;
|
|
289
318
|
var _this$props3 = _this.props,
|
|
@@ -301,7 +330,6 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
301
330
|
mediaViewerExtensions = _this$props3.mediaViewerExtensions;
|
|
302
331
|
var annotationMarks = _this.props.isAnnotationMark ? _this.props.marks.filter(_this.props.isAnnotationMark) : undefined;
|
|
303
332
|
var borderMark = _this.props.marks.find(_this.props.isBorderMark);
|
|
304
|
-
var dataConsumerMark = _this.getDataConsumerMark();
|
|
305
333
|
var linkMark = _this.props.marks.find(_this.props.isLinkMark);
|
|
306
334
|
var linkHref = linkMark === null || linkMark === void 0 ? void 0 : linkMark.attrs.href;
|
|
307
335
|
var eventHandlers = linkHref ? undefined : _this.props.eventHandlers;
|
|
@@ -323,7 +351,7 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
323
351
|
border: !!borderMark,
|
|
324
352
|
// Only defined for remix-generated media (i.e. media nodes with a dataConsumer mark).
|
|
325
353
|
// Format: "remix:{type}:{subtype}" e.g. "remix:infographic:corporate-doodle"
|
|
326
|
-
remixSource:
|
|
354
|
+
remixSource: _this.getDataConsumerSource()
|
|
327
355
|
})
|
|
328
356
|
}, (0, _react2.jsx)(_MediaBadges.MediaBadges, {
|
|
329
357
|
mediaElement: mediaSingleElement,
|
|
@@ -341,6 +369,7 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
341
369
|
isDrafting: isDrafting
|
|
342
370
|
}));
|
|
343
371
|
}), (0, _react2.jsx)(_MediaCard.MediaCard, (0, _extends2.default)({
|
|
372
|
+
mediaElementRef: _this.props.deferRenderedEventUntilVisible ? _this.setMediaElement : undefined,
|
|
344
373
|
contextIdentifierProvider: contextIdentifierProvider
|
|
345
374
|
// Ignored via go/ees005
|
|
346
375
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
@@ -352,7 +381,7 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
352
381
|
shouldEnableDownloadButton: enableDownloadButton,
|
|
353
382
|
ssr: ssr,
|
|
354
383
|
onError: _this.props.onMediaRenderEvent || _this.props.onError ? _this.onError : undefined,
|
|
355
|
-
onPreviewRender: _this.props.onMediaRenderEvent || _this.props.onPreviewRender ? _this.onPreviewRender : undefined,
|
|
384
|
+
onPreviewRender: _this.props.onMediaRenderEvent || _this.props.onPreviewRender || _this.props.deferRenderedEventUntilVisible ? _this.onPreviewRender : undefined,
|
|
356
385
|
mediaViewerExtensions: mediaViewerExtensions
|
|
357
386
|
}))))));
|
|
358
387
|
});
|
|
@@ -381,6 +410,13 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
381
410
|
handler(event, _linkMark && linkHref);
|
|
382
411
|
}
|
|
383
412
|
});
|
|
413
|
+
if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_maui_retention_analytics')) {
|
|
414
|
+
var _props$id;
|
|
415
|
+
_this.renderedTracker = (0, _renderedResultTracker.createRenderedResultTracker)({
|
|
416
|
+
onRendered: _this.fireRenderedEvent
|
|
417
|
+
});
|
|
418
|
+
_this.renderedTracker.setResult((_props$id = _props.id) !== null && _props$id !== void 0 ? _props$id : '');
|
|
419
|
+
}
|
|
384
420
|
_this.handleMediaLinkClickFn = _this.handleMediaLinkClick.bind(_this);
|
|
385
421
|
return _this;
|
|
386
422
|
}
|
|
@@ -388,29 +424,17 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
388
424
|
return (0, _createClass2.default)(Media, [{
|
|
389
425
|
key: "componentDidMount",
|
|
390
426
|
value: function componentDidMount() {
|
|
391
|
-
var _dataConsumerMark$att2;
|
|
392
427
|
this.emitMediaRenderEvent({
|
|
393
428
|
type: 'mounted'
|
|
394
429
|
});
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
if (infographicType && this.props.fireAnalyticsEvent) {
|
|
398
|
-
this.props.fireAnalyticsEvent({
|
|
399
|
-
action: _enums.ACTION.RENDERED,
|
|
400
|
-
actionSubject: _enums.ACTION_SUBJECT.MEDIA,
|
|
401
|
-
actionSubjectId: this.props.id,
|
|
402
|
-
eventType: _enums.EVENT_TYPE.TRACK,
|
|
403
|
-
attributes: {
|
|
404
|
-
infographicType: infographicType,
|
|
405
|
-
pageMode: 'view',
|
|
406
|
-
mediaId: this.props.id
|
|
407
|
-
}
|
|
408
|
-
});
|
|
430
|
+
if (!this.props.deferRenderedEventUntilVisible) {
|
|
431
|
+
this.fireRenderedEvent();
|
|
409
432
|
}
|
|
410
433
|
}
|
|
411
434
|
}, {
|
|
412
435
|
key: "componentDidUpdate",
|
|
413
436
|
value: function componentDidUpdate(prevProps) {
|
|
437
|
+
this.updateRenderedTracking();
|
|
414
438
|
if (prevProps.id !== this.props.id || this.getDataConsumerSource(prevProps) !== this.getDataConsumerSource() || prevProps.onMediaRenderEvent !== this.props.onMediaRenderEvent) {
|
|
415
439
|
this.emitMediaRenderEvent({
|
|
416
440
|
type: 'unmounted'
|
|
@@ -423,6 +447,8 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
423
447
|
}, {
|
|
424
448
|
key: "componentWillUnmount",
|
|
425
449
|
value: function componentWillUnmount() {
|
|
450
|
+
var _this$renderedTracker4;
|
|
451
|
+
(_this$renderedTracker4 = this.renderedTracker) === null || _this$renderedTracker4 === void 0 || _this$renderedTracker4.destroy();
|
|
426
452
|
this.emitMediaRenderEvent({
|
|
427
453
|
type: 'unmounted'
|
|
428
454
|
});
|
|
@@ -445,6 +471,7 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
445
471
|
}]);
|
|
446
472
|
}(_react.PureComponent);
|
|
447
473
|
var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
|
|
474
|
+
var _getDataConsumerMark2;
|
|
448
475
|
var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
|
|
449
476
|
draftPosition = _useAnnotationRangeSt.hoverDraftDocumentPosition;
|
|
450
477
|
var dataAttributes = props.dataAttributes;
|
|
@@ -486,6 +513,9 @@ var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
|
|
|
486
513
|
// Ignored via go/ees005
|
|
487
514
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
488
515
|
, (0, _extends2.default)({}, props, {
|
|
516
|
+
deferRenderedEventUntilVisible: ((_getDataConsumerMark2 = getDataConsumerMark(props.marks)) === null || _getDataConsumerMark2 === void 0 || (_getDataConsumerMark2 = _getDataConsumerMark2.attrs.sources) === null || _getDataConsumerMark2 === void 0 ? void 0 : _getDataConsumerMark2.some(function (source) {
|
|
517
|
+
return source.startsWith('remix:');
|
|
518
|
+
})) === true && (0, _isExperimentEnabled.isExperimentEnabled)('platform_maui_retention_analytics'),
|
|
489
519
|
dataAttributes: dataAttributesWithDraftAnnotation,
|
|
490
520
|
isDrafting: shouldApplyDraftAnnotation
|
|
491
521
|
}));
|
package/dist/cjs/ui/MediaCard.js
CHANGED
|
@@ -297,35 +297,34 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
|
|
|
297
297
|
// we need this statement for the mandatory mediaClientConfig below
|
|
298
298
|
var mediaClientConfig = mediaClient === null || mediaClient === void 0 ? void 0 : mediaClient.mediaClientConfig;
|
|
299
299
|
var Card = enableSyncMediaCard ? _cardSync.default : _cardLoader.default;
|
|
300
|
-
return (
|
|
301
|
-
|
|
300
|
+
return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
|
|
301
|
+
ref: this.props.mediaElementRef
|
|
302
302
|
// Ignored via go/ees005
|
|
303
303
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
);
|
|
304
|
+
}, dataAttributes, {
|
|
305
|
+
"data-node-type": "media",
|
|
306
|
+
"data-local-id": localId
|
|
307
|
+
}), /*#__PURE__*/_react.default.createElement(Card
|
|
308
|
+
// TODO: MPT-315 - clean up after we move mediaClientConfig into FileIdentifier
|
|
309
|
+
// context is not really used when the type is external and we want to render the component asap
|
|
310
|
+
// Ignored via go/ees005
|
|
311
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
312
|
+
, {
|
|
313
|
+
mediaClientConfig: mediaClientConfig,
|
|
314
|
+
alt: alt,
|
|
315
|
+
identifier: identifier,
|
|
316
|
+
dimensions: cardDimensions,
|
|
317
|
+
appearance: appearance,
|
|
318
|
+
resizeMode: resizeMode,
|
|
319
|
+
disableOverlay: disableOverlay,
|
|
320
|
+
shouldOpenMediaViewer: shouldOpenMediaViewer,
|
|
321
|
+
mediaViewerItems: Array.from(mediaIdentifierMap.values()),
|
|
322
|
+
featureFlags: featureFlags,
|
|
323
|
+
ssr: ssr === null || ssr === void 0 ? void 0 : ssr.mode,
|
|
324
|
+
shouldHideTooltip: false,
|
|
325
|
+
onError: this.onError,
|
|
326
|
+
onPreviewRender: this.props.onPreviewRender
|
|
327
|
+
}));
|
|
329
328
|
}
|
|
330
329
|
}, {
|
|
331
330
|
key: "render",
|
|
@@ -391,7 +390,11 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
|
|
|
391
390
|
var ssrMediaItem = ssr === null || ssr === void 0 || (_ssr$ssrMediaItems = ssr.ssrMediaItems) === null || _ssr$ssrMediaItems === void 0 ? void 0 : _ssr$ssrMediaItems.find(function (item) {
|
|
392
391
|
return item.id === id;
|
|
393
392
|
});
|
|
394
|
-
return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
|
|
393
|
+
return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
|
|
394
|
+
ref: this.props.mediaElementRef
|
|
395
|
+
// Ignored via go/ees005
|
|
396
|
+
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
397
|
+
}, getClipboardAttrs({
|
|
395
398
|
id: id,
|
|
396
399
|
alt: alt,
|
|
397
400
|
collection: collection,
|
|
@@ -80,7 +80,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
80
80
|
var TABLE_INFO_TIMEOUT = 10000;
|
|
81
81
|
var RENDER_EVENT_SAMPLE_RATE = 0.1;
|
|
82
82
|
var packageName = "@atlaskit/renderer";
|
|
83
|
-
var packageVersion = "153.0.
|
|
83
|
+
var packageVersion = "153.0.3";
|
|
84
84
|
var setAsQueryContainerStyles = (0, _react2.css)({
|
|
85
85
|
containerName: 'ak-renderer-wrapper',
|
|
86
86
|
containerType: 'inline-size'
|
|
@@ -19,8 +19,10 @@ import { ExternalImageBadge } from '@atlaskit/editor-common/media-single/Externa
|
|
|
19
19
|
import { MediaBadges } from '@atlaskit/editor-common/media-single/MediaBadges';
|
|
20
20
|
import { MediaBorderGapFiller } from '@atlaskit/editor-common/MediaSingle/styled';
|
|
21
21
|
import { WithProviders } from '@atlaskit/editor-common/provider-factory/with-providers';
|
|
22
|
+
import { createRenderedResultTracker } from '@atlaskit/editor-common/rendered-result-tracker';
|
|
22
23
|
import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types/emitter';
|
|
23
24
|
import { hexToEditorBorderPaletteColor } from '@atlaskit/editor-palette/border';
|
|
25
|
+
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
24
26
|
import { MODE, PLATFORM } from '../../../analytics/events';
|
|
25
27
|
import { useAnnotationRangeState } from '../../../ui/annotations/contexts/AnnotationRangeContext';
|
|
26
28
|
import { useInlineCommentSubscriberContext } from '../../../ui/annotations/hooks/use-inline-comment-subscriber';
|
|
@@ -217,10 +219,20 @@ class Media extends PureComponent {
|
|
|
217
219
|
constructor(_props) {
|
|
218
220
|
super(_props);
|
|
219
221
|
_defineProperty(this, "mediaInstance", {});
|
|
220
|
-
_defineProperty(this, "
|
|
222
|
+
_defineProperty(this, "mediaElement", null);
|
|
223
|
+
_defineProperty(this, "setMediaElement", element => {
|
|
224
|
+
this.mediaElement = element;
|
|
225
|
+
this.updateRenderedTracking();
|
|
226
|
+
});
|
|
227
|
+
_defineProperty(this, "updateRenderedTracking", () => {
|
|
228
|
+
var _this$renderedTracker, _this$props$id, _this$renderedTracker2;
|
|
229
|
+
(_this$renderedTracker = this.renderedTracker) === null || _this$renderedTracker === void 0 ? void 0 : _this$renderedTracker.setResult((_this$props$id = this.props.id) !== null && _this$props$id !== void 0 ? _this$props$id : '');
|
|
230
|
+
(_this$renderedTracker2 = this.renderedTracker) === null || _this$renderedTracker2 === void 0 ? void 0 : _this$renderedTracker2.observe(this.props.deferRenderedEventUntilVisible ? this.mediaElement : null);
|
|
231
|
+
});
|
|
221
232
|
_defineProperty(this, "getDataConsumerSource", (props = this.props) => {
|
|
222
|
-
var _getDataConsumerMark,
|
|
223
|
-
|
|
233
|
+
var _getDataConsumerMark, _sources$find;
|
|
234
|
+
const sources = (_getDataConsumerMark = getDataConsumerMark(props.marks)) === null || _getDataConsumerMark === void 0 ? void 0 : _getDataConsumerMark.attrs.sources;
|
|
235
|
+
return (_sources$find = sources === null || sources === void 0 ? void 0 : sources.find(source => source.startsWith('remix:'))) !== null && _sources$find !== void 0 ? _sources$find : sources === null || sources === void 0 ? void 0 : sources[0];
|
|
224
236
|
});
|
|
225
237
|
_defineProperty(this, "emitMediaRenderEvent", (event, props = this.props) => {
|
|
226
238
|
var _props$onMediaRenderE;
|
|
@@ -231,8 +243,26 @@ class Media extends PureComponent {
|
|
|
231
243
|
mediaInstance: this.mediaInstance
|
|
232
244
|
});
|
|
233
245
|
});
|
|
246
|
+
_defineProperty(this, "fireRenderedEvent", () => {
|
|
247
|
+
const infographicType = this.getDataConsumerSource();
|
|
248
|
+
if (infographicType && this.props.fireAnalyticsEvent) {
|
|
249
|
+
this.props.fireAnalyticsEvent({
|
|
250
|
+
action: ACTION.RENDERED,
|
|
251
|
+
actionSubject: ACTION_SUBJECT.MEDIA,
|
|
252
|
+
actionSubjectId: this.props.id,
|
|
253
|
+
eventType: EVENT_TYPE.TRACK,
|
|
254
|
+
attributes: {
|
|
255
|
+
infographicType,
|
|
256
|
+
pageMode: 'view',
|
|
257
|
+
mediaId: this.props.id
|
|
258
|
+
}
|
|
259
|
+
});
|
|
260
|
+
}
|
|
261
|
+
});
|
|
234
262
|
_defineProperty(this, "onPreviewRender", renderedMediaId => {
|
|
235
|
-
var _this$props$onPreview, _this$props;
|
|
263
|
+
var _this$renderedTracker3, _this$props$onPreview, _this$props;
|
|
264
|
+
this.updateRenderedTracking();
|
|
265
|
+
(_this$renderedTracker3 = this.renderedTracker) === null || _this$renderedTracker3 === void 0 ? void 0 : _this$renderedTracker3.ready(renderedMediaId);
|
|
236
266
|
(_this$props$onPreview = (_this$props = this.props).onPreviewRender) === null || _this$props$onPreview === void 0 ? void 0 : _this$props$onPreview.call(_this$props, renderedMediaId);
|
|
237
267
|
this.emitMediaRenderEvent({
|
|
238
268
|
renderedMediaId,
|
|
@@ -248,7 +278,6 @@ class Media extends PureComponent {
|
|
|
248
278
|
});
|
|
249
279
|
});
|
|
250
280
|
_defineProperty(this, "renderCard", (providers = {}) => {
|
|
251
|
-
var _dataConsumerMark$att;
|
|
252
281
|
const {
|
|
253
282
|
contextIdentifierProvider
|
|
254
283
|
} = providers;
|
|
@@ -267,7 +296,6 @@ class Media extends PureComponent {
|
|
|
267
296
|
} = this.props;
|
|
268
297
|
const annotationMarks = this.props.isAnnotationMark ? this.props.marks.filter(this.props.isAnnotationMark) : undefined;
|
|
269
298
|
const borderMark = this.props.marks.find(this.props.isBorderMark);
|
|
270
|
-
const dataConsumerMark = this.getDataConsumerMark();
|
|
271
299
|
const linkMark = this.props.marks.find(this.props.isLinkMark);
|
|
272
300
|
const linkHref = linkMark === null || linkMark === void 0 ? void 0 : linkMark.attrs.href;
|
|
273
301
|
const eventHandlers = linkHref ? undefined : this.props.eventHandlers;
|
|
@@ -290,7 +318,7 @@ class Media extends PureComponent {
|
|
|
290
318
|
border: !!borderMark,
|
|
291
319
|
// Only defined for remix-generated media (i.e. media nodes with a dataConsumer mark).
|
|
292
320
|
// Format: "remix:{type}:{subtype}" e.g. "remix:infographic:corporate-doodle"
|
|
293
|
-
remixSource:
|
|
321
|
+
remixSource: this.getDataConsumerSource()
|
|
294
322
|
}
|
|
295
323
|
}
|
|
296
324
|
}, jsx(MediaBadges, {
|
|
@@ -308,6 +336,7 @@ class Media extends PureComponent {
|
|
|
308
336
|
mediaSingleElement: mediaSingleElement,
|
|
309
337
|
isDrafting: isDrafting
|
|
310
338
|
}))), jsx(MediaCard, _extends({
|
|
339
|
+
mediaElementRef: this.props.deferRenderedEventUntilVisible ? this.setMediaElement : undefined,
|
|
311
340
|
contextIdentifierProvider: contextIdentifierProvider
|
|
312
341
|
// Ignored via go/ees005
|
|
313
342
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
@@ -319,7 +348,7 @@ class Media extends PureComponent {
|
|
|
319
348
|
shouldEnableDownloadButton: enableDownloadButton,
|
|
320
349
|
ssr: ssr,
|
|
321
350
|
onError: this.props.onMediaRenderEvent || this.props.onError ? this.onError : undefined,
|
|
322
|
-
onPreviewRender: this.props.onMediaRenderEvent || this.props.onPreviewRender ? this.onPreviewRender : undefined,
|
|
351
|
+
onPreviewRender: this.props.onMediaRenderEvent || this.props.onPreviewRender || this.props.deferRenderedEventUntilVisible ? this.onPreviewRender : undefined,
|
|
323
352
|
mediaViewerExtensions: mediaViewerExtensions
|
|
324
353
|
}))))));
|
|
325
354
|
});
|
|
@@ -349,30 +378,25 @@ class Media extends PureComponent {
|
|
|
349
378
|
handler(event, linkMark && linkHref);
|
|
350
379
|
}
|
|
351
380
|
});
|
|
381
|
+
if (isExperimentEnabled('platform_maui_retention_analytics')) {
|
|
382
|
+
var _props$id;
|
|
383
|
+
this.renderedTracker = createRenderedResultTracker({
|
|
384
|
+
onRendered: this.fireRenderedEvent
|
|
385
|
+
});
|
|
386
|
+
this.renderedTracker.setResult((_props$id = _props.id) !== null && _props$id !== void 0 ? _props$id : '');
|
|
387
|
+
}
|
|
352
388
|
this.handleMediaLinkClickFn = this.handleMediaLinkClick.bind(this);
|
|
353
389
|
}
|
|
354
390
|
componentDidMount() {
|
|
355
|
-
var _dataConsumerMark$att2;
|
|
356
391
|
this.emitMediaRenderEvent({
|
|
357
392
|
type: 'mounted'
|
|
358
393
|
});
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
if (infographicType && this.props.fireAnalyticsEvent) {
|
|
362
|
-
this.props.fireAnalyticsEvent({
|
|
363
|
-
action: ACTION.RENDERED,
|
|
364
|
-
actionSubject: ACTION_SUBJECT.MEDIA,
|
|
365
|
-
actionSubjectId: this.props.id,
|
|
366
|
-
eventType: EVENT_TYPE.TRACK,
|
|
367
|
-
attributes: {
|
|
368
|
-
infographicType,
|
|
369
|
-
pageMode: 'view',
|
|
370
|
-
mediaId: this.props.id
|
|
371
|
-
}
|
|
372
|
-
});
|
|
394
|
+
if (!this.props.deferRenderedEventUntilVisible) {
|
|
395
|
+
this.fireRenderedEvent();
|
|
373
396
|
}
|
|
374
397
|
}
|
|
375
398
|
componentDidUpdate(prevProps) {
|
|
399
|
+
this.updateRenderedTracking();
|
|
376
400
|
if (prevProps.id !== this.props.id || this.getDataConsumerSource(prevProps) !== this.getDataConsumerSource() || prevProps.onMediaRenderEvent !== this.props.onMediaRenderEvent) {
|
|
377
401
|
this.emitMediaRenderEvent({
|
|
378
402
|
type: 'unmounted'
|
|
@@ -383,6 +407,8 @@ class Media extends PureComponent {
|
|
|
383
407
|
}
|
|
384
408
|
}
|
|
385
409
|
componentWillUnmount() {
|
|
410
|
+
var _this$renderedTracker4;
|
|
411
|
+
(_this$renderedTracker4 = this.renderedTracker) === null || _this$renderedTracker4 === void 0 ? void 0 : _this$renderedTracker4.destroy();
|
|
386
412
|
this.emitMediaRenderEvent({
|
|
387
413
|
type: 'unmounted'
|
|
388
414
|
});
|
|
@@ -404,6 +430,7 @@ class Media extends PureComponent {
|
|
|
404
430
|
}
|
|
405
431
|
}
|
|
406
432
|
const MediaWithDraftAnnotation = props => {
|
|
433
|
+
var _getDataConsumerMark2, _getDataConsumerMark3;
|
|
407
434
|
const {
|
|
408
435
|
hoverDraftDocumentPosition: draftPosition
|
|
409
436
|
} = useAnnotationRangeState();
|
|
@@ -441,6 +468,7 @@ const MediaWithDraftAnnotation = props => {
|
|
|
441
468
|
// Ignored via go/ees005
|
|
442
469
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
443
470
|
, _extends({}, props, {
|
|
471
|
+
deferRenderedEventUntilVisible: ((_getDataConsumerMark2 = getDataConsumerMark(props.marks)) === null || _getDataConsumerMark2 === void 0 ? void 0 : (_getDataConsumerMark3 = _getDataConsumerMark2.attrs.sources) === null || _getDataConsumerMark3 === void 0 ? void 0 : _getDataConsumerMark3.some(source => source.startsWith('remix:'))) === true && isExperimentEnabled('platform_maui_retention_analytics'),
|
|
444
472
|
dataAttributes: dataAttributesWithDraftAnnotation,
|
|
445
473
|
isDrafting: shouldApplyDraftAnnotation
|
|
446
474
|
}));
|
|
@@ -222,35 +222,34 @@ export class MediaCardView extends Component {
|
|
|
222
222
|
// we need this statement for the mandatory mediaClientConfig below
|
|
223
223
|
const mediaClientConfig = mediaClient === null || mediaClient === void 0 ? void 0 : mediaClient.mediaClientConfig;
|
|
224
224
|
const Card = enableSyncMediaCard ? CardSync : CardAsync;
|
|
225
|
-
return (
|
|
226
|
-
|
|
225
|
+
return /*#__PURE__*/React.createElement("div", _extends({
|
|
226
|
+
ref: this.props.mediaElementRef
|
|
227
227
|
// Ignored via go/ees005
|
|
228
228
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
);
|
|
229
|
+
}, dataAttributes, {
|
|
230
|
+
"data-node-type": "media",
|
|
231
|
+
"data-local-id": localId
|
|
232
|
+
}), /*#__PURE__*/React.createElement(Card
|
|
233
|
+
// TODO: MPT-315 - clean up after we move mediaClientConfig into FileIdentifier
|
|
234
|
+
// context is not really used when the type is external and we want to render the component asap
|
|
235
|
+
// Ignored via go/ees005
|
|
236
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
237
|
+
, {
|
|
238
|
+
mediaClientConfig: mediaClientConfig,
|
|
239
|
+
alt: alt,
|
|
240
|
+
identifier: identifier,
|
|
241
|
+
dimensions: cardDimensions,
|
|
242
|
+
appearance: appearance,
|
|
243
|
+
resizeMode: resizeMode,
|
|
244
|
+
disableOverlay: disableOverlay,
|
|
245
|
+
shouldOpenMediaViewer: shouldOpenMediaViewer,
|
|
246
|
+
mediaViewerItems: Array.from(mediaIdentifierMap.values()),
|
|
247
|
+
featureFlags: featureFlags,
|
|
248
|
+
ssr: ssr === null || ssr === void 0 ? void 0 : ssr.mode,
|
|
249
|
+
shouldHideTooltip: false,
|
|
250
|
+
onError: this.onError,
|
|
251
|
+
onPreviewRender: this.props.onPreviewRender
|
|
252
|
+
}));
|
|
254
253
|
}
|
|
255
254
|
render() {
|
|
256
255
|
var _ssr$ssrMediaItems;
|
|
@@ -314,7 +313,11 @@ export class MediaCardView extends Component {
|
|
|
314
313
|
const currentUrl = window.location.href;
|
|
315
314
|
const shouldDisableLazyLoading = currentUrl.includes('/wiki/pdf/spaces/');
|
|
316
315
|
const ssrMediaItem = ssr === null || ssr === void 0 ? void 0 : (_ssr$ssrMediaItems = ssr.ssrMediaItems) === null || _ssr$ssrMediaItems === void 0 ? void 0 : _ssr$ssrMediaItems.find(item => item.id === id);
|
|
317
|
-
return /*#__PURE__*/React.createElement("div", _extends({
|
|
316
|
+
return /*#__PURE__*/React.createElement("div", _extends({
|
|
317
|
+
ref: this.props.mediaElementRef
|
|
318
|
+
// Ignored via go/ees005
|
|
319
|
+
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
320
|
+
}, getClipboardAttrs({
|
|
318
321
|
id,
|
|
319
322
|
alt,
|
|
320
323
|
collection,
|
|
@@ -65,7 +65,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
65
65
|
const TABLE_INFO_TIMEOUT = 10000;
|
|
66
66
|
const RENDER_EVENT_SAMPLE_RATE = 0.1;
|
|
67
67
|
const packageName = "@atlaskit/renderer";
|
|
68
|
-
const packageVersion = "153.0.
|
|
68
|
+
const packageVersion = "153.0.3";
|
|
69
69
|
const setAsQueryContainerStyles = css({
|
|
70
70
|
containerName: 'ak-renderer-wrapper',
|
|
71
71
|
containerType: 'inline-size'
|
|
@@ -31,8 +31,10 @@ import { ExternalImageBadge } from '@atlaskit/editor-common/media-single/Externa
|
|
|
31
31
|
import { MediaBadges } from '@atlaskit/editor-common/media-single/MediaBadges';
|
|
32
32
|
import { MediaBorderGapFiller } from '@atlaskit/editor-common/MediaSingle/styled';
|
|
33
33
|
import { WithProviders } from '@atlaskit/editor-common/provider-factory/with-providers';
|
|
34
|
+
import { createRenderedResultTracker } from '@atlaskit/editor-common/rendered-result-tracker';
|
|
34
35
|
import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types/emitter';
|
|
35
36
|
import { hexToEditorBorderPaletteColor } from '@atlaskit/editor-palette/border';
|
|
37
|
+
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
36
38
|
import { MODE, PLATFORM } from '../../../analytics/events';
|
|
37
39
|
import { useAnnotationRangeState } from '../../../ui/annotations/contexts/AnnotationRangeContext';
|
|
38
40
|
import { useInlineCommentSubscriberContext } from '../../../ui/annotations/hooks/use-inline-comment-subscriber';
|
|
@@ -242,13 +244,23 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
242
244
|
_classCallCheck(this, Media);
|
|
243
245
|
_this = _callSuper(this, Media, [_props]);
|
|
244
246
|
_defineProperty(_this, "mediaInstance", {});
|
|
245
|
-
_defineProperty(_this, "
|
|
246
|
-
|
|
247
|
+
_defineProperty(_this, "mediaElement", null);
|
|
248
|
+
_defineProperty(_this, "setMediaElement", function (element) {
|
|
249
|
+
_this.mediaElement = element;
|
|
250
|
+
_this.updateRenderedTracking();
|
|
251
|
+
});
|
|
252
|
+
_defineProperty(_this, "updateRenderedTracking", function () {
|
|
253
|
+
var _this$renderedTracker, _this$props$id, _this$renderedTracker2;
|
|
254
|
+
(_this$renderedTracker = _this.renderedTracker) === null || _this$renderedTracker === void 0 || _this$renderedTracker.setResult((_this$props$id = _this.props.id) !== null && _this$props$id !== void 0 ? _this$props$id : '');
|
|
255
|
+
(_this$renderedTracker2 = _this.renderedTracker) === null || _this$renderedTracker2 === void 0 || _this$renderedTracker2.observe(_this.props.deferRenderedEventUntilVisible ? _this.mediaElement : null);
|
|
247
256
|
});
|
|
248
257
|
_defineProperty(_this, "getDataConsumerSource", function () {
|
|
249
|
-
var _getDataConsumerMark;
|
|
258
|
+
var _getDataConsumerMark, _sources$find;
|
|
250
259
|
var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _this.props;
|
|
251
|
-
|
|
260
|
+
var sources = (_getDataConsumerMark = getDataConsumerMark(props.marks)) === null || _getDataConsumerMark === void 0 ? void 0 : _getDataConsumerMark.attrs.sources;
|
|
261
|
+
return (_sources$find = sources === null || sources === void 0 ? void 0 : sources.find(function (source) {
|
|
262
|
+
return source.startsWith('remix:');
|
|
263
|
+
})) !== null && _sources$find !== void 0 ? _sources$find : sources === null || sources === void 0 ? void 0 : sources[0];
|
|
252
264
|
});
|
|
253
265
|
_defineProperty(_this, "emitMediaRenderEvent", function (event) {
|
|
254
266
|
var _props$onMediaRenderE;
|
|
@@ -259,8 +271,26 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
259
271
|
mediaInstance: _this.mediaInstance
|
|
260
272
|
}));
|
|
261
273
|
});
|
|
274
|
+
_defineProperty(_this, "fireRenderedEvent", function () {
|
|
275
|
+
var infographicType = _this.getDataConsumerSource();
|
|
276
|
+
if (infographicType && _this.props.fireAnalyticsEvent) {
|
|
277
|
+
_this.props.fireAnalyticsEvent({
|
|
278
|
+
action: ACTION.RENDERED,
|
|
279
|
+
actionSubject: ACTION_SUBJECT.MEDIA,
|
|
280
|
+
actionSubjectId: _this.props.id,
|
|
281
|
+
eventType: EVENT_TYPE.TRACK,
|
|
282
|
+
attributes: {
|
|
283
|
+
infographicType: infographicType,
|
|
284
|
+
pageMode: 'view',
|
|
285
|
+
mediaId: _this.props.id
|
|
286
|
+
}
|
|
287
|
+
});
|
|
288
|
+
}
|
|
289
|
+
});
|
|
262
290
|
_defineProperty(_this, "onPreviewRender", function (renderedMediaId) {
|
|
263
|
-
var _this$props$onPreview, _this$props;
|
|
291
|
+
var _this$renderedTracker3, _this$props$onPreview, _this$props;
|
|
292
|
+
_this.updateRenderedTracking();
|
|
293
|
+
(_this$renderedTracker3 = _this.renderedTracker) === null || _this$renderedTracker3 === void 0 || _this$renderedTracker3.ready(renderedMediaId);
|
|
264
294
|
(_this$props$onPreview = (_this$props = _this.props).onPreviewRender) === null || _this$props$onPreview === void 0 || _this$props$onPreview.call(_this$props, renderedMediaId);
|
|
265
295
|
_this.emitMediaRenderEvent({
|
|
266
296
|
renderedMediaId: renderedMediaId,
|
|
@@ -276,7 +306,6 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
276
306
|
});
|
|
277
307
|
});
|
|
278
308
|
_defineProperty(_this, "renderCard", function () {
|
|
279
|
-
var _dataConsumerMark$att;
|
|
280
309
|
var providers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
281
310
|
var contextIdentifierProvider = providers.contextIdentifierProvider;
|
|
282
311
|
var _this$props3 = _this.props,
|
|
@@ -294,7 +323,6 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
294
323
|
mediaViewerExtensions = _this$props3.mediaViewerExtensions;
|
|
295
324
|
var annotationMarks = _this.props.isAnnotationMark ? _this.props.marks.filter(_this.props.isAnnotationMark) : undefined;
|
|
296
325
|
var borderMark = _this.props.marks.find(_this.props.isBorderMark);
|
|
297
|
-
var dataConsumerMark = _this.getDataConsumerMark();
|
|
298
326
|
var linkMark = _this.props.marks.find(_this.props.isLinkMark);
|
|
299
327
|
var linkHref = linkMark === null || linkMark === void 0 ? void 0 : linkMark.attrs.href;
|
|
300
328
|
var eventHandlers = linkHref ? undefined : _this.props.eventHandlers;
|
|
@@ -316,7 +344,7 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
316
344
|
border: !!borderMark,
|
|
317
345
|
// Only defined for remix-generated media (i.e. media nodes with a dataConsumer mark).
|
|
318
346
|
// Format: "remix:{type}:{subtype}" e.g. "remix:infographic:corporate-doodle"
|
|
319
|
-
remixSource:
|
|
347
|
+
remixSource: _this.getDataConsumerSource()
|
|
320
348
|
})
|
|
321
349
|
}, jsx(MediaBadges, {
|
|
322
350
|
mediaElement: mediaSingleElement,
|
|
@@ -334,6 +362,7 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
334
362
|
isDrafting: isDrafting
|
|
335
363
|
}));
|
|
336
364
|
}), jsx(MediaCard, _extends({
|
|
365
|
+
mediaElementRef: _this.props.deferRenderedEventUntilVisible ? _this.setMediaElement : undefined,
|
|
337
366
|
contextIdentifierProvider: contextIdentifierProvider
|
|
338
367
|
// Ignored via go/ees005
|
|
339
368
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
@@ -345,7 +374,7 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
345
374
|
shouldEnableDownloadButton: enableDownloadButton,
|
|
346
375
|
ssr: ssr,
|
|
347
376
|
onError: _this.props.onMediaRenderEvent || _this.props.onError ? _this.onError : undefined,
|
|
348
|
-
onPreviewRender: _this.props.onMediaRenderEvent || _this.props.onPreviewRender ? _this.onPreviewRender : undefined,
|
|
377
|
+
onPreviewRender: _this.props.onMediaRenderEvent || _this.props.onPreviewRender || _this.props.deferRenderedEventUntilVisible ? _this.onPreviewRender : undefined,
|
|
349
378
|
mediaViewerExtensions: mediaViewerExtensions
|
|
350
379
|
}))))));
|
|
351
380
|
});
|
|
@@ -374,6 +403,13 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
374
403
|
handler(event, _linkMark && linkHref);
|
|
375
404
|
}
|
|
376
405
|
});
|
|
406
|
+
if (isExperimentEnabled('platform_maui_retention_analytics')) {
|
|
407
|
+
var _props$id;
|
|
408
|
+
_this.renderedTracker = createRenderedResultTracker({
|
|
409
|
+
onRendered: _this.fireRenderedEvent
|
|
410
|
+
});
|
|
411
|
+
_this.renderedTracker.setResult((_props$id = _props.id) !== null && _props$id !== void 0 ? _props$id : '');
|
|
412
|
+
}
|
|
377
413
|
_this.handleMediaLinkClickFn = _this.handleMediaLinkClick.bind(_this);
|
|
378
414
|
return _this;
|
|
379
415
|
}
|
|
@@ -381,29 +417,17 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
381
417
|
return _createClass(Media, [{
|
|
382
418
|
key: "componentDidMount",
|
|
383
419
|
value: function componentDidMount() {
|
|
384
|
-
var _dataConsumerMark$att2;
|
|
385
420
|
this.emitMediaRenderEvent({
|
|
386
421
|
type: 'mounted'
|
|
387
422
|
});
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
if (infographicType && this.props.fireAnalyticsEvent) {
|
|
391
|
-
this.props.fireAnalyticsEvent({
|
|
392
|
-
action: ACTION.RENDERED,
|
|
393
|
-
actionSubject: ACTION_SUBJECT.MEDIA,
|
|
394
|
-
actionSubjectId: this.props.id,
|
|
395
|
-
eventType: EVENT_TYPE.TRACK,
|
|
396
|
-
attributes: {
|
|
397
|
-
infographicType: infographicType,
|
|
398
|
-
pageMode: 'view',
|
|
399
|
-
mediaId: this.props.id
|
|
400
|
-
}
|
|
401
|
-
});
|
|
423
|
+
if (!this.props.deferRenderedEventUntilVisible) {
|
|
424
|
+
this.fireRenderedEvent();
|
|
402
425
|
}
|
|
403
426
|
}
|
|
404
427
|
}, {
|
|
405
428
|
key: "componentDidUpdate",
|
|
406
429
|
value: function componentDidUpdate(prevProps) {
|
|
430
|
+
this.updateRenderedTracking();
|
|
407
431
|
if (prevProps.id !== this.props.id || this.getDataConsumerSource(prevProps) !== this.getDataConsumerSource() || prevProps.onMediaRenderEvent !== this.props.onMediaRenderEvent) {
|
|
408
432
|
this.emitMediaRenderEvent({
|
|
409
433
|
type: 'unmounted'
|
|
@@ -416,6 +440,8 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
416
440
|
}, {
|
|
417
441
|
key: "componentWillUnmount",
|
|
418
442
|
value: function componentWillUnmount() {
|
|
443
|
+
var _this$renderedTracker4;
|
|
444
|
+
(_this$renderedTracker4 = this.renderedTracker) === null || _this$renderedTracker4 === void 0 || _this$renderedTracker4.destroy();
|
|
419
445
|
this.emitMediaRenderEvent({
|
|
420
446
|
type: 'unmounted'
|
|
421
447
|
});
|
|
@@ -438,6 +464,7 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
438
464
|
}]);
|
|
439
465
|
}(PureComponent);
|
|
440
466
|
var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
|
|
467
|
+
var _getDataConsumerMark2;
|
|
441
468
|
var _useAnnotationRangeSt = useAnnotationRangeState(),
|
|
442
469
|
draftPosition = _useAnnotationRangeSt.hoverDraftDocumentPosition;
|
|
443
470
|
var dataAttributes = props.dataAttributes;
|
|
@@ -479,6 +506,9 @@ var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
|
|
|
479
506
|
// Ignored via go/ees005
|
|
480
507
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
481
508
|
, _extends({}, props, {
|
|
509
|
+
deferRenderedEventUntilVisible: ((_getDataConsumerMark2 = getDataConsumerMark(props.marks)) === null || _getDataConsumerMark2 === void 0 || (_getDataConsumerMark2 = _getDataConsumerMark2.attrs.sources) === null || _getDataConsumerMark2 === void 0 ? void 0 : _getDataConsumerMark2.some(function (source) {
|
|
510
|
+
return source.startsWith('remix:');
|
|
511
|
+
})) === true && isExperimentEnabled('platform_maui_retention_analytics'),
|
|
482
512
|
dataAttributes: dataAttributesWithDraftAnnotation,
|
|
483
513
|
isDrafting: shouldApplyDraftAnnotation
|
|
484
514
|
}));
|
package/dist/esm/ui/MediaCard.js
CHANGED
|
@@ -288,35 +288,34 @@ export var MediaCardView = /*#__PURE__*/function (_Component) {
|
|
|
288
288
|
// we need this statement for the mandatory mediaClientConfig below
|
|
289
289
|
var mediaClientConfig = mediaClient === null || mediaClient === void 0 ? void 0 : mediaClient.mediaClientConfig;
|
|
290
290
|
var Card = enableSyncMediaCard ? CardSync : CardAsync;
|
|
291
|
-
return (
|
|
292
|
-
|
|
291
|
+
return /*#__PURE__*/React.createElement("div", _extends({
|
|
292
|
+
ref: this.props.mediaElementRef
|
|
293
293
|
// Ignored via go/ees005
|
|
294
294
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
);
|
|
295
|
+
}, dataAttributes, {
|
|
296
|
+
"data-node-type": "media",
|
|
297
|
+
"data-local-id": localId
|
|
298
|
+
}), /*#__PURE__*/React.createElement(Card
|
|
299
|
+
// TODO: MPT-315 - clean up after we move mediaClientConfig into FileIdentifier
|
|
300
|
+
// context is not really used when the type is external and we want to render the component asap
|
|
301
|
+
// Ignored via go/ees005
|
|
302
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
303
|
+
, {
|
|
304
|
+
mediaClientConfig: mediaClientConfig,
|
|
305
|
+
alt: alt,
|
|
306
|
+
identifier: identifier,
|
|
307
|
+
dimensions: cardDimensions,
|
|
308
|
+
appearance: appearance,
|
|
309
|
+
resizeMode: resizeMode,
|
|
310
|
+
disableOverlay: disableOverlay,
|
|
311
|
+
shouldOpenMediaViewer: shouldOpenMediaViewer,
|
|
312
|
+
mediaViewerItems: Array.from(mediaIdentifierMap.values()),
|
|
313
|
+
featureFlags: featureFlags,
|
|
314
|
+
ssr: ssr === null || ssr === void 0 ? void 0 : ssr.mode,
|
|
315
|
+
shouldHideTooltip: false,
|
|
316
|
+
onError: this.onError,
|
|
317
|
+
onPreviewRender: this.props.onPreviewRender
|
|
318
|
+
}));
|
|
320
319
|
}
|
|
321
320
|
}, {
|
|
322
321
|
key: "render",
|
|
@@ -382,7 +381,11 @@ export var MediaCardView = /*#__PURE__*/function (_Component) {
|
|
|
382
381
|
var ssrMediaItem = ssr === null || ssr === void 0 || (_ssr$ssrMediaItems = ssr.ssrMediaItems) === null || _ssr$ssrMediaItems === void 0 ? void 0 : _ssr$ssrMediaItems.find(function (item) {
|
|
383
382
|
return item.id === id;
|
|
384
383
|
});
|
|
385
|
-
return /*#__PURE__*/React.createElement("div", _extends({
|
|
384
|
+
return /*#__PURE__*/React.createElement("div", _extends({
|
|
385
|
+
ref: this.props.mediaElementRef
|
|
386
|
+
// Ignored via go/ees005
|
|
387
|
+
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
388
|
+
}, getClipboardAttrs({
|
|
386
389
|
id: id,
|
|
387
390
|
alt: alt,
|
|
388
391
|
collection: collection,
|
|
@@ -70,7 +70,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
70
70
|
var TABLE_INFO_TIMEOUT = 10000;
|
|
71
71
|
var RENDER_EVENT_SAMPLE_RATE = 0.1;
|
|
72
72
|
var packageName = "@atlaskit/renderer";
|
|
73
|
-
var packageVersion = "153.0.
|
|
73
|
+
var packageVersion = "153.0.3";
|
|
74
74
|
var setAsQueryContainerStyles = css({
|
|
75
75
|
containerName: 'ak-renderer-wrapper',
|
|
76
76
|
containerType: 'inline-size'
|
|
@@ -20,6 +20,7 @@ export type MediaProps = MediaCardProps & {
|
|
|
20
20
|
allowAltTextOnImages?: boolean;
|
|
21
21
|
allowAnnotationsDraftMode?: boolean;
|
|
22
22
|
children?: React.ReactNode;
|
|
23
|
+
deferRenderedEventUntilVisible?: boolean;
|
|
23
24
|
enableDownloadButton?: boolean;
|
|
24
25
|
eventHandlers?: EventHandlers;
|
|
25
26
|
featureFlags?: MediaFeatureFlags;
|
|
@@ -43,6 +43,7 @@ export interface MediaCardProps {
|
|
|
43
43
|
id?: string;
|
|
44
44
|
imageStatus?: ImageStatus;
|
|
45
45
|
localId?: string;
|
|
46
|
+
mediaElementRef?: React.Ref<HTMLDivElement>;
|
|
46
47
|
/** Extensions for the media viewer (e.g. comment button in header). */
|
|
47
48
|
mediaViewerExtensions?: MediaViewerExtensions;
|
|
48
49
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/renderer",
|
|
3
|
-
"version": "153.0.
|
|
3
|
+
"version": "153.0.4",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"@atlaskit/status": "^5.14.0",
|
|
74
74
|
"@atlaskit/task-decision": "^21.13.0",
|
|
75
75
|
"@atlaskit/theme": "^28.2.0",
|
|
76
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
76
|
+
"@atlaskit/tmp-editor-statsig": "^248.0.0",
|
|
77
77
|
"@atlaskit/tokens": "^20.8.0",
|
|
78
78
|
"@atlaskit/tooltip": "^24.4.0",
|
|
79
79
|
"@atlaskit/visually-hidden": "^4.4.0",
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"uuid": "^11.1.1"
|
|
89
89
|
},
|
|
90
90
|
"peerDependencies": {
|
|
91
|
-
"@atlaskit/editor-common": "^134.
|
|
91
|
+
"@atlaskit/editor-common": "^134.1.0",
|
|
92
92
|
"@atlaskit/link-provider": "^6.0.0",
|
|
93
93
|
"@atlaskit/media-core": "^39.0.0",
|
|
94
94
|
"react": "^18.2.0 || ^19.2.0",
|
|
@@ -100,7 +100,7 @@
|
|
|
100
100
|
"@af/visual-regression": "workspace:^",
|
|
101
101
|
"@atlaskit/analytics-gas-types": "^6.2.0",
|
|
102
102
|
"@atlaskit/checkbox": "^19.3.0",
|
|
103
|
-
"@atlaskit/editor-plugin-media": "^32.
|
|
103
|
+
"@atlaskit/editor-plugin-media": "^32.1.0",
|
|
104
104
|
"@atlaskit/editor-test-helpers": "workspace:^",
|
|
105
105
|
"@atlaskit/inline-edit": "^16.4.0",
|
|
106
106
|
"@atlaskit/json-ld-types": "^2.1.0",
|