@atlaskit/media-viewer 46.3.0 → 47.0.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 +37 -0
- package/dist/cjs/analytics/index.js +20 -15
- package/dist/cjs/analytics/ufoExperiences.js +11 -9
- package/dist/cjs/content.js +3 -3
- package/dist/cjs/download.js +2 -2
- package/dist/cjs/errorMessage.js +6 -4
- package/dist/cjs/header.js +6 -6
- package/dist/cjs/item-viewer.js +33 -4
- package/dist/cjs/list.js +2 -2
- package/dist/cjs/media-viewer.js +4 -11
- package/dist/cjs/navigation.js +3 -3
- package/dist/cjs/styleWrappers.js +458 -0
- package/dist/cjs/styles.js +125 -0
- package/dist/cjs/version.json +1 -1
- package/dist/cjs/viewers/archiveSidebar/archive-sidebar-folder-entry.js +10 -7
- package/dist/cjs/viewers/archiveSidebar/archive-sidebar-header.js +5 -3
- package/dist/cjs/viewers/archiveSidebar/archive-sidebar-renderer.js +3 -3
- package/dist/cjs/viewers/archiveSidebar/archive-sidebar.js +5 -5
- package/dist/cjs/viewers/archiveSidebar/archive.js +16 -14
- package/dist/cjs/viewers/archiveSidebar/styleWrappers.js +123 -0
- package/dist/cjs/viewers/archiveSidebar/styles.js +58 -0
- package/dist/cjs/viewers/audio.js +10 -8
- package/dist/cjs/viewers/codeViewer/codeViewerRenderer.js +33 -12
- package/dist/cjs/viewers/codeViewer/index.js +2 -2
- package/dist/cjs/viewers/codeViewer/styles.js +21 -0
- package/dist/cjs/viewers/doc/index.js +2 -2
- package/dist/cjs/viewers/doc/pdfRenderer.js +8 -8
- package/dist/cjs/viewers/image/interactive-img.js +11 -9
- package/dist/cjs/viewers/video.js +3 -3
- package/dist/cjs/zoomControls.js +4 -4
- package/dist/es2019/analytics/index.js +14 -2
- package/dist/es2019/analytics/ufoExperiences.js +6 -4
- package/dist/es2019/content.js +1 -1
- package/dist/es2019/download.js +1 -1
- package/dist/es2019/errorMessage.js +3 -2
- package/dist/es2019/header.js +1 -1
- package/dist/es2019/item-viewer.js +34 -4
- package/dist/es2019/list.js +1 -1
- package/dist/es2019/media-viewer.js +4 -11
- package/dist/es2019/navigation.js +1 -1
- package/dist/es2019/styleWrappers.js +298 -0
- package/dist/es2019/{styled.js → styles.js} +56 -65
- package/dist/es2019/version.json +1 -1
- package/dist/es2019/viewers/archiveSidebar/archive-sidebar-folder-entry.js +4 -2
- package/dist/es2019/viewers/archiveSidebar/archive-sidebar-header.js +2 -1
- package/dist/es2019/viewers/archiveSidebar/archive-sidebar-renderer.js +2 -2
- package/dist/es2019/viewers/archiveSidebar/archive-sidebar.js +1 -1
- package/dist/es2019/viewers/archiveSidebar/archive.js +3 -2
- package/dist/es2019/viewers/archiveSidebar/styleWrappers.js +90 -0
- package/dist/es2019/viewers/archiveSidebar/{styled.js → styles.js} +13 -13
- package/dist/es2019/viewers/audio.js +3 -2
- package/dist/es2019/viewers/codeViewer/codeViewerRenderer.js +26 -8
- package/dist/es2019/viewers/codeViewer/{styled.js → styles.js} +3 -3
- package/dist/es2019/viewers/doc/pdfRenderer.js +13 -11
- package/dist/es2019/viewers/image/interactive-img.js +6 -4
- package/dist/es2019/viewers/video.js +1 -1
- package/dist/es2019/zoomControls.js +1 -1
- package/dist/esm/analytics/index.js +14 -2
- package/dist/esm/analytics/ufoExperiences.js +7 -5
- package/dist/esm/components/media-viewer-loader.js +1 -1
- package/dist/esm/content.js +1 -1
- package/dist/esm/download.js +1 -1
- package/dist/esm/errorMessage.js +4 -2
- package/dist/esm/header.js +1 -1
- package/dist/esm/item-viewer.js +34 -4
- package/dist/esm/list.js +1 -1
- package/dist/esm/media-viewer.js +4 -11
- package/dist/esm/navigation.js +1 -1
- package/dist/esm/styleWrappers.js +338 -0
- package/dist/esm/styles.js +64 -0
- package/dist/esm/utils/getObjectUrlFromFileState.js +1 -1
- package/dist/esm/utils/index.js +1 -1
- package/dist/esm/version.json +1 -1
- package/dist/esm/viewers/archiveSidebar/archive-sidebar-folder-entry.js +5 -3
- package/dist/esm/viewers/archiveSidebar/archive-sidebar-header.js +2 -1
- package/dist/esm/viewers/archiveSidebar/archive-sidebar-renderer.js +3 -3
- package/dist/esm/viewers/archiveSidebar/archive-sidebar.js +3 -2
- package/dist/esm/viewers/archiveSidebar/archive.js +4 -3
- package/dist/esm/viewers/archiveSidebar/archiveViewerLoader.js +1 -1
- package/dist/esm/viewers/archiveSidebar/styleWrappers.js +79 -0
- package/dist/esm/viewers/archiveSidebar/styles.js +32 -0
- package/dist/esm/viewers/audio.js +4 -3
- package/dist/esm/viewers/codeViewer/codeViewerRenderer.js +27 -11
- package/dist/esm/viewers/codeViewer/index.js +1 -1
- package/dist/esm/viewers/codeViewer/styles.js +10 -0
- package/dist/esm/viewers/doc/index.js +1 -1
- package/dist/esm/viewers/doc/pdfRenderer.js +10 -9
- package/dist/esm/viewers/image/index.js +1 -1
- package/dist/esm/viewers/image/interactive-img.js +6 -4
- package/dist/esm/viewers/video.js +2 -2
- package/dist/esm/zoomControls.js +1 -1
- package/dist/types/analytics/index.d.ts +13 -1
- package/dist/types/analytics/ufoExperiences.d.ts +7 -1
- package/dist/types/components/types.d.ts +4 -0
- package/dist/types/errorMessage.d.ts +2 -0
- package/dist/types/item-viewer.d.ts +2 -0
- package/dist/types/styleWrappers.d.ts +114 -0
- package/dist/types/styles.d.ts +57 -0
- package/dist/types/viewers/archiveSidebar/styleWrappers.d.ts +24 -0
- package/dist/types/viewers/archiveSidebar/styles.d.ts +23 -0
- package/dist/types/viewers/codeViewer/codeViewerRenderer.d.ts +10 -3
- package/dist/types/viewers/codeViewer/styles.d.ts +2 -0
- package/example-helpers/MainWrapper.tsx +41 -0
- package/example-helpers/{styled.ts → styles.ts} +6 -6
- package/package.json +7 -7
- package/report.api.md +80 -0
- package/dist/cjs/styled.js +0 -209
- package/dist/cjs/viewers/archiveSidebar/styled.js +0 -88
- package/dist/cjs/viewers/codeViewer/styled.js +0 -24
- package/dist/esm/styled.js +0 -76
- package/dist/esm/viewers/archiveSidebar/styled.js +0 -32
- package/dist/esm/viewers/codeViewer/styled.js +0 -10
- package/dist/types/styled.d.ts +0 -61
- package/dist/types/viewers/archiveSidebar/styled.d.ts +0 -24
- package/dist/types/viewers/codeViewer/styled.d.ts +0 -3
|
@@ -38,7 +38,7 @@ var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
|
|
|
38
38
|
|
|
39
39
|
var _colors = require("@atlaskit/theme/colors");
|
|
40
40
|
|
|
41
|
-
var
|
|
41
|
+
var _styleWrappers = require("../../styleWrappers");
|
|
42
42
|
|
|
43
43
|
var _zoomLevel = require("../../domain/zoomLevel");
|
|
44
44
|
|
|
@@ -279,11 +279,11 @@ var InteractiveImgComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
279
279
|
var hdPrimaryColor = isHDActivating ? _colors.B75 : isHDActive ? _colors.B200 : _colors.DN400;
|
|
280
280
|
var hdSecondaryColor = isHDActive && !isHDActivating ? _colors.N0 : _colors.DN60;
|
|
281
281
|
var testId = isHDActivating ? 'hd-activating' : isHDActive ? 'hd-active' : 'hd-inactive';
|
|
282
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
282
|
+
return /*#__PURE__*/_react.default.createElement(_styleWrappers.HDIconGroupWrapper, {
|
|
283
283
|
className: _mediaUi.hideControlsClassName
|
|
284
284
|
}, isHDActivating ? /*#__PURE__*/_react.default.createElement(_spinner.default, {
|
|
285
285
|
appearance: "invert"
|
|
286
|
-
}) : undefined, /*#__PURE__*/_react.default.createElement(
|
|
286
|
+
}) : undefined, /*#__PURE__*/_react.default.createElement(_styleWrappers.HDIconWrapper, null, /*#__PURE__*/_react.default.createElement(_vidHdCircle.default, {
|
|
287
287
|
primaryColor: hdPrimaryColor,
|
|
288
288
|
secondaryColor: hdSecondaryColor,
|
|
289
289
|
label: "hd",
|
|
@@ -324,12 +324,13 @@ var InteractiveImgComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
324
324
|
}
|
|
325
325
|
|
|
326
326
|
var srcToDisplay = isHDAvailable && isHDActive && originalBinaryImageSrc ? originalBinaryImageSrc : src;
|
|
327
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
327
|
+
return /*#__PURE__*/_react.default.createElement(_styleWrappers.ImageWrapper, {
|
|
328
328
|
"data-testid": "media-viewer-image-content",
|
|
329
329
|
onClick: this.onImageClicked,
|
|
330
|
-
|
|
331
|
-
style: wrapperStyleOverride
|
|
332
|
-
|
|
330
|
+
ref: this.saveWrapperRef,
|
|
331
|
+
style: wrapperStyleOverride,
|
|
332
|
+
className: "media-viewer-image-content"
|
|
333
|
+
}, /*#__PURE__*/_react.default.createElement(_styleWrappers.Img, {
|
|
333
334
|
"data-testid": "media-viewer-image",
|
|
334
335
|
canDrag: canDrag,
|
|
335
336
|
isDragging: isDragging,
|
|
@@ -338,8 +339,9 @@ var InteractiveImgComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
338
339
|
onLoad: this.onImgLoad,
|
|
339
340
|
onError: onError,
|
|
340
341
|
onMouseDown: this.startDragging,
|
|
341
|
-
shouldPixelate: zoomLevel.value > 1
|
|
342
|
-
|
|
342
|
+
shouldPixelate: zoomLevel.value > 1,
|
|
343
|
+
className: "media-viewer-image"
|
|
344
|
+
}), /*#__PURE__*/_react.default.createElement(_styleWrappers.BaselineExtend, null), /*#__PURE__*/_react.default.createElement(_zoomControls.ZoomControls, {
|
|
343
345
|
zoomLevel: zoomLevel,
|
|
344
346
|
onChange: this.onZoomChange
|
|
345
347
|
}), this.renderHDIndicator());
|
|
@@ -35,7 +35,7 @@ var _domain = require("../domain");
|
|
|
35
35
|
|
|
36
36
|
var _errors = require("../errors");
|
|
37
37
|
|
|
38
|
-
var
|
|
38
|
+
var _styleWrappers = require("../styleWrappers");
|
|
39
39
|
|
|
40
40
|
var _isIE = require("../utils/isIE");
|
|
41
41
|
|
|
@@ -116,7 +116,7 @@ var VideoViewer = /*#__PURE__*/function (_BaseViewer) {
|
|
|
116
116
|
previewCount = _this$props2.previewCount;
|
|
117
117
|
var useCustomVideoPlayer = !(0, _isIE.isIE)();
|
|
118
118
|
var isAutoPlay = previewCount === 0;
|
|
119
|
-
return useCustomVideoPlayer ? /*#__PURE__*/_react.default.createElement(
|
|
119
|
+
return useCustomVideoPlayer ? /*#__PURE__*/_react.default.createElement(_styleWrappers.CustomVideoPlayerWrapper, {
|
|
120
120
|
"data-testid": "media-viewer-video-content"
|
|
121
121
|
}, /*#__PURE__*/_react.default.createElement(_mediaUi.CustomMediaPlayer, {
|
|
122
122
|
type: "video",
|
|
@@ -133,7 +133,7 @@ var VideoViewer = /*#__PURE__*/function (_BaseViewer) {
|
|
|
133
133
|
lastWatchTimeConfig: {
|
|
134
134
|
contentId: item.id
|
|
135
135
|
}
|
|
136
|
-
})) : /*#__PURE__*/_react.default.createElement(
|
|
136
|
+
})) : /*#__PURE__*/_react.default.createElement(_styleWrappers.Video, {
|
|
137
137
|
autoPlay: isAutoPlay,
|
|
138
138
|
controls: true,
|
|
139
139
|
src: content
|
package/dist/cjs/zoomControls.js
CHANGED
|
@@ -31,7 +31,7 @@ var _zoomOut = _interopRequireDefault(require("@atlaskit/icon/glyph/media-servic
|
|
|
31
31
|
|
|
32
32
|
var _zoomIn = _interopRequireDefault(require("@atlaskit/icon/glyph/media-services/zoom-in"));
|
|
33
33
|
|
|
34
|
-
var
|
|
34
|
+
var _styleWrappers = require("./styleWrappers");
|
|
35
35
|
|
|
36
36
|
var _analyticsNext = require("@atlaskit/analytics-next");
|
|
37
37
|
|
|
@@ -97,9 +97,9 @@ var ZoomControlsBase = /*#__PURE__*/function (_Component) {
|
|
|
97
97
|
var _this$props3 = this.props,
|
|
98
98
|
zoomLevel = _this$props3.zoomLevel,
|
|
99
99
|
formatMessage = _this$props3.intl.formatMessage;
|
|
100
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
100
|
+
return /*#__PURE__*/_react.default.createElement(_styleWrappers.ZoomWrapper, {
|
|
101
101
|
className: _mediaUi.hideControlsClassName
|
|
102
|
-
}, /*#__PURE__*/_react.default.createElement(
|
|
102
|
+
}, /*#__PURE__*/_react.default.createElement(_styleWrappers.ZoomControlsWrapper, null, /*#__PURE__*/_react.default.createElement(_mediaUi.MediaButton, {
|
|
103
103
|
isDisabled: !zoomLevel.canZoomOut,
|
|
104
104
|
onClick: this.zoomOut,
|
|
105
105
|
iconBefore: /*#__PURE__*/_react.default.createElement(_zoomOut.default, {
|
|
@@ -111,7 +111,7 @@ var ZoomControlsBase = /*#__PURE__*/function (_Component) {
|
|
|
111
111
|
iconBefore: /*#__PURE__*/_react.default.createElement(_zoomIn.default, {
|
|
112
112
|
label: formatMessage(_mediaUi.messages.zoom_in)
|
|
113
113
|
})
|
|
114
|
-
})), /*#__PURE__*/_react.default.createElement(
|
|
114
|
+
})), /*#__PURE__*/_react.default.createElement(_styleWrappers.ZoomLevelIndicator, null, zoomLevel.asPercentage));
|
|
115
115
|
}
|
|
116
116
|
}]);
|
|
117
117
|
return ZoomControlsBase;
|
|
@@ -1,7 +1,19 @@
|
|
|
1
|
-
import { ANALYTICS_MEDIA_CHANNEL } from '@atlaskit/media-common';
|
|
2
|
-
import { name as packageName, version as packageVersion } from '../version.json';
|
|
1
|
+
import { filterFeatureFlagNames, filterFeatureFlagKeysAllProducts, ANALYTICS_MEDIA_CHANNEL } from '@atlaskit/media-common';
|
|
3
2
|
const componentName = 'mediaViewer';
|
|
3
|
+
const packageName = "@atlaskit/media-viewer";
|
|
4
|
+
const packageVersion = "47.0.0";
|
|
4
5
|
export { packageName, packageVersion, componentName, componentName as component };
|
|
6
|
+
export const relevantFlags = {
|
|
7
|
+
newCardExperience: false,
|
|
8
|
+
captions: false,
|
|
9
|
+
timestampOnVideo: false,
|
|
10
|
+
observedWidth: false,
|
|
11
|
+
mediaInline: false,
|
|
12
|
+
folderUploads: false,
|
|
13
|
+
mediaUploadApiV2: true
|
|
14
|
+
};
|
|
15
|
+
export const LOGGED_FEATURE_FLAGS = filterFeatureFlagNames(relevantFlags);
|
|
16
|
+
export const LOGGED_FEATURE_FLAG_KEYS = filterFeatureFlagKeysAllProducts(relevantFlags);
|
|
5
17
|
export function getFileAttributes(fileState) {
|
|
6
18
|
if (!fileState) {
|
|
7
19
|
return {
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { UFOExperience, ExperiencePerformanceTypes, ExperienceTypes } from '@atlaskit/ufo';
|
|
2
2
|
import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
|
|
3
|
-
import {
|
|
3
|
+
import { LOGGED_FEATURE_FLAG_KEYS } from '.';
|
|
4
|
+
const packageName = "@atlaskit/media-viewer";
|
|
5
|
+
const packageVersion = "47.0.0";
|
|
4
6
|
let ufoExperience;
|
|
5
7
|
|
|
6
8
|
const getExperience = () => {
|
|
@@ -10,7 +12,8 @@ const getExperience = () => {
|
|
|
10
12
|
component: 'media-viewer'
|
|
11
13
|
},
|
|
12
14
|
type: ExperienceTypes.Experience,
|
|
13
|
-
performanceType: ExperiencePerformanceTypes.InlineResult
|
|
15
|
+
performanceType: ExperiencePerformanceTypes.InlineResult,
|
|
16
|
+
featureFlags: LOGGED_FEATURE_FLAG_KEYS
|
|
14
17
|
};
|
|
15
18
|
ufoExperience = new UFOExperience('media-file', inlineExperience);
|
|
16
19
|
}
|
|
@@ -23,8 +26,7 @@ export const startMediaFileUfoExperience = () => {
|
|
|
23
26
|
};
|
|
24
27
|
export const succeedMediaFileUfoExperience = properties => {
|
|
25
28
|
getExperience().success({
|
|
26
|
-
metadata: {
|
|
27
|
-
fileAttributes: properties,
|
|
29
|
+
metadata: { ...properties,
|
|
28
30
|
packageName,
|
|
29
31
|
packageVersion,
|
|
30
32
|
mediaEnvironment: getMediaEnvironment(),
|
package/dist/es2019/content.js
CHANGED
|
@@ -2,7 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import { Component } from 'react';
|
|
3
3
|
import CrossIcon from '@atlaskit/icon/glyph/cross';
|
|
4
4
|
import { MediaButton, hideControlsClassName, InactivityDetector } from '@atlaskit/media-ui';
|
|
5
|
-
import { CloseButtonWrapper, ContentWrapper } from './
|
|
5
|
+
import { CloseButtonWrapper, ContentWrapper } from './styleWrappers';
|
|
6
6
|
export class Content extends Component {
|
|
7
7
|
/*
|
|
8
8
|
* Here we get called by InactivityDetector and given a function we
|
package/dist/es2019/download.js
CHANGED
|
@@ -7,7 +7,7 @@ import { FormattedMessage } from 'react-intl-next';
|
|
|
7
7
|
import { ANALYTICS_MEDIA_CHANNEL } from '@atlaskit/media-common';
|
|
8
8
|
import { createDownloadButtonClickedEvent } from './analytics/events/ui/downloadButtonClicked';
|
|
9
9
|
import { createFailedPreviewDownloadButtonClickedEvent } from './analytics/events/ui/failedPreviewDownloadButtonClicked';
|
|
10
|
-
import { DownloadButtonWrapper } from './
|
|
10
|
+
import { DownloadButtonWrapper } from './styleWrappers';
|
|
11
11
|
const downloadIcon = /*#__PURE__*/React.createElement(DownloadIcon, {
|
|
12
12
|
label: "Download"
|
|
13
13
|
});
|
|
@@ -2,7 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import { FormattedMessage, injectIntl } from 'react-intl-next';
|
|
3
3
|
import { messages as i18nMessages } from '@atlaskit/media-ui';
|
|
4
4
|
import { withAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
5
|
-
import { ErrorMessageWrapper, ErrorImage } from './
|
|
5
|
+
import { ErrorMessageWrapper, ErrorImage } from './styleWrappers';
|
|
6
6
|
import { errorLoadingFile } from './error-images';
|
|
7
7
|
import { fireAnalytics } from './analytics';
|
|
8
8
|
import { getPrimaryErrorReason, getSecondaryErrorReason } from './errors';
|
|
@@ -55,7 +55,8 @@ export class ErrorMessage extends React.Component {
|
|
|
55
55
|
if (supressAnalytics !== true) {
|
|
56
56
|
const payload = ErrorMessage.getEventPayload(error, fileId, fileState);
|
|
57
57
|
fireAnalytics(payload, props);
|
|
58
|
-
const rawPayload = { ...(payload === null || payload === void 0 ? void 0 : payload.attributes)
|
|
58
|
+
const rawPayload = { ...(payload === null || payload === void 0 ? void 0 : payload.attributes),
|
|
59
|
+
fileStateFlags: props.fileStateFlags
|
|
59
60
|
};
|
|
60
61
|
|
|
61
62
|
if (Object.keys(rawPayload).includes('status')) {
|
package/dist/es2019/header.js
CHANGED
|
@@ -6,7 +6,7 @@ import { hideControlsClassName, messages, toHumanReadableMediaSize, MediaButton
|
|
|
6
6
|
import { getLanguageType, getExtension, isCodeViewerItem } from '@atlaskit/media-ui/codeViewer';
|
|
7
7
|
import { FormattedMessage, injectIntl } from 'react-intl-next';
|
|
8
8
|
import { Outcome } from './domain';
|
|
9
|
-
import { Header as HeaderWrapper, LeftHeader, RightHeader, MetadataWrapper, MetadataSubText, MedatadataTextWrapper, MetadataIconWrapper, MetadataFileName, FormattedMessageWrapper } from './
|
|
9
|
+
import { Header as HeaderWrapper, LeftHeader, RightHeader, MetadataWrapper, MetadataSubText, MedatadataTextWrapper, MetadataIconWrapper, MetadataFileName, FormattedMessageWrapper } from './styleWrappers';
|
|
10
10
|
import { ToolbarDownloadButton, DisabledToolbarDownloadButton } from './download';
|
|
11
11
|
import { MimeTypeIcon } from '@atlaskit/media-ui/mime-type-icon';
|
|
12
12
|
import { getFormat } from './viewers/codeViewer/util';
|
|
@@ -50,6 +50,11 @@ export class ItemViewerBase extends React.Component {
|
|
|
50
50
|
|
|
51
51
|
_defineProperty(this, "state", initialState);
|
|
52
52
|
|
|
53
|
+
_defineProperty(this, "fileStateFlags", {
|
|
54
|
+
wasStatusUploading: false,
|
|
55
|
+
wasStatusProcessing: false
|
|
56
|
+
});
|
|
57
|
+
|
|
53
58
|
_defineProperty(this, "onSuccess", () => {
|
|
54
59
|
const {
|
|
55
60
|
item
|
|
@@ -58,7 +63,10 @@ export class ItemViewerBase extends React.Component {
|
|
|
58
63
|
if (isFileStateItem(fileItem)) {
|
|
59
64
|
const fileAttributes = getFileAttributes(fileItem);
|
|
60
65
|
fireAnalytics(createLoadSucceededEvent(fileAttributes), this.props);
|
|
61
|
-
succeedMediaFileUfoExperience(
|
|
66
|
+
succeedMediaFileUfoExperience({
|
|
67
|
+
fileAttributes,
|
|
68
|
+
fileStateFlags: this.fileStateFlags
|
|
69
|
+
});
|
|
62
70
|
}
|
|
63
71
|
});
|
|
64
72
|
});
|
|
@@ -74,7 +82,10 @@ export class ItemViewerBase extends React.Component {
|
|
|
74
82
|
fileId: 'external-image'
|
|
75
83
|
}), this.props);
|
|
76
84
|
succeedMediaFileUfoExperience({
|
|
77
|
-
|
|
85
|
+
fileAttributes: {
|
|
86
|
+
fileId: 'external-image'
|
|
87
|
+
},
|
|
88
|
+
fileStateFlags: this.fileStateFlags
|
|
78
89
|
});
|
|
79
90
|
});
|
|
80
91
|
|
|
@@ -191,12 +202,14 @@ export class ItemViewerBase extends React.Component {
|
|
|
191
202
|
return /*#__PURE__*/React.createElement(ErrorMessage, {
|
|
192
203
|
fileId: isFileIdentifier(identifier) ? identifier.id : 'undefined',
|
|
193
204
|
error: error,
|
|
194
|
-
fileState: fileState
|
|
205
|
+
fileState: fileState,
|
|
206
|
+
fileStateFlags: this.fileStateFlags
|
|
195
207
|
}, /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement(FormattedMessage, messages.try_downloading_file)), this.renderDownloadButton(fileState, error));
|
|
196
208
|
} else {
|
|
197
209
|
return /*#__PURE__*/React.createElement(ErrorMessage, {
|
|
198
210
|
fileId: isFileIdentifier(identifier) ? identifier.id : 'undefined',
|
|
199
|
-
error: error
|
|
211
|
+
error: error,
|
|
212
|
+
fileStateFlags: this.fileStateFlags
|
|
200
213
|
});
|
|
201
214
|
}
|
|
202
215
|
}
|
|
@@ -257,6 +270,22 @@ export class ItemViewerBase extends React.Component {
|
|
|
257
270
|
});
|
|
258
271
|
}
|
|
259
272
|
|
|
273
|
+
updateFileStateFlag(fileState) {
|
|
274
|
+
if (!fileState) {
|
|
275
|
+
return;
|
|
276
|
+
}
|
|
277
|
+
|
|
278
|
+
const {
|
|
279
|
+
status
|
|
280
|
+
} = fileState;
|
|
281
|
+
|
|
282
|
+
if (status === 'processing') {
|
|
283
|
+
this.fileStateFlags.wasStatusProcessing = true;
|
|
284
|
+
} else if (status === 'uploading') {
|
|
285
|
+
this.fileStateFlags.wasStatusUploading = true;
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
|
|
260
289
|
init(props) {
|
|
261
290
|
const {
|
|
262
291
|
mediaClient,
|
|
@@ -282,6 +311,7 @@ export class ItemViewerBase extends React.Component {
|
|
|
282
311
|
collectionName: identifier.collectionName
|
|
283
312
|
}).subscribe({
|
|
284
313
|
next: file => {
|
|
314
|
+
this.updateFileStateFlag(file);
|
|
285
315
|
this.setState({
|
|
286
316
|
item: Outcome.successful(file)
|
|
287
317
|
});
|
package/dist/es2019/list.js
CHANGED
|
@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import { hideControlsClassName } from '@atlaskit/media-ui';
|
|
4
4
|
import { ItemViewer } from './item-viewer';
|
|
5
|
-
import { HeaderWrapper, ListWrapper } from './
|
|
5
|
+
import { HeaderWrapper, ListWrapper } from './styleWrappers';
|
|
6
6
|
import { Navigation } from './navigation';
|
|
7
7
|
import Header from './header';
|
|
8
8
|
export class List extends React.Component {
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
import React from 'react';
|
|
3
|
-
import { withMediaAnalyticsContext
|
|
3
|
+
import { withMediaAnalyticsContext } from '@atlaskit/media-common';
|
|
4
4
|
import { IntlProvider, injectIntl } from 'react-intl-next';
|
|
5
5
|
import { Shortcut } from '@atlaskit/media-ui';
|
|
6
6
|
import { withAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
7
|
-
import { packageName, packageVersion, component, componentName, fireAnalytics } from './analytics';
|
|
7
|
+
import { packageName, packageVersion, component, componentName, fireAnalytics, LOGGED_FEATURE_FLAGS } from './analytics';
|
|
8
8
|
import { createModalEvent } from './analytics/events/screen/modal';
|
|
9
9
|
import { createClosedEvent } from './analytics/events/ui/closed';
|
|
10
10
|
import { List } from './list';
|
|
11
11
|
import { Collection } from './collection';
|
|
12
12
|
import { Content } from './content';
|
|
13
|
-
import { Blanket, SidebarWrapper } from './
|
|
13
|
+
import { Blanket, SidebarWrapper } from './styleWrappers';
|
|
14
14
|
import { start } from 'perf-marks';
|
|
15
15
|
import { mediaViewerPopupClass } from './classnames';
|
|
16
16
|
export class MediaViewerComponent extends React.Component {
|
|
@@ -172,14 +172,7 @@ export const MediaViewer = withMediaAnalyticsContext({
|
|
|
172
172
|
component,
|
|
173
173
|
componentName
|
|
174
174
|
}, {
|
|
175
|
-
filterFeatureFlags:
|
|
176
|
-
newCardExperience: false,
|
|
177
|
-
captions: false,
|
|
178
|
-
timestampOnVideo: false,
|
|
179
|
-
observedWidth: false,
|
|
180
|
-
mediaInline: false,
|
|
181
|
-
folderUploads: false
|
|
182
|
-
})
|
|
175
|
+
filterFeatureFlags: LOGGED_FEATURE_FLAGS
|
|
183
176
|
})(withAnalyticsEvents()(injectIntl(MediaViewerComponent, {
|
|
184
177
|
enforceContext: false
|
|
185
178
|
})));
|
|
@@ -7,7 +7,7 @@ import { hideControlsClassName } from '@atlaskit/media-ui';
|
|
|
7
7
|
import Button from '@atlaskit/button/standard-button';
|
|
8
8
|
import { Shortcut } from '@atlaskit/media-ui';
|
|
9
9
|
import { withAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
10
|
-
import { ArrowsWrapper, RightWrapper, LeftWrapper, Arrow } from './
|
|
10
|
+
import { ArrowsWrapper, RightWrapper, LeftWrapper, Arrow } from './styleWrappers';
|
|
11
11
|
import { getSelectedIndex } from './utils';
|
|
12
12
|
import { createNavigatedEvent } from './analytics/events/ui/navigated';
|
|
13
13
|
import { fireAnalytics } from './analytics';
|
|
@@ -0,0 +1,298 @@
|
|
|
1
|
+
/** @jsx jsx */
|
|
2
|
+
import { jsx } from '@emotion/react';
|
|
3
|
+
import { forwardRef, useMemo } from 'react';
|
|
4
|
+
import { arrowStyles, arrowsWrapperStyles, audioCoverStyles, audioPlayerStyles, audioStyles, baselineExtendStyles, blanketStyles, closeButtonWrapperStyles, contentWrapperStyles, customAudioPlayerWrapperStyles, customVideoPlayerWrapperStyles, downloadButtonWrapperStyles, errorImageStyles, errorMessageWrapperStyles, formattedMessageWrapperStyles, hdIconGroupWrapperStyles, hdIconWrapperStyles, headerStyles, headerWrapperStyles, imageWrapperStyles, imgStyles, leftHeaderStyles, leftWrapperStyles, listWrapperStyles, medatadataTextWrapperStyles, metadataFileNameStyles, metadataIconWrapperStyles, metadataSubTextStyles, metadataWrapperStyles, pdfWrapperStyles, rightHeaderStyles, rightWrapperStyles, sidebarWrapperStyles, spinnerWrapperStyles, videoStyles, zoomControlsWrapperStyles, zoomLevelIndicatorStyles, zoomWrapperStyles } from './styles';
|
|
5
|
+
export const Blanket = ({
|
|
6
|
+
'data-testid': datatestId,
|
|
7
|
+
className,
|
|
8
|
+
children
|
|
9
|
+
}) => jsx("div", {
|
|
10
|
+
css: blanketStyles,
|
|
11
|
+
"data-testid": datatestId,
|
|
12
|
+
className: className
|
|
13
|
+
}, children);
|
|
14
|
+
export const HeaderWrapper = ({
|
|
15
|
+
className,
|
|
16
|
+
children
|
|
17
|
+
}) => jsx("div", {
|
|
18
|
+
css: headerWrapperStyles,
|
|
19
|
+
className: className
|
|
20
|
+
}, children);
|
|
21
|
+
HeaderWrapper.displayName = 'HeaderWrapper';
|
|
22
|
+
export const ListWrapper = ({
|
|
23
|
+
children
|
|
24
|
+
}) => jsx("div", {
|
|
25
|
+
css: listWrapperStyles
|
|
26
|
+
}, children);
|
|
27
|
+
ListWrapper.displayName = 'ListWrapper';
|
|
28
|
+
export const ArrowsWrapper = ({
|
|
29
|
+
children
|
|
30
|
+
}) => jsx("div", {
|
|
31
|
+
css: arrowsWrapperStyles
|
|
32
|
+
}, children);
|
|
33
|
+
export const CloseButtonWrapper = ({
|
|
34
|
+
className,
|
|
35
|
+
children
|
|
36
|
+
}) => jsx("div", {
|
|
37
|
+
css: closeButtonWrapperStyles,
|
|
38
|
+
className: className
|
|
39
|
+
}, children);
|
|
40
|
+
export const ContentWrapper = ({
|
|
41
|
+
isSidebarVisible,
|
|
42
|
+
children
|
|
43
|
+
}) => jsx("div", {
|
|
44
|
+
css: contentWrapperStyles({
|
|
45
|
+
isSidebarVisible
|
|
46
|
+
})
|
|
47
|
+
}, children);
|
|
48
|
+
export const ZoomWrapper = ({
|
|
49
|
+
className,
|
|
50
|
+
children
|
|
51
|
+
}) => jsx("div", {
|
|
52
|
+
css: zoomWrapperStyles,
|
|
53
|
+
className: className
|
|
54
|
+
}, children);
|
|
55
|
+
export const ZoomControlsWrapper = ({
|
|
56
|
+
children
|
|
57
|
+
}) => jsx("div", {
|
|
58
|
+
css: zoomControlsWrapperStyles
|
|
59
|
+
}, children);
|
|
60
|
+
export const ZoomLevelIndicator = ({
|
|
61
|
+
children
|
|
62
|
+
}) => jsx("span", {
|
|
63
|
+
css: zoomLevelIndicatorStyles
|
|
64
|
+
}, children);
|
|
65
|
+
export const HDIconGroupWrapper = ({
|
|
66
|
+
className,
|
|
67
|
+
children
|
|
68
|
+
}) => jsx("div", {
|
|
69
|
+
css: hdIconGroupWrapperStyles,
|
|
70
|
+
className: className
|
|
71
|
+
}, children);
|
|
72
|
+
export const HDIconWrapper = ({
|
|
73
|
+
children
|
|
74
|
+
}) => jsx("div", {
|
|
75
|
+
css: hdIconWrapperStyles
|
|
76
|
+
}, children);
|
|
77
|
+
export const ErrorMessageWrapper = ({
|
|
78
|
+
'data-testid': datatestId,
|
|
79
|
+
children
|
|
80
|
+
}) => jsx("div", {
|
|
81
|
+
css: errorMessageWrapperStyles,
|
|
82
|
+
"data-testid": datatestId
|
|
83
|
+
}, children);
|
|
84
|
+
export const ErrorImage = ({
|
|
85
|
+
src,
|
|
86
|
+
alt
|
|
87
|
+
}) => jsx("img", {
|
|
88
|
+
css: errorImageStyles,
|
|
89
|
+
alt: alt,
|
|
90
|
+
src: src
|
|
91
|
+
});
|
|
92
|
+
export const Video = ({
|
|
93
|
+
autoPlay,
|
|
94
|
+
controls,
|
|
95
|
+
src
|
|
96
|
+
}) => // eslint-disable-next-line jsx-a11y/media-has-caption
|
|
97
|
+
jsx("video", {
|
|
98
|
+
css: videoStyles,
|
|
99
|
+
autoPlay: autoPlay,
|
|
100
|
+
controls: controls,
|
|
101
|
+
src: src
|
|
102
|
+
});
|
|
103
|
+
export const PDFWrapper = /*#__PURE__*/forwardRef(({
|
|
104
|
+
'data-testid': datatestId,
|
|
105
|
+
children
|
|
106
|
+
}, ref) => jsx("div", {
|
|
107
|
+
css: pdfWrapperStyles,
|
|
108
|
+
ref: ref,
|
|
109
|
+
"data-testid": datatestId
|
|
110
|
+
}, children));
|
|
111
|
+
export const Arrow = ({
|
|
112
|
+
className,
|
|
113
|
+
children
|
|
114
|
+
}) => jsx("span", {
|
|
115
|
+
css: arrowStyles,
|
|
116
|
+
className: className
|
|
117
|
+
}, children);
|
|
118
|
+
export const LeftWrapper = ({
|
|
119
|
+
children
|
|
120
|
+
}) => jsx("div", {
|
|
121
|
+
css: leftWrapperStyles
|
|
122
|
+
}, children);
|
|
123
|
+
export const RightWrapper = ({
|
|
124
|
+
children
|
|
125
|
+
}) => jsx("div", {
|
|
126
|
+
css: rightWrapperStyles
|
|
127
|
+
}, children); // header.tsx
|
|
128
|
+
|
|
129
|
+
export const Header = ({
|
|
130
|
+
children,
|
|
131
|
+
isArchiveSideBarVisible,
|
|
132
|
+
className
|
|
133
|
+
}) => jsx("div", {
|
|
134
|
+
css: headerStyles({
|
|
135
|
+
isArchiveSideBarVisible
|
|
136
|
+
}),
|
|
137
|
+
className: className
|
|
138
|
+
}, children);
|
|
139
|
+
export const LeftHeader = ({
|
|
140
|
+
children
|
|
141
|
+
}) => jsx("div", {
|
|
142
|
+
css: leftHeaderStyles
|
|
143
|
+
}, children);
|
|
144
|
+
export const ImageWrapper = /*#__PURE__*/forwardRef(({
|
|
145
|
+
children,
|
|
146
|
+
'data-testid': datatestId,
|
|
147
|
+
onClick,
|
|
148
|
+
style,
|
|
149
|
+
className
|
|
150
|
+
}, ref) => jsx("div", {
|
|
151
|
+
"data-testid": datatestId,
|
|
152
|
+
onClick: onClick,
|
|
153
|
+
ref: ref,
|
|
154
|
+
css: imageWrapperStyles,
|
|
155
|
+
style: style,
|
|
156
|
+
className: className
|
|
157
|
+
}, children));
|
|
158
|
+
export const BaselineExtend = () => jsx("div", {
|
|
159
|
+
css: baselineExtendStyles
|
|
160
|
+
});
|
|
161
|
+
export const Img = ({
|
|
162
|
+
canDrag,
|
|
163
|
+
isDragging,
|
|
164
|
+
shouldPixelate,
|
|
165
|
+
'data-testid': datatestId,
|
|
166
|
+
src,
|
|
167
|
+
style,
|
|
168
|
+
onLoad,
|
|
169
|
+
onError,
|
|
170
|
+
onMouseDown,
|
|
171
|
+
className
|
|
172
|
+
}) => {
|
|
173
|
+
const cursor = useMemo(() => {
|
|
174
|
+
if (canDrag && isDragging) {
|
|
175
|
+
return 'grabbing';
|
|
176
|
+
} else if (canDrag) {
|
|
177
|
+
return 'grab';
|
|
178
|
+
} else {
|
|
179
|
+
return 'auto';
|
|
180
|
+
}
|
|
181
|
+
}, [canDrag, isDragging]);
|
|
182
|
+
return jsx("img", {
|
|
183
|
+
className: className,
|
|
184
|
+
css: imgStyles({
|
|
185
|
+
cursor,
|
|
186
|
+
shouldPixelate
|
|
187
|
+
}),
|
|
188
|
+
"data-testid": datatestId,
|
|
189
|
+
src: src,
|
|
190
|
+
style: style,
|
|
191
|
+
onLoad: onLoad,
|
|
192
|
+
onError: onError,
|
|
193
|
+
onMouseDown: onMouseDown
|
|
194
|
+
});
|
|
195
|
+
};
|
|
196
|
+
export const MedatadataTextWrapper = ({
|
|
197
|
+
children
|
|
198
|
+
}) => jsx("div", {
|
|
199
|
+
css: medatadataTextWrapperStyles
|
|
200
|
+
}, children);
|
|
201
|
+
export const MetadataWrapper = ({
|
|
202
|
+
children
|
|
203
|
+
}) => jsx("div", {
|
|
204
|
+
css: metadataWrapperStyles
|
|
205
|
+
}, children);
|
|
206
|
+
export const MetadataFileName = ({
|
|
207
|
+
'data-testid': datatestId,
|
|
208
|
+
children
|
|
209
|
+
}) => jsx("div", {
|
|
210
|
+
css: metadataFileNameStyles,
|
|
211
|
+
"data-testid": datatestId
|
|
212
|
+
}, children);
|
|
213
|
+
export const MetadataSubText = ({
|
|
214
|
+
'data-testid': datatestId,
|
|
215
|
+
children
|
|
216
|
+
}) => jsx("div", {
|
|
217
|
+
css: metadataSubTextStyles,
|
|
218
|
+
"data-testid": datatestId
|
|
219
|
+
}, children);
|
|
220
|
+
export const MetadataIconWrapper = ({
|
|
221
|
+
children
|
|
222
|
+
}) => jsx("div", {
|
|
223
|
+
css: metadataIconWrapperStyles
|
|
224
|
+
}, children);
|
|
225
|
+
export const RightHeader = ({
|
|
226
|
+
children
|
|
227
|
+
}) => jsx("div", {
|
|
228
|
+
css: rightHeaderStyles
|
|
229
|
+
}, children);
|
|
230
|
+
export const CustomAudioPlayerWrapper = ({
|
|
231
|
+
children
|
|
232
|
+
}) => jsx("div", {
|
|
233
|
+
css: customAudioPlayerWrapperStyles
|
|
234
|
+
}, children);
|
|
235
|
+
export const AudioPlayer = ({
|
|
236
|
+
'data-testid': datatestId,
|
|
237
|
+
children
|
|
238
|
+
}) => jsx("div", {
|
|
239
|
+
css: audioPlayerStyles,
|
|
240
|
+
"data-testid": datatestId
|
|
241
|
+
}, children);
|
|
242
|
+
AudioPlayer.displayName = 'AudioPlayer';
|
|
243
|
+
export const Audio = /*#__PURE__*/forwardRef(({
|
|
244
|
+
autoPlay,
|
|
245
|
+
controls,
|
|
246
|
+
src,
|
|
247
|
+
preload
|
|
248
|
+
}, ref) => // eslint-disable-next-line jsx-a11y/media-has-caption
|
|
249
|
+
jsx("audio", {
|
|
250
|
+
css: audioStyles,
|
|
251
|
+
ref: ref,
|
|
252
|
+
autoPlay: autoPlay,
|
|
253
|
+
controls: controls,
|
|
254
|
+
src: src,
|
|
255
|
+
preload: preload
|
|
256
|
+
}));
|
|
257
|
+
export const AudioCover = ({
|
|
258
|
+
src,
|
|
259
|
+
alt
|
|
260
|
+
}) => jsx("img", {
|
|
261
|
+
css: audioCoverStyles,
|
|
262
|
+
alt: alt,
|
|
263
|
+
src: src
|
|
264
|
+
});
|
|
265
|
+
export const DefaultCoverWrapper = ({
|
|
266
|
+
children
|
|
267
|
+
}) => jsx("div", {
|
|
268
|
+
css: downloadButtonWrapperStyles
|
|
269
|
+
}, children);
|
|
270
|
+
export const DownloadButtonWrapper = ({
|
|
271
|
+
children
|
|
272
|
+
}) => jsx("div", {
|
|
273
|
+
css: downloadButtonWrapperStyles
|
|
274
|
+
}, children);
|
|
275
|
+
export const CustomVideoPlayerWrapper = ({
|
|
276
|
+
'data-testid': datatestId,
|
|
277
|
+
children
|
|
278
|
+
}) => jsx("div", {
|
|
279
|
+
css: customVideoPlayerWrapperStyles,
|
|
280
|
+
"data-testid": datatestId
|
|
281
|
+
}, children);
|
|
282
|
+
export const SidebarWrapper = ({
|
|
283
|
+
'data-testid': datatestId,
|
|
284
|
+
children
|
|
285
|
+
}) => jsx("div", {
|
|
286
|
+
css: sidebarWrapperStyles,
|
|
287
|
+
"data-testid": datatestId
|
|
288
|
+
}, children);
|
|
289
|
+
export const SpinnerWrapper = ({
|
|
290
|
+
children
|
|
291
|
+
}) => jsx("div", {
|
|
292
|
+
css: spinnerWrapperStyles
|
|
293
|
+
}, children);
|
|
294
|
+
export const FormattedMessageWrapper = ({
|
|
295
|
+
children
|
|
296
|
+
}) => jsx("span", {
|
|
297
|
+
css: formattedMessageWrapperStyles
|
|
298
|
+
}, children);
|